This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 1980d1f5b8b61d55f33968d597d65269071b4007 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 13:21:47 2016 +0200 On remete les données de tests sur sizeCategory + ajout d'un test sur le fichier complet (mais qu'on ignore pour le moment car trop long à lancer... (See #8297) --- ...ndSpeciesCategoryAndLengthCellImportAction.java | 3 ++- ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 8 +++++-- ...AndSpeciesCategoryAndLengthImportServiceIT.java | 24 +++++++++------------ ...iesCategoryAndLength_SmallImportServiceIT.java} | 18 ++++++---------- .../byEchotypeAndSpeciesCategoryAndLength.csv.gz | Bin 709007 -> 709794 bytes ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 2584 -> 2585 bytes 6 files changed, 24 insertions(+), 29 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java index 99314d0..d23730c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java @@ -1,6 +1,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Result; @@ -45,7 +46,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAct protected Category getResultCategory(ImportDataFileResult result, ResultCategoryCache resultCategoryCache, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow row) { SizeCategory sizeCategory = null; - if (row.getSizeCategory() != null) { + if (!Strings.isNullOrEmpty(row.getSizeCategory())) { sizeCategory = sizeCategoryCache.getSizeCategory(row.getSizeCategory(), row.getSizeCategoryMeaning(), result); Preconditions.checkNotNull(sizeCategory); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java index f6cb055..5c8cce0 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java @@ -26,6 +26,7 @@ import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.DataQuality; +import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.services.csv.CellAble; import fr.ifremer.echobase.services.csv.ResultAble; @@ -67,8 +68,11 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp row.setCell(cell); row.setSpecies(category.getSpeciesCategory().getSpecies()); row.setLengthClass(category.getSpeciesCategory().getLengthClass()); - row.setSizeCategory(category.getSpeciesCategory().getSizeCategory().getName()); - row.setSizeCategoryMeaning(category.getSpeciesCategory().getSizeCategory().getMeaning()); + SizeCategory sizeCategory = category.getSpeciesCategory().getSizeCategory(); + if (sizeCategory != null) { + row.setSizeCategory(sizeCategory.getName()); + row.setSizeCategoryMeaning(sizeCategory.getMeaning()); + } row.setEchotype(category.getEchotype()); row.result.addAll(results); return row; diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java index 22b1101..2f45a1d 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java @@ -30,6 +30,7 @@ import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.ImportDataFixtures; import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageResultsImportConfiguration; +import org.junit.Ignore; import java.io.IOException; @@ -37,6 +38,7 @@ import java.io.IOException; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ +@Ignore public class VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT extends VoyageResultsImportServiceITSupport { public VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT() { @@ -58,7 +60,7 @@ public class VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportS configuration.setImportType(ImportType.RESULT_ESDU); InputFile inputFile = configuration.getEsduByEchotypeAndSpeciesCategoryAndLengthFile(); - prepareInputFile(inputFile, getImportPath("byEchotypeAndSpeciesCategoryAndLength_small.csv.gz")); + prepareInputFile(inputFile, getImportPath("byEchotypeAndSpeciesCategoryAndLength.csv.gz")); addMissingEsduCells(EchoBaseCsvUtil.CELL_NAME, configuration.getVoyageId(), inputFile); configuration.setDataProcessingId(getDataProcessingId()); @@ -68,23 +70,17 @@ public class VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportS @Override protected void assertAfertImport(ImportDataResult<VoyageResultsImportConfiguration> result) throws IOException { - int nbCategory = 11; -// int nbCategory = 129; - int nbSpeciesCategories= 11; -// int nbSpeciesCategories= 129; - int nbSizeCategories= 1; -// int nbSizeCategories= 62; - int nbResult = 196; -// int nbResult = 68108; + int nbCategory = 129; + int nbSpeciesCategories= 129; + int nbSizeCategories= 62; + int nbResult = 68108; ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 0); + assertCsvImportResult0(importDataFileResult, nbResult); 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, 8); -// assertCsvImportResultPerEntity(importDataFileResult, SizeCategory.class, nbSizeCategories, 0, 69); - assertCsvImportResult0(importDataFileResult, nbResult); + assertCsvImportResultPerEntity(importDataFileResult, SpeciesCategory.class, nbSpeciesCategories, 0, 585); + assertCsvImportResultPerEntity(importDataFileResult, SizeCategory.class, nbSizeCategories, 0, 69); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLength_SmallImportServiceIT.java similarity index 85% copy from echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java copy to echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLength_SmallImportServiceIT.java index 22b1101..0ca9c2f 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLength_SmallImportServiceIT.java @@ -37,9 +37,9 @@ import java.io.IOException; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT extends VoyageResultsImportServiceITSupport { +public class VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLength_SmallImportServiceIT extends VoyageResultsImportServiceITSupport { - public VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT() { + public VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLength_SmallImportServiceIT() { super(1); } @@ -69,22 +69,16 @@ public class VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportS protected void assertAfertImport(ImportDataResult<VoyageResultsImportConfiguration> result) throws IOException { int nbCategory = 11; -// int nbCategory = 129; - int nbSpeciesCategories= 11; -// int nbSpeciesCategories= 129; - int nbSizeCategories= 1; -// int nbSizeCategories= 62; + int nbSpeciesCategories = 11; + int nbSizeCategories = 11; int nbResult = 196; -// int nbResult = 68108; ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 0); + assertCsvImportResult0(importDataFileResult, nbResult); 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, 8); -// assertCsvImportResultPerEntity(importDataFileResult, SizeCategory.class, nbSizeCategories, 0, 69); - assertCsvImportResult0(importDataFileResult, nbResult); + assertCsvImportResultPerEntity(importDataFileResult, SizeCategory.class, nbSizeCategories, 0, 18); } diff --git a/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength.csv.gz index 6c6125a..3ab3e97 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz index 6a06049..062a49e 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.