|
@@ -37,11 +37,11 @@ |
37 |
37 |
|
throws Exception |
38 |
38 |
|
{ |
39 |
39 |
|
// Leap Day |
40 |
|
- |
chk( new SimpleDate( 2004, 2, 29 ), "29 Feb 2004", "dMy", 2004, 2, 29 ); |
|
40 |
+ |
chk( new CalendarYMD( 2004, 2, 29 ), "29 Feb 2004", "dMy", 2004, 2, 29 ); |
41 |
41 |
|
// exception-exception Leap Day |
42 |
|
- |
chk( new SimpleDate( 2000, 2, 29 ), "29 Feb 2000", "dMy", 2000, 2, 29 ); |
|
42 |
+ |
chk( new CalendarYMD( 2000, 2, 29 ), "29 Feb 2000", "dMy", 2000, 2, 29 ); |
43 |
43 |
|
|
44 |
|
- |
chk( new SimpleDate( 1957, 1, 4 ), "04 Jan 1957", "dMy", 1957, 1, 4 ); |
|
44 |
+ |
chk( new CalendarYMD( 1957, 1, 4 ), "04 Jan 1957", "dMy", 1957, 1, 4 ); |
45 |
45 |
|
chk( "yy", 1996, "96", "y", 1996, 0, 0 ); |
46 |
46 |
|
chk( "/yy", 1996, "/96", "y", 1996, 0, 0 ); |
47 |
47 |
|
chk( "/ y:", 1996, "/ 1996:", "y", 1996, 0, 0 ); |
|
@@ -60,25 +60,25 @@ |
60 |
60 |
|
|
61 |
61 |
|
private void chk( String pDateFormat, int pYearSrc, String pToString, String pFieldOrder, int pYear, int pMonth, int pDay ) |
62 |
62 |
|
{ |
63 |
|
- |
chk( new DateFormat( pDateFormat ), new SimpleDate( pYearSrc ), pToString, pFieldOrder, pYear, pMonth, pDay ); |
|
63 |
+ |
chk( new DateFormat( pDateFormat ), new CalendarYMD( pYearSrc ), pToString, pFieldOrder, pYear, pMonth, pDay ); |
64 |
64 |
|
} |
65 |
65 |
|
|
66 |
66 |
|
private void chk( String pDateFormat, int pYearSrc, int pMonthSrc, String pToString, String pFieldOrder, int pYear, int pMonth, int pDay ) |
67 |
67 |
|
{ |
68 |
|
- |
chk( new DateFormat( pDateFormat ), new SimpleDate( pYearSrc, pMonthSrc ), pToString, pFieldOrder, pYear, pMonth, pDay ); |
|
68 |
+ |
chk( new DateFormat( pDateFormat ), new CalendarYMD( pYearSrc, pMonthSrc ), pToString, pFieldOrder, pYear, pMonth, pDay ); |
69 |
69 |
|
} |
70 |
70 |
|
|
71 |
71 |
|
private void chk( String pDateFormat, int pYearSrc, int pMonthSrc, int pDaySrc, String pToString, String pFieldOrder, int pYear, int pMonth, int pDay ) |
72 |
72 |
|
{ |
73 |
|
- |
chk( new DateFormat( pDateFormat ), new SimpleDate( pYearSrc, pMonthSrc, pDaySrc ), pToString, pFieldOrder, pYear, pMonth, pDay ); |
|
73 |
+ |
chk( new DateFormat( pDateFormat ), new CalendarYMD( pYearSrc, pMonthSrc, pDaySrc ), pToString, pFieldOrder, pYear, pMonth, pDay ); |
74 |
74 |
|
} |
75 |
75 |
|
|
76 |
|
- |
private void chk( SimpleDate pDate, String pToString, String pFieldOrder, int pYear, int pMonth, int pDay ) |
|
76 |
+ |
private void chk( CalendarYMD pDate, String pToString, String pFieldOrder, int pYear, int pMonth, int pDay ) |
77 |
77 |
|
{ |
78 |
78 |
|
chk( pDate.getDateRes().getDateFormat(), pDate, pToString, pFieldOrder, pYear, pMonth, pDay ); |
79 |
79 |
|
} |
80 |
80 |
|
|
81 |
|
- |
private void chk( DateFormat pFormat, SimpleDate pDate, String pToString, String pFieldOrder, int pYear, int pMonth, int pDay ) |
|
81 |
+ |
private void chk( DateFormat pFormat, CalendarYMD pDate, String pToString, String pFieldOrder, int pYear, int pMonth, int pDay ) |
82 |
82 |
|
{ |
83 |
83 |
|
assertEquals( pFieldOrder, pFormat.getFieldOrder() ); |
84 |
84 |
|
assertEquals( "Year", pYear, pDate.getYear() ); |