Return-Path: X-Original-To: apmail-abdera-commits-archive@www.apache.org Delivered-To: apmail-abdera-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E80427C3E for ; Wed, 21 Dec 2011 06:37:52 +0000 (UTC) Received: (qmail 97812 invoked by uid 500); 21 Dec 2011 06:37:52 -0000 Delivered-To: apmail-abdera-commits-archive@abdera.apache.org Received: (qmail 97786 invoked by uid 500); 21 Dec 2011 06:37:52 -0000 Mailing-List: contact commits-help@abdera.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@abdera.apache.org Delivered-To: mailing list commits@abdera.apache.org Received: (qmail 97774 invoked by uid 99); 21 Dec 2011 06:37:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2011 06:37:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2011 06:37:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DC4852388980 for ; Wed, 21 Dec 2011 06:37:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1221627 - in /abdera/abdera2: common/src/main/java/org/apache/abdera2/common/date/DateTimes.java test/src/main/java/org/apache/abdera2/test/common/date/DateTimesTest.java Date: Wed, 21 Dec 2011 06:37:26 -0000 To: commits@abdera.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111221063726.DC4852388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmsnell Date: Wed Dec 21 06:37:26 2011 New Revision: 1221627 URL: http://svn.apache.org/viewvc?rev=1221627&view=rev Log: Bug fixes and test cases Added: abdera/abdera2/test/src/main/java/org/apache/abdera2/test/common/date/DateTimesTest.java (with props) Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/date/DateTimes.java Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/date/DateTimes.java URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/date/DateTimes.java?rev=1221627&r1=1221626&r2=1221627&view=diff ============================================================================== --- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/date/DateTimes.java (original) +++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/date/DateTimes.java Wed Dec 21 06:37:26 2011 @@ -321,10 +321,18 @@ public final class DateTimes { } } + public static DateTime utc(String dt) { + return dt(dt, DateTimeZone.UTC); + } + public static DateTime dt(String dt) { return new DateTime(dt); } + public static DateTime dt(String dt, DateTimeZone dtz) { + return new DateTime(dt,dtz); + } + public static DateTime dt(Date date) { return new DateTime(date); } Added: abdera/abdera2/test/src/main/java/org/apache/abdera2/test/common/date/DateTimesTest.java URL: http://svn.apache.org/viewvc/abdera/abdera2/test/src/main/java/org/apache/abdera2/test/common/date/DateTimesTest.java?rev=1221627&view=auto ============================================================================== --- abdera/abdera2/test/src/main/java/org/apache/abdera2/test/common/date/DateTimesTest.java (added) +++ abdera/abdera2/test/src/main/java/org/apache/abdera2/test/common/date/DateTimesTest.java Wed Dec 21 06:37:26 2011 @@ -0,0 +1,50 @@ +package org.apache.abdera2.test.common.date; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import static org.apache.abdera2.common.date.DateTimes.*; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.junit.Test; + +public class DateTimesTest { + + @Test + public void testDateTimes() { + + DateTime dt = now(); + assertNotNull(dt); + + dt = utc("2012-12-12T12:12:12-00:00"); + assertEquals(2012,dt.getYear()); + assertEquals(12,dt.getMonthOfYear()); + assertEquals(12,dt.getDayOfMonth()); + assertEquals(12,dt.getHourOfDay()); + assertEquals(12,dt.getMinuteOfHour()); + assertEquals(12,dt.getSecondOfMinute()); + assertEquals(DateTimeZone.UTC, dt.getZone()); + + assertEquals("2012-12-12T12:12:12.000Z", format(dt)); + + // not testing every combination here.. just making sure basic mechanism works... + + assertTrue(after(dt("2012-12-12T12:12:11-00:00")).apply(dt)); + assertFalse(afterBetweenOrAt(dt("2012-12-12T12:12:12-00:00"),dt("2012-12-12T12:12:14-00:00")).apply(dt)); + assertTrue(afterBetweenOrAt(dt("2012-12-12T12:12:11-00:00"),dt("2012-12-12T12:12:13-00:00")).apply(dt)); + assertTrue(afterBetweenOrAt(dt("2012-12-12T12:12:10-00:00"),dt("2012-12-12T12:12:12-00:00")).apply(dt)); + + assertTrue(afterNow().apply(now().plusMinutes(1))); + assertFalse(afterNow().apply(now().minusMinutes(1))); + + assertTrue(atBetweenOrBefore(dt("2012-12-12T12:12:12-00:00"),dt("2012-12-12T12:12:14-00:00")).apply(dt)); + assertTrue(atBetweenOrBefore(dt("2012-12-12T12:12:11-00:00"),dt("2012-12-12T12:12:13-00:00")).apply(dt)); + assertFalse(atBetweenOrBefore(dt("2012-12-12T12:12:10-00:00"),dt("2012-12-12T12:12:12-00:00")).apply(dt)); + + assertTrue(equivalent(dt, "2012-12-12T12:12:12-00:00")); + assertTrue(equivalent(toTimeZone(dt,"EST"),"2012-12-12T12:12:12-00:00")); + } + +} Propchange: abdera/abdera2/test/src/main/java/org/apache/abdera2/test/common/date/DateTimesTest.java ------------------------------------------------------------------------------ svn:mime-type = text/plain