This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git commit b180fa2b237c3e4c9c28dc783d550c6685829f1d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Sep 7 11:34:29 2015 +0200 test sauvegard de trip seine (refs #7463) --- observe-application-web/pom.xml | 7 + .../ird/observe/services/TestMethodResource.java | 17 ++- .../service/seine/TripSeineServiceTest.java | 160 +++++++-------------- 3 files changed, 73 insertions(+), 111 deletions(-) diff --git a/observe-application-web/pom.xml b/observe-application-web/pom.xml index c678672..6692462 100644 --- a/observe-application-web/pom.xml +++ b/observe-application-web/pom.xml @@ -143,6 +143,13 @@ <artifactId>yamlbeans</artifactId> </dependency> + <!-- paranamer --> + <dependency> + <groupId>com.thoughtworks.paranamer</groupId> + <artifactId>paranamer</artifactId> + <scope>runtime</scope> + </dependency> + <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java index 97f1c27..e53eed9 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java @@ -30,14 +30,21 @@ public class TestMethodResource implements TestRule { protected final char[] password; + protected final String databaseName; + protected ObserveDataSourceConfigurationRest dataSourceConfiguration; public TestMethodResource(TestClassResource testClassResource) { - this(testClassResource, "admin", 'a'); + this(testClassResource, null); + } + + public TestMethodResource(TestClassResource testClassResource, String databaseName) { + this(testClassResource, databaseName, "userTest", "password3".toCharArray()); } - public TestMethodResource(TestClassResource testClassResource, String login, char... password) { + public TestMethodResource(TestClassResource testClassResource, String databaseName, String login, char... password) { this.testClassResource = testClassResource; + this.databaseName = databaseName; this.login = login; this.password = password; } @@ -80,7 +87,7 @@ public class TestMethodResource implements TestRule { testClassResource.setTemporaryDirectoryRoot(temporaryDirectoryRoot); - dataSourceConfiguration = testClassResource.createDataSourceConfigurationRest(testClass, "admin", 'a'); + dataSourceConfiguration = testClassResource.createDataSourceConfigurationRest(testClass, databaseName, login, password); checkServerIsAvailable(testClass, methodName); @@ -94,7 +101,6 @@ public class TestMethodResource implements TestRule { log.debug("Ends " + testClass.getName() + "::" + methodName); } - testClassResource.closeServiceFactory(); testClassResource.setTemporaryDirectoryRoot(null); } @@ -111,6 +117,9 @@ public class TestMethodResource implements TestRule { serverExist = false; } } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("error on check server ", e); + } serverExist = false; } diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java index 88c0ccd..65fda18 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java @@ -12,13 +12,13 @@ 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.dto.seine.TripSeineStubDto; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -29,7 +29,7 @@ import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@Ignore + public class TripSeineServiceTest { public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; @@ -42,7 +42,7 @@ public class TripSeineServiceTest { public static final TestClassResource testClassResource = new TestClassResource(); @Rule - public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); + public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource, "testSeine"); protected TripSeineService service; @@ -61,7 +61,7 @@ public class TripSeineServiceTest { Assert.assertNotNull(stubDtos); - Assert.assertEquals(135, stubDtos.size()); + Assert.assertEquals(3, stubDtos.size()); TripSeineStubDto tripSeineStub1Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_1)); @@ -221,109 +221,55 @@ public class TripSeineServiceTest { } -// @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()); -// -// } -// -// -// @Ignore -// @Test -// public void saveUpdateTest() { -// -// FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); -// -// 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_1); -// -// 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_1); + + 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); + + FormDto<TripSeineDto> formDtoReload = service.loadToRead(TRIP_SEINE_ID_1); + TripSeineDto tripSeineDtoReload = formDtoReload.getForm(); + + Assert.assertEquals(tripSeineDto.getCaptain(), tripSeineDtoReload.getCaptain()); + Assert.assertEquals(tripSeineDto.getObserver(), tripSeineDtoReload.getObserver()); + Assert.assertEquals(tripSeineDto.getDataEntryOperator(), tripSeineDtoReload.getDataEntryOperator()); + Assert.assertEquals(tripSeineDto.getVessel(), tripSeineDtoReload.getVessel()); + Assert.assertEquals(tripSeineDto.getOcean(), tripSeineDtoReload.getOcean()); + Assert.assertEquals(tripSeineDto.getDepartureHarbour(), tripSeineDtoReload.getDepartureHarbour()); + Assert.assertEquals(tripSeineDto.getLandingHarbour(), tripSeineDtoReload.getLandingHarbour()); + Assert.assertEquals(tripSeineDto.getErsId(), tripSeineDtoReload.getErsId()); + Assert.assertEquals(tripSeineDto.getStartDate(), tripSeineDtoReload.getStartDate()); + Assert.assertEquals(tripSeineDto.getEndDate(), tripSeineDtoReload.getEndDate()); + Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeineDtoReload.getFormsUrl()); + Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeineDtoReload.getReportsUrl()); + Assert.assertEquals(tripSeineDto.getComment(), tripSeineDtoReload.getComment()); + + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.