[Echobase-commits] 01/01: ref #8173, plug export with concatenation

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 a7f703218b166e29b749f5f64ea46d08d0180fcc Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Oct 3 16:58:35 2016 +0200 ref #8173, plug export with concatenation --- .../service/atlantos/ExportAtlantosService.java | 197 ++++++++++++++++++++- .../service/atlantos/model/BiologyExportModel.java | 3 +- .../service/atlantos/model/CatchExportModel.java | 3 +- .../service/atlantos/model/DataExportModel.java | 12 +- .../service/atlantos/model/HaulExportModel.java | 3 +- .../service/atlantos/row/CatchExportRow.java | 2 +- .../service/atlantos/row/DataExportRow.java | 2 +- .../atlantos/row/DataProcessingExportRow.java | 16 +- .../service/atlantos/row/InstrumentExportRow.java | 12 +- .../echobase/services/ImportDataFixtures.java | 11 ++ .../atlantos/ExportAtlantosServiceTest.java | 22 ++- .../import-data/echobase-atlantos.h2.db.gz | Bin 0 -> 1238097 bytes 12 files changed, 251 insertions(+), 32 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosService.java index 4cf72f8..1993f14 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosService.java @@ -24,11 +24,29 @@ package fr.ifremer.echobase.services.service.atlantos; import com.google.common.base.Preconditions; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.DataMetadatas; import fr.ifremer.echobase.io.EchoBaseIOUtil; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import fr.ifremer.echobase.services.service.atlantos.model.BiologyExportModel; +import fr.ifremer.echobase.services.service.atlantos.model.CalibrationExportModel; +import fr.ifremer.echobase.services.service.atlantos.model.CatchExportModel; import fr.ifremer.echobase.services.service.atlantos.model.CruiseExportModel; +import fr.ifremer.echobase.services.service.atlantos.model.DataAcquisitionExportModel; +import fr.ifremer.echobase.services.service.atlantos.model.DataExportModel; +import fr.ifremer.echobase.services.service.atlantos.model.DataProcessingExportModel; +import fr.ifremer.echobase.services.service.atlantos.model.HaulExportModel; +import fr.ifremer.echobase.services.service.atlantos.model.InstrumentExportModel; +import fr.ifremer.echobase.services.service.atlantos.row.BiologyExportRow; +import fr.ifremer.echobase.services.service.atlantos.row.CalibrationExportRow; +import fr.ifremer.echobase.services.service.atlantos.row.CatchExportRow; import fr.ifremer.echobase.services.service.atlantos.row.CruiseExportRow; +import fr.ifremer.echobase.services.service.atlantos.row.DataAcquisitionExportRow; +import fr.ifremer.echobase.services.service.atlantos.row.DataExportRow; +import fr.ifremer.echobase.services.service.atlantos.row.DataProcessingExportRow; +import fr.ifremer.echobase.services.service.atlantos.row.HaulExportRow; +import fr.ifremer.echobase.services.service.atlantos.row.InstrumentExportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Export; @@ -36,7 +54,15 @@ import org.nuiton.csv.Export; import javax.inject.Inject; import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.List; +import java.util.Map; /** * @author Julien Ruchaud - ruchaud@codelutin.com @@ -55,26 +81,60 @@ public class ExportAtlantosService extends EchoBaseServiceSupport { Preconditions.checkNotNull(model); Preconditions.checkNotNull(model.getVoyageId()); - int nbSteps = 3; + int nbSteps = 11; model.setNbSteps(nbSteps); Voyage voyage = persistenceService.getVoyage(model.getVoyageId()); Preconditions.checkNotNull(voyage); File tempDirectory = model.getWorkingDirectory(); + String basePath = tempDirectory.getAbsolutePath(); // Export data - exportData(tempDirectory, voyage, model); + exportDatas(tempDirectory, voyage, model); // Concat files + String name = voyage.getName(); + SimpleDateFormat formatter = new SimpleDateFormat("YYYY"); + String year = formatter.format(voyage.getStartDate()); + + List<Path> inputs = Arrays.asList( + Paths.get(basePath, "Cruise.csv"), + Paths.get(basePath, "Haul.csv"), + Paths.get(basePath, "Catch.csv"), + Paths.get(basePath, "Biology.csv") + ); + Path output = Paths.get(basePath, "Biotic_" + year + name + ".csv"); + concatDatas(inputs, output); + model.incrementsProgress(); + + inputs = Arrays.asList( + Paths.get(basePath, "Instrument.csv"), + Paths.get(basePath, "Calibration.csv"), + Paths.get(basePath, "DataAcquisition.csv"), + Paths.get(basePath, "DataProcessing.csv"), + Paths.get(basePath, "Cruise.csv"), + Paths.get(basePath, "Data.csv") + ); + output = Paths.get(basePath, "Acoustic_" + year + name + ".csv"); + concatDatas(inputs, output); model.incrementsProgress(); } - protected void exportData(File rawDataDirectory, + protected void concatDatas(List<Path> inputs, Path output) throws IOException { + // Join files (lines) + for (Path path : inputs) { + List<String> lines = Files.readAllLines(path, StandardCharsets.UTF_8); + Files.write(output, lines, StandardCharsets.UTF_8, StandardOpenOption.CREATE, StandardOpenOption.APPEND); + } + } + + protected void exportDatas(File rawDataDirectory, Voyage voyage, ExportAtlantosConfiguration model) throws IOException { + char csvSeparator = ','; EchoBaseIOUtil.forceMkdir(rawDataDirectory); if (log.isInfoEnabled()) { @@ -88,7 +148,7 @@ public class ExportAtlantosService extends EchoBaseServiceSupport { log.info("generate " + file); } - CruiseExportModel exportModel = new CruiseExportModel(getCsvSeparator()); + CruiseExportModel exportModel = new CruiseExportModel(csvSeparator); List<CruiseExportRow> rows = exportModel.prepareRows(voyage); try { Export.exportToFile(exportModel, rows, file); @@ -97,6 +157,135 @@ public class ExportAtlantosService extends EchoBaseServiceSupport { } model.incrementsProgress(); } + + { // create haul file + File file = new File(rawDataDirectory, "Haul.csv"); + if (log.isInfoEnabled()) { + log.info("generate " + file); + } + + HaulExportModel exportModel = new HaulExportModel(csvSeparator); + List<HaulExportRow> rows = exportModel.prepareRows(voyage); + try { + Export.exportToFile(exportModel, rows, file); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export cruise to " + file, e); + } + model.incrementsProgress(); + } + + { // create catch file + File file = new File(rawDataDirectory, "Catch.csv"); + if (log.isInfoEnabled()) { + log.info("generate " + file); + } + + CatchExportModel exportModel = new CatchExportModel(csvSeparator); + List<CatchExportRow> rows = exportModel.prepareRows(voyage); + try { + Export.exportToFile(exportModel, rows, file); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export cruise to " + file, e); + } + model.incrementsProgress(); + } + + { // create biology file + File file = new File(rawDataDirectory, "Biology.csv"); + if (log.isInfoEnabled()) { + log.info("generate " + file); + } + + BiologyExportModel exportModel = new BiologyExportModel(csvSeparator); + List<BiologyExportRow> rows = exportModel.prepareRows(voyage); + try { + Export.exportToFile(exportModel, rows, file); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export cruise to " + file, e); + } + model.incrementsProgress(); + } + + { // create instrument file + File file = new File(rawDataDirectory, "Instrument.csv"); + if (log.isInfoEnabled()) { + log.info("generate " + file); + } + + InstrumentExportModel exportModel = new InstrumentExportModel(csvSeparator); + List<InstrumentExportRow> rows = exportModel.prepareRows(voyage); + try { + Export.exportToFile(exportModel, rows, file); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export cruise to " + file, e); + } + model.incrementsProgress(); + } + + { // create calibration file + File file = new File(rawDataDirectory, "Calibration.csv"); + if (log.isInfoEnabled()) { + log.info("generate " + file); + } + + CalibrationExportModel exportModel = new CalibrationExportModel(csvSeparator); + List<CalibrationExportRow> rows = exportModel.prepareRows(voyage); + try { + Export.exportToFile(exportModel, rows, file); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export cruise to " + file, e); + } + model.incrementsProgress(); + } + + { // create data acquisition file + File file = new File(rawDataDirectory, "DataAcquisition.csv"); + if (log.isInfoEnabled()) { + log.info("generate " + file); + } + + DataAcquisitionExportModel exportModel = new DataAcquisitionExportModel(csvSeparator); + List<DataAcquisitionExportRow> rows = exportModel.prepareRows(voyage); + try { + Export.exportToFile(exportModel, rows, file); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export cruise to " + file, e); + } + model.incrementsProgress(); + } + + { // create data processing file + File file = new File(rawDataDirectory, "DataProcessing.csv"); + if (log.isInfoEnabled()) { + log.info("generate " + file); + } + + DataProcessingExportModel exportModel = new DataProcessingExportModel(csvSeparator); + List<DataProcessingExportRow> rows = exportModel.prepareRows(voyage); + try { + Export.exportToFile(exportModel, rows, file); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export cruise to " + file, e); + } + model.incrementsProgress(); + } + + { // create data file + File file = new File(rawDataDirectory, "Data.csv"); + if (log.isInfoEnabled()) { + log.info("generate " + file); + } + + Map<String, DataMetadata> metadatas = persistenceService.getEntitiesMap(DataMetadata.class, DataMetadatas.DATA_METADATA_NAME); + DataExportModel exportModel = new DataExportModel(csvSeparator); + List<DataExportRow> rows = exportModel.prepareRows(voyage, metadatas); + try { + Export.exportToFile(exportModel, rows, file); + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not export cruise to " + file, e); + } + model.incrementsProgress(); + } } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/BiologyExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/BiologyExportModel.java index e9dc865..ebadfb4 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/BiologyExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/BiologyExportModel.java @@ -23,6 +23,7 @@ package fr.ifremer.echobase.services.service.atlantos.model; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.service.atlantos.row.BiologyExportRow; +import java.util.Arrays; import java.util.List; import org.nuiton.csv.ext.AbstractExportModel; @@ -59,7 +60,7 @@ public class BiologyExportModel extends AbstractExportModel<BiologyExportRow> { } public List<BiologyExportRow> prepareRows(Voyage voyage) { - return null; + return Arrays.asList(new BiologyExportRow()); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CatchExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CatchExportModel.java index 8033321..85f1d34 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CatchExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/CatchExportModel.java @@ -23,6 +23,7 @@ package fr.ifremer.echobase.services.service.atlantos.model; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.service.atlantos.row.CatchExportRow; +import java.util.Arrays; import java.util.List; import org.nuiton.csv.ext.AbstractExportModel; @@ -59,7 +60,7 @@ public class CatchExportModel extends AbstractExportModel<CatchExportRow> { } public List<CatchExportRow> prepareRows(Voyage voyage) { - return null; + return Arrays.asList(new CatchExportRow()); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataExportModel.java index 29d10f5..0b32c36 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/DataExportModel.java @@ -72,7 +72,7 @@ public class DataExportModel extends AbstractExportModel<DataExportRow> { public List<DataExportRow> prepareRows(Voyage voyage, Map<String, DataMetadata> metadatas) { String Sv = metadatas.get("Sv").getTopiaId(); String sv = metadatas.get("sv").getTopiaId(); - String sA = metadatas.get("sA").getTopiaId(); + //String sA = metadatas.get("sA").getTopiaId(); String sa = metadatas.get("sa").getTopiaId(); List<DataExportRow> rows = new ArrayList<DataExportRow>(); @@ -99,10 +99,10 @@ public class DataExportModel extends AbstractExportModel<DataExportRow> { DataMetadata dataMetadata = data.getDataMetadata(); String dataMetadataId = dataMetadata.getTopiaId(); - if (dataMetadataId.equals(Sv) || - dataMetadataId.equals(sv) || - dataMetadataId.equals(sA) || - dataMetadataId.equals(sa)) { +// if (dataMetadataId.equals(Sv) || +// dataMetadataId.equals(sv) || +// dataMetadataId.equals(sA) || +// dataMetadataId.equals(sa)) { DataExportRow row = new DataExportRow(); row.setCell(data, cell, metadatas); @@ -112,7 +112,7 @@ public class DataExportModel extends AbstractExportModel<DataExportRow> { row.setCruiseLocalId(voyage.getTopiaId()); //row.setCalibrationId(calibrationId); rows.add(row); - } +// } } } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/HaulExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/HaulExportModel.java index 13e8d81..4399e5c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/HaulExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/model/HaulExportModel.java @@ -23,6 +23,7 @@ package fr.ifremer.echobase.services.service.atlantos.model; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.service.atlantos.row.HaulExportRow; +import java.util.Arrays; import java.util.List; import org.nuiton.csv.ext.AbstractExportModel; @@ -80,7 +81,7 @@ public class HaulExportModel extends AbstractExportModel<HaulExportRow> { } public List<HaulExportRow> prepareRows(Voyage voyage) { - return null; + return Arrays.asList(new HaulExportRow()); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CatchExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CatchExportRow.java index 60d5702..6af5331 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CatchExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/CatchExportRow.java @@ -61,7 +61,7 @@ public class CatchExportRow { return "Record"; } - public String getCruiseLocalID() { + public String getCruiseLocalId() { return ""; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataExportRow.java index d17d896..ba58a54 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataExportRow.java @@ -201,7 +201,7 @@ public class DataExportRow { } public String getDataType() { - return this.data.getDataMetadata().getDataType().getName(); + return ""; } public String getDataUnit() { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataProcessingExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataProcessingExportRow.java index 1113c35..e77ec34 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataProcessingExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/DataProcessingExportRow.java @@ -81,23 +81,23 @@ public class DataProcessingExportRow { return this.dataProcessing.getChannelId(); } - public float getBandwidth() { + public Float getBandwidth() { return this.dataProcessing.getBandWith(); } - public float getFrequency() { + public Float getFrequency() { return this.dataProcessing.getFrequency(); } - public float getTransceiverPower() { + public Float getTransceiverPower() { return this.dataProcessing.getTransceiverPower(); } - public float getTransmitPulseLength() { + public Float getTransmitPulseLength() { return this.dataProcessing.getTransmitPulseLength(); } - public float getOnAxisGain() { + public Float getOnAxisGain() { return this.dataProcessing.getTransceiverProcessingGain(); } @@ -105,11 +105,11 @@ public class DataProcessingExportRow { return this.dataProcessing.getTransceiverGainUnits(); } - public float getSaCorrection() { + public Float getSaCorrection() { return this.dataProcessing.getTransceiverProcessingSacorrection(); } - public float getAbsorption() { + public Float getAbsorption() { return this.dataProcessing.getTransceiverProcessingAbsorption(); } @@ -125,7 +125,7 @@ public class DataProcessingExportRow { return this.dataProcessing.getSoundSpeedCalculations(); } - public float getTransducerPSI() { + public Float getTransducerPSI() { return this.dataProcessing.getTransducerProcessingPsi(); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/InstrumentExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/InstrumentExportRow.java index 775cf3e..eec1692 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/InstrumentExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/row/InstrumentExportRow.java @@ -63,7 +63,7 @@ public class InstrumentExportRow { return "Record"; } - public float getFrequency() { + public Float getFrequency() { return this.instrument.getTransducerFrequency(); } @@ -87,23 +87,23 @@ public class InstrumentExportRow { return this.instrument.getTransducerBeams(); } - public float getTransducerDepth() { + public Float getTransducerDepth() { return this.instrument.getTransducerDepth(); } - public float getTransducerOrientation() { + public Float getTransducerOrientation() { return this.instrument.getTransducerAzimuth(); } - public float getTransducerPSI() { + public Float getTransducerPSI() { return this.instrument.getTransducerPsi(); } - public float getTransducerBeamAngleMajor() { + public Float getTransducerBeamAngleMajor() { return this.instrument.getTransducerBeamAngleMajor(); } - public float getTransducerBeamAngleMinor() { + public Float getTransducerBeamAngleMinor() { return this.instrument.getTransducerBeamAngleMinor(); } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDataFixtures.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDataFixtures.java index 40130ad..70648fa 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDataFixtures.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDataFixtures.java @@ -163,6 +163,17 @@ public enum ImportDataFixtures { IMPORT_DATA_ECHOBASE_MOORING.assertBeforeImportExisting(serviceContext, fixtures); serviceContext.assertNbEntities(Echotype.class, fixtures.NB_ECHOTYPE()); } + }, + EXPORT_DATA_ECHOBASE_ATLANTOS("/import-data/echobase-atlantos.h2.db.gz") { + @Override + public void assertBeforeImportNotExisting(FakeEchoBaseServiceContext serviceContext, EchoBaseServiceFixtures fixtures) { + } + + @Override + public void assertBeforeImportExisting(FakeEchoBaseServiceContext serviceContext, EchoBaseServiceFixtures fixtures) { + serviceContext.assertNbEntities(DataAcquisition.class, 1); + serviceContext.assertNbEntities(DataProcessing.class, 1); + } }; diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosServiceTest.java index 44a511f..ef5e189 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosServiceTest.java @@ -42,7 +42,7 @@ public class ExportAtlantosServiceTest extends EchoBaseTestServiceSupport { @Override protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext( - ImportDataFixtures.IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT.getDbPath()); + ImportDataFixtures.EXPORT_DATA_ECHOBASE_ATLANTOS.getDbPath()); } @Inject @@ -59,13 +59,29 @@ public class ExportAtlantosServiceTest extends EchoBaseTestServiceSupport { ExportAtlantosConfiguration model = new ExportAtlantosConfiguration(); model.setVoyageId(getVoyageId()); + model.setWorkingDirectory(workingDirectory); Assert.assertFalse(new File(workingDirectory, "Cruise.csv").exists()); + Assert.assertFalse(new File(workingDirectory, "Haul.csv").exists()); + Assert.assertFalse(new File(workingDirectory, "Catch.csv").exists()); + Assert.assertFalse(new File(workingDirectory, "Biology.csv").exists()); + Assert.assertFalse(new File(workingDirectory, "Instrument.csv").exists()); + Assert.assertFalse(new File(workingDirectory, "Calibration.csv").exists()); + Assert.assertFalse(new File(workingDirectory, "DataAcquisition.csv").exists()); + Assert.assertFalse(new File(workingDirectory, "DataProcessing.csv").exists()); + Assert.assertFalse(new File(workingDirectory, "Data.csv").exists()); - Voyage voyage = persistenceService.getVoyage(getVoyageId()); - exportService.exportData(workingDirectory, voyage, model); + exportService.doExport(model); Assert.assertTrue(new File(workingDirectory, "Cruise.csv").exists()); + Assert.assertTrue(new File(workingDirectory, "Haul.csv").exists()); + Assert.assertTrue(new File(workingDirectory, "Catch.csv").exists()); + Assert.assertTrue(new File(workingDirectory, "Biology.csv").exists()); + Assert.assertTrue(new File(workingDirectory, "Instrument.csv").exists()); + Assert.assertTrue(new File(workingDirectory, "Calibration.csv").exists()); + Assert.assertTrue(new File(workingDirectory, "DataAcquisition.csv").exists()); + Assert.assertTrue(new File(workingDirectory, "DataProcessing.csv").exists()); + Assert.assertTrue(new File(workingDirectory, "Data.csv").exists()); } } diff --git a/echobase-services/src/test/resources/import-data/echobase-atlantos.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-atlantos.h2.db.gz new file mode 100644 index 0000000..5009f1a Binary files /dev/null and b/echobase-services/src/test/resources/import-data/echobase-atlantos.h2.db.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.