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 c6e7300cad250e52f3a0e038dacef38745d730af Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 18 13:18:53 2015 +0200 Correction des liens sur certains référentiels + tester le chargement de tous les référentiels --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 32889 -> 33042 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 75755 -> 75604 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54561 -> 55176 bytes observe-services-topia/pom.xml | 2 +- .../services/service/ReferentialDtoBuilder.java | 6 +- .../service/ReferentialServiceTopiaTest.java | 83 +++++++++++++++++++++ 6 files changed, 87 insertions(+), 4 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 6ca3d46..862033a 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 6ed2246..61cf0e8 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 2745504..4896129 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index 6c297c8..f5560e2 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -71,7 +71,7 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - + <!-- persistence --> <!--dependency> <groupId>org.hibernate</groupId> diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java index 10d7157..3bf82d3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java @@ -6,10 +6,10 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceStatus; import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; +import fr.ird.observe.entities.constants.seine.Ownership; +import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.constants.seine.Ownership; -import fr.ird.observe.services.dto.constants.seine.SchoolType; -import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; 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 9564a03..9947348 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 @@ -4,6 +4,8 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.services.ObserveServiceContextTopia; import fr.ird.observe.services.ObserveServiceMainFactory; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import org.apache.commons.logging.Log; @@ -15,6 +17,7 @@ import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; @@ -74,4 +77,84 @@ public class ReferentialServiceTopiaTest { } + @Test + public void testLoadToRead() throws Exception { + + TopiaContext tx = dataSourceResource.newTransaction("testLoadToRead"); + + for (Map.Entry<Class<?>, Class<?>> entry : ReferentialServiceTopia.modelToEntityTypeCache.entrySet()) { + + Class dtoType = entry.getKey(); + Class entityType = entry.getValue(); + loadToRead(tx, dtoType, entityType); + + } + + } + + @Test + public void testLoadToEdit() throws Exception { + + TopiaContext tx = dataSourceResource.newTransaction("testLoadToEdit"); + + for (Map.Entry<Class<?>, Class<?>> entry : ReferentialServiceTopia.modelToEntityTypeCache.entrySet()) { + + Class dtoType = entry.getKey(); + Class entityType = entry.getValue(); + loadToEdit(tx, dtoType, entityType); + + } + + } + + protected void loadToRead(TopiaContext tx, Class dtoType, Class entityType) { + TopiaDAO<?> dao = dataSourceResource.getDataSource().getDAO(tx, entityType); + long expectedCount = dao.count(); + + if (log.isInfoEnabled()) { + log.info("Test referential of type: " + dtoType.getSimpleName() + " expected count: " + expectedCount); + } + + for (TopiaEntity o : dao) { + + if (log.isDebugEnabled()) { + log.debug("Load to read entity: " + o.getTopiaId()); + } + + FormDto formDto = service.loadToRead(dtoType, o.getTopiaId()); + Assert.assertNotNull(formDto); + Assert.assertEquals(dtoType, formDto.getType()); + + IdDto form = formDto.getForm(); + Assert.assertNotNull(form); + Assert.assertEquals(o.getTopiaId(), form.getId()); + + } + } + + protected void loadToEdit(TopiaContext tx, Class dtoType, Class entityType) { + TopiaDAO<?> dao = dataSourceResource.getDataSource().getDAO(tx, entityType); + long expectedCount = dao.count(); + + if (log.isInfoEnabled()) { + log.info("Test referential of type: " + dtoType.getSimpleName() + " expected count: " + expectedCount); + } + + for (TopiaEntity o : dao) { + + if (log.isDebugEnabled()) { + log.debug("Load to edit entity: " + o.getTopiaId()); + } + + FormDto formDto = service.loadToEdit(dtoType, o.getTopiaId()); + Assert.assertNotNull(formDto); + Assert.assertEquals(dtoType, formDto.getType()); + + IdDto form = formDto.getForm(); + Assert.assertNotNull(form); + Assert.assertEquals(o.getTopiaId(), form.getId()); + + } + } + } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.