This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d051db817aea147d3f3497a9bc59a6af456aab75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 30 16:54:05 2015 +0100 Ajout de fixtures --- .../services/service/AbstractServiceTopiaTest.java | 21 +- .../DataSourceDumpProducerServiceTopiaTest.java | 3 +- .../service/DataSourceServiceTopiaTest.java | 5 +- .../report/AbstractReportServiceTopiaTest.java | 9 +- .../actions/validate/ValidateServiceTopiaTest.java | 5 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 7 +- .../service/seine/RouteServiceTopiaTest.java | 3 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 7 +- .../service/seine/TripSeineServiceTopiaTest.java | 29 +- .../java/fr/ird/observe/test/ObserveFixtures.java | 298 +++++++++++++++++++++ 10 files changed, 338 insertions(+), 49 deletions(-) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java index b39899d..71eba10 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java @@ -9,6 +9,7 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.junit.Assert; @@ -23,27 +24,9 @@ import java.util.Date; * @author Tony Chemit - chemit@codelutin.com */ @DatabaseNameConfiguration(DatabaseName.referentiel) -@DatabaseVersionConfiguration(AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseVersionConfiguration(ObserveFixtures.DEFAULT_VERSION) public class AbstractServiceTopiaTest { - public static final String DEFAULT_VERSION = "5.0-3"; - - public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; - - public static final String TRIP_SEINE_ID_2 = "fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215"; - - public static final String TRIP_SEINE_ID_3 = "fr.ird.observe.entities.seine.TripSeine#1360156698296#0.6097793743126777"; - - public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; - - public static final String TRIP_LONGLINE_ID_1 = "fr.ird.observe.entities.longline.TripLongline#1429538088091#0.763886003987864"; - - public static final String TRIP_LONGLINE_ID_2 = "fr.ird.observe.entities.longline.TripLongline#1429540363472#0.517173705156893"; - - public static final String TRIP_LONGLINE_ID_3 = "fr.ird.observe.entities.longline.TripLongline#1429537115030#0.493692863034084"; - - public static final String SET_LONGLINE_ID_1 = "fr.ird.observe.entities.longline.SetLongline#1429538714446#0.0876020351424813"; - @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java index 78e445f..a67b644 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableSet; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; @@ -58,7 +59,7 @@ public class DataSourceDumpProducerServiceTopiaTest extends AbstractServiceTopia @Test public void testGetDataDump() throws Exception { - byte[] dataDump = service.getDataDump(ImmutableSet.of(TRIP_SEINE_ID_1)); + byte[] dataDump = service.getDataDump(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1)); Assert.assertNotNull(dataDump); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java index e95c9ec..6afd455 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java @@ -33,6 +33,7 @@ import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportExcept import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.TestHelper; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; @@ -223,7 +224,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setImportReferentialDataSourceConfiguration(dataSourceConfiguration); - dataSourceCreateConfiguration.setImportDataConfiguration(dataSourceConfiguration, ImmutableSet.of(AbstractServiceTopiaTest.TRIP_SEINE_ID_1)); + dataSourceCreateConfiguration.setImportDataConfiguration(dataSourceConfiguration, ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1)); ObserveDataSourceConfigurationTopiaH2 createdDatabaseDataSourceConfiguration = dataSourceResource.createDataSourceConfigurationH2(getClass(), "resultDatabase"); @@ -234,7 +235,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { ObserveTopiaApplicationContext createdDatabaseTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(createdDatabaseDataSourceConfiguration); applicationContextResource.assertSchemaCreated(createdDatabaseTopiaApplicationContext); - applicationContextResource.assertEntitiesExist(createdDatabaseTopiaApplicationContext, AbstractServiceTopiaTest.TRIP_SEINE_ID_1); + applicationContextResource.assertEntitiesExist(createdDatabaseTopiaApplicationContext, ObserveFixtures.TRIP_SEINE_ID_1); } protected void closeDatabase(ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration) throws InterruptedException { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java index 73bd3be..7deaa3a 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java @@ -30,6 +30,7 @@ import fr.ird.observe.services.dto.actions.report.ReportRequest; import fr.ird.observe.services.dto.actions.report.ReportVariable; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,7 +46,7 @@ import java.util.Map; /** * Classe abstraite de test d'un report. - * <p/> + * * On définit ici le mécanisme pour tester unitairement un report et son * résultat. * @@ -85,7 +86,7 @@ public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopi /** * L'unique test à lancer. - * <p/> + * * On vérifie : * <ul> * <li>la syntaxe du report via {@link #testReportSyntax(Report)}</li> @@ -101,7 +102,7 @@ public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopi testReportSyntax(report); // creation de l'executeur de report - report = service.populateVariables(report, TRIP_SEINE_ID_1); + report = service.populateVariables(report, ObserveFixtures.TRIP_SEINE_ID_1); // les variables a utiliser (par defaut, pas de variable) Map<String, Object> variables = new HashMap<String, Object>(); @@ -111,7 +112,7 @@ public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopi // on execute le report - DataMatrix result = service.executeReport(report, TRIP_SEINE_ID_1); + DataMatrix result = service.executeReport(report, ObserveFixtures.TRIP_SEINE_ID_1); if (log.isInfoEnabled()) { log.info("Result :\n" + result.getClipbordContent(true, true)); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java index 95f5e5d..0b28883 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; @@ -138,7 +139,7 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { request.setValidationContext(ValidateService.N1_CREATE_CONTEXT); request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values())); - request.setDataIds(ImmutableSet.of(TRIP_SEINE_ID_1, TRIP_SEINE_ID_2)); + request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2)); ValidateDataResult result = service.validateData(request); Assert.assertNotNull(result); @@ -165,7 +166,7 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { request.setValidationContext(ValidateService.N1_UPDATE_CONTEXT); request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values())); - request.setDataIds(ImmutableSet.of(TRIP_SEINE_ID_1, TRIP_SEINE_ID_2)); + request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2)); ValidateDataResult result = service.validateData(request); Assert.assertNotNull(result); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java index 8a1155b..15f6ca0 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java @@ -40,6 +40,7 @@ import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; @@ -65,7 +66,7 @@ public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServic @Test public void loadToEditTest() { - Form<SetLonglineDetailCompositionDto> form = service.loadForm(SET_LONGLINE_ID_1); + Form<SetLonglineDetailCompositionDto> form = service.loadForm(ObserveFixtures.SET_LONGLINE_ID_1); Assert.assertNotNull(form); @@ -93,7 +94,7 @@ public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServic @CopyDatabaseConfiguration public void saveTest() { - Form<SetLonglineDetailCompositionDto> form = service.loadForm(SET_LONGLINE_ID_1); + Form<SetLonglineDetailCompositionDto> form = service.loadForm(ObserveFixtures.SET_LONGLINE_ID_1); SetLonglineDetailCompositionDto compositionDto = form.getObject(); SectionDto sectionDto = compositionDto.getSection(4); @@ -143,7 +144,7 @@ public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServic service.save(compositionDto); - SetLongline setLongline = dataSourceResource.findById(SetLongline.class, SET_LONGLINE_ID_1); + SetLongline setLongline = dataSourceResource.findById(SetLongline.class, ObserveFixtures.SET_LONGLINE_ID_1); Section section = setLongline.getSectionByTopiaId(sectionDto.getId()); Assert.assertEquals(sectionDto.getSettingIdentifier(), section.getSettingIdentifier()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java index fd383e9..f722612 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java @@ -26,6 +26,7 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; @@ -50,7 +51,7 @@ public class RouteServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void preCreateTest() { - Form<RouteDto> form = service.preCreate(TRIP_SEINE_ID_1); + Form<RouteDto> form = service.preCreate(ObserveFixtures.TRIP_SEINE_ID_1); Assert.assertNotNull(form); RouteDto routeDto = form.getObject(); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java index 6613642..e249708 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; @@ -65,9 +66,9 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void loadToEditTest() { - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); - Form<TripSeineGearUseDto> form = service.loadForm(TRIP_SEINE_ID_1); + Form<TripSeineGearUseDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); Assert.assertNotNull(form); TripSeineGearUseDto tripSeineGearUseDto = form.getObject(); @@ -113,7 +114,7 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { @Test @CopyDatabaseConfiguration public void saveUpdateTest() { - Form<TripSeineGearUseDto> form = service.loadForm(TRIP_SEINE_ID_1); + Form<TripSeineGearUseDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); TripSeineGearUseDto tripSeineGearUseDto = form.getObject(); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index 0d8b333..9aba86f 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -40,6 +40,7 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; @@ -72,14 +73,14 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void getTripSeineByProgramTest() { - DataReferenceSet<TripSeineDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + DataReferenceSet<TripSeineDto> stubDtos = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); Assert.assertNotNull(stubDtos); Assert.assertEquals(3, stubDtos.sizeReference()); DataReference<TripSeineDto> tripSeineStubDto = stubDtos.getReferenceByPosition(0); - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); @@ -88,7 +89,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); tripSeineStubDto = stubDtos.getReferenceByPosition(1); - tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_2); + tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_2); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); @@ -97,7 +98,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); tripSeineStubDto = stubDtos.getReferenceByPosition(2); - tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_3); + tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_3); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); @@ -110,8 +111,8 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void loadFormTest() throws Exception { - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); - Form<TripSeineDto> form = service.loadForm(TRIP_SEINE_ID_1); + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); + Form<TripSeineDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); Assert.assertNotNull(form); TripSeineDto tripSeineDto = form.getObject(); @@ -146,7 +147,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void preCreateTest() { - Form<TripSeineDto> form = service.preCreate(PROGRAM_ID); + Form<TripSeineDto> form = service.preCreate(ObserveFixtures.PROGRAM_ID); Assert.assertNotNull(form); TripSeineDto tripSeineDto = form.getObject(); @@ -181,7 +182,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @CopyDatabaseConfiguration public void saveCreateTest() throws BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - Form<TripSeineDto> form = service.preCreate(PROGRAM_ID); + Form<TripSeineDto> form = service.preCreate(ObserveFixtures.PROGRAM_ID); TripSeineDto tripSeineDto = form.getObject(); @@ -235,7 +236,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @CopyDatabaseConfiguration public void saveUpdateTest() throws BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - Form<TripSeineDto> form = service.loadForm(TRIP_SEINE_ID_1); + Form<TripSeineDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); loadReferenceSets(referentialService, form); @@ -263,7 +264,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { service.save(form.getObject()); - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); @@ -290,7 +291,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @CopyDatabaseConfiguration public void saveConcurrentTest() throws BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - Form<TripSeineDto> form = service.loadForm(TRIP_SEINE_ID_1); + Form<TripSeineDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); TripSeineDto tripSeineDto = form.getObject(); @@ -320,13 +321,13 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Date lastUpdateBefore = getLastUpdateDate(TripSeine.class); - service.delete(TRIP_SEINE_ID_1); + service.delete(ObserveFixtures.TRIP_SEINE_ID_1); - DataReferenceSet<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + DataReferenceSet<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); - Assert.assertFalse(dataSourceResource.exists(TripSeine.class, TRIP_SEINE_ID_1)); + Assert.assertFalse(dataSourceResource.exists(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1)); Date lastUpdateAfter = getLastUpdateDate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java b/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java new file mode 100644 index 0000000..a15d653 --- /dev/null +++ b/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -0,0 +1,298 @@ +package fr.ird.observe.test; + +import com.google.common.collect.ImmutableMap; +import org.apache.commons.lang3.mutable.MutableLong; + +import java.util.Map; +import java.util.TreeMap; + +/** + * Created on 29/12/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveFixtures { + + public static final String DEFAULT_VERSION = "5.0-3"; + + public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; + + public static final String TRIP_SEINE_ID_2 = "fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215"; + + public static final String TRIP_SEINE_ID_3 = "fr.ird.observe.entities.seine.TripSeine#1360156698296#0.6097793743126777"; + + public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; + + public static final String TRIP_LONGLINE_ID_1 = "fr.ird.observe.entities.longline.TripLongline#1429538088091#0.763886003987864"; + + public static final String TRIP_LONGLINE_ID_2 = "fr.ird.observe.entities.longline.TripLongline#1429540363472#0.517173705156893"; + + public static final String TRIP_LONGLINE_ID_3 = "fr.ird.observe.entities.longline.TripLongline#1429537115030#0.493692863034084"; + + public static final String SET_LONGLINE_ID_1 = "fr.ird.observe.entities.longline.SetLongline#1429538714446#0.0876020351424813"; + + public static final ImmutableMap<String, Long> REFERENTIAL_COMMON_TABLES_COUNT = ImmutableMap + .<String, Long>builder() + .put("observe_common.vesselsizecategory", 13L) + .put("observe_common.country", 53L) + .put("observe_common.harbour", 74L) + .put("observe_common.vesseltype", 14L) + .put("observe_common.vessel", 977L) + .put("observe_common.speciesgroup", 8L) + .put("observe_common.species", 275L) + .put("observe_common.ocean_species", 482L) + .put("observe_common.sex", 5L) + .put("observe_common.fpazone", 41L) + .put("observe_common.specieslist", 5L) + .put("observe_common.species_specieslist", 372L) + .put("observe_common.person", 390L) + .put("observe_common.ocean", 3L) + .put("observe_common.organism", 8L) + .put("observe_common.lengthweightparameter", 352L) + .put("observe_common.program", 27L) + .put("observe_common.gearcaracteristictype", 6L) + .put("observe_common.gearcaracteristic", 22L) + .put("observe_common.gear", 26L) + .put("observe_common.gear_gearcaracteristic", 29L) + .put("observe_common.lastupdatedate", 95L) + .build(); + + public static final ImmutableMap<String, Long> REFERENTIAL_SEINE_TABLES_COUNT = ImmutableMap + .<String, Long>builder() + .put("observe_seine.vesselactivity", 23L) + .put("observe_seine.surroundingactivity", 8L) + .put("observe_seine.reasonfornullset", 10L) + .put("observe_seine.reasonfornofishing", 13L) + .put("observe_seine.speciesfate", 9L) + .put("observe_seine.objectfate", 9L) + .put("observe_seine.weightcategory", 101L) + .put("observe_seine.detectionmode", 10L) + .put("observe_seine.transmittingbuoyoperation", 3L) + .put("observe_seine.objectoperation", 4L) + .put("observe_seine.reasonfordiscard", 5L) + .put("observe_seine.speciesstatus", 3L) + .put("observe_seine.observedsystem", 21L) + .put("observe_seine.transmittingbuoytype", 12L) + .put("observe_seine.objecttype", 23L) + .put("observe_seine.wind", 13L) + .build(); + + public 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.encountertype", 12L) + .put("observe_longline.healthness", 6L) + .put("observe_longline.hookposition", 13L) + .put("observe_longline.hooksize", 22L) + .put("observe_longline.hooktype", 13L) + .put("observe_longline.itemverticalposition", 3L) + .put("observe_longline.itemhorizontalposition", 3L) + .put("observe_longline.lightstickscolor", 7L) + .put("observe_longline.lightstickstype", 2L) + .put("observe_longline.linetype", 8L) + .put("observe_longline.maturitystatus", 12L) + .put("observe_longline.mitigationtype", 15L) + .put("observe_longline.sensorbrand", 4L) + .put("observe_longline.sensordataformat", 2L) + .put("observe_longline.sensortype", 4L) + .put("observe_longline.settingshape", 6L) + .put("observe_longline.sizemeasuretype", 17L) + .put("observe_longline.stomacfullness", 7L) + .put("observe_longline.triptype", 3L) + .put("observe_longline.vesselactivity", 5L) + .put("observe_longline.weightmeasuretype", 3L) + .build(); + + public static final ImmutableMap<String, Long> REFERENTIAL_TABLES_COUNT = mergeResults( + REFERENTIAL_COMMON_TABLES_COUNT, + REFERENTIAL_LONGLINE_TABLES_COUNT, + REFERENTIAL_SEINE_TABLES_COUNT + ); + + public static final ImmutableMap<String, Long> TRIP_SEINE_1_TABLES_COUNT = ImmutableMap + .<String, Long>builder() + .put("observe_seine.trip", 1L) + .put("observe_seine.gearusefeatures", 2L) + .put("observe_seine.gearusefeaturesmeasurement", 4L) + .put("observe_seine.route", 34L) + .put("observe_seine.set", 35L) + .put("observe_seine.activity", 862L) + .put("observe_seine.floatingobject", 54L) + .put("observe_seine.schoolestimate", 27L) + .put("observe_seine.nontargetcatch", 109L) + .put("observe_seine.nontargetsample", 20L) + .put("observe_seine.nontargetlength", 767L) + .put("observe_seine.targetcatch", 73L) + .put("observe_seine.targetsample", 10L) + .put("observe_seine.targetlength", 85L) + .put("observe_seine.objectobservedspecies", 3L) + .put("observe_seine.objectschoolestimate", 1L) + .put("observe_seine.transmittingbuoy", 62L) + .put("observe_seine.activity_observedsystem", 1182L) + .build(); + + public static final ImmutableMap<String, Long> TRIP_SEINE_2_TABLES_COUNT = ImmutableMap + .<String, Long>builder() + .put("observe_seine.trip", 1L) + .put("observe_seine.gearusefeatures", 0L) + .put("observe_seine.gearusefeaturesmeasurement", 0L) + .put("observe_seine.route", 46L) + .put("observe_seine.set", 42L) + .put("observe_seine.activity", 657L) + .put("observe_seine.activity_observedsystem", 652L) + .put("observe_seine.floatingobject", 50L) + .put("observe_seine.schoolestimate", 10L) + .put("observe_seine.nontargetcatch", 112L) + .put("observe_seine.nontargetsample", 19L) + .put("observe_seine.nontargetlength", 242L) + .put("observe_seine.targetcatch", 73L) + .put("observe_seine.targetsample", 0L) + .put("observe_seine.targetlength", 0L) + .put("observe_seine.objectobservedspecies", 2L) + .put("observe_seine.objectschoolestimate", 3L) + .put("observe_seine.transmittingbuoy", 68L) + .build(); + + public static final ImmutableMap<String, Long> TRIP_SEINE_3_TABLES_COUNT = ImmutableMap + .<String, Long>builder() + .put("observe_seine.trip", 1L) + .put("observe_seine.gearusefeatures", 0L) + .put("observe_seine.gearusefeaturesmeasurement", 0L) + .put("observe_seine.route", 45L) + .put("observe_seine.set", 35L) + .put("observe_seine.activity", 816L) + .put("observe_seine.floatingobject", 41L) + .put("observe_seine.schoolestimate", 35L) + .put("observe_seine.nontargetcatch", 104L) + .put("observe_seine.nontargetsample", 16L) + .put("observe_seine.nontargetlength", 1193L) + .put("observe_seine.targetcatch", 118L) + .put("observe_seine.targetsample", 14L) + .put("observe_seine.targetlength", 53L) + .put("observe_seine.objectobservedspecies", 0L) + .put("observe_seine.objectschoolestimate", 24L) + .put("observe_seine.transmittingbuoy", 39L) + .put("observe_seine.activity_observedsystem", 321L) + .build(); + + public static final ImmutableMap<String, Long> ALL_TRIP_SEINE_COUNT = mergeResults( + TRIP_SEINE_1_TABLES_COUNT, + TRIP_SEINE_2_TABLES_COUNT, + TRIP_SEINE_3_TABLES_COUNT + ); + + public static final ImmutableMap<String, Long> TRIP_LONGLINE_1_TABLES_COUNT = ImmutableMap + .<String, Long>builder() + .put("observe_longline.trip", 1L) + .put("observe_longline.set", 13L) + .put("observe_longline.activity", 13L) + .put("observe_longline.gearusefeatures", 0L) + .put("observe_longline.gearusefeaturesmeasurement", 0L) + .put("observe_longline.encounter", 27L) + .put("observe_longline.sensorused", 0L) + .put("observe_longline.tdr", 0L) + .put("observe_longline.baitscomposition", 13L) + .put("observe_longline.floatlinescomposition", 65L) + .put("observe_longline.hookscomposition", 39L) + .put("observe_longline.branchlinescomposition", 13L) + .put("observe_longline.section", 234L) + .put("observe_longline.basket", 3042L) + .put("observe_longline.branchline", 18252L) + .put("observe_longline.catch", 435L) + .put("observe_longline.catch_predator", 49L) + .put("observe_longline.sizemeasure", 340L) + .put("observe_longline.weightmeasure", 0L) + .put("observe_longline.tdrrecord", 0L) + .put("observe_longline.species_tdr", 0L) + .put("observe_longline.mitigationtype_set", 0L) + .build(); + + public static final ImmutableMap<String, Long> TRIP_LONGLINE_2_TABLES_COUNT = ImmutableMap + .<String, Long>builder() + .put("observe_longline.trip", 1L) + .put("observe_longline.set", 5L) + .put("observe_longline.activity", 5L) + .put("observe_longline.gearusefeatures", 0L) + .put("observe_longline.gearusefeaturesmeasurement", 0L) + .put("observe_longline.encounter", 3L) + .put("observe_longline.sensorused", 0L) + .put("observe_longline.tdr", 0L) + .put("observe_longline.baitscomposition", 10L) + .put("observe_longline.floatlinescomposition", 0L) + .put("observe_longline.hookscomposition", 10L) + .put("observe_longline.branchlinescomposition", 2L) + .put("observe_longline.section", 95L) + .put("observe_longline.basket", 1140L) + .put("observe_longline.branchline", 6840L) + .put("observe_longline.catch", 152L) + .put("observe_longline.sizemeasure", 116L) + .put("observe_longline.weightmeasure", 0L) + .put("observe_longline.tdrrecord", 0L) + .put("observe_longline.species_tdr", 0L) + .put("observe_longline.mitigationtype_set", 0L) + .put("observe_longline.catch_predator", 9L) + .build(); + + public static final ImmutableMap<String, Long> TRIP_LONGLINE_3_TABLES_COUNT = ImmutableMap + .<String, Long>builder() + .put("observe_longline.trip", 1L) + .put("observe_longline.set", 14L) + .put("observe_longline.activity", 14L) + .put("observe_longline.gearusefeatures", 0L) + .put("observe_longline.gearusefeaturesmeasurement", 0L) + .put("observe_longline.encounter", 12L) + .put("observe_longline.sensorused", 0L) + .put("observe_longline.tdr", 0L) + .put("observe_longline.baitscomposition", 14L) + .put("observe_longline.floatlinescomposition", 36L) + .put("observe_longline.hookscomposition", 42L) + .put("observe_longline.branchlinescomposition", 14L) + .put("observe_longline.section", 243L) + .put("observe_longline.basket", 3229L) + .put("observe_longline.branchline", 19374L) + .put("observe_longline.catch", 677L) + .put("observe_longline.mitigationtype_set", 0L) + .put("observe_longline.sizemeasure", 647L) + .put("observe_longline.weightmeasure", 0L) + .put("observe_longline.catch_predator", 25L) + .put("observe_longline.tdrrecord", 0L) + .put("observe_longline.species_tdr", 0L) + .build(); + + public static final ImmutableMap<String, Long> ALL_TRIP_LONGLINE_COUNT = mergeResults( + TRIP_LONGLINE_1_TABLES_COUNT, + TRIP_LONGLINE_2_TABLES_COUNT, + TRIP_LONGLINE_3_TABLES_COUNT + ); + + + @SafeVarargs + protected static ImmutableMap<String, Long> mergeResults(ImmutableMap<String, Long>... expectedTablesCounts) { + TreeMap<String, MutableLong> expectedTablesCountTmp = new TreeMap<>(); + for (ImmutableMap<String, Long> tablesCounts : expectedTablesCounts) { + + for (Map.Entry<String, Long> entry : tablesCounts.entrySet()) { + String key = entry.getKey(); + Long value = entry.getValue(); + MutableLong count = expectedTablesCountTmp.get(key); + if (count == null) { + count = new MutableLong(value); + expectedTablesCountTmp.put(key, count); + + } else { + count.add(value); + } + } + } + ImmutableMap.Builder<String, Long> expectedTablesCountBuilder = ImmutableMap.builder(); + for (Map.Entry<String, MutableLong> entry : expectedTablesCountTmp.entrySet()) { + expectedTablesCountBuilder.put(entry.getKey(), entry.getValue().longValue()); + } + ImmutableMap<String, Long> expectedResults = expectedTablesCountBuilder.build(); + return expectedResults; + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.