litesoft
Diff Revisions
873
vs
893
for /trunk/Java/core/Anywhere/tests/org/litesoft/core/simpletypes/temporal/CalendarYMDTest.java
|
@@ -28,22 +28,21 @@ |
28 |
28 |
|
chkCB( "1996a" ); |
29 |
29 |
|
chkCB( "1996/a" ); |
30 |
30 |
|
chkCB( "1996/1/a" ); |
|
31 |
+ |
|
|
32 |
+ |
// Missing Parts |
|
33 |
+ |
chkCB( "1996" ); |
|
34 |
+ |
chkCB( "1996/1" ); |
|
35 |
+ |
|
|
36 |
+ |
// Too Many Parts |
|
37 |
+ |
chkCB( "1996/2/1 0" ); |
|
38 |
+ |
|
31 |
39 |
|
// Bad Dates |
32 |
|
- |
chkCB( "2000/0" ); |
33 |
|
- |
chkCB( "2000/13" ); |
34 |
40 |
|
chkCB( "2000/0/1" ); |
35 |
41 |
|
chkCB( "2000/13/1" ); |
36 |
42 |
|
chkCB( "2000/1/0" ); |
37 |
43 |
|
chkCB( "2000/1/32" ); |
38 |
44 |
|
chkCB( "2000/4/31" ); |
39 |
45 |
|
chkCB( "2100/2/29" ); // exception to Leap Day |
40 |
|
- |
|
41 |
|
- |
// Missing Parts |
42 |
|
- |
chkCB( "1996" ); |
43 |
|
- |
chkCB( "1996/1" ); |
44 |
|
- |
|
45 |
|
- |
// Too Many Parts |
46 |
|
- |
chkCB( "1996/2/1/0" ); |
47 |
46 |
|
} |
48 |
47 |
|
|
49 |
48 |
|
private void chkCB( String pToYMD ) |
|
@@ -140,7 +139,7 @@ |
140 |
139 |
|
assertEquals( "Month", pMonth, pDate.getMonth() ); |
141 |
140 |
|
assertEquals( "Day", pDay, pDate.getDay() ); |
142 |
141 |
|
assertEquals( pDateFormatToString, pFormat.format( pDate ) ); |
143 |
|
- |
assertEquals( "toYMB", zExpectedStringFormY + "/" + zExpectedStringFormM + "/" + zExpectedStringFormD, pDate.toYMD() ); |
|
142 |
+ |
assertEquals( "toYMD", zExpectedStringFormY + "/" + zExpectedStringFormM + "/" + zExpectedStringFormD, pDate.toYMD() ); |
144 |
143 |
|
assertEquals( "fromYMD", pDate, CalendarYMD.fromYMD( pDate.toYMD() ) ); |
145 |
144 |
|
assertEquals( "toSQLvalue", zExpectedStringFormY + "-" + zExpectedStringFormM + "-" + zExpectedStringFormD, pDate.toSQLvalue() ); |
146 |
145 |
|
assertEquals( "fromSQLvalue", pDate, CalendarYMD.fromSQLvalue( pDate.toSQLvalue() ) ); |