You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2008/03/11 01:46:53 UTC
svn commit: r635768 -
/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Author: sebb
Date: Mon Mar 10 17:46:49 2008
New Revision: 635768
URL: http://svn.apache.org/viewvc?rev=635768&view=rev
Log:
Add extra short date tests.
Currently the following tests will fail:
testParseShortFutureDates1 & 2
Modified:
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java?rev=635768&r1=635767&r2=635768&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java Mon Mar 10 17:46:49 2008
@@ -247,28 +247,52 @@
}
}
- public void testParseShortPastDates() throws Exception {
- GregorianCalendar now = new GregorianCalendar();
- checkShortParse("Now",now,now); // should always work
+ public void testParseShortPastDates1() throws Exception {
+ GregorianCalendar now = new GregorianCalendar(2001, Calendar.MAY, 30, 12, 0);
+ checkShortParse("2001-5-30",now,now); // should always work
GregorianCalendar target = (GregorianCalendar) now.clone();
target.add(Calendar.WEEK_OF_YEAR, -1);
- checkShortParse("Now -1 week",now,target);
+ checkShortParse("2001-5-30 -1 week",now,target);
target.add(Calendar.WEEK_OF_YEAR, -12);
- checkShortParse("Now -13 weeks",now,target);
+ checkShortParse("2001-5-30 -13 weeks",now,target);
target.add(Calendar.WEEK_OF_YEAR, -13);
- checkShortParse("Now -26 weeks",now,target);
+ checkShortParse("2001-5-30 -26 weeks",now,target);
}
- public void testParseShortFutureDates() throws Exception {
- GregorianCalendar now = new GregorianCalendar();
- checkShortParse("Now",now,now); // should always work
+ public void testParseShortPastDates2() throws Exception {
+ GregorianCalendar now = new GregorianCalendar(2004, Calendar.AUGUST, 1, 12, 0);
+ checkShortParse("2004-8-1",now,now); // should always work
+ GregorianCalendar target = (GregorianCalendar) now.clone();
+ target.add(Calendar.WEEK_OF_YEAR, -1);
+ checkShortParse("2004-8-1 -1 week",now,target);
+ target.add(Calendar.WEEK_OF_YEAR, -12);
+ checkShortParse("2004-8-1 -13 weeks",now,target);
+ target.add(Calendar.WEEK_OF_YEAR, -13);
+ checkShortParse("2004-8-1 -26 weeks",now,target);
+ }
+
+ public void testParseShortFutureDates1() throws Exception {
+ GregorianCalendar now = new GregorianCalendar(2001, Calendar.MAY, 30, 12, 0);
+ checkShortParse("2001-5-30",now,now); // should always work
+ GregorianCalendar target = (GregorianCalendar) now.clone();
+ target.add(Calendar.WEEK_OF_YEAR, 1);
+ checkShortParse("2001-5-30 +1 week",now,target);
+ target.add(Calendar.WEEK_OF_YEAR, 12);
+ checkShortParse("2001-5-30 +13 weeks",now,target);
+ target.add(Calendar.WEEK_OF_YEAR, 13);
+ checkShortParse("2001-5-30 +26 weeks",now,target);
+ }
+
+ public void testParseShortFutureDates2() throws Exception {
+ GregorianCalendar now = new GregorianCalendar(2004, Calendar.AUGUST, 1, 12, 0);
+ checkShortParse("2004-8-1",now,now); // should always work
GregorianCalendar target = (GregorianCalendar) now.clone();
target.add(Calendar.WEEK_OF_YEAR, 1);
- checkShortParse("Now +1 week",now,target);
+ checkShortParse("2004-8-1 +1 week",now,target);
target.add(Calendar.WEEK_OF_YEAR, 12);
- checkShortParse("Now +13 weeks",now,target);
+ checkShortParse("2004-8-1 +13 weeks",now,target);
target.add(Calendar.WEEK_OF_YEAR, 13);
- checkShortParse("Now +26 weeks",now,target);
+ checkShortParse("2004-8-1 +26 weeks",now,target);
}
// Test leap year if current year is a leap year