[Echobase-commits] 01/05: Improve import data tests

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 6256a3a8425a3018c89e9797e304adbda6fd1b16 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 2 12:33:28 2016 +0200 Improve import data tests --- .../importdata/AbstractImportDataServiceIT.java | 12 +++++---- .../importdata/VoyageAcousticImportServiceIT.java | 9 +++---- .../VoyageCatchesAllImportServiceIT.java | 9 +++++-- .../VoyageCatchesImportServiceITSupport.java | 6 ++--- ...geCatchesImportServiceOnlyBiometrySampleIT.java | 29 ++++++++++++++-------- .../VoyageCatchesImportServiceOnlySubSampleIT.java | 9 +++---- ...oyageCatchesImportServiceOnlyTotalSampleIT.java | 15 +++++++---- .../VoyageCommonsAllImportServiceIT.java | 9 +++---- .../VoyageCommonsImportServiceITSupport.java | 4 +++ .../VoyageCommonsTransectImportServiceIT.java | 9 +++---- .../VoyageCommonsTransitImportServiceIT.java | 9 +++---- .../VoyageCommonsVoyageImportServiceIT.java | 9 +++---- .../importdata/VoyageOperationImportServiceIT.java | 9 +++---- .../VoyageResultsEsduCellImportServiceIT.java | 9 +++---- .../VoyageResultsImportServiceITSupport.java | 4 +++ .../VoyageResultsMapFishCellImportServiceIT.java | 9 +++---- .../VoyageResultsMapOtherCellImportServiceIT.java | 9 +++---- .../VoyageResultsRegionCellImportServiceIT.java | 9 +++---- .../VoyageResultsVoyageImportServiceIT.java | 9 +++---- ...geResultsVoyageImportServiceOnlyEchotypeIT.java | 9 +++---- ...sultsVoyageImportServiceOnlyLengthAgeKeyIT.java | 9 +++---- ...tsVoyageImportServiceOnlyLengthWeightKeyIT.java | 9 +++---- 22 files changed, 114 insertions(+), 100 deletions(-) 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 5090bf9..35669a0 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 @@ -82,12 +82,16 @@ public abstract class AbstractImportDataServiceIT<C extends ImportDataConfigurat public static final TimeLog TIME_LOG = new TimeLog(AbstractImportDataServiceIT.class); + private final int nbFiles; + + protected AbstractImportDataServiceIT(int nbFiles) { + this.nbFiles = nbFiles; + } + protected abstract C createConfiguration() throws IOException; protected abstract ImportDataService.ImportDataAction<C> newAction() throws IOException; - protected abstract int getNbResult(); - protected abstract void assertBeforeImport(); protected abstract void assertAfertImport(ImportDataResult<C> result) throws IOException; @@ -100,9 +104,7 @@ public abstract class AbstractImportDataServiceIT<C extends ImportDataConfigurat C configuration = createConfiguration(); configuration.setWorkingDirectory(getConfiguration().getTemporaryDirectory()); - int nbResult = getNbResult(); - - ImportDataResult<C> result = doImport0(configuration, newAction(), nbResult); + ImportDataResult<C> result = doImport0(configuration, newAction(), nbFiles); assertAfertImport(result); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageAcousticImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageAcousticImportServiceIT.java index eaf9377..fcb806d 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageAcousticImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageAcousticImportServiceIT.java @@ -36,6 +36,10 @@ import java.util.Set; */ public class VoyageAcousticImportServiceIT extends AbstractImportDataServiceIT<VoyageAcousticsImportConfiguration> { + public VoyageAcousticImportServiceIT() { + super(1); + } + protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES()); } @@ -75,11 +79,6 @@ public class VoyageAcousticImportServiceIT extends AbstractImportDataServiceIT<V } @Override - protected int getNbResult() { - return 1; - } - - @Override protected void assertBeforeImport() { assertImportCommonData(); assertNoEntities(DataAcquisition.class, DataProcessing.class, Cell.class, Data.class); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java index e4be519..40412da 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java @@ -23,6 +23,7 @@ package fr.ifremer.echobase.services.service.importdata; import fr.ifremer.echobase.entities.data.Sample; import fr.ifremer.echobase.entities.data.SampleData; import fr.ifremer.echobase.entities.references.SpeciesCategory; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCatchesImportConfiguration; import java.io.IOException; @@ -34,9 +35,13 @@ import java.util.Set; */ public class VoyageCatchesAllImportServiceIT extends VoyageCatchesImportServiceITSupport { + public VoyageCatchesAllImportServiceIT() { + super(3); + } + @Override - protected int getNbResult() { - return 3; + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_OPERATION()); } @Override diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceITSupport.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceITSupport.java index 8e03ad6..f3cdc58 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceITSupport.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceITSupport.java @@ -21,7 +21,6 @@ package fr.ifremer.echobase.services.service.importdata; * #L% */ -import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCatchesImportConfiguration; import java.io.IOException; @@ -32,14 +31,15 @@ import java.io.IOException; */ public abstract class VoyageCatchesImportServiceITSupport extends AbstractImportDataServiceIT<VoyageCatchesImportConfiguration> { - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_OPERATION()); + protected VoyageCatchesImportServiceITSupport(int nbFiles) { + super(nbFiles); } protected String[] getImportPath(String filename) { return new String[]{"/import-data", "catches", filename}; } + @Override protected VoyageCatchesImportConfiguration createConfiguration() throws IOException { VoyageCatchesImportConfiguration configuration = new VoyageCatchesImportConfiguration(getLocale()); configuration.setVoyageId(getVoyageId()); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlyBiometrySampleIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlyBiometrySampleIT.java index 3dc783b..c7b206f 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlyBiometrySampleIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlyBiometrySampleIT.java @@ -20,12 +20,13 @@ */ package fr.ifremer.echobase.services.service.importdata; +import com.google.common.collect.Iterables; import fr.ifremer.echobase.entities.data.Sample; import fr.ifremer.echobase.entities.data.SampleData; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCatchesImportConfiguration; import java.io.IOException; -import java.util.Set; /** * @author Tony Chemit - chemit@codelutin.com @@ -33,6 +34,15 @@ import java.util.Set; */ public class VoyageCatchesImportServiceOnlyBiometrySampleIT extends VoyageCatchesImportServiceITSupport { + public VoyageCatchesImportServiceOnlyBiometrySampleIT() { + super(1); + } + + @Override + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_OPERATION_TOTAL_SAMPLES()); + } + @Override protected VoyageCatchesImportConfiguration createConfiguration() throws IOException { VoyageCatchesImportConfiguration configuration = super.createConfiguration(); @@ -41,11 +51,6 @@ public class VoyageCatchesImportServiceOnlyBiometrySampleIT extends VoyageCatche } @Override - protected int getNbResult() { - return 1; - } - - @Override protected void assertBeforeImport() { assertImportCommonData(); assertImportOperations(); @@ -55,10 +60,14 @@ public class VoyageCatchesImportServiceOnlyBiometrySampleIT extends VoyageCatche @Override protected void assertAfertImport(ImportDataResult<VoyageCatchesImportConfiguration> result) throws IOException { - Set<ImportDataFileResult> importDataFileResults = result.getImportResults(); - assertNbIds(importDataFileResults, 0, fixtures.NB_SAMPLE_BIOMETRY()); - assertCsvImportResult(importDataFileResults, 0, Sample.class, fixtures.NB_SAMPLE_BIOMETRY()); - assertCsvImportResult(importDataFileResults, 0, SampleData.class, fixtures.NB_SAMPLE_DATA_BIOMETRY()); + ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 0); + + int nbSamples = fixtures.NB_SAMPLE_BIOMETRY(); + int nbSampleData = fixtures.NB_SAMPLE_DATA_BIOMETRY(); + + assertCsvImportResultPerEntity(importDataFileResult, Sample.class, nbSamples, 0, nbSamples + fixtures.NB_SAMPLE_TOTAL()); + assertCsvImportResultPerEntity(importDataFileResult, SampleData.class, nbSampleData, 0, nbSampleData + fixtures.NB_SAMPLE_DATA_TOTAL()); + assertCsvImportResult0(importDataFileResult, nbSamples + nbSampleData); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlySubSampleIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlySubSampleIT.java index 852f915..5edd62b 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlySubSampleIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlySubSampleIT.java @@ -34,6 +34,10 @@ import java.io.IOException; */ public class VoyageCatchesImportServiceOnlySubSampleIT extends VoyageCatchesImportServiceITSupport { + public VoyageCatchesImportServiceOnlySubSampleIT() { + super(1); + } + @Override protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_OPERATION_TOTAL_SAMPLES()); @@ -47,11 +51,6 @@ public class VoyageCatchesImportServiceOnlySubSampleIT extends VoyageCatchesImpo } @Override - protected int getNbResult() { - return 1; - } - - @Override protected void assertBeforeImport() { assertImportCommonData(); assertImportOperations(); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlyTotalSampleIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlyTotalSampleIT.java index 302be2d..89ee62a 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlyTotalSampleIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlyTotalSampleIT.java @@ -23,6 +23,7 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.collect.Iterables; import fr.ifremer.echobase.entities.data.Sample; import fr.ifremer.echobase.entities.data.SampleData; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCatchesImportConfiguration; import java.io.IOException; @@ -33,6 +34,15 @@ import java.io.IOException; */ public class VoyageCatchesImportServiceOnlyTotalSampleIT extends VoyageCatchesImportServiceITSupport { + public VoyageCatchesImportServiceOnlyTotalSampleIT() { + super(1); + } + + @Override + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_OPERATION()); + } + @Override protected VoyageCatchesImportConfiguration createConfiguration() throws IOException { VoyageCatchesImportConfiguration configuration = super.createConfiguration(); @@ -41,11 +51,6 @@ public class VoyageCatchesImportServiceOnlyTotalSampleIT extends VoyageCatchesIm } @Override - protected int getNbResult() { - return 1; - } - - @Override protected void assertBeforeImport() { assertImportCommonData(); assertImportOperations(); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsAllImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsAllImportServiceIT.java index bf407d4..9d9cb35 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsAllImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsAllImportServiceIT.java @@ -36,6 +36,10 @@ import java.io.IOException; */ public class VoyageCommonsAllImportServiceIT extends VoyageCommonsImportServiceITSupport { + public VoyageCommonsAllImportServiceIT() { + super(3); + } + @Override protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_NO_DATA()); @@ -64,11 +68,6 @@ public class VoyageCommonsAllImportServiceIT extends VoyageCommonsImportServiceI } @Override - protected int getNbResult() { - return 3; - } - - @Override protected void assertBeforeImport() { // no data in db diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsImportServiceITSupport.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsImportServiceITSupport.java index 6f9d205..f14e9d0 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsImportServiceITSupport.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsImportServiceITSupport.java @@ -31,6 +31,10 @@ import java.io.IOException; */ public abstract class VoyageCommonsImportServiceITSupport extends AbstractImportDataServiceIT<VoyageCommonsImportConfiguration> { + protected VoyageCommonsImportServiceITSupport(int nbFiles) { + super(nbFiles); + } + protected final String[] getImportPath(String filename) { return new String[]{"/import-data", "common", filename}; } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransectImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransectImportServiceIT.java index 07570dd..f973c6e 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransectImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransectImportServiceIT.java @@ -36,6 +36,10 @@ import java.io.IOException; */ public class VoyageCommonsTransectImportServiceIT extends VoyageCommonsImportServiceITSupport { + public VoyageCommonsTransectImportServiceIT() { + super(1); + } + @Override protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_COMMON_DATA()); @@ -93,9 +97,4 @@ public class VoyageCommonsTransectImportServiceIT extends VoyageCommonsImportSer } - @Override - protected int getNbResult() { - return 1; - } - } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransitImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransitImportServiceIT.java index 3d4cde1..5844536 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransitImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransitImportServiceIT.java @@ -37,6 +37,10 @@ import java.io.IOException; */ public class VoyageCommonsTransitImportServiceIT extends VoyageCommonsImportServiceITSupport { + public VoyageCommonsTransitImportServiceIT() { + super(1); + } + @Override protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_COMMON_DATA()); @@ -91,9 +95,4 @@ public class VoyageCommonsTransitImportServiceIT extends VoyageCommonsImportServ } - @Override - protected int getNbResult() { - return 1; - } - } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsVoyageImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsVoyageImportServiceIT.java index 9128832..84c37b6 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsVoyageImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsVoyageImportServiceIT.java @@ -37,6 +37,10 @@ import java.io.IOException; */ public class VoyageCommonsVoyageImportServiceIT extends VoyageCommonsImportServiceITSupport { + public VoyageCommonsVoyageImportServiceIT() { + super(1); + } + @Override protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_NO_DATA()); @@ -62,11 +66,6 @@ public class VoyageCommonsVoyageImportServiceIT extends VoyageCommonsImportServi } @Override - protected int getNbResult() { - return 1; - } - - @Override protected void assertBeforeImport() { // no data in db diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageOperationImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageOperationImportServiceIT.java index bd5e71d..2778c46 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageOperationImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageOperationImportServiceIT.java @@ -35,6 +35,10 @@ import java.util.Set; */ public class VoyageOperationImportServiceIT extends AbstractImportDataServiceIT<VoyageOperationsImportConfiguration> { + public VoyageOperationImportServiceIT() { + super(3); + } + protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_COMMON_DATA()); } @@ -61,11 +65,6 @@ public class VoyageOperationImportServiceIT extends AbstractImportDataServiceIT< } @Override - protected int getNbResult() { - return 3; - } - - @Override protected void assertBeforeImport() { assertImportCommonData(); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellImportServiceIT.java index 008e38b..f224c4a 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellImportServiceIT.java @@ -41,6 +41,10 @@ import java.util.Set; */ public class VoyageResultsEsduCellImportServiceIT extends VoyageResultsImportServiceITSupport { + public VoyageResultsEsduCellImportServiceIT() { + super(1); + } + protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT()); } @@ -50,11 +54,6 @@ public class VoyageResultsEsduCellImportServiceIT extends VoyageResultsImportSer } @Override - protected int getNbResult() { - return 1; - } - - @Override protected VoyageResultsImportConfiguration createConfiguration() throws IOException { VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_ESDU); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsImportServiceITSupport.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsImportServiceITSupport.java index 436de75..9787c09 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsImportServiceITSupport.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsImportServiceITSupport.java @@ -31,6 +31,10 @@ import java.io.IOException; */ public abstract class VoyageResultsImportServiceITSupport extends AbstractImportDataServiceIT<VoyageResultsImportConfiguration> { + protected VoyageResultsImportServiceITSupport(int nbFiles) { + super(nbFiles); + } + protected VoyageResultsImportConfiguration createConfiguration() throws IOException { VoyageResultsImportConfiguration configuration = new VoyageResultsImportConfiguration(getLocale()); configuration.setVoyageId(getVoyageId()); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapFishCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapFishCellImportServiceIT.java index 78dbd71..30c7068 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapFishCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapFishCellImportServiceIT.java @@ -37,6 +37,10 @@ import java.util.Set; */ public class VoyageResultsMapFishCellImportServiceIT extends VoyageResultsImportServiceITSupport { + public VoyageResultsMapFishCellImportServiceIT() { + super(1); + } + @Override protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT()); @@ -47,11 +51,6 @@ public class VoyageResultsMapFishCellImportServiceIT extends VoyageResultsImport } @Override - protected int getNbResult() { - return 1; - } - - @Override protected VoyageResultsImportConfiguration createConfiguration() throws IOException { VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_MAP_FISH); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapOtherCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapOtherCellImportServiceIT.java index f34a5f8..573b64e 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapOtherCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapOtherCellImportServiceIT.java @@ -38,6 +38,10 @@ import java.util.Set; */ public class VoyageResultsMapOtherCellImportServiceIT extends VoyageResultsImportServiceITSupport { + public VoyageResultsMapOtherCellImportServiceIT() { + super(1); + } + protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT()); } @@ -47,11 +51,6 @@ public class VoyageResultsMapOtherCellImportServiceIT extends VoyageResultsImpor } @Override - protected int getNbResult() { - return 1; - } - - @Override protected VoyageResultsImportConfiguration createConfiguration() throws IOException { VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_MAP_OTHER); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsRegionCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsRegionCellImportServiceIT.java index 5fd3fa8..490e924 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsRegionCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsRegionCellImportServiceIT.java @@ -38,6 +38,10 @@ import java.util.Set; */ public class VoyageResultsRegionCellImportServiceIT extends VoyageResultsImportServiceITSupport { + public VoyageResultsRegionCellImportServiceIT() { + super(3); + } + protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT()); } @@ -47,11 +51,6 @@ public class VoyageResultsRegionCellImportServiceIT extends VoyageResultsImportS } @Override - protected int getNbResult() { - return 3; - } - - @Override protected VoyageResultsImportConfiguration createConfiguration() throws IOException { VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_REGION); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceIT.java index ddc9eb1..e3e2bb2 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceIT.java @@ -36,6 +36,10 @@ import java.util.Set; */ public class VoyageResultsVoyageImportServiceIT extends VoyageResultsImportServiceITSupport { + public VoyageResultsVoyageImportServiceIT() { + super(3); + } + protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES()); } @@ -45,11 +49,6 @@ public class VoyageResultsVoyageImportServiceIT extends VoyageResultsImportServi } @Override - protected int getNbResult() { - return 3; - } - - @Override protected VoyageResultsImportConfiguration createConfiguration() throws IOException { VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_VOYAGE); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyEchotypeIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyEchotypeIT.java index 0332251..a565f93 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyEchotypeIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyEchotypeIT.java @@ -34,6 +34,10 @@ import java.util.Set; */ public class VoyageResultsVoyageImportServiceOnlyEchotypeIT extends VoyageResultsImportServiceITSupport { + public VoyageResultsVoyageImportServiceOnlyEchotypeIT() { + super(1); + } + protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES()); } @@ -43,11 +47,6 @@ public class VoyageResultsVoyageImportServiceOnlyEchotypeIT extends VoyageResult } @Override - protected int getNbResult() { - return 1; - } - - @Override protected VoyageResultsImportConfiguration createConfiguration() throws IOException { VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_VOYAGE); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT.java index b41d71d..196925a 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT.java @@ -34,6 +34,10 @@ import java.util.Set; */ public class VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT extends VoyageResultsImportServiceITSupport { + public VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT() { + super(1); + } + protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES()); } @@ -43,11 +47,6 @@ public class VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT extends VoyageRe } @Override - protected int getNbResult() { - return 1; - } - - @Override protected VoyageResultsImportConfiguration createConfiguration() throws IOException { VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_VOYAGE); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT.java index a4b04e8..ab8b125 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT.java @@ -34,6 +34,10 @@ import java.util.Set; */ public class VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT extends VoyageResultsImportServiceITSupport { + public VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT() { + super(1); + } + protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES()); } @@ -43,11 +47,6 @@ public class VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT extends Voyag } @Override - protected int getNbResult() { - return 1; - } - - @Override protected VoyageResultsImportConfiguration createConfiguration() throws IOException { VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_VOYAGE); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.