Author: bleny Date: 2011-03-17 16:58:07 +0100 (Thu, 17 Mar 2011) New Revision: 2088 Url: http://nuiton.org/repositories/revision/nuiton-utils/2088 Log: fix + regression test for ano #1403 Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-03-12 14:21:45 UTC (rev 2087) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-03-17 15:58:07 UTC (rev 2088) @@ -151,7 +151,9 @@ Calendar calendar = getDefaultCalendar(date); int maximum = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); calendar.set(Calendar.DAY_OF_MONTH, maximum); - return calendar.getTime(); + Date lastDay = calendar.getTime(); + lastDay = setMaxTimeOfDay(lastDay); + return lastDay; } /** Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-03-12 14:21:45 UTC (rev 2087) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-03-17 15:58:07 UTC (rev 2088) @@ -125,9 +125,22 @@ /** * Test of setLastDayOfMonth method, of class DateUtil. */ - //@Test - public void testSetLastDayOfMonth() { - log.info("setLastDayOfMonth"); + @Test + public void testSetFistLastDayOfMonth() { + Date february = DateUtil.createDate(22, 2, 2011); + Date firstDayOfFebruary = DateUtil.setFirstDayOfMonth(february); + Date lastDayOfFebruary = DateUtil.setLastDayOfMonth(february); + + Date day1 = DateUtil.createDate(0, 0, 2, 1, 2, 2011); + Date day2 = DateUtil.createDate(67, 45, 23, 28, 2, 2011); + + if (log.isDebugEnabled()) { + log.debug("first day of february = " + firstDayOfFebruary + ", last day of february = " + + lastDayOfFebruary + ", day1 = " + day1 + ", day 2 = " + day2); + } + + Assert.assertTrue(DateUtil.between(day1, firstDayOfFebruary, lastDayOfFebruary)); + Assert.assertTrue(DateUtil.between(day2, firstDayOfFebruary, lastDayOfFebruary)); } /**