This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit bdb44c978ff752914b52c06c02cace1e98db1a4c Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Nov 4 10:52:06 2014 +0100 Dans le calcul du nombre de jours de mers, si la date de débarquement est à minuit, on veille à bien compter le jour d'arrivée comme jour de mer --- wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java | 2 +- .../src/test/java/fr/ifremer/wao/WaoUtilsTest.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java b/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java index cbda03d..0da34ca 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java @@ -182,7 +182,7 @@ public class WaoUtils { } count.increment(); aDay = DateUtils.addDays(aDay, 1); - } while (aDay.before(observationEndDate)); + } while ( ! aDay.after(observationEndDate)); // not after équivaut à before ou equals Map<Date, Integer> result = new TreeMap<>(); for (Map.Entry<Date, MutableInt> entry : tempResult.entrySet()) { result.put(entry.getKey(), entry.getValue().intValue()); diff --git a/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java b/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java index 43f01f0..81c9246 100644 --- a/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java +++ b/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java @@ -75,7 +75,16 @@ public class WaoUtilsTest { checkObservationTimeInDays(DateUtil.createDate(0, 0, 12, 31, 1, 2014), DateUtil.createDate(0, 0, 23, 1, 2, 2014), 2); } - + + @Test + public void testGetObservationDaysByMonthsWithMidnight() { + + checkObservationTimeInDays(DateUtil.createDate(0, 0, 6, 1, 9, 2014), DateUtil.createDate(0, 0, 0, 13, 9, 2014), 1); + + checkObservationTimeInDays(DateUtil.createDate(0, 0, 0, 1, 9, 2014), DateUtil.createDate(0, 0, 6, 13, 9, 2014), 1); + + } + protected void checkObservationTimeInDays(Date observationBeginDate, Date observationEndDate, int expectedSize) { Map<Date, Integer> observationDaysByMonths = WaoUtils.getObservationDaysByMonths(observationBeginDate, observationEndDate); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.