This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 48ac1c94a02825c67fd6f93fa6c8e22a02f1e1f1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 1 16:45:11 2016 +0200 Début de revue des tests pour intégrer les exports --- .../services/EchoBaseTestServiceSupport.java | 39 ++++++++++++-------- .../importdata/AbstractImportDataServiceIT.java | 8 ++++- .../importdata/AcousticImportServiceIT.java | 2 +- .../service/importdata/CatchesImportServiceIT.java | 6 ++-- .../CatchesImportServiceOnlyBiometrySampleIT.java | 2 +- .../CatchesImportServiceOnlySubSampleIT.java | 2 +- .../CatchesImportServiceOnlyTotalSampleIT.java | 2 +- .../importdata/CommonAllImportServiceIT.java | 6 ++-- .../importdata/CommonTransectImportServiceIT.java | 2 +- .../importdata/CommonTransitImportServiceIT.java | 2 +- .../importdata/CommonVoyageImportServiceIT.java | 42 ++++++++++++++++++---- .../importdata/OperationImportServiceIT.java | 6 ++-- .../importdata/ResultsEsduCellImportServiceIT.java | 8 ++--- .../ResultsMapFishCellImportServiceIT.java | 2 +- .../ResultsMapOtherCellImportServiceIT.java | 2 +- .../ResultsRegionCellImportServiceIT.java | 2 +- .../importdata/ResultsVoyageImportServiceIT.java | 6 ++-- .../ResultsVoyageImportServiceOnlyEchotypeIT.java | 2 +- ...sultsVoyageImportServiceOnlyLengthAgeKeyIT.java | 2 +- ...tsVoyageImportServiceOnlyLengthWeightKeyIT.java | 2 +- 20 files changed, 95 insertions(+), 50 deletions(-) diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java index a963bd0..a1a6f01 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java @@ -110,10 +110,9 @@ public abstract class EchoBaseTestServiceSupport extends EchoBaseServiceSupport String... path) throws IOException { String filename = path[path.length - 1]; String resourcePath = StringUtil.join(Arrays.asList(path), "/", true); - InputStream inputStream = getClass().getResourceAsStream(resourcePath); - try { - Preconditions.checkNotNull(inputStream, - "Could not find resource at " + resourcePath); + try (InputStream inputStream = getClass().getResourceAsStream(resourcePath)) { + + Preconditions.checkNotNull(inputStream, "Could not find resource at " + resourcePath); File testDir = getTestDir(); File newFile; @@ -125,11 +124,8 @@ public abstract class EchoBaseTestServiceSupport extends EchoBaseServiceSupport filename = filename.substring(0, filename.length() - 3); newFile = new File(testDir, filename); - FileOutputStream outputStream = FileUtils.openOutputStream(newFile); - try { + try (FileOutputStream outputStream = FileUtils.openOutputStream(newFile)) { IOUtils.copy(new GZIPInputStream(inputStream), outputStream); - } finally { - outputStream.close(); } } else { @@ -138,10 +134,7 @@ public abstract class EchoBaseTestServiceSupport extends EchoBaseServiceSupport newFile = new File(testDir, filename); - FileUtils.copyInputStreamToFile( - inputStream, - newFile - ); + FileUtils.copyInputStreamToFile(inputStream, newFile); } inputFile.setFileName(filename); @@ -150,8 +143,7 @@ public abstract class EchoBaseTestServiceSupport extends EchoBaseServiceSupport if (log.isDebugEnabled()) { log.debug("Copy file to " + newFile); } - } finally { - inputStream.close(); + } } @@ -170,6 +162,17 @@ public abstract class EchoBaseTestServiceSupport extends EchoBaseServiceSupport protected <E extends TopiaEntity> void assertCsvImportResult(ImportDataFileResult actual, Class<E> entityType, + int numberCreated) throws TopiaException { + assertCsvImportResult(actual, + entityType, + numberCreated, + 0, + numberCreated); + } + + + protected <E extends TopiaEntity> void assertCsvImportResult(ImportDataFileResult actual, + Class<E> entityType, int numberCreated, int numberUpdated, int nbCount) throws TopiaException { @@ -199,7 +202,7 @@ public abstract class EchoBaseTestServiceSupport extends EchoBaseServiceSupport assertNbEntities(entityType, nbCount); } - protected <E extends TopiaEntity> void assertNbIDs(Set<ImportDataFileResult> results, + protected <E extends TopiaEntity> void assertNbIds(Set<ImportDataFileResult> results, int pos, int nbIds) throws TopiaException { Assert.assertTrue(results.size() >= pos); @@ -208,6 +211,12 @@ public abstract class EchoBaseTestServiceSupport extends EchoBaseServiceSupport Assert.assertEquals(nbIds, actual.getIds().size()); } + protected <E extends TopiaEntity> void assertNbIds(ImportDataFileResult actual, + int nbIds) throws TopiaException { + Assert.assertNotNull(actual); + Assert.assertEquals(nbIds, actual.getIds().size()); + } + protected <E extends TopiaEntity> void assertNbEntities(Class<E> entityType, int expectedNumber) throws TopiaException { long count = serviceContext.getEchoBaseUserPersistenceContext().getDao(entityType).count(); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java index 5736efa..e9c4e75 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java @@ -113,6 +113,12 @@ public abstract class AbstractImportDataServiceIT extends EchoBaseTestServiceSup protected <M extends VoyageImportDataConfigurationSupport> Set<ImportDataFileResult> doImport(M conf, ImportDataService.ImportDataAction<M> importDataAction, int nbResults) throws ImportException { + return doImport0(conf, importDataAction, nbResults).getImportResults(); + + } + + protected <M extends VoyageImportDataConfigurationSupport> ImportDataResult<M> doImport0(M conf, ImportDataService.ImportDataAction<M> importDataAction, int nbResults) throws ImportException { + ImportDataService service = newService(ImportDataService.class); EchoBaseUser fakeUser = createFakeUser(); @@ -136,7 +142,7 @@ public abstract class AbstractImportDataServiceIT extends EchoBaseTestServiceSup } } - return importDataResult.getImportResults(); + return importDataResult; } // protected <E extends TopiaEntity> E create(TopiaDao<E> dao, diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java index 7e2d45e..e5395e0 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java @@ -79,7 +79,7 @@ public class AcousticImportServiceIT extends AbstractImportDataServiceIT { Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageAcousticsImportDataAction(), 1); - assertNbIDs(result, 0, fixtures.NB_CELL()); + assertNbIds(result, 0, fixtures.NB_CELL()); assertCsvImportResult(result, 0, DataAcquisition.class, fixtures.NB_DATA_ACQUISITION()); assertCsvImportResult(result, 0, DataProcessing.class, fixtures.NB_DATA_PROCESSING()); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java index 723ae69..900c4f3 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java @@ -60,18 +60,18 @@ public class CatchesImportServiceIT extends AbstractImportDataServiceIT { Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageCatchesImportDataAction(), 3); - assertNbIDs(result, 0, fixtures.NB_SAMPLE_TOTAL()); + assertNbIds(result, 0, fixtures.NB_SAMPLE_TOTAL()); assertCsvImportResult(result, 0, Sample.class, fixtures.NB_SAMPLE_TOTAL(), 0, fixtures.NB_SAMPLE()); assertCsvImportResult(result, 0, SampleData.class, fixtures.NB_SAMPLE_DATA_TOTAL(), 0, fixtures.NB_SAMPLE_DATA()); assertCsvImportResult(result, 0, SpeciesCategory.class, 4, 0, 456); - assertNbIDs(result, 1, fixtures.NB_SAMPLE_UNSORTED()); + assertNbIds(result, 1, fixtures.NB_SAMPLE_UNSORTED()); assertCsvImportResult(result, 1, Sample.class, fixtures.NB_SAMPLE_UNSORTED(), 0, fixtures.NB_SAMPLE()); assertCsvImportResult(result, 1, SampleData.class, fixtures.NB_SAMPLE_DATA_UNSORTED(), 0, fixtures.NB_SAMPLE_DATA()); assertCsvImportResult(result, 1, SpeciesCategory.class, 9, 0, 456); - assertNbIDs(result, 2, fixtures.NB_SAMPLE_BIOMETRY()); + assertNbIds(result, 2, fixtures.NB_SAMPLE_BIOMETRY()); assertCsvImportResult(result, 2, Sample.class, fixtures.NB_SAMPLE_BIOMETRY(), 0, fixtures.NB_SAMPLE()); assertCsvImportResult(result, 2, SampleData.class, fixtures.NB_SAMPLE_DATA_BIOMETRY(), 0, fixtures.NB_SAMPLE_DATA()); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyBiometrySampleIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyBiometrySampleIT.java index 7ddb31b..42053ae 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyBiometrySampleIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyBiometrySampleIT.java @@ -57,7 +57,7 @@ public class CatchesImportServiceOnlyBiometrySampleIT extends AbstractImportData Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageCatchesImportDataAction(), 1); - assertNbIDs(result, 0, fixtures.NB_SAMPLE_BIOMETRY()); + assertNbIds(result, 0, fixtures.NB_SAMPLE_BIOMETRY()); assertCsvImportResult(result, 0, Sample.class, fixtures.NB_SAMPLE_BIOMETRY()); assertCsvImportResult(result, 0, SampleData.class, fixtures.NB_SAMPLE_DATA_BIOMETRY()); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlySubSampleIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlySubSampleIT.java index f2c36e1..1fbe8be 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlySubSampleIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlySubSampleIT.java @@ -57,7 +57,7 @@ public class CatchesImportServiceOnlySubSampleIT extends AbstractImportDataServi Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageCatchesImportDataAction(), 1); - assertNbIDs(result, 0, fixtures.NB_SAMPLE_UNSORTED()); + assertNbIds(result, 0, fixtures.NB_SAMPLE_UNSORTED()); assertCsvImportResult(result, 0, Sample.class, fixtures.NB_SAMPLE_UNSORTED()); assertCsvImportResult(result, 0, SampleData.class, fixtures.NB_SAMPLE_DATA_UNSORTED()); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyTotalSampleIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyTotalSampleIT.java index 47027a9..7d22db7 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyTotalSampleIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyTotalSampleIT.java @@ -57,7 +57,7 @@ public class CatchesImportServiceOnlyTotalSampleIT extends AbstractImportDataSer Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageCatchesImportDataAction(), 1); - assertNbIDs(result, 0, fixtures.NB_SAMPLE_TOTAL()); + assertNbIds(result, 0, fixtures.NB_SAMPLE_TOTAL()); assertCsvImportResult(result, 0, Sample.class, fixtures.NB_SAMPLE_TOTAL()); assertCsvImportResult(result, 0, SampleData.class, fixtures.NB_SAMPLE_DATA_TOTAL()); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java index 54048c1..f9fcd8b 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java @@ -73,13 +73,13 @@ public class CommonAllImportServiceIT extends AbstractImportDataServiceIT { Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageCommonsImportDataAction(), 3); - assertNbIDs(result, 0, fixtures.NB_VOYAGE()); + assertNbIds(result, 0, fixtures.NB_VOYAGE()); assertCsvImportResult(result, 0, Voyage.class, fixtures.NB_VOYAGE()); - assertNbIDs(result, 1, 0); + assertNbIds(result, 1, 0); assertCsvImportResult(result, 1, Transit.class, fixtures.NB_TRANSIT()); - assertNbIDs(result, 2, 0); + assertNbIds(result, 2, 0); assertCsvImportResult(result, 2, Transect.class, fixtures.NB_TRANSECT()); assertImportCommonData(); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java index d5df2ea..8c48feb 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java @@ -69,7 +69,7 @@ public class CommonTransectImportServiceIT extends AbstractImportDataServiceIT { Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageCommonsImportDataAction(), 1); - assertNbIDs(result, 0, fixtures.NB_TRANSECT()); + assertNbIds(result, 0, fixtures.NB_TRANSECT()); assertCsvImportResult(result, 0, Transect.class, fixtures.NB_TRANSECT()); assertImportCommonData(); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java index ab82331..9116876 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java @@ -71,7 +71,7 @@ public class CommonTransitImportServiceIT extends AbstractImportDataServiceIT { Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageCommonsImportDataAction(), 1); - assertNbIDs(result, 0, fixtures.NB_TRANSIT()); + assertNbIds(result, 0, fixtures.NB_TRANSIT()); assertCsvImportResult(result, 0, Transit.class, fixtures.NB_TRANSIT()); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java index fc643c5..b68470f 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java @@ -21,14 +21,20 @@ package fr.ifremer.echobase.services.service.importdata; * #L% */ +import com.google.common.collect.Iterables; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.Transect; import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCommonsImportConfiguration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; +import java.nio.file.Files; import java.util.Set; /** @@ -37,6 +43,9 @@ import java.util.Set; */ public class CommonVoyageImportServiceIT extends AbstractImportDataServiceIT { + /** Logger. */ + private static final Log log = LogFactory.getLog(CommonVoyageImportServiceIT.class); + @Override protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_NO_DATA()); @@ -61,19 +70,40 @@ public class CommonVoyageImportServiceIT extends AbstractImportDataServiceIT { conf.setDatum(fixtures.DATUM()); conf.setMissionId(fixtures.MISSION_ID()); conf.setVoyageDescription(fixtures.VOYAGE_DESCRIPTION()); + conf.setWorkingDirectory(getConfiguration().getTemporaryDirectory()); prepareInputFile(conf.getVoyageFile(), getImportPath("voyage.csv.gz")); conf.setImportType(ImportType.COMMON_VOYAGE); - Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageCommonsImportDataAction(), 1); + ImportDataResult<VoyageCommonsImportConfiguration> result = doImport0(conf, new ImportDataService.VoyageCommonsImportDataAction(), 1); + Set<ImportDataFileResult> importDataFileResults = result.getImportResults(); + Assert.assertEquals(1, importDataFileResults.size()); + { + + ImportDataFileResult importDataFileResult = Iterables.get(importDataFileResults, 0); + + assertNbIds(importDataFileResult, fixtures.NB_VOYAGE()); + assertCsvImportResult(importDataFileResult, Voyage.class, fixtures.NB_VOYAGE()); + + assertNbEntities(Voyage.class, fixtures.NB_VOYAGE()); + assertNbEntities(Transit.class, 0); + assertNbEntities(Transect.class, 0); + + InputFile processedImportFile = importDataFileResult.getProcessedImportFile(); + String processedImportFileContent = new String(Files.readAllBytes(processedImportFile.getFile().toPath())); + + InputFile importedImportFile = importDataFileResult.getImportedExportFile(); + String importedImportFileContent = new String(Files.readAllBytes(importedImportFile.getFile().toPath())); + - assertNbIDs(result, 0, fixtures.NB_VOYAGE()); - assertCsvImportResult(result, 0, Voyage.class, fixtures.NB_VOYAGE()); + if (log.isInfoEnabled()) { + log.info("processedImportFile: " + processedImportFile.getFileName() + "\n:" + processedImportFileContent + + "\nimportedImportFileContent: " + importedImportFile.getFileName() + "\n:" + importedImportFileContent + ); + } + } - assertNbEntities(Voyage.class, fixtures.NB_VOYAGE()); - assertNbEntities(Transit.class, 0); - assertNbEntities(Transect.class, 0); } } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java index 1d45c56..3cdf269 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java @@ -65,13 +65,13 @@ public class OperationImportServiceIT extends AbstractImportDataServiceIT { Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageOperationsImportDataAction(), 3); - assertNbIDs(result, 0, fixtures.NB_OPERATION()); + assertNbIds(result, 0, fixtures.NB_OPERATION()); assertCsvImportResult(result, 0, Operation.class, fixtures.NB_OPERATION()); - assertNbIDs(result, 1, 0); + assertNbIds(result, 1, 0); assertCsvImportResult(result, 1, OperationMetadataValue.class, fixtures.NB_OPERATION_METADATAVALUE()); - assertNbIDs(result, 2, 0); + assertNbIds(result, 2, 0); assertCsvImportResult(result, 2, GearMetadataValue.class, fixtures.NB_GEAR_METADATAVALUE()); assertImportOperations(); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java index 5c73646..40506d1 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java @@ -74,7 +74,7 @@ public class ResultsEsduCellImportServiceIT extends AbstractImportDataServiceIT Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - assertNbIDs(result, 0, 43533); + assertNbIds(result, 0, 43533); assertCsvImportResult(result, 0, Result.class, 43533); assertCsvImportResult(result, 0, Category.class, 7); @@ -105,7 +105,7 @@ public class ResultsEsduCellImportServiceIT extends AbstractImportDataServiceIT Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - assertNbIDs(result, 0, 357291); + assertNbIds(result, 0, 357291); assertCsvImportResult(result, 0, Result.class, 357291); assertCsvImportResult(result, 0, Category.class, 27); @@ -137,7 +137,7 @@ public class ResultsEsduCellImportServiceIT extends AbstractImportDataServiceIT Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - assertNbIDs(result, 0, 68108); + assertNbIds(result, 0, 68108); assertCsvImportResult(result, 0, Result.class, 68108); assertCsvImportResult(result, 0, Category.class, 129); assertCsvImportResult(result, 0, SpeciesCategory.class, 129, 0, 585); @@ -169,7 +169,7 @@ public class ResultsEsduCellImportServiceIT extends AbstractImportDataServiceIT Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - assertNbIDs(result, 0, 10021); + assertNbIds(result, 0, 10021); assertCsvImportResult(result, 0, Category.class, 14); assertCsvImportResult(result, 0, Result.class, 10021); assertCsvImportResult(result, 0, AgeCategory.class, 6, 0, 10); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java index 3dc9e42..fbff362 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java @@ -65,7 +65,7 @@ public class ResultsMapFishCellImportServiceIT extends AbstractImportDataService Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - assertNbIDs(result, 0, 380); + assertNbIds(result, 0, 380); assertCsvImportResult(result, 0, Cell.class, 380); assertCsvImportResult(result, 0, Data.class, 2280); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java index f42e5e4..4e5c98c 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java @@ -65,7 +65,7 @@ public class ResultsMapOtherCellImportServiceIT extends AbstractImportDataServic Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - assertNbIDs(result, 0, 380); + assertNbIds(result, 0, 380); assertCsvImportResult(result, 0, Cell.class, 380); assertCsvImportResult(result, 0, Data.class, 2280); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java index 8658503..1618159 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java @@ -75,7 +75,7 @@ public class ResultsRegionCellImportServiceIT extends AbstractImportDataServiceI Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 3); - assertNbIDs(result, 0, 10); + assertNbIds(result, 0, 10); assertCsvImportResult(result, 0, Cell.class, 10, 0, 2083); assertCsvImportResult(result, 0, Data.class, 238); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java index 98cc11c..358b68f 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java @@ -68,13 +68,13 @@ public class ResultsVoyageImportServiceIT extends AbstractImportDataServiceIT { Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 3); - assertNbIDs(result, 0, fixtures.NB_LENGTH_AGE_KEY()); + assertNbIds(result, 0, fixtures.NB_LENGTH_AGE_KEY()); assertCsvImportResult(result, 0, LengthAgeKey.class, fixtures.NB_LENGTH_AGE_KEY()); - assertNbIDs(result, 1, fixtures.NB_LENGTH_WEIGHT_KEY()); + assertNbIds(result, 1, fixtures.NB_LENGTH_WEIGHT_KEY()); assertCsvImportResult(result, 1, LengthWeightKey.class, fixtures.NB_LENGTH_WEIGHT_KEY()); - assertNbIDs(result, 2, fixtures.NB_ECHOTYPE()); + assertNbIds(result, 2, fixtures.NB_ECHOTYPE()); assertCsvImportResult(result, 2, Echotype.class, fixtures.NB_ECHOTYPE()); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyEchotypeIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyEchotypeIT.java index 422751c..a281b1f 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyEchotypeIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyEchotypeIT.java @@ -60,7 +60,7 @@ public class ResultsVoyageImportServiceOnlyEchotypeIT extends AbstractImportData Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - assertNbIDs(result, 0, fixtures.NB_ECHOTYPE()); + assertNbIds(result, 0, fixtures.NB_ECHOTYPE()); assertCsvImportResult(result, 0, Echotype.class, fixtures.NB_ECHOTYPE()); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthAgeKeyIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthAgeKeyIT.java index afa853b..797626e 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthAgeKeyIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthAgeKeyIT.java @@ -61,7 +61,7 @@ public class ResultsVoyageImportServiceOnlyLengthAgeKeyIT extends AbstractImport Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - assertNbIDs(result, 0, fixtures.NB_LENGTH_AGE_KEY()); + assertNbIds(result, 0, fixtures.NB_LENGTH_AGE_KEY()); assertCsvImportResult(result, 0, LengthAgeKey.class, fixtures.NB_LENGTH_AGE_KEY()); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthWeightKeyIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthWeightKeyIT.java index 3acfab2..aa3f4ef 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthWeightKeyIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthWeightKeyIT.java @@ -61,7 +61,7 @@ public class ResultsVoyageImportServiceOnlyLengthWeightKeyIT extends AbstractImp Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - assertNbIDs(result, 0, fixtures.NB_LENGTH_WEIGHT_KEY()); + assertNbIds(result, 0, fixtures.NB_LENGTH_WEIGHT_KEY()); assertCsvImportResult(result, 0, LengthWeightKey.class, fixtures.NB_LENGTH_WEIGHT_KEY()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.