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 5c24c971c6b4e1c23aad4e63f71ed8d3513884e8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 12:21:34 2016 +0200 Mise à jour du test d'import acoustic pour intégrer la nouvelle colonne *label* (See #8222) --- .../importdata/AbstractImportDataServiceIT.java | 20 ++++++++++++++++++++ .../importdata/VoyageAcousticImportServiceIT.java | 12 +++++++++--- .../import-data/acoustic/movies_small.csv.gz | Bin 6128 -> 6972 bytes 3 files changed, 29 insertions(+), 3 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 828b657..ed84605 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 @@ -21,12 +21,14 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.base.Charsets; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; +import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Cells; import fr.ifremer.echobase.entities.data.DataAcquisition; @@ -38,6 +40,7 @@ import fr.ifremer.echobase.entities.data.TransitImpl; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.AcousticInstrument; import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; @@ -325,4 +328,21 @@ public abstract class AbstractImportDataServiceIT<C extends ImportDataConfigurat return dataProcessing.getTopiaId(); } + protected void addMissingDataMetadata(String dataMetadataName) { + + EchoBaseUserPersistenceContext persistenceContext = this.serviceContext.getEchoBaseUserPersistenceContext(); + + Optional<DataMetadata> optionalSampleDataType = persistenceContext.getDataMetadataDao().forNameEquals(dataMetadataName).tryFindUnique(); + if (!optionalSampleDataType.isPresent()) { + + if (log.isInfoEnabled()) { + log.info("Add dataMetadata " +dataMetadataName); + } + persistenceContext.getDataMetadataDao().create(DataMetadata.PROPERTY_NAME,dataMetadataName); + + persistenceContext.commit(); + } + + } + } 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 abcc88f..8146b3a 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 @@ -25,6 +25,7 @@ import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.DataAcquisition; import fr.ifremer.echobase.entities.data.DataProcessing; +import fr.ifremer.echobase.entities.references.DataMetadataImpl; import fr.ifremer.echobase.services.ImportDataFixtures; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageAcousticsImportConfiguration; @@ -81,6 +82,13 @@ public class VoyageAcousticImportServiceIT extends AbstractImportDataServiceIT<V } @Override + protected void assertBeforeImport() { + super.assertBeforeImport(); + + addMissingDataMetadata(DataMetadataImpl.RADIAL_NUMBER); + } + + @Override protected void assertAfertImport(ImportDataResult<VoyageAcousticsImportConfiguration> result) throws IOException { int nbDataAcquisition = fixtures.NB_DATA_ACQUISITION(); @@ -89,8 +97,7 @@ public class VoyageAcousticImportServiceIT extends AbstractImportDataServiceIT<V // int nbData = fixtures.NB_DATA(); int nbCell = 289; - int nbData = 2621; - + int nbData = 2885; ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 0); @@ -101,7 +108,6 @@ public class VoyageAcousticImportServiceIT extends AbstractImportDataServiceIT<V assertCsvImportResultPerEntity(importDataFileResult, Cell.class, nbCell, 0, nbCell); assertCsvImportResultPerEntity(importDataFileResult, Data.class, nbData, 0, nbData); - } } diff --git a/echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz b/echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz index c046435..62e9e22 100644 Binary files a/echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz and b/echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.