Author: bleny Date: 2011-04-12 09:13:48 +0000 (Tue, 12 Apr 2011) New Revision: 1183 Log: fix bug when filling companies values for sampling filter Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-04-11 16:44:35 UTC (rev 1182) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-04-12 09:13:48 UTC (rev 1183) @@ -382,6 +382,7 @@ protected void fillSampleRow(SampleRow sampleRow) { ObsProgram obsProgram = sampleRow.getObsProgram(); + addCompanies(sampleRow.getCompany()); if (ObsProgram.OBSDEB.equals(obsProgram)) { addAllObservers(sampleRow.getObservers()); addObservationUnits(sampleRow.getObservationUnit()); @@ -395,7 +396,6 @@ for (DCF5Code dcf5Code : dcf5Codes) { addFishingGearDCFCodes(dcf5Code.getFishingGearDCF()); addTargetSpeciesDCFCodes(dcf5Code.getTargetSpeciesDCF()); - addCompanies(sampleRow.getCompany()); } } if (ObsProgram.OBSVENTE.equals(obsProgram)) { 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 16:44:35 UTC (rev 1182) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-12 09:13:48 UTC (rev 1183) @@ -236,9 +236,10 @@ // and the possible values (here we only check that this // doesn't raise any error SamplingFilterValues samplingFilterValues = serviceSampling.getPossibleValuesForFilter(samplingFilter); - samplingFilterValues.getSampleRows(); - samplingFilterValues.getObservationUnits(); - samplingFilterValues.getObservers(); + Assert.assertEquals(4, samplingFilterValues.getSampleRows().size()); + Assert.assertEquals(2, samplingFilterValues.getObservationUnits().size()); + Assert.assertEquals(0, samplingFilterValues.getObservers().size()); + Assert.assertEquals(2, samplingFilterValues.getCompanies().size()); samplingFilter = serviceSampling.newSamplingFilter(joshAsAdministrator()); samplingFilter.setPeriod(new PeriodDates(DateUtil.createDate(20, 2, 2010),