Author: tchemit Date: 2014-03-25 10:54:38 +0100 (Tue, 25 Mar 2014) New Revision: 1739 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1739 Log: refs-20 #4483 (fix tests) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-03-25 09:31:50 UTC (rev 1738) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-03-25 09:54:38 UTC (rev 1739) @@ -110,6 +110,8 @@ this.highTotalReal = new MutableInt(); this.observationTimesInDaysTotalPlanned = new MutableDouble(); this.observationTimesInDaysTotalActual = new MutableLong(); + this.totalExpectedForMonths = new TreeMap<>(); + this.totalRealForMonths = new TreeMap<>(); PeriodDates periodDates = new PeriodDates(sampleRowsFilter.getPeriodFrom(), sampleRowsFilter.getPeriodTo()); @@ -165,8 +167,8 @@ MutableInt totalExpected = totalExpectedForMonths.get(month); MutableInt totalReal = totalRealForMonths.get(month); ObsMerSamplingPlan.ObsMerSamplingPlanStatistics planStatistics = - new ObsMerSamplingPlan.ObsMerSamplingPlanStatistics(totalExpected.toInteger(), - totalReal.toInteger()); + new ObsMerSamplingPlan.ObsMerSamplingPlanStatistics(totalExpected == null ? null : totalExpected.toInteger(), + totalReal == null ? null : totalReal.toInteger()); statisticsMap.put(month, planStatistics); } Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-03-25 09:31:50 UTC (rev 1738) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-03-25 09:54:38 UTC (rev 1739) @@ -62,23 +62,23 @@ serviceContext.setDate(DateUtil.createDate(15, 5, 2010)); SampleRowsFilter filter = service.newSampleRowsFilter(fixtures.admin()); - List<SampleRow> samplingPlan = service.getSamplingPlan(filter); + List<SampleRow> samplingPlan = service.getSamplingPlan(filter).getRows(); Assert.assertEquals(12, samplingPlan.size()); filter = service.newSampleRowsFilter(fixtures.admin()); filter.setFishingGearDcfIds(ImmutableSet.of(fixtures.ptb().getTopiaId())); - samplingPlan = service.getSamplingPlan(filter); + samplingPlan = service.getSamplingPlan(filter).getRows(); Assert.assertEquals(3, samplingPlan.size()); filter = service.newSampleRowsFilter(fixtures.admin()); filter.setTargetSpeciesDcfIds(ImmutableSet.of(fixtures.def().getTopiaId())); - samplingPlan = service.getSamplingPlan(filter); + samplingPlan = service.getSamplingPlan(filter).getRows(); Assert.assertEquals(4, samplingPlan.size()); filter = service.newSampleRowsFilter(fixtures.admin()); filter.setFishingGearDcfIds(ImmutableSet.of(fixtures.ptb().getTopiaId())); filter.setTargetSpeciesDcfIds(ImmutableSet.of(fixtures.def().getTopiaId())); - samplingPlan = service.getSamplingPlan(filter); + samplingPlan = service.getSamplingPlan(filter).getRows(); Assert.assertEquals(1, samplingPlan.size()); }