This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit c59457ac2e5bac3e3609c86d66ad270ad933049e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Aug 25 10:42:43 2015 +0200 correction du test pour TripSeineServiceTopia (refs #7458). --- .../entities/constants/ReferenceLocale.java | 14 ++-- .../observe/entities/seine/TripSeineTopiaDao.java | 4 +- .../services/service/AbstractServiceTopiaTest.java | 76 +++++++++++++++++++ .../service/ReferentialServiceTopiaTest.java | 39 ++++------ .../service/seine/TripSeineServiceTopiaTest.java | 86 ++++++---------------- 5 files changed, 123 insertions(+), 96 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java index 6c55be8..227588c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java @@ -133,25 +133,25 @@ public enum ReferenceLocale { result = i18nEntity.getLabel1(); break; case 2: - result = i18nEntity.getLabel1(); + result = i18nEntity.getLabel2(); break; case 3: - result = i18nEntity.getLabel1(); + result = i18nEntity.getLabel3(); break; case 4: - result = i18nEntity.getLabel1(); + result = i18nEntity.getLabel4(); break; case 5: - result = i18nEntity.getLabel1(); + result = i18nEntity.getLabel5(); break; case 6: - result = i18nEntity.getLabel1(); + result = i18nEntity.getLabel6(); break; case 7: - result = i18nEntity.getLabel1(); + result = i18nEntity.getLabel7(); break; case 8: - result = i18nEntity.getLabel1(); + result = i18nEntity.getLabel8(); break; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 2910b8a..15f58ba 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -254,8 +254,8 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { trip.setEndDate(set.getDate(3)); trip.setOpen(set.getBoolean(4)); - String observerFirstName = set.getString(5); - String observerLastName = set.getString(6); + String observerLastName = set.getString(5); + String observerFirstName = set.getString(6); Person observer = new PersonImpl(); observer.setFirstName(observerFirstName); observer.setLastName(observerLastName); 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 new file mode 100644 index 0000000..98b0784 --- /dev/null +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java @@ -0,0 +1,76 @@ +package fr.ird.observe.services.service; + +import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.services.ApplicationContextResource; +import fr.ird.observe.services.DataSourceResource; +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.dto.ReferenceDto; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public abstract class AbstractServiceTopiaTest { + + 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"; + + @ClassRule + public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); + + public abstract List<String> getTestNamesChangeDataBase(); + public abstract String getScriptName(); + + @Rule + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, getTestNamesChangeDataBase()); + + @Before + public void setUp() throws Exception { + + if (applicationContextResource.isNeedToReloadDataBase()) { + // Create database from script + String scriptPath = applicationContextResource.getScriptPath(getScriptName(), H2DataSourceMigration.V_4_0_1); + dataSourceResource.createDataSourceFromScript(scriptPath); + } + + } + + public <S extends ObserveService> S newService(Class<S> serviceType) { + + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + + S service = applicationContextResource.newService(dataSourceConfiguration, serviceType); + + return service; + } + + + protected void assertEntityEqualsReferenceDto(TopiaEntity entity, ReferenceDto referenceDto) { + if (entity == null) { + Assert.assertNull(referenceDto); + } else { + Assert.assertEquals(entity.getTopiaId(), referenceDto.getId()); + } + + } + + protected void assertReferenceDtoEqualsEntity(ReferenceDto referenceDto, TopiaEntity entity) { + if (referenceDto == null) { + Assert.assertNull(entity); + } else { + Assert.assertEquals(referenceDto.getId(), entity.getTopiaId()); + } + + } + +} 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 e200303..e509db0 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 @@ -2,12 +2,8 @@ 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; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.services.ApplicationContextResource; -import fr.ird.observe.services.DataSourceResource; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceSetDto; @@ -17,13 +13,11 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; +import java.util.List; import java.util.Map; /** @@ -31,33 +25,28 @@ import java.util.Map; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReferentialServiceTopiaTest { +public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { /** Logger. */ private static final Log log = LogFactory.getLog(ReferentialServiceTopiaTest.class); - @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, TEST_NAMES_CHANGE_DATA_BASE); - protected ReferentialService service; - @Before - public void setUp() throws Exception { + @Override + public List<String> getTestNamesChangeDataBase() { + return ImmutableList.of("testDelete"); + } - // Create database from script - if (applicationContextResource.isNeedToReloadDataBase()) { - String scriptPath = applicationContextResource.getScriptPath("referentiel", H2DataSourceMigration.V_4_0_1); - dataSourceResource.createDataSourceFromScript(scriptPath); - } + @Override + public String getScriptName() { + return "referentiel"; + } - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + @Override + public void setUp() throws Exception { + super.setUp(); - service = applicationContextResource.newService(dataSourceConfiguration, ReferentialService.class); + service = newService(ReferentialService.class); } 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 657422e..6ebaf5a 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 @@ -2,14 +2,9 @@ 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; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; @@ -19,13 +14,10 @@ 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 fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; -import org.junit.Before; -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; @@ -34,43 +26,32 @@ import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class TripSeineServiceTopiaTest { - - @ClassRule - public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); - - 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#1360156698296#0.6097793743126777"; - public static final String TRIP_SEINE_ID_3 = "fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215"; - - 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", - "deleteTest"); - - @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, TEST_NAMES_CHANGE_DATA_BASE); +public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { protected TripSeineService service; protected ReferentialService referentialService; - @Before - public void setUp() throws Exception { + @Override + public List<String> getTestNamesChangeDataBase() { + return ImmutableList.of( + "saveCreateTest", + "saveUpdateTest", + "deleteTest"); + } - if (applicationContextResource.isNeedToReloadDataBase()) { - // Create database from script - String scriptPath = applicationContextResource.getScriptPath("dataForTestSeine", H2DataSourceMigration.V_4_0_1); - dataSourceResource.createDataSourceFromScript(scriptPath); - } + @Override + public String getScriptName() { + return "dataForTestSeine"; + } - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + @Override + public void setUp() throws Exception { + super.setUp(); - service = applicationContextResource.newService(dataSourceConfiguration, TripSeineService.class); + service = newService(TripSeineService.class); - referentialService = applicationContextResource.newService(dataSourceConfiguration, ReferentialService.class); + referentialService = newService(ReferentialService.class); } @@ -87,8 +68,8 @@ public class TripSeineServiceTopiaTest { TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(tripSeine.getStartDate(), tripSeineStubDto.getStartDate()); - Assert.assertEquals(tripSeine.getEndDate(), tripSeineStubDto.getEndDate()); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo(tripSeineStubDto.getStartDate())); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo(tripSeineStubDto.getEndDate())); Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); @@ -96,8 +77,8 @@ public class TripSeineServiceTopiaTest { tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_2); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(tripSeine.getStartDate(), tripSeineStubDto.getStartDate()); - Assert.assertEquals(tripSeine.getEndDate(), tripSeineStubDto.getEndDate()); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo(tripSeineStubDto.getStartDate())); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo(tripSeineStubDto.getEndDate())); Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); @@ -105,8 +86,8 @@ public class TripSeineServiceTopiaTest { tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_3); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(tripSeine.getStartDate(), tripSeineStubDto.getStartDate()); - Assert.assertEquals(tripSeine.getEndDate(), tripSeineStubDto.getEndDate()); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo(tripSeineStubDto.getStartDate())); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo(tripSeineStubDto.getEndDate())); Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); @@ -348,23 +329,4 @@ public class TripSeineServiceTopiaTest { } - protected void assertEntityEqualsReferenceDto(TopiaEntity entity, ReferenceDto referenceDto) { - if (entity == null) { - Assert.assertNull(referenceDto); - } else { - Assert.assertEquals(entity.getTopiaId(), referenceDto.getId()); - } - - } - - protected void assertReferenceDtoEqualsEntity(ReferenceDto referenceDto, TopiaEntity entity) { - if (referenceDto == null) { - Assert.assertNull(entity); - } else { - Assert.assertEquals(referenceDto.getId(), entity.getTopiaId()); - } - - } - - } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.