bayard 2004/08/28 20:44:22 Modified: lang/src/test/org/apache/commons/lang/time DurationFormatUtilsTest.java Log: various tests which helped find the last two bugs Revision Changes Path 1.9 +43 -0 jakarta-commons/lang/src/test/org/apache/commons/lang/time/DurationFormatUtilsTest.java Index: DurationFormatUtilsTest.java =================================================================== RCS file: /home/cvs/jakarta-commons/lang/src/test/org/apache/commons/lang/time/DurationFormatUtilsTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- DurationFormatUtilsTest.java 27 Aug 2004 06:45:25 -0000 1.8 +++ DurationFormatUtilsTest.java 29 Aug 2004 03:44:22 -0000 1.9 @@ -167,6 +167,49 @@ //assertEquals("P1Y2M3DT10H30M", text); } + public void testFormat() { + long time = 0; + assertEquals( "0", DurationFormatUtils.format(time, "y") ); + assertEquals( "0", DurationFormatUtils.format(time, "M") ); + assertEquals( "0", DurationFormatUtils.format(time, "d") ); + assertEquals( "0", DurationFormatUtils.format(time, "H") ); + assertEquals( "0", DurationFormatUtils.format(time, "m") ); + assertEquals( "0", DurationFormatUtils.format(time, "s") ); + assertEquals( "0", DurationFormatUtils.format(time, "S") ); + assertEquals( "0000", DurationFormatUtils.format(time, "SSSS") ); + assertEquals( "0000", DurationFormatUtils.format(time, "yyyy") ); + assertEquals( "0000", DurationFormatUtils.format(time, "yyMM") ); + + time = 60 * 1000; + assertEquals( "0", DurationFormatUtils.format(time, "y") ); + assertEquals( "0", DurationFormatUtils.format(time, "M") ); + assertEquals( "0", DurationFormatUtils.format(time, "d") ); + assertEquals( "0", DurationFormatUtils.format(time, "H") ); + assertEquals( "1", DurationFormatUtils.format(time, "m") ); + assertEquals( "60", DurationFormatUtils.format(time, "s") ); + assertEquals( "60000", DurationFormatUtils.format(time, "S") ); + assertEquals( "01:00", DurationFormatUtils.format(time, "mm:ss") ); + + time = 3 * DateUtils.MILLIS_PER_YEAR + 7 * DateUtils.MILLIS_PER_MONTH; + assertEquals( "37", DurationFormatUtils.format(time, "yM") ); + assertEquals( "3 years 7 months", DurationFormatUtils.format(time, "y' years 'M' months'") ); + assertEquals( "03/07", DurationFormatUtils.format(time, "yy/MM") ); + + time = 3 * DateUtils.MILLIS_PER_YEAR + 11 * DateUtils.MILLIS_PER_MONTH; + assertEquals( "311", DurationFormatUtils.format(time, "yM") ); + assertEquals( "3 years 11 months", DurationFormatUtils.format(time, "y' years 'M' months'") ); + assertEquals( "03/11", DurationFormatUtils.format(time, "yy/MM") ); + + time = 3 * DateUtils.MILLIS_PER_YEAR + 12 * DateUtils.MILLIS_PER_MONTH; + assertEquals( "40", DurationFormatUtils.format(time, "yM") ); + assertEquals( "4 years 0 months", DurationFormatUtils.format(time, "y' years 'M' months'") ); + assertEquals( "04/00", DurationFormatUtils.format(time, "yy/MM") ); + assertEquals( "48", DurationFormatUtils.format(time, "M") ); + assertEquals( "48", DurationFormatUtils.format(time, "MM") ); + assertEquals( "048", DurationFormatUtils.format(time, "MMM") ); + + } + public void testLexx() { // tests each constant assertArrayEquals(
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]