Author: bleny Date: 2014-06-17 18:01:52 +0200 (Tue, 17 Jun 2014) New Revision: 2056 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2056 Log: fixes #5188 review observationTimeInDays Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-06-17 15:33:09 UTC (rev 2055) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-06-17 16:01:52 UTC (rev 2056) @@ -26,8 +26,10 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.nuiton.util.DateUtil; +import java.util.Calendar; import java.util.Date; import java.util.LinkedList; import java.util.List; @@ -232,7 +234,9 @@ Integer observationTimeInDays = null; if (getObservationBeginDate() != null && getObservationEndDate() != null) { // +1 car demandé par le métier - observationTimeInDays = DateUtil.getDifferenceInDays(getObservationBeginDate(), getObservationEndDate()) + 1; + observationTimeInDays = DateUtil.getDifferenceInDays( + DateUtils.truncate(getObservationBeginDate(), Calendar.DAY_OF_MONTH), + DateUtils.truncate(getObservationEndDate(), Calendar.DAY_OF_MONTH)) + 1; } return observationTimeInDays; } Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java (rev 0) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java 2014-06-17 16:01:52 UTC (rev 2056) @@ -0,0 +1,31 @@ +package fr.ifremer.wao.entity; + +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.util.DateUtil; + +import java.util.Date; + +public class ContactImplTest { + + @Test + public void testGetObservationTimeInDays() { + + checkObservationTimeInDays(DateUtil.createDate(0, 0, 8, 19, 05, 2014), DateUtil.createDate(0, 0, 18, 19, 05, 2014), 1); + checkObservationTimeInDays(DateUtil.createDate(0, 0, 18, 19, 05, 2014), DateUtil.createDate(0, 0, 6, 20, 05, 2014), 2); + checkObservationTimeInDays(DateUtil.createDate(0, 0, 1, 19, 05, 2014), DateUtil.createDate(0, 0, 23, 20, 05, 2014), 2); + + } + + public void checkObservationTimeInDays(Date observationBeginDate, Date observationEndDate, int expectedObservationTimeInDays) { + + ContactImpl contact = new ContactImpl(); + contact.setObservationBeginDate(observationBeginDate); + contact.setObservationEndDate(observationEndDate); + + Integer actualObservationTimeInDays = contact.getObservationTimeInDays(); + Assert.assertEquals((Integer) expectedObservationTimeInDays, actualObservationTimeInDays); + + } + +} \ No newline at end of file