branch feature/7458-4 created (now 37c7478)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-4 in repository observe. See http://git.codelutin.com/observe.git at 37c7478 TripSeineServiceTopia : implantation des tests de sauvegarde. Ne pas regenérer la base de test à chacque début de test (uniquement si des modifications y sont apportées) (refs #7458). This branch includes the following new commits: new 37c7478 TripSeineServiceTopia : implantation des tests de sauvegarde. Ne pas regenérer la base de test à chacque début de test (uniquement si des modifications y sont apportées) (refs #7458). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 37c7478535d304721925f811438db1c2c2199b8a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Aug 24 14:03:10 2015 +0200 TripSeineServiceTopia : implantation des tests de sauvegarde. Ne pas regenérer la base de test à chacque début de test (uniquement si des modifications y sont apportées) (refs #7458). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7458-4 in repository observe. See http://git.codelutin.com/observe.git commit 37c7478535d304721925f811438db1c2c2199b8a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Aug 24 14:03:10 2015 +0200 TripSeineServiceTopia : implantation des tests de sauvegarde. Ne pas regenérer la base de test à chacque début de test (uniquement si des modifications y sont apportées) (refs #7458). --- .../java/fr/ird/observe/services/dto/FormDto.java | 10 ++ .../ird/observe/services/dto/ReferenceSetDtos.java | 13 ++ .../service/seine/TripSeineServiceTopia.java | 15 ++- .../services/ApplicationContextResource.java | 25 ++++ .../ird/observe/services/DataSourceResource.java | 34 +++-- .../service/DataSourceServiceTopiaTest.java | 11 +- .../service/ReferentialServiceTopiaTest.java | 11 +- .../service/seine/TripSeineServiceTopiaTest.java | 137 +++++++++++++++++++-- .../resources/db/4.0.1/dataForTestLongline.sql.gz | Bin 0 -> 1520436 bytes .../resources/db/4.0.1/dataForTestSeine.sql.gz | Bin 0 -> 430098 bytes .../src/main/resources/db/4.0.1/test.sql.gz | Bin 5044065 -> 0 bytes 11 files changed, 230 insertions(+), 26 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java index 93be919..d2b7b58 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.dto; import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; public class FormDto<R extends IdDto> extends AbstractFormDto { @@ -26,4 +27,13 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { public Class<R> getType() { return type; } + + public <D extends IdDto> ReferenceSetDto<D> getReferenceSetDto(Class<D> type) { + + ReferenceSetDto referenceSetDto = Iterables.find(getLabels(), ReferenceSetDtos.newTypePredicate(type)); + + return referenceSetDto; + + } + } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java index 86ae4ae..b8ddb17 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java @@ -1,8 +1,10 @@ package fr.ird.observe.services.dto; import com.google.common.base.Function; +import com.google.common.base.Predicate; import java.util.LinkedHashSet; +import java.util.Objects; public class ReferenceSetDtos extends AbstractReferenceSetDtos { @@ -37,5 +39,16 @@ public class ReferenceSetDtos extends AbstractReferenceSetDtos { } + public static <D extends IdDto, BeanType extends ReferenceSetDto> Predicate<BeanType> newTypePredicate(final Class<D> type) { + return new Predicate<BeanType>() { + + @Override + public boolean apply(BeanType input) { + return Objects.equals(type, input.getType()); + } + }; + + } + } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 2d3c553..a3476d7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -60,6 +60,13 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); + TripSeineDto tripSeineDto = form.getForm(); + + if (tripSeineDto.getEndDate() == null) { + Date date = DateUtil.getEndOfDay(now()); + tripSeineDto.setEndDate(date); + } + return form; } @@ -70,15 +77,13 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe Program program = loadEntity(ProgramDto.class, Program.class, programId); - TripSeine preCreated = getDao().newInstance(); - Date date = DateUtil.getDay(now()); - preCreated.setStartDate(date); + tripSeine.setStartDate(date); - preCreated.setEndDate(date); + tripSeine.setEndDate(date); - preCreated.setProgram(program); + tripSeine.setProgram(program); FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index 7a7a393..4b13c45 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -11,6 +11,7 @@ import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.nuiton.util.version.Version; +import java.io.File; import java.nio.file.Path; /** @@ -27,6 +28,10 @@ public class ApplicationContextResource implements TestRule { protected final ObserveServiceFactoryTopia serviceFactory; + private File testDirectory; + + boolean needToReloadDataBase; + public ApplicationContextResource() { this.serviceApplicationContext = new ObserveServiceApplicationContext(); this.serviceFactory = new ObserveServiceFactoryTopia() { @@ -42,6 +47,7 @@ public class ApplicationContextResource implements TestRule { return serviceContext; } }; + needToReloadDataBase = true; } public String getScriptPath(String classifier, Version databaseVersion) { @@ -76,6 +82,14 @@ public class ApplicationContextResource implements TestRule { }; } + public boolean isNeedToReloadDataBase() { + return needToReloadDataBase; + } + + public void setNeedToReloadDataBase(boolean needToReloadDataBase) { + this.needToReloadDataBase = needToReloadDataBase; + } + protected void before(Description description) { Class<?> testClass = description.getTestClass(); @@ -99,5 +113,16 @@ public class ApplicationContextResource implements TestRule { log.debug("Ends " + testClass.getName()); } + closeServiceFactory(); + setTemporaryDirectoryRoot(null); + + } + + public File getTestDirectory() { + return testDirectory; + } + + public void setTestDirectory(File testDirectory) { + this.testDirectory = testDirectory; } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java index e15f952..0a9b351 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java @@ -26,6 +26,7 @@ import java.io.InputStream; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; +import java.util.List; /** * Created on 18/08/15. @@ -41,10 +42,11 @@ public class DataSourceResource implements TestRule { protected ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration; - private File testDirectory; + protected List<String> testNamesChangeDataBase; - public DataSourceResource(ApplicationContextResource applicationContextResource) { + public DataSourceResource(ApplicationContextResource applicationContextResource, List<String> testNamesChangeDataBase) { this.applicationContextResource = applicationContextResource; + this.testNamesChangeDataBase = testNamesChangeDataBase; } public ObserveDataSourceConfigurationTopiaH2 getDataSourceConfiguration() { @@ -118,10 +120,18 @@ public class DataSourceResource implements TestRule { log.debug("Starts " + testClass.getName() + "::" + methodName); } - testDirectory = TestHelper.newFile(methodName); - Path temporaryDirectoryRoot = new File(testDirectory, "tmp").toPath(); - Files.createDirectories(temporaryDirectoryRoot); - applicationContextResource.setTemporaryDirectoryRoot(temporaryDirectoryRoot); + if (applicationContextResource.isNeedToReloadDataBase()) { + + File testDirectory = TestHelper.newFile(methodName); + applicationContextResource.setTestDirectory(testDirectory); + + Path temporaryDirectoryRoot = new File(testDirectory, "tmp").toPath(); + + Files.createDirectories(temporaryDirectoryRoot); + + applicationContextResource.setTemporaryDirectoryRoot(temporaryDirectoryRoot); + + } dataSourceConfiguration = createDataSourceConfigurationH2(testClass, methodName); @@ -131,7 +141,7 @@ public class DataSourceResource implements TestRule { ObserveDataSourceConfigurationTopiaH2 configurationTopiaH2 = new ObserveDataSourceConfigurationTopiaH2(); - File localDbFile = new File(testDirectory, "localdb"); + File localDbFile = new File(applicationContextResource.getTestDirectory(), "localdb"); if (log.isInfoEnabled()) { log.info("db directory: " + localDbFile); @@ -154,8 +164,14 @@ public class DataSourceResource implements TestRule { log.debug("Ends " + testClass.getName() + "::" + methodName); } - applicationContextResource.closeServiceFactory(); - applicationContextResource.setTemporaryDirectoryRoot(null); + applicationContextResource.setNeedToReloadDataBase(testNamesChangeDataBase.contains(methodName)); + + if (applicationContextResource.isNeedToReloadDataBase()) { + + applicationContextResource.closeServiceFactory(); + applicationContextResource.setTemporaryDirectoryRoot(null); + + } } } 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 82b61b5..377e976 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 @@ -1,5 +1,6 @@ package fr.ird.observe.services.service; +import com.google.common.collect.ImmutableList; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.migration.H2DataSourceMigration; @@ -28,8 +29,16 @@ public class DataSourceServiceTopiaTest { @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); + public static final ImmutableList<String> TEST_NAMES_CHANGE_DATA_BASE = ImmutableList.of( + "testOpenNotExistingDatabase", + "testOpen", + "testCreateEmptyDataSource", + "testCreateDataSourceFromImportDatabase", + "testCreateDataSourceFromImportReferential", + "testCreateDataSourceFromImportReferentialAndData"); + @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource); + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, TEST_NAMES_CHANGE_DATA_BASE); protected DataSourceService service; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index 20128ae..e200303 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service; +import com.google.common.collect.ImmutableList; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.referentiel.LengthWeightParameter; @@ -38,8 +39,10 @@ public class ReferentialServiceTopiaTest { @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); + public static final ImmutableList<String> TEST_NAMES_CHANGE_DATA_BASE = ImmutableList.of("testDelete"); + @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource); + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, TEST_NAMES_CHANGE_DATA_BASE); protected ReferentialService service; @@ -47,8 +50,10 @@ public class ReferentialServiceTopiaTest { public void setUp() throws Exception { // Create database from script - String scriptPath = applicationContextResource.getScriptPath("referentiel", H2DataSourceMigration.V_4_0_1); - dataSourceResource.createDataSourceFromScript(scriptPath); + if (applicationContextResource.isNeedToReloadDataBase()) { + String scriptPath = applicationContextResource.getScriptPath("referentiel", H2DataSourceMigration.V_4_0_1); + dataSourceResource.createDataSourceFromScript(scriptPath); + } ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); 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 46b379a..760bc99 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 @@ -1,10 +1,12 @@ package fr.ird.observe.services.service.seine; import com.google.common.collect.Collections2; +import com.google.common.collect.ImmutableList; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ApplicationContextResource; import fr.ird.observe.services.DataSourceResource; +import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -13,6 +15,7 @@ import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.ReferentialService; @@ -22,6 +25,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.DateUtil; import java.util.Collection; @@ -33,12 +37,14 @@ public class TripSeineServiceTopiaTest { @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); - public static final String TRIP_SEINE_ID = "fr.ird.observe.entities.seine.TripSeine#1412004815781#0.2859887799862254"; + public static final String TRIP_SEINE_ID = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; + public static final ImmutableList<String> TEST_NAMES_CHANGE_DATA_BASE = ImmutableList.of("saveCreateTest", "saveUpdateTest"); + @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource); + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, TEST_NAMES_CHANGE_DATA_BASE); protected TripSeineService service; @@ -47,9 +53,11 @@ public class TripSeineServiceTopiaTest { @Before public void setUp() throws Exception { - // Create database from script - String scriptPath = applicationContextResource.getScriptPath("test", H2DataSourceMigration.V_4_0_1); - dataSourceResource.createDataSourceFromScript(scriptPath); + if (applicationContextResource.isNeedToReloadDataBase()) { + // Create database from script + String scriptPath = applicationContextResource.getScriptPath("dataForTestSeine", H2DataSourceMigration.V_4_0_1); + dataSourceResource.createDataSourceFromScript(scriptPath); + } ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); @@ -69,7 +77,7 @@ public class TripSeineServiceTopiaTest { //FIXME A mieux tester, j'ai déjà fait des corrections, mais il reste des choses à revoir //FIXME Mais surtout je pense qu'il faut un autre objet qui reflete exactement le besoin //FIXME L'idée c'est de ne pas avoir des objets creux, ceux-là le sont bien... - Assert.assertEquals(13, tripSeineDtos.sizeReference()); + Assert.assertEquals(3, tripSeineDtos.sizeReference()); } @@ -168,8 +176,8 @@ public class TripSeineServiceTopiaTest { Assert.assertNull(tripSeineDto.getDepartureHarbour()); Assert.assertNull(tripSeineDto.getLandingHarbour()); Assert.assertNull(tripSeineDto.getErsId()); -// Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getStartDate()); -// Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getEndDate()); + Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getStartDate()); + Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getEndDate()); Assert.assertNull(tripSeineDto.getFormsUrl()); Assert.assertNull(tripSeineDto.getReportsUrl()); Assert.assertNull(tripSeineDto.getComment()); @@ -189,9 +197,113 @@ public class TripSeineServiceTopiaTest { } + } + + @Test + public void saveCreateTest() { + + FormDto<TripSeineDto> formDto = service.preCreate(PROGRAM_ID); + + TripSeineDto tripSeineDto = formDto.getForm(); + + ReferenceSetDto<PersonDto> personRefs = formDto.getReferenceSetDto(PersonDto.class); + ReferenceSetDto<VesselDto> vesselRefs = formDto.getReferenceSetDto(VesselDto.class); + ReferenceSetDto<OceanDto> oceanRefs = formDto.getReferenceSetDto(OceanDto.class); + ReferenceSetDto<HarbourDto> harbourRefs = formDto.getReferenceSetDto(HarbourDto.class); + + tripSeineDto.setCaptain((ReferentialReferenceDto<PersonDto>) personRefs.getReference(0)); + tripSeineDto.setObserver((ReferentialReferenceDto<PersonDto>) personRefs.getReference(1)); + tripSeineDto.setDataEntryOperator((ReferentialReferenceDto<PersonDto>) personRefs.getReference(2)); + + tripSeineDto.setVessel((ReferentialReferenceDto<VesselDto>) vesselRefs.getReference(0)); + + tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); + + tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); + tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); + + tripSeineDto.setErsId("ersid"); + + tripSeineDto.setStartDate(DateUtil.createDate(24, 8, 2015)); + tripSeineDto.setEndDate(DateUtil.createDate(24, 9, 2015)); + + tripSeineDto.setFormsUrl("http://une.url.com/formulaire"); + tripSeineDto.setReportsUrl("http://une.url.com/rapport"); + + tripSeineDto.setComment("Un commentaire"); + + String tripSeineId = service.save(formDto); + + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, tripSeineId); + + assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); + assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); + assertReferenceDtoEqualsEntity(tripSeineDto.getDataEntryOperator(), tripSeine.getDataEntryOperator()); + assertReferenceDtoEqualsEntity(tripSeineDto.getVessel(), tripSeine.getVessel()); + assertReferenceDtoEqualsEntity(tripSeineDto.getOcean(), tripSeine.getOcean()); + assertReferenceDtoEqualsEntity(tripSeineDto.getDepartureHarbour(), tripSeine.getDepartureHarbour()); + assertReferenceDtoEqualsEntity(tripSeineDto.getLandingHarbour(), tripSeine.getLandingHarbour()); + Assert.assertEquals(tripSeineDto.getErsId(), tripSeine.getErsId()); + Assert.assertEquals(tripSeineDto.getStartDate(), tripSeine.getStartDate()); + Assert.assertEquals(tripSeineDto.getEndDate(), tripSeine.getEndDate()); + Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); + Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); + Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); } + + + @Test + public void saveUpdateTest() { + + FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID); + + TripSeineDto tripSeineDto = formDto.getForm(); + + ReferenceSetDto<PersonDto> personRefs = formDto.getReferenceSetDto(PersonDto.class); + ReferenceSetDto<OceanDto> oceanRefs = formDto.getReferenceSetDto(OceanDto.class); + ReferenceSetDto<HarbourDto> harbourRefs = formDto.getReferenceSetDto(HarbourDto.class); + + tripSeineDto.setCaptain((ReferentialReferenceDto<PersonDto>) personRefs.getReference(0)); + tripSeineDto.setDataEntryOperator((ReferentialReferenceDto<PersonDto>) personRefs.getReference(2)); + + tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); + + tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); + tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); + + tripSeineDto.setErsId("ersid"); + + tripSeineDto.setStartDate(DateUtil.createDate(24, 8, 2015)); + tripSeineDto.setEndDate(DateUtil.createDate(24, 9, 2015)); + + tripSeineDto.setFormsUrl("http://une.url.com/formulaire"); + tripSeineDto.setReportsUrl("http://une.url.com/rapport"); + + tripSeineDto.setComment("Un commentaire"); + + service.save(formDto); + + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID); + + assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); + assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); + assertReferenceDtoEqualsEntity(tripSeineDto.getDataEntryOperator(), tripSeine.getDataEntryOperator()); + assertReferenceDtoEqualsEntity(tripSeineDto.getVessel(), tripSeine.getVessel()); + assertReferenceDtoEqualsEntity(tripSeineDto.getOcean(), tripSeine.getOcean()); + assertReferenceDtoEqualsEntity(tripSeineDto.getDepartureHarbour(), tripSeine.getDepartureHarbour()); + assertReferenceDtoEqualsEntity(tripSeineDto.getLandingHarbour(), tripSeine.getLandingHarbour()); + Assert.assertEquals(tripSeineDto.getErsId(), tripSeine.getErsId()); + Assert.assertEquals(tripSeineDto.getStartDate(), tripSeine.getStartDate()); + Assert.assertEquals(tripSeineDto.getEndDate(), tripSeine.getEndDate()); + Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); + Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); + Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); + + } + + protected void assertEntityEqualsReferenceDto(TopiaEntity entity, ReferenceDto referenceDto) { if (entity == null) { Assert.assertNull(referenceDto); @@ -201,5 +313,14 @@ public class TripSeineServiceTopiaTest { } + protected void assertReferenceDtoEqualsEntity(ReferenceDto referenceDto, TopiaEntity entity) { + if (referenceDto == null) { + Assert.assertNull(entity); + } else { + Assert.assertEquals(referenceDto.getId(), entity.getTopiaId()); + } + + } + } diff --git a/observe-test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz b/observe-test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz new file mode 100644 index 0000000..7aae6a5 Binary files /dev/null and b/observe-test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz differ diff --git a/observe-test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz b/observe-test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz new file mode 100644 index 0000000..f61fb10 Binary files /dev/null and b/observe-test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz differ diff --git a/observe-test-data/src/main/resources/db/4.0.1/test.sql.gz b/observe-test-data/src/main/resources/db/4.0.1/test.sql.gz deleted file mode 100644 index a094b0a..0000000 Binary files a/observe-test-data/src/main/resources/db/4.0.1/test.sql.gz and /dev/null differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm