branch feature/8170 updated (130fa02 -> 3e840ed)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 130fa02 Revue de l'api pour les imports de résults + début des imports de résultats esdu new 3e840ed Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3e840edbd3794983bf2a5b0929272519bb09aab6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 5 13:26:43 2016 +0200 Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) Summary of changes: .../VoyageResultsEsduCellImportServiceIT.java | 184 --------------------- ...EchotypeAndSpeciesCategoryImportServiceIT.java} | 26 ++- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 5 - ...lOnlySpeciesAndAgeCategoryImportServiceIT.java} | 33 ++-- ...OnlySpeciesAndSizeCategoryImportServiceIT.java} | 33 ++-- .../esdu/byEchotypeAndSpeciesCategory.csv.gz | Bin 547091 -> 547121 bytes .../esdu/byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2042 bytes .../result/esdu/bySpeciesAndAgeCategory.csv.gz | Bin 141033 -> 141215 bytes .../esdu/bySpeciesAndAgeCategory_small.csv.gz | Bin 0 -> 2379 bytes .../result/esdu/bySpeciesAndSizeCategory.csv.gz | Bin 707226 -> 709007 bytes .../esdu/bySpeciesAndSizeCategory_small.csv.gz | Bin 0 -> 2544 bytes 11 files changed, 47 insertions(+), 234 deletions(-) delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellImportServiceIT.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java} (78%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => VoyageResultsEsduCellOnlySpeciesAndAgeCategoryImportServiceIT.java} (70%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT.java} (70%) create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 3e840edbd3794983bf2a5b0929272519bb09aab6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 5 13:26:43 2016 +0200 Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) --- .../VoyageResultsEsduCellImportServiceIT.java | 184 --------------------- ...EchotypeAndSpeciesCategoryImportServiceIT.java} | 26 ++- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 5 - ...lOnlySpeciesAndAgeCategoryImportServiceIT.java} | 33 ++-- ...OnlySpeciesAndSizeCategoryImportServiceIT.java} | 33 ++-- .../esdu/byEchotypeAndSpeciesCategory.csv.gz | Bin 547091 -> 547121 bytes .../esdu/byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2042 bytes .../result/esdu/bySpeciesAndAgeCategory.csv.gz | Bin 141033 -> 141215 bytes .../esdu/bySpeciesAndAgeCategory_small.csv.gz | Bin 0 -> 2379 bytes .../result/esdu/bySpeciesAndSizeCategory.csv.gz | Bin 707226 -> 709007 bytes .../esdu/bySpeciesAndSizeCategory_small.csv.gz | Bin 0 -> 2544 bytes 11 files changed, 47 insertions(+), 234 deletions(-) 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 deleted file mode 100644 index f224c4a..0000000 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellImportServiceIT.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.service.importdata; - -import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; -import fr.ifremer.echobase.entities.ImportType; -import fr.ifremer.echobase.entities.data.Category; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.references.AgeCategory; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.SpeciesCategory; -import fr.ifremer.echobase.io.InputFile; -import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.service.importdata.configurations.VoyageResultsImportConfiguration; -import org.junit.Test; - -import java.io.IOException; -import java.util.Set; - -/** - * @author Tony Chemit - chemit@codelutin.com - * @since 0.3 - */ -public class VoyageResultsEsduCellImportServiceIT extends VoyageResultsImportServiceITSupport { - - public VoyageResultsEsduCellImportServiceIT() { - super(1); - } - - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext(fixtures.IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT()); - } - - protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "result", "esdu", filename}; - } - - @Override - protected VoyageResultsImportConfiguration createConfiguration() throws IOException { - VoyageResultsImportConfiguration configuration = super.createConfiguration(); - configuration.setImportType(ImportType.RESULT_ESDU); - configuration.setDataProcessingId(getDataProcessingId()); - - InputFile inputFile = configuration.getEsduByEchotypeFile(); - prepareInputFile(inputFile, getImportPath("byEchotype.csv.gz")); - - addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, configuration.getVoyageId(), inputFile); - return configuration; - } - - @Override - protected void assertBeforeImport() { - assertImportCommonData(); - assertImportOperations(); - assertImportSampleDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - } - - @Override - protected void assertAfertImport(ImportDataResult<VoyageResultsImportConfiguration> result) throws IOException { - Set<ImportDataFileResult> importDataFileResults = result.getImportResults(); - assertNbIds(importDataFileResults, 0, 43533); - - assertCsvImportResult(importDataFileResults, 0, Result.class, 43533); - assertCsvImportResult(importDataFileResults, 0, Category.class, 7); - } - - @Test - public void doImportByEchotypeAndSpecies() throws Exception { - - assertImportCommonData(); - assertImportOperations(); - assertImportSampleDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - - VoyageResultsImportConfiguration conf = new VoyageResultsImportConfiguration(getLocale()); - - conf.setResultLabel("resultLabel"); - conf.setVoyageId(getVoyageId()); - conf.setImportType(ImportType.RESULT_ESDU); - - InputFile inputFile = conf.getEsduByEchotypeAndSpeciesCategoryFile(); - prepareInputFile(inputFile, getImportPath("byEchotypeAndSpeciesCategory.csv.gz")); - - addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, conf.getVoyageId(), inputFile); - - conf.setDataProcessingId(getDataProcessingId()); - - Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - - assertNbIds(result, 0, 357291); - - assertCsvImportResult(result, 0, Result.class, 357291); - assertCsvImportResult(result, 0, Category.class, 27); - assertCsvImportResult(result, 0, SpeciesCategory.class, 1, 0, 457); - } - - @Test - public void doImportBySpeciesAndSizeCategory() throws Exception { - - assertImportCommonData(); - assertImportOperations(); - assertImportSampleDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - - VoyageResultsImportConfiguration conf = new VoyageResultsImportConfiguration(getLocale()); - - conf.setResultLabel("resultLabel"); - conf.setVoyageId(getVoyageId()); - conf.setImportType(ImportType.RESULT_ESDU); - - InputFile intputFile = conf.getEsduBySpeciesAndSizeCategoryFile(); - prepareInputFile(intputFile, getImportPath("bySpeciesAndSizeCategory.csv.gz")); - - addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, conf.getVoyageId(), intputFile); - - conf.setDataProcessingId(getDataProcessingId()); - - Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - - assertNbIds(result, 0, 68108); - assertCsvImportResult(result, 0, Result.class, 68108); - assertCsvImportResult(result, 0, Category.class, 129); - assertCsvImportResult(result, 0, SpeciesCategory.class, 129, 0, 585); - assertCsvImportResult(result, 0, SizeCategory.class, 62, 0, 69); - } - - @Test - public void doImportBySpeciesAndAgeCategory() throws Exception { - - assertImportCommonData(); - assertImportOperations(); - assertImportSampleDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - - VoyageResultsImportConfiguration conf = new VoyageResultsImportConfiguration(getLocale()); - - conf.setResultLabel("resultLabel"); - conf.setVoyageId(getVoyageId()); - conf.setImportType(ImportType.RESULT_ESDU); - - InputFile inputFile = conf.getEsduBySpeciesAndAgeCategoryFile(); - prepareInputFile(inputFile, getImportPath("bySpeciesAndAgeCategory.csv.gz")); - - addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, conf.getVoyageId(), inputFile); - - conf.setDataProcessingId(getDataProcessingId()); - - Set<ImportDataFileResult> result = doImport(conf, new ImportDataService.VoyageResultsImportDataAction(), 1); - - assertNbIds(result, 0, 10021); - assertCsvImportResult(result, 0, Category.class, 14); - assertCsvImportResult(result, 0, Result.class, 10021); - assertCsvImportResult(result, 0, AgeCategory.class, 6, 0, 10); - assertCsvImportResult(result, 0, SpeciesCategory.class, 14, 0, 470); - } - -} diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java similarity index 78% copy from echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java copy to echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java index b7cf342..4166e0e 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java @@ -24,6 +24,7 @@ import com.google.common.collect.Iterables; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; @@ -35,9 +36,9 @@ import java.io.IOException; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResultsImportServiceITSupport { +public class VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT extends VoyageResultsImportServiceITSupport { - public VoyageResultsEsduCellOnlyEchotypeImportServiceIT() { + public VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT() { super(1); } @@ -54,14 +55,11 @@ public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResu VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_ESDU); - InputFile inputFile = configuration.getEsduByEchotypeFile(); - prepareInputFile(inputFile, getImportPath("byEchotype_small.csv.gz")); + InputFile inputFile = configuration.getEsduByEchotypeAndSpeciesCategoryFile(); + prepareInputFile(inputFile, getImportPath("byEchotypeAndSpeciesCategory_small.csv.gz")); addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, configuration.getVoyageId(), inputFile); - configuration.setDataProcessingId(getDataProcessingId()); - - addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, configuration.getVoyageId(), inputFile); return configuration; } @@ -76,19 +74,17 @@ public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResu @Override protected void assertAfertImport(ImportDataResult<VoyageResultsImportConfiguration> result) throws IOException { -// Set<ImportDataFileResult> importDataFileResults = result.getImportResults(); -// assertNbIds(importDataFileResults, 0, 43533); -// -// assertCsvImportResult(importDataFileResults, 0, Result.class, 43533); -// assertCsvImportResult(importDataFileResults, 0, Category.class, 7); - int nbCategory = 7; - int nbResult = 1569; -// int nbResult = 43533; + int nbCategory = 20; +// int nbCategory = 27; + int nbSpeciesCategories = 1; + int nbResult = 1584; +// int nbResult = 357291; ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 0); assertCsvImportResultPerEntity(importDataFileResult, Result.class, nbResult, 0, nbResult); assertCsvImportResultPerEntity(importDataFileResult, Category.class, nbCategory, 0, nbCategory); + assertCsvImportResultPerEntity(importDataFileResult, SpeciesCategory.class, nbSpeciesCategories, 0, 457); assertCsvImportResult0(importDataFileResult, nbResult); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java index b7cf342..f50e291 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java @@ -76,11 +76,6 @@ public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResu @Override protected void assertAfertImport(ImportDataResult<VoyageResultsImportConfiguration> result) throws IOException { -// Set<ImportDataFileResult> importDataFileResults = result.getImportResults(); -// assertNbIds(importDataFileResults, 0, 43533); -// -// assertCsvImportResult(importDataFileResults, 0, Result.class, 43533); -// assertCsvImportResult(importDataFileResults, 0, Category.class, 7); int nbCategory = 7; int nbResult = 1569; diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlySpeciesAndAgeCategoryImportServiceIT.java similarity index 70% copy from echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java copy to echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlySpeciesAndAgeCategoryImportServiceIT.java index b7cf342..ee6b279 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlySpeciesAndAgeCategoryImportServiceIT.java @@ -24,6 +24,8 @@ import com.google.common.collect.Iterables; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.references.AgeCategory; +import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; @@ -35,9 +37,9 @@ import java.io.IOException; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResultsImportServiceITSupport { +public class VoyageResultsEsduCellOnlySpeciesAndAgeCategoryImportServiceIT extends VoyageResultsImportServiceITSupport { - public VoyageResultsEsduCellOnlyEchotypeImportServiceIT() { + public VoyageResultsEsduCellOnlySpeciesAndAgeCategoryImportServiceIT() { super(1); } @@ -54,14 +56,11 @@ public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResu VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_ESDU); - InputFile inputFile = configuration.getEsduByEchotypeFile(); - prepareInputFile(inputFile, getImportPath("byEchotype_small.csv.gz")); + InputFile inputFile = configuration.getEsduBySpeciesAndAgeCategoryFile(); + prepareInputFile(inputFile, getImportPath("bySpeciesAndAgeCategory_small.csv.gz")); addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, configuration.getVoyageId(), inputFile); - configuration.setDataProcessingId(getDataProcessingId()); - - addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, configuration.getVoyageId(), inputFile); return configuration; } @@ -76,19 +75,23 @@ public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResu @Override protected void assertAfertImport(ImportDataResult<VoyageResultsImportConfiguration> result) throws IOException { -// Set<ImportDataFileResult> importDataFileResults = result.getImportResults(); -// assertNbIds(importDataFileResults, 0, 43533); -// -// assertCsvImportResult(importDataFileResults, 0, Result.class, 43533); -// assertCsvImportResult(importDataFileResults, 0, Category.class, 7); - int nbCategory = 7; - int nbResult = 1569; -// int nbResult = 43533; + int nbResult = 149; +// int nbResult = 10021; + int nbCategory = 11; +// int nbCategory = 14; + int nbSpeciesCategories = 11; +// int nbSpeciesCategories = 129; + int nbAgeCategories = 4; +// int nbAgeCategories = 6; ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 0); assertCsvImportResultPerEntity(importDataFileResult, Result.class, nbResult, 0, nbResult); assertCsvImportResultPerEntity(importDataFileResult, Category.class, nbCategory, 0, nbCategory); + assertCsvImportResultPerEntity(importDataFileResult, SpeciesCategory.class, nbSpeciesCategories, 0, 467); +// assertCsvImportResultPerEntity(importDataFileResult, SpeciesCategory.class, nbSpeciesCategories, 0, 470); + assertCsvImportResultPerEntity(importDataFileResult, AgeCategory.class, nbAgeCategories, 0, 8); +// assertCsvImportResultPerEntity(importDataFileResult, AgeCategory.class, nbAgeCategories, 0, 10); assertCsvImportResult0(importDataFileResult, nbResult); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT.java similarity index 70% copy from echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java copy to echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT.java index b7cf342..9ff573e 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT.java @@ -24,6 +24,8 @@ import com.google.common.collect.Iterables; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; @@ -35,9 +37,9 @@ import java.io.IOException; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResultsImportServiceITSupport { +public class VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT extends VoyageResultsImportServiceITSupport { - public VoyageResultsEsduCellOnlyEchotypeImportServiceIT() { + public VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT() { super(1); } @@ -54,14 +56,11 @@ public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResu VoyageResultsImportConfiguration configuration = super.createConfiguration(); configuration.setImportType(ImportType.RESULT_ESDU); - InputFile inputFile = configuration.getEsduByEchotypeFile(); - prepareInputFile(inputFile, getImportPath("byEchotype_small.csv.gz")); + InputFile inputFile = configuration.getEsduBySpeciesAndSizeCategoryFile(); + prepareInputFile(inputFile, getImportPath("bySpeciesAndSizeCategory_small.csv.gz")); addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, configuration.getVoyageId(), inputFile); - configuration.setDataProcessingId(getDataProcessingId()); - - addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, configuration.getVoyageId(), inputFile); return configuration; } @@ -76,19 +75,23 @@ public class VoyageResultsEsduCellOnlyEchotypeImportServiceIT extends VoyageResu @Override protected void assertAfertImport(ImportDataResult<VoyageResultsImportConfiguration> result) throws IOException { -// Set<ImportDataFileResult> importDataFileResults = result.getImportResults(); -// assertNbIds(importDataFileResults, 0, 43533); -// -// assertCsvImportResult(importDataFileResults, 0, Result.class, 43533); -// assertCsvImportResult(importDataFileResults, 0, Category.class, 7); - int nbCategory = 7; - int nbResult = 1569; -// int nbResult = 43533; + int nbCategory = 11; +// int nbCategory = 129; + int nbSpeciesCategories= 11; +// int nbSpeciesCategories= 129; + int nbSizeCategories= 11; +// int nbSizeCategories= 62; + int nbResult = 196; +// int nbResult = 68108; ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 0); assertCsvImportResultPerEntity(importDataFileResult, Result.class, nbResult, 0, nbResult); assertCsvImportResultPerEntity(importDataFileResult, Category.class, nbCategory, 0, nbCategory); + assertCsvImportResultPerEntity(importDataFileResult, SpeciesCategory.class, nbSpeciesCategories, 0, 467); +// assertCsvImportResultPerEntity(importDataFileResult, SpeciesCategory.class, nbSpeciesCategories, 0, 585); + assertCsvImportResultPerEntity(importDataFileResult, SizeCategory.class, nbSizeCategories, 0, 18); +// assertCsvImportResultPerEntity(importDataFileResult, SizeCategory.class, nbSizeCategories, 0, 69); assertCsvImportResult0(importDataFileResult, nbResult); } diff --git a/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory.csv.gz index 14e7e09..64b6e1f 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory_small.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory_small.csv.gz new file mode 100644 index 0000000..2de0f06 Binary files /dev/null and b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory_small.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory.csv.gz index baf3494..83026ab 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory_small.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory_small.csv.gz new file mode 100644 index 0000000..9f9983f Binary files /dev/null and b/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory_small.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz index c8de3f7..6c6125a 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory_small.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory_small.csv.gz new file mode 100644 index 0000000..8e35eb8 Binary files /dev/null and b/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory_small.csv.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm