Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e5b394d8 by Tony CHEMIT at 2017-10-27T13:34:13+02:00 fix db name - - - - - 6a24f3b4 by Tony CHEMIT at 2017-10-27T13:34:40+02:00 fix some replication tests on longline model + improve some other trip management stuff - - - - - 14 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java - persistence/src/main/models/Observe.model - services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java - services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java - services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java - services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java - services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - test/src/main/resources/db/6.0/referentiel.sql.gz - test/src/main/resources/db/6.904/referentiel.sql.gz Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java @@ -332,7 +332,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa for (TripEntry tripEntry : tripEntries) { progressModel.incrementsCurrentStep(); - ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId()); + ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getTripId()); ExportTripResult exportTripResult = localTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.exportData.message.result.export.trip"), exportTripResult, ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -326,7 +326,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), tripId); ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.right.trip"), exportTripResult, @@ -355,7 +355,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), tripId); ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.left.trip"), exportTripResult, ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java @@ -154,7 +154,7 @@ public class StorageBackupUILauncher extends StorageUILauncher { for (DataDtoReference trip : entry.getValue()) { - ExportTripRequest exportRequest = new ExportTripRequest(false, entry.getKey().getId(), trip.getId()); + ExportTripRequest exportRequest = new ExportTripRequest(false, trip.getId()); ExportTripResult exportTripResult = managementService.exportTrip(exportRequest); progressModel.incrementsCurrentStep(); ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -264,7 +264,7 @@ sensorType {*:1} referentiel.longline.SensorType sensorDataFormat {*:0..1} referentiel.longline.SensorDataFormat sensorBrand {*:1} referentiel.longline.SensorBrand -longline.SetLonglineObs > CommentableEntity >> ObserveSet | entity dbName=SetObs +longline.SetLonglineObs > CommentableEntity >> ObserveSet | entity dbName=setObs homeId + {*:1} String number + {*:1} Integer basketsPerSectionCount + {*:1} Integer ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.local.service.data; import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.db.ObserveBlobsContainer; +import fr.ird.observe.entities.Trip; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.local.ObserveServiceContextLocal; import fr.ird.observe.services.local.service.ObserveServiceLocal; @@ -87,7 +88,9 @@ public class TripManagementServiceLocal extends ObserveServiceLocal implements T long time = System.nanoTime() - t0; - return new ExportTripResult(exportRequest, tripContent, blobsContainers, time); + Trip trip = getTopiaPersistenceContext().findByTopiaId(tripId); + String programId = trip.getProgram().getTopiaId(); + return new ExportTripResult(exportRequest, programId,tripContent, blobsContainers, time); } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java @@ -46,6 +46,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; +import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTable; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; import org.nuiton.util.StringUtil; @@ -140,4 +141,15 @@ class ReplicateTestSupport extends ServiceTestSupport { } + protected void testReplicate(TopiaSqlTables tables, ImmutableMap<String, Long> expectedTablesCount, Iterable<String> tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { + + ReplicateTablesRequest request + = createReplicateTablesRequest(DatabaseName.referentiel) + .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds)) + .setTables(tables) + .build(); + + testReplicate0(request, expectedTablesCount); + + } } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java @@ -22,71 +22,48 @@ package fr.ird.observe.entity; * #L% */ -import com.google.common.collect.ImmutableMap; -import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.service.BabModelVersionException; -import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; -import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.dto.data.longline.TripLonglineDto; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.ObserveFixtures; -import java.io.IOException; -import org.junit.Ignore; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; -import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; /** * Created on 29/12/15. * * @author Tony Chemit - dev@tchemit.fr - * FIXME Review database, there is some missing in new referential, so it does not work. */ -@Ignore @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) public class ReplicateTripLonglineTest extends ReplicateTestSupport { - @Test - public void testReplicateAllTripLongline() throws Exception { - testReplicate(ObserveFixtures.ALL_TRIP_LONGLINE_COUNT); - } - - @Test - public void testReplicateAllTripLongline2() throws Exception { - testReplicate(ObserveFixtures.ALL_TRIP_LONGLINE_COUNT, - ObserveFixtures.TRIP_LONGLINE_ID_1, - ObserveFixtures.TRIP_LONGLINE_ID_2, - ObserveFixtures.TRIP_LONGLINE_ID_3); - } + /** Logger. */ + private static final Log log = LogFactory.getLog(ReplicateTripLonglineTest.class); @Test - public void testReplicateTripLonline1() throws Exception { - testReplicate(ObserveFixtures.TRIP_LONGLINE_1_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_1); - } - - @Test - public void testReplicateTripLonline2() throws Exception { - testReplicate(ObserveFixtures.TRIP_LONGLINE_2_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_2); - } - - @Test - public void testReplicateTripLonline3() throws Exception { - testReplicate(ObserveFixtures.TRIP_LONGLINE_3_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_3); - } - - protected void testReplicate(ImmutableMap<String, Long> expectedTablesCount, String... tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { - + public void testReplicate() throws Exception { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); + log.info(String.format("will replicate %d trip(s).", ids.size())); TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripLonglineTables(); - ReplicateTablesRequest request - = createReplicateTablesRequest(DatabaseName.referentiel) - .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds)) - .setTables(tables) - .build(); - - testReplicate0(request, expectedTablesCount); - + testReplicate(tables, ObserveFixtures.ALL_TRIP_LONGLINE_COUNT, ids); } +// @Test +// public void testReplicateTripLonline1() throws Exception { +// testReplicate(ObserveFixtures.TRIP_LONGLINE_1_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_1); +// } +// +// @Test +// public void testReplicateTripLonline2() throws Exception { +// testReplicate(ObserveFixtures.TRIP_LONGLINE_2_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_2); +// } +// +// @Test +// public void testReplicateTripLonline3() throws Exception { +// testReplicate(ObserveFixtures.TRIP_LONGLINE_3_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_3); +// } + } ===================================== services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java +++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java @@ -22,13 +22,14 @@ package fr.ird.observe.entity; * #L% */ -import com.google.common.collect.ImmutableMap; +import fr.ird.observe.dto.data.seine.TripSeineDto; import fr.ird.observe.services.test.DatabaseName; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.ObserveFixtures; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest; -import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; /** @@ -38,47 +39,30 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; */ @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class ReplicateTripSeineTest extends ReplicateTestSupport { + /** Logger. */ + private static final Log log = LogFactory.getLog(ReplicateTripSeineTest.class); @Test - public void testReplicateAllTripSeine() throws Exception { - testReplicate(ObserveFixtures.ALL_TRIP_SEINE_COUNT); - } - - @Test - public void testReplicateTripSeine1() throws Exception { - testReplicate(ObserveFixtures.TRIP_SEINE_1_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_1); - } - - @Test - public void testReplicateAllTripSeine2() throws Exception { - testReplicate(ObserveFixtures.ALL_TRIP_SEINE_COUNT, - ObserveFixtures.TRIP_SEINE_ID_1, - ObserveFixtures.TRIP_SEINE_ID_2, - ObserveFixtures.TRIP_SEINE_ID_3); - } - - @Test - public void testReplicateTripSeine2() throws Exception { - testReplicate(ObserveFixtures.TRIP_SEINE_2_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_2); - } - - @Test - public void testReplicateTripSeine3() throws Exception { - testReplicate(ObserveFixtures.TRIP_SEINE_3_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_3); - } - - protected void testReplicate(ImmutableMap<String, Long> expectedTablesCount, String... tripIds) throws Exception { - + public void testReplicate() throws Exception { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); + log.info(String.format("will replicate %d trip(s).", ids.size())); TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripSeineTables(); - - ReplicateTablesRequest request - = createReplicateTablesRequest(DatabaseName.referentiel) - .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds)) - .setTables(tables) - .build(); - - testReplicate0(request, expectedTablesCount); - + testReplicate(tables, ObserveFixtures.ALL_TRIP_SEINE_COUNT, ids); } +// @Test +// public void testReplicateTripSeine1() throws Exception { +// testReplicate(ObserveFixtures.TRIP_SEINE_1_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_1); +// } +// +// @Test +// public void testReplicateTripSeine2() throws Exception { +// testReplicate(ObserveFixtures.TRIP_SEINE_2_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_2); +// } +// +// @Test +// public void testReplicateTripSeine3() throws Exception { +// testReplicate(ObserveFixtures.TRIP_SEINE_3_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_3); +// } + } ===================================== services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java @@ -22,6 +22,9 @@ package fr.ird.observe.services.service.data; * #L% */ +import fr.ird.observe.dto.data.longline.TripLonglineDto; +import fr.ird.observe.dto.data.longline.TripLonglineReference; +import fr.ird.observe.dto.data.seine.TripSeineDto; import fr.ird.observe.dto.data.seine.TripSeineReference; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; @@ -41,6 +44,7 @@ import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.ObserveFixtures; +import java.util.Set; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -54,19 +58,24 @@ public class TripManagementServiceTest extends ServiceTestSupport { private TripManagementService tripManagementService; private TripSeineService tripSeineService; + private TripLonglineService tripLonglineService; @Before public void setUp() throws Exception { tripManagementService = getTestMethodResource().newService(TripManagementService.class); tripSeineService = getTestMethodResource().newService(TripSeineService.class); + tripLonglineService = getTestMethodResource().newService(TripLonglineService.class); } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @Test public void exportTripSeine() { - ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1); - ExportTripResult result = tripManagementService.exportTrip(request); - Assert.assertNotNull(result); + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); + for (String id : ids) { + ExportTripRequest request = new ExportTripRequest(false, id); + ExportTripResult result = tripManagementService.exportTrip(request); + Assert.assertNotNull(result); + } } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @@ -74,64 +83,93 @@ public class TripManagementServiceTest extends ServiceTestSupport { @Test public void deleteTripSeine() { - DataDtoReferenceSet<TripSeineReference> allTripSeineBefore = tripSeineService.getAllTripSeine(); + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); + for (String id : ids) { - DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1); - DeleteTripResult result = tripManagementService.deleteTrip(request); - Assert.assertNotNull(result); + DataDtoReferenceSet<TripSeineReference> allTripBefore = tripSeineService.getAllTripSeine(); + DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, id); + DeleteTripResult result = tripManagementService.deleteTrip(request); + Assert.assertNotNull(result); - DataDtoReferenceSet<TripSeineReference> allTripSeineAfter = tripSeineService.getAllTripSeine(); - Assert.assertTrue(allTripSeineBefore.size() == allTripSeineAfter.size() + 1); + DataDtoReferenceSet<TripSeineReference> allTripAfter = tripSeineService.getAllTripSeine(); + Assert.assertTrue(allTripBefore.size() == allTripAfter.size() + 1); + } } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @CopyDatabaseConfiguration @Test public void importTripSeine() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { - - ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1); - importTrip(request, true); - + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class); + importTrip(true, ids); } - // FIXME Le test met 6 minutes, comprendre pourquoi l'import est aussi long (environ 18000 branchlines) -// @Ignore @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) @CopyDatabaseConfiguration @Test public void importTripLongline() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); + importTrip(false, ids); + } + + @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) + @CopyDatabaseConfiguration + @Test + public void deleteTripLongline() { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); + for (String id : ids) { + DataDtoReferenceSet<TripLonglineReference> allTripBefore = tripLonglineService.getAllTripLongline(); + + DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, id); + DeleteTripResult result = tripManagementService.deleteTrip(request); + Assert.assertNotNull(result); - ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_LONGLINE_ID_1); - importTrip(request, false); + DataDtoReferenceSet<TripLonglineReference> allTripAfter = tripLonglineService.getAllTripLongline(); + Assert.assertTrue(allTripBefore.size() == allTripAfter.size() + 1); + } + } + @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) + @Test + public void exportTripLongline() { + Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class); + for (String id : ids) { + ExportTripRequest request = new ExportTripRequest(false, id); + ExportTripResult result = tripManagementService.exportTrip(request); + Assert.assertNotNull(result); + } } - private void importTrip(ExportTripRequest request, boolean forSeine) throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { - ExportTripResult result = tripManagementService.exportTrip(request); + private void importTrip(boolean forSeine, Set<String> ids) throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException { - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = getTestMethodResource().createDataSourceConfigurationH2(getClass(), "importTripTarget"); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = getTestMethodResource().createDataSourceConfigurationH2(getClass(), "importTripTarget" + forSeine); try (DataSourceService dataSourceService = getTestClassResource().newService(dataSourceConfiguration, DataSourceService.class)) { DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setImportReferentialDataSourceConfiguration(getTestMethodResource().getDataSourceConfiguration()); - + dataSourceCreateConfiguration.setLeaveOpenSource(true); ObserveDataSourceConnection dataSourceConnection = dataSourceService.create(dataSourceConfiguration, dataSourceCreateConfiguration); dataSourceConnection = new ObserveDataSourceConnectionTopiaForTest(dataSourceConnection.getAuthenticationToken()); - TripManagementService tripManagementService = getTestClassResource().newService(dataSourceConnection, TripManagementService.class); TripSeineService tripSeineService = getTestClassResource().newService(dataSourceConnection, TripSeineService.class); TripLonglineService tripLonglineService = getTestClassResource().newService(dataSourceConnection, TripLonglineService.class); - int allTripSeineBefore = forSeine ? tripSeineService.getAllTripSeine().size() : + int allTripBefore = forSeine ? tripSeineService.getAllTripSeine().size() : tripLonglineService.getAllTripLongline().size(); - tripManagementService.importTrip(new ImportTripRequest(result)); + for (String id : ids) { - int allTripSeineAfter = forSeine ? tripSeineService.getAllTripSeine().size() : - tripLonglineService.getAllTripLongline().size(); - Assert.assertTrue(allTripSeineAfter == allTripSeineBefore + 1); + ExportTripRequest request = new ExportTripRequest(false, id); + ExportTripResult result = this.tripManagementService.exportTrip(request); + + tripManagementService.importTrip(new ImportTripRequest(result)); + + int allTripAfter = forSeine ? tripSeineService.getAllTripSeine().size() : + tripLonglineService.getAllTripLongline().size(); + Assert.assertEquals(allTripAfter, ++allTripBefore); + } } ===================================== services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java @@ -33,12 +33,10 @@ import fr.ird.observe.dto.ObserveDto; public class ExportTripRequest implements ObserveDto { private final boolean forPG; - private final String programId; private final String tripId; - public ExportTripRequest(boolean forPG, String programId, String tripId) { + public ExportTripRequest(boolean forPG, String tripId) { this.forPG = forPG; - this.programId = programId; this.tripId = tripId; } @@ -46,10 +44,6 @@ public class ExportTripRequest implements ObserveDto { return forPG; } - public String getProgramId() { - return programId; - } - public String getTripId() { return tripId; } ===================================== services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java @@ -41,10 +41,10 @@ public class ExportTripResult implements ObserveDto { private final long time; public ExportTripResult(ExportTripRequest request, - byte[] sqlContent, + String programId, byte[] sqlContent, ImmutableSet<ObserveBlobsContainer> blobsContainers, long time) { - this.programId = request.getProgramId(); + this.programId = programId; this.tripId = request.getTripId(); this.sqlContent = sqlContent; this.blobsContainers = blobsContainers; ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -94,19 +94,19 @@ public class ObserveFixtures { .put("observe_common.lengthlengthparameter", 0L) .put("observe_common.lengthweightparameter", 365L) .put("observe_common.ocean", 3L) - .put("observe_common.ocean_species", 500L) + .put("observe_common.ocean_species", 517L) .put("observe_common.organism", 9L) - .put("observe_common.person", 512L) + .put("observe_common.person", 514L) .put("observe_common.program", 27L) .put("observe_common.shipOwner", 27L) - .put("observe_common.sex", 5L) - .put("observe_common.sizemeasuretype", 17L) - .put("observe_common.species", 285L) - .put("observe_common.species_specieslist", 401L) + .put("observe_common.shipowner", 27L) + .put("observe_common.sizemeasuretype", 24L) + .put("observe_common.species", 294L) + .put("observe_common.species_specieslist", 410L) .put("observe_common.speciesgroup", 11L) - .put("observe_common.speciesgroupreleasemode", 10L) + .put("observe_common.speciesgroup_speciesgroupreleasemode", 20L) .put("observe_common.specieslist", 6L) - .put("observe_common.vessel", 1172L) + .put("observe_common.vessel", 1175L) .put("observe_common.vesselsizecategory", 13L) .put("observe_common.vesseltype", 14L) .put("observe_common.weightmeasuretype", 3L) @@ -135,13 +135,13 @@ public class ObserveFixtures { private static final ImmutableMap<String, Long> REFERENTIAL_LONGLINE_TABLES_COUNT = ImmutableMap .<String, Long>builder() .put("observe_longline.baithaulingstatus", 5L) - .put("observe_longline.baitsettingstatus", 5L) - .put("observe_longline.baittype", 16L) - .put("observe_longline.catchfate", 5L) + .put("observe_longline.baitsettingstatus", 6L) + .put("observe_longline.baittype", 17L) + .put("observe_longline.catchfate", 6L) .put("observe_longline.encountertype", 12L) .put("observe_longline.healthness", 6L) .put("observe_longline.hookposition", 13L) - .put("observe_longline.hooksize", 22L) + .put("observe_longline.hooksize", 23L) .put("observe_longline.hooktype", 13L) .put("observe_longline.itemverticalposition", 3L) .put("observe_longline.itemhorizontalposition", 3L) @@ -153,8 +153,8 @@ public class ObserveFixtures { .put("observe_longline.sensorbrand", 4L) .put("observe_longline.sensordataformat", 2L) .put("observe_longline.sensortype", 4L) - .put("observe_longline.settingshape", 6L) - .put("observe_longline.stomacfullness", 7L) + .put("observe_longline.settingshape", 7L) + .put("observe_longline.stomacfullness", 8L) .put("observe_longline.triptype", 3L) .put("observe_longline.vesselactivity", 5L) .build(); @@ -307,7 +307,7 @@ public class ObserveFixtures { .put("observe_longline.basket", 3229L) .put("observe_longline.branchline", 19374L) .put("observe_longline.catch", 677L) - .put("observe_longline.mitigationtype_set", 0L) + .put("observe_longline.mitigationtype_setobs", 0L) .put("observe_longline.sizemeasure", 647L) .put("observe_longline.weightmeasure", 0L) .put("observe_longline.catch_predator", 25L) ===================================== test/src/main/resources/db/6.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.0/referentiel.sql.gz and b/test/src/main/resources/db/6.0/referentiel.sql.gz differ ===================================== test/src/main/resources/db/6.904/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.904/referentiel.sql.gz and b/test/src/main/resources/db/6.904/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bb2a1aac2e3a2dade97d3891576... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bb2a1aac2e3a2dade97d3891576... You're receiving this email because of your account on gitlab.com.