Author: bleny Date: 2011-04-11 13:29:13 +0000 (Mon, 11 Apr 2011) New Revision: 1174 Log: fix test Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-04-11 13:03:02 UTC (rev 1173) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-04-11 13:29:13 UTC (rev 1174) @@ -320,12 +320,12 @@ // Period filter on sampleRow dates if (period != null) { if (ObsProgram.OBSDEB.equals(filter.getObsProgram())) { - query.addWhere(sampleRowProperty.day(), TopiaQuery.Op.LT, period.getThruDate()). - addWhere(sampleRowProperty.day(), TopiaQuery.Op.GT, period.getFromDate()); + query.addWhere(sampleRowProperty.day(), TopiaQuery.Op.LE, period.getThruDate()). + addWhere(sampleRowProperty.day(), TopiaQuery.Op.GE, period.getFromDate()); } else { period.initDayOfMonthExtremities(); - query.addWhere(sampleRowProperty.periodBegin(), TopiaQuery.Op.LT, period.getThruDate()). - addWhere(sampleRowProperty.periodEnd(), TopiaQuery.Op.GT, period.getFromDate()); + query.addWhere(sampleRowProperty.periodBegin(), TopiaQuery.Op.LE, period.getThruDate()). + addWhere(sampleRowProperty.periodEnd(), TopiaQuery.Op.GE, period.getFromDate()); } } else if (fromDate != null) { if (ObsProgram.OBSDEB.equals(filter.getObsProgram())) { Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-11 13:03:02 UTC (rev 1173) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-11 13:29:13 UTC (rev 1174) @@ -328,7 +328,6 @@ * plan by sending a same observer on two different place the same day */ @Test - @Ignore("not yet implemented") public void coordinatorCannotBreakSamplingPlan() throws IOException, WaoBusinessException { coordinatorCanAddObserversViaImport();