Author: bleny Date: 2010-12-22 18:56:43 +0100 (Wed, 22 Dec 2010) New Revision: 1977 Url: http://nuiton.org/repositories/revision/nuiton-utils/1977 Log: fix #1157 + test Modified: trunk/src/main/java/org/nuiton/util/DateUtil.java trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties trunk/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtil.java 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/main/java/org/nuiton/util/DateUtil.java 2010-12-22 17:56:43 UTC (rev 1977) @@ -96,6 +96,7 @@ */ public static Date createDate(int s, int m, int h, int dd, int mm, int yy) { Calendar calendar = Calendar.getInstance(); + calendar.setTimeInMillis(0L); calendar.set(Calendar.YEAR, yy); calendar.set(Calendar.MONTH, mm-1); calendar.set(Calendar.DAY_OF_MONTH, dd); Modified: trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties 2010-12-22 17:56:43 UTC (rev 1977) @@ -1,3 +1,6 @@ +Can't\ find\ assignable\ argument\ for\ %s\ in\ %s= +Class\ %s\ can't\ be\ instanciated\ with\ %s= +Your\ class\ %s\ has\ more\ than\ one\ constructor= nuitonutil.config.moving.conf=Moving old configuration file from %s to %s nuitonutil.debug.objectutil.create=Try to create %s with %s nuitonutil.debug.objectutil.instantiate=Can't instantiate %s with params %s Modified: trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties 2010-12-22 17:56:43 UTC (rev 1977) @@ -1,3 +1,6 @@ +Can't\ find\ assignable\ argument\ for\ %s\ in\ %s= +Class\ %s\ can't\ be\ instanciated\ with\ %s= +Your\ class\ %s\ has\ more\ than\ one\ constructor= nuitonutil.config.moving.conf=D\u00E9placement du fichier de configuration depuis %s vers %s nuitonutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s nuitonutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s Modified: trunk/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilTest.java 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/test/java/org/nuiton/util/DateUtilTest.java 2010-12-22 17:56:43 UTC (rev 1977) @@ -35,6 +35,7 @@ import org.junit.Test; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -85,11 +86,11 @@ * Test of createDate method, of class DateUtils. */ @Test - public void testCreateDate() { + public void testCreateDate() throws ParseException { log.info("createDate"); - Date newdate = DateUtil.createDate(3, 3, 2009); - Calendar calendar = DateUtil.getDefaultCalendar(newdate); + Date newDate = DateUtil.createDate(3, 3, 2009); + Calendar calendar = DateUtil.getDefaultCalendar(newDate); Assert.assertEquals(3, calendar.get(Calendar.DAY_OF_MONTH)); Assert.assertEquals(2, calendar.get(Calendar.MONTH)); @@ -102,6 +103,18 @@ } /** + * Non regression test for bug #1157 + * @since 1.5.2 + */ + @Test + public void testCreateDateIsDeterministic() throws ParseException { + Date createdDate = DateUtil.createDate(0, 33, 18, 22, 12, 2010); + Date parsedDate = DateUtil.parseDate("22/12/2010 18:33", "dd/MM/yyyy HH:mm"); + log.info(createdDate.getTime() + " ?= " + parsedDate.getTime()); + Assert.assertEquals(createdDate, parsedDate); + } + + /** * Test of createDateAfterToday method, of class DateUtil. */ //@Test