Author: tchemit Date: 2012-03-28 12:15:25 +0200 (Wed, 28 Mar 2012) New Revision: 422 Url: http://forge.codelutin.com/repositories/revision/echobase/422 Log: fix some esdu result import (remove bad data metas + add correct entities count) Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-28 10:15:25 UTC (rev 422) @@ -132,7 +132,6 @@ //TODO Remove this when referentiel is ok create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "SigmaSp"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "RegionID"); create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondBiomass"); create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondAbundance"); @@ -198,16 +197,13 @@ addMissingEsduCells(conf.getVoyageId(), inputFile); - //TODO Remove this when referentiel is ok - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "N"); - List<CsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); assertCsvImportResult(result, 0, Result.class, 10021); assertCsvImportResult(result, 0, AgeCategory.class, 10); assertCsvImportResult(result, 0, Category.class, 14); - assertCsvImportResult(result, 0, SpeciesCategory.class, 14); + assertCsvImportResult(result, 0, SpeciesCategory.class, 14, 0, 471); } protected void addMissingEsduCells(String voyageId,