[Echobase-commits] r421 - in trunk/echobase-services/src: main/java/fr/ifremer/echobase/services main/java/fr/ifremer/echobase/services/importdata/csv test/java/fr/ifremer/echobase/services test/java/fr/ifremer/echobase/services/importdata

Author: tchemit Date: 2012-03-28 01:21:55 +0200 (Wed, 28 Mar 2012) New Revision: 421 Url: http://forge.codelutin.com/repositories/revision/echobase/421 Log: remove unused directories + clean imports Removed: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -42,38 +42,6 @@ */ public class AcousticDataImportModel extends AbstractImportModel<AcousticDataImportRow> { - - /* -ESDU Data - -Latitude MOVIES_EILayer\\cellset\\lat, OK -Longitude MOVIES_EILayer\\cellset\\long OK -depth MOVIES_EILayer\\shipnav\\depth OK -timeStart MOVIES_EILayer\\cellset\\datestart OK -timeEnd MOVIES_EILayer\\cellset\\dateend OK -NASC MOVIES_EILayer\\eilayer\\sa OK -Volume MOVIES_EILayer\\cellset\\volume OK -Surface MOVIES_EILayer\\cellset\\area OK -NumberOfSamplesRecorded MOVIES_EILayer\\cellset\\nt OK -NumberOfSamplesEchoIntegrated MOVIES_EILayer\\cellset\\ni"OK - - -Elementary Data - -Latitude MOVIES_EILayer\\cellset\\lat -Longitude MOVIES_EILayer\\cellset\\long -depthStart (surface ou bottom) MOVIES_EILayer\\cellset\\depthstart -depthEnd (surface ou bottom) MOVIES_EILayer\\cellset\\depthend -timeStart MOVIES_EILayer\\cellset\\datestart -timeEnd MOVIES_EILayer\\cellset\\dateend -NASC MOVIES_EILayer\\eilayer\\sa -Volume MOVIES_EILayer\\cellset\\volume -Surface MOVIES_EILayer\\cellset\\area -NumberOfSamplesRecorded MOVIES_EILayer\\cellset\\nt -NumberOfSamplesEchoIntegrated MOVIES_EILayer\\cellset\\ni -minEIthr MOVIES_EILayer\cellset\thresholdlow -maxEIthr MOVIES_EILayer\cellset\thresholdup - */ public AcousticDataImportModel(char separator, Map<String, AcousticInstrument> instrumentsById) { super(separator); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -46,15 +46,6 @@ Map<String, SampleDataType> sampleDataTypeMap) { super(separator); - /* - operationID - baracoudacode - numFish - dataLabel - dataValue - name - */ - newForeignKeyColumn("operationID", BiometrySampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); newForeignKeyColumn("baracoudacode", BiometrySampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -39,29 +39,12 @@ */ public class EchotypeImportModel extends AbstractImportModel<EchotypeImportRow> { - protected final Map<String, Voyage> voyageMap; - - protected final Map<String, DepthStratum> depthStratumMap; - - protected final Map<String, Species> speciesMap; - public EchotypeImportModel(char separator, Map<String, Voyage> voyageMap, Map<String, DepthStratum> depthStratumMap, Map<String, Species> speciesMap) { super(separator); - this.voyageMap = voyageMap; - this.depthStratumMap = depthStratumMap; - this.speciesMap = speciesMap; - /* - voyage - echotypeName - DepthStratumID - meaning - baracoudacode - */ - newMandatoryColumn("echotypeName", Echotype.PROPERTY_NAME); newMandatoryColumn("meaning", Echotype.PROPERTY_MEANING); newForeignKeyColumn(EchotypeImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -47,14 +47,6 @@ Map<String, Operation> operationMap) { super(separator); - /* - vesselName - id - gearID - metadataType - gearMetadataValue - */ - newForeignKeyColumn("vesselName", GearMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); newForeignKeyColumn("operationID", GearMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -40,20 +40,11 @@ */ public class LengthAgeKeyImportModel extends AbstractImportModel<LengthAgeKeyImportRow> { - protected final Map<String, Voyage> voyageMap; - - protected final Map<String, Strata> strataMap; - - protected final Map<String, Species> speciesMap; - public LengthAgeKeyImportModel(char separator, Map<String, Voyage> voyageMap, Map<String, Strata> strataMap, Map<String, Species> speciesMap) { super(separator); - this.voyageMap = voyageMap; - this.strataMap = strataMap; - this.speciesMap = speciesMap; newForeignKeyColumn(LengthAgeKeyImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -40,29 +40,11 @@ */ public class LengthWeightKeyImportModel extends AbstractImportModel<LengthWeightKeyImportRow> { - protected final Map<String, Voyage> voyageMap; - - protected final Map<String, SizeCategory> sizeCategoryMap; - - protected final Map<String, Species> speciesMap; - public LengthWeightKeyImportModel(char separator, Map<String, Voyage> voyageMap, Map<String, SizeCategory> sizeCategoryMap, Map<String, Species> speciesMap) { super(separator); - this.voyageMap = voyageMap; - this.sizeCategoryMap = sizeCategoryMap; - this.speciesMap = speciesMap; - - /* - voyage - sizeCategory - aParameter - bParameter - codeMemo - */ - newMandatoryColumn("aParameter", LengthWeightKey.PROPERTY_APARAMETER, EchobaseCsvUtil.PRIMITIVE_FLOAT); newMandatoryColumn("bParameter", LengthWeightKey.PROPERTY_BPARAMETER, EchobaseCsvUtil.PRIMITIVE_FLOAT); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -46,20 +46,6 @@ Map<String, DepthStratum> depthStratumMap) { super(separator); - /* - vesselName // - id // - depthStratumID // - gearShootingStartTime // - midHaulLatitude // - midHaulLongitude // - gearShootingStartLatitude // - gearShootingStartLongitude // - gearShootingEndTime // - gearShootingEndLatitude // - gearShootingEndLongitude // - gearName // - */ newForeignKeyColumn("vesselName", OperationImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); newForeignKeyColumn("gearCode", Operation.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -45,13 +45,6 @@ Map<String, Operation> operationMap) { super(separator); - /* - vesselName/ - id/ - metadataType/ - operationMetadataValue/ - */ - newForeignKeyColumn("vesselName", OperationMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); newForeignKeyColumn("operationID", OperationMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java 2012-03-27 23:21:55 UTC (rev 421) @@ -42,7 +42,6 @@ public RegionCellAssociationImportRow() { } - public Cell getEsduCell() { return esduCell; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -49,21 +49,6 @@ Map<String, SexCategory> sexCategoryMap) { super(separator); - /* - operationID - subHaul - baracoudacode - sizeCategory - sexCategory - sampleWeight - numberSampled - - numberAtLength - weightAtLength - units - round - */ - newIgnoredColumn("subHaul"); newIgnoredColumn("units"); newIgnoredColumn("round"); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java 2012-03-27 23:21:55 UTC (rev 421) @@ -38,7 +38,6 @@ */ public class SubSampleImportRow { - public static final String PROPERTY_OPERATION = "operation"; public static final String PROPERTY_SPECIES = "species"; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -46,18 +46,6 @@ Map<String, SizeCategory> sizeCategoryMap) { super(separator); - /* - operationID - baracoudacode - sizeCategory - sampleWeight - numberSampled - meanLength - meanWeight - noPerKg - sortedWeight - */ - newForeignKeyColumn("operationID", TotalSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); newForeignKeyColumn("baracoudacode", TotalSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(TotalSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -38,8 +38,6 @@ */ public class TransitImportModel extends AbstractImportModel<TransitImportRow> { - public static final String TRANSIT_VoyageId = "voyageName"; - public TransitImportModel(char separator, Map<String, Voyage> voyageMap) { super(separator); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-03-27 23:21:55 UTC (rev 421) @@ -46,6 +46,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Arrays; +import java.util.List; import java.util.Set; import java.util.zip.GZIPInputStream; @@ -146,6 +147,19 @@ } + protected <E extends TopiaEntity> void assertCsvImportResult(List<CsvFileImportResult> actual, + int pos, + Class<E> entityType, + int numberCreated) throws TopiaException { + Assert.assertTrue(actual.size() >= pos); + assertCsvImportResult(actual.get(pos), + entityType, + numberCreated, + 0, + numberCreated); + + } + protected <E extends TopiaEntity> void assertCsvImportResult(CsvFileImportResult actual, Class<E> entityType, int numberCreated, @@ -160,6 +174,23 @@ assertNbEntities(entityType, nbCount); } + protected <E extends TopiaEntity> void assertCsvImportResult(List<CsvFileImportResult> results, + int pos, + Class<E> entityType, + int numberCreated, + int numberUpdated, + int nbCount) throws TopiaException { + Assert.assertTrue(results.size() >= pos); + CsvFileImportResult actual = results.get(pos); + Assert.assertNotNull(actual); + Set<EchoBaseEntityEnum> entityTypes = actual.getEntityTypes(); + EchoBaseEntityEnum expectedEntityType = EchoBaseEntityEnum.valueOf(entityType); + Assert.assertTrue(entityTypes.contains(expectedEntityType)); + Assert.assertEquals(numberCreated, actual.getNumberCreated(expectedEntityType)); + Assert.assertEquals(numberUpdated, actual.getNumberUpdated(expectedEntityType)); + assertNbEntities(entityType, nbCount); + } + protected <E extends TopiaEntity> void assertNbEntities(Class<E> entityType, int expectedNumber) throws TopiaException { long count = getDAO(entityType).count(); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -83,14 +83,13 @@ prepareInputFile(conf.getMoviesFile(), getImportPath("movies.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, AcousticDataImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, AcousticDataImportService.class, 1); - CsvFileImportResult importResult = result.get(0); - assertCsvImportResult(importResult, DataAcquisition.class, NB_DATA_ACQUISITION); - assertCsvImportResult(importResult, DataProcessing.class, NB_DATA_PROCESSING); - assertCsvImportResult(importResult, Cell.class, NB_CELL); - assertCsvImportResult(importResult, Data.class, NB_DATA); + assertCsvImportResult(result, 0, DataAcquisition.class, NB_DATA_ACQUISITION); + assertCsvImportResult(result, 0, DataProcessing.class, NB_DATA_PROCESSING); + assertCsvImportResult(result, 0, Cell.class, NB_CELL); + assertCsvImportResult(result, 0, Data.class, NB_DATA); assertImportAcousticDatas(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -30,7 +30,6 @@ import org.junit.Ignore; import org.junit.Test; -import java.util.Iterator; import java.util.List; /** @@ -68,22 +67,17 @@ prepareInputFile(conf.getBiometrySampleFile(), getImportPath("biometrysample.csv.gz")); + List<CsvFileImportResult> result; + result = doImport(conf, CatchesDataImportService.class, 3); - List<CsvFileImportResult> result = doImport( - conf, CatchesDataImportService.class, 3); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_TOTAL, 0, NB_SAMPLE); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_TOTAL, 0, NB_SAMPLE_DATA); - Iterator<CsvFileImportResult> iterator = result.iterator(); - CsvFileImportResult importResult; + assertCsvImportResult(result, 1, Sample.class, NB_SAMPLE_UNSORTED, 0, NB_SAMPLE); + assertCsvImportResult(result, 1, SampleData.class, NB_SAMPLE_DATA_UNSORTED, 0, NB_SAMPLE_DATA); - importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_TOTAL, 0, NB_SAMPLE); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_TOTAL, 0, NB_SAMPLE_DATA); - importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_UNSORTED, 0, NB_SAMPLE); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_UNSORTED, 0, NB_SAMPLE_DATA); - importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_BIOMETRY, 0, NB_SAMPLE); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_BIOMETRY, 0, NB_SAMPLE_DATA); + assertCsvImportResult(result, 2, Sample.class, NB_SAMPLE_BIOMETRY, 0, NB_SAMPLE); + assertCsvImportResult(result, 2, SampleData.class, NB_SAMPLE_DATA_BIOMETRY, 0, NB_SAMPLE_DATA); assertImportSampleDatas(); } @@ -104,12 +98,11 @@ prepareInputFile(conf.getTotalSampleFile(), getImportPath("totalsample.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, CatchesDataImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, CatchesDataImportService.class, 1); - CsvFileImportResult importResult = result.get(0); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_TOTAL); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_TOTAL); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_TOTAL); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_TOTAL); } @Ignore @@ -128,13 +121,11 @@ prepareInputFile(conf.getSubSampleFile(), getImportPath("subsample.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, CatchesDataImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, CatchesDataImportService.class, 1); - Iterator<CsvFileImportResult> iterator = result.iterator(); - CsvFileImportResult importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_UNSORTED); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_UNSORTED); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_UNSORTED); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_UNSORTED); } @Ignore @@ -153,13 +144,10 @@ prepareInputFile(conf.getBiometrySampleFile(), getImportPath("biometrysample.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, CatchesDataImportService.class, 1); - - Iterator<CsvFileImportResult> iterator = result.iterator(); - CsvFileImportResult importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_BIOMETRY); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_BIOMETRY); + List<CsvFileImportResult> result; + result = doImport(conf, CatchesDataImportService.class, 1); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_BIOMETRY); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_BIOMETRY); } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -29,7 +29,6 @@ import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.junit.Test; -import java.util.Iterator; import java.util.List; /** @@ -74,12 +73,10 @@ transit.clearTransect(); } - List<CsvFileImportResult> result = doImport( - conf, CommonDataImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, CommonDataImportService.class, 1); - Iterator<CsvFileImportResult> iterator = result.iterator(); - assertCsvImportResult(iterator.next(), Transect.class, - NB_TRANSECT); + assertCsvImportResult(result, 0, Transect.class, NB_TRANSECT); assertImportCommonData(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -30,7 +30,6 @@ import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.junit.Test; -import java.util.Iterator; import java.util.List; /** @@ -78,13 +77,12 @@ conf.setImportMode(CommonDataImportMode.ALL); - List<CsvFileImportResult> result = doImport( - conf, CommonDataImportService.class, 3); + List<CsvFileImportResult> result; + result = doImport(conf, CommonDataImportService.class, 3); - Iterator<CsvFileImportResult> iterator = result.iterator(); - assertCsvImportResult(iterator.next(), Voyage.class, NB_VOYAGE); - assertCsvImportResult(iterator.next(), Transit.class, NB_TRANSIT); - assertCsvImportResult(iterator.next(), Transect.class, NB_TRANSECT); + assertCsvImportResult(result, 0, Voyage.class, NB_VOYAGE); + assertCsvImportResult(result, 1, Transit.class, NB_TRANSIT); + assertCsvImportResult(result, 2, Transect.class, NB_TRANSECT); assertImportCommonData(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -30,7 +30,6 @@ import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.junit.Test; -import java.util.Iterator; import java.util.List; /** @@ -70,13 +69,12 @@ prepareInputFile(conf.getGearMetadataFile(), getImportPath("gearmetadatavalue.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, OperationImportService.class, 3); + List<CsvFileImportResult> result; + result = doImport(conf, OperationImportService.class, 3); - Iterator<CsvFileImportResult> iterator = result.iterator(); - assertCsvImportResult(iterator.next(), Operation.class, NB_OPERATION); - assertCsvImportResult(iterator.next(), OperationMetadataValue.class, NB_OPERATION_METADATAVALUE); - assertCsvImportResult(iterator.next(), GearMetadataValue.class, NB_GEAR_METADATAVALUE); + assertCsvImportResult(result, 0, Operation.class, NB_OPERATION); + assertCsvImportResult(result, 1, OperationMetadataValue.class, NB_OPERATION_METADATAVALUE); + assertCsvImportResult(result, 2, GearMetadataValue.class, NB_GEAR_METADATAVALUE); assertImportOperations(); } 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:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -99,12 +99,12 @@ addMissingEsduCells(conf.getVoyageId(), inputFile); - List<CsvFileImportResult> result = doImport( - conf, ResultsEsduCellImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, 43533); - assertCsvImportResult(result.get(0), Category.class, 7); - assertCsvImportResult(result.get(0), SpeciesCategory.class, 1); + assertCsvImportResult(result, 0, Result.class, 43533); + assertCsvImportResult(result, 0, Category.class, 7); + assertCsvImportResult(result, 0, SpeciesCategory.class, 1); } @Test @@ -140,7 +140,7 @@ List<CsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, 396990); + assertCsvImportResult(result, 0, Result.class, 396990); } @Test @@ -169,10 +169,10 @@ List<CsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, 68108); - assertCsvImportResult(result.get(0), Category.class, 129); - assertCsvImportResult(result.get(0), SpeciesCategory.class, 129); - assertCsvImportResult(result.get(0), SizeCategory.class, 62); + assertCsvImportResult(result, 0, Result.class, 68108); + assertCsvImportResult(result, 0, Category.class, 129); + assertCsvImportResult(result, 0, SpeciesCategory.class, 129); + assertCsvImportResult(result, 0, SizeCategory.class, 62); } @Test @@ -204,11 +204,10 @@ List<CsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - CsvFileImportResult actual = result.get(0); - assertCsvImportResult(actual, Result.class, 10021); - assertCsvImportResult(actual, AgeCategory.class, 10); - assertCsvImportResult(actual, Category.class, 14); - assertCsvImportResult(actual, SpeciesCategory.class, 14); + assertCsvImportResult(result, 0, Result.class, 10021); + assertCsvImportResult(result, 0, AgeCategory.class, 10); + assertCsvImportResult(result, 0, Category.class, 14); + assertCsvImportResult(result, 0, SpeciesCategory.class, 14); } protected void addMissingEsduCells(String voyageId, Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -74,12 +74,12 @@ //TODO Use this //prepareInputFile(conf.getMapResultFile(), getImportPath("mapResults.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, ResultsMapCellImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsMapCellImportService.class, 1); - assertCsvImportResult(result.get(0), Cell.class, 0); - assertCsvImportResult(result.get(0), Data.class, 0); - assertCsvImportResult(result.get(1), Result.class, 0); + assertCsvImportResult(result, 0, Cell.class, 0); + assertCsvImportResult(result, 0, Data.class, 0); +// assertCsvImportResult(result,1, Result.class, 0); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -77,10 +77,10 @@ List<CsvFileImportResult> result; result = doImport(conf, ResultsRegionCellImportService.class, 1); - assertCsvImportResult(result.get(0), Cell.class, 228); - assertCsvImportResult(result.get(0), Data.class, 228 * 4); - //assertCsvImportResult(result.get(1), Result.class, 0); - //assertCsvImportResult(result.get(2), Result.class, 0); + assertCsvImportResult(result, 0, Cell.class, 228); + assertCsvImportResult(result, 0, Data.class, 228 * 4); + //assertCsvImportResult(result,1, Result.class, 0); + //assertCsvImportResult(result,2, Result.class, 0); } } \ No newline at end of file Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -72,16 +72,12 @@ getImportPath("lengthWeightKey.csv.gz")); prepareInputFile(conf.getEchotypeFile(), getImportPath("echotype.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, ResultsVoyageImportService.class, 3); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsVoyageImportService.class, 3); - assertCsvImportResult(result.get(0), LengthAgeKey.class, - NB_LENGTH_AGE_KEY); - assertCsvImportResult(result.get(1), LengthWeightKey.class, - NB_LENGTH_WEIGHT_KEY); - assertCsvImportResult(result.get(2), Echotype.class, - NB_ECHOTYPE); - + assertCsvImportResult(result, 0, LengthAgeKey.class, NB_LENGTH_AGE_KEY); + assertCsvImportResult(result, 1, LengthWeightKey.class, NB_LENGTH_WEIGHT_KEY); + assertCsvImportResult(result, 2, Echotype.class, NB_ECHOTYPE); } @Ignore @@ -103,11 +99,10 @@ prepareInputFile(conf.getLengthAgeKeyFile(), getImportPath("lengthAgeKey.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, ResultsVoyageImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsVoyageImportService.class, 1); - assertCsvImportResult(result.get(0), LengthAgeKey.class, - NB_LENGTH_AGE_KEY); + assertCsvImportResult(result, 0, LengthAgeKey.class, NB_LENGTH_AGE_KEY); } @Ignore @@ -129,12 +124,10 @@ prepareInputFile(conf.getLengthWeightKeyFile(), getImportPath("lengthWeightKey.csv.gz")); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsVoyageImportService.class, 1); - List<CsvFileImportResult> result = doImport( - conf, ResultsVoyageImportService.class, 1); - - assertCsvImportResult(result.get(0), LengthWeightKey.class, - NB_LENGTH_WEIGHT_KEY); + assertCsvImportResult(result, 0, LengthWeightKey.class, NB_LENGTH_WEIGHT_KEY); } @Ignore @@ -155,11 +148,10 @@ prepareInputFile(conf.getEchotypeFile(), getImportPath("echotype.csv.gz")); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsVoyageImportService.class, 1); - List<CsvFileImportResult> result = doImport( - conf, ResultsVoyageImportService.class, 1); - - assertCsvImportResult(result.get(0), Echotype.class, NB_ECHOTYPE); + assertCsvImportResult(result, 0, Echotype.class, NB_ECHOTYPE); } } \ No newline at end of file