litesoft

Explore

Commits

Diff Revisions 895 vs 897 for /trunk/Java/core/Anywhere/tests/org/litesoft/core/simpletypes/temporal/CalendarYTest.java

		@@ -3,8 +3,6 @@
3	3
4	4		import junit.framework.*;
5	5
6		-	import org.litesoft.core.typeutils.*;
7		-
8	6		public class CalendarYTest extends AbstractTemporalTestSupport<CalendarY>
9	7		{
10	8		public static TestSuite suite()
		@@ -103,13 +101,12 @@
103	101
104	102		private void chk( DateFormat pFormat, CalendarY pDate, String pDateFormatToString, int pYear )
105	103		{
106		-	String zExpectedStringFormYandSQL = Integers.zeroPadIt( 4, pYear );
107	104		assertEquals( "y", pFormat.getFieldOrder() );
108	105		assertEquals( "Year", pYear, pDate.getYear() );
109	106		assertEquals( pDateFormatToString, pFormat.format( pDate ) );
110		-	assertEquals( "toY", zExpectedStringFormYandSQL, pDate.toY() );
	107	+	assertEquals( "toY", toY( pYear ), pDate.toY() );
111	108		assertEquals( "fromY", pDate, CalendarY.fromY( pDate.toY() ) );
112		-	assertEquals( "toSQLvalue", zExpectedStringFormYandSQL, pDate.toSQLvalue() );
	109	+	assertEquals( "toSQLvalue", toSQLvalueY( pYear ), pDate.toSQLvalue() );
113	110		assertEquals( "fromSQLvalue", pDate, CalendarY.fromSQLvalue( pDate.toSQLvalue() ) );
114	111		}
115	112