This is an automated email from the git hooks/post-receive script. New commit to branch feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour in repository tutti. See http://git.codelutin.com/tutti.git commit e0e0eacaa0c7b4edecbab50ad5540c487682d9bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 15:17:11 2015 +0100 Faire fonctionner les tests de suppression (mais ajout d'un fixme) --- .../service/ReferentialServiceTopiaTest.java | 17 ++++------- .../service/seine/TripSeineServiceTopiaTest.java | 33 ++++------------------ 2 files changed, 12 insertions(+), 38 deletions(-) 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 46133ef..9e65256 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 @@ -32,17 +32,13 @@ import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; -import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.topia.persistence.TopiaEntity; import java.util.Date; @@ -51,7 +47,6 @@ import java.util.Date; * * @author Tony Chemit - chemit@codelutin.com */ -@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { /** Logger. */ @@ -79,8 +74,6 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { } - //FIXME En réutilisant une table de lastUpdateDate - @Ignore @Test @CopyDatabaseConfiguration public void testDelete() throws Exception { @@ -120,12 +113,12 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { } } - protected void delete(ObserveTopiaPersistenceContext persistenceContext, Class dtoType, Class entityType) { + protected <D extends ReferentialDto, E extends ObserveReferentialEntity> void delete(ObserveTopiaPersistenceContext persistenceContext, Class<D> dtoType, Class<E> entityType) { - TopiaDao<?> dao = persistenceContext.getDao(entityType); + TopiaDao<E> dao = persistenceContext.getDao(entityType); long expectedCount = dao.count(); - TopiaEntity entity = dao.iterator().next(); + E entity = dao.iterator().next(); if (log.isInfoEnabled()) { log.info("Test delete: " + entity.getTopiaId()); } @@ -141,7 +134,9 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(expectedCount - 1, dao.count()); - Date lastUpdateAfter = persistenceContext.getLastUpdateDate(entityType); + //FIXME On ne voit pas la date de mise à jour ici? alors que le dao est ok +// Date lastUpdateAfter = persistenceContext.getLastUpdateDate(entityType); + Date lastUpdateAfter = getLastUpdateDate(entityType); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); try { 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 0e99d68..c7a06a4 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 @@ -27,7 +27,6 @@ import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; @@ -45,7 +44,6 @@ import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -208,7 +206,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { tripSeineDto.setComment("Un commentaire"); - Date lastUpdateBefore = getLastUpdate(TripSeine.class); + Date lastUpdateBefore = getLastUpdateDate(TripSeine.class); SaveResultDto saveResult = service.save(form.getObject()); @@ -229,7 +227,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); Assert.assertNotNull(tripSeine.getLastUpdateDate()); - Date lastUpdateAfter = getLastUpdate(TripSeine.class); + Date lastUpdateAfter = getLastUpdateDate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); } @@ -261,7 +259,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { tripSeineDto.setComment("Un commentaire"); - Date lastUpdateBefore = getLastUpdate(TripSeine.class); + Date lastUpdateBefore = getLastUpdateDate(TripSeine.class); service.save(form.getObject()); @@ -283,7 +281,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNotNull(tripSeine.getLastUpdateDate()); Assert.assertNotEquals(tripSeineDto.getLastUpdate(), tripSeine.getLastUpdateDate()); - Date lastUpdateAfter = getLastUpdate(TripSeine.class); + Date lastUpdateAfter = getLastUpdateDate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); } @@ -316,13 +314,11 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } - //FIXME En réutilisant une table de lastUpdateDate - @Ignore @Test @CopyDatabaseConfiguration public void deleteTest() { - Date lastUpdateBefore = getLastUpdate(TripSeine.class); + Date lastUpdateBefore = getLastUpdateDate(TripSeine.class); service.delete(TRIP_SEINE_ID_1); @@ -332,26 +328,9 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertFalse(dataSourceResource.exists(TripSeine.class, TRIP_SEINE_ID_1)); - Date lastUpdateAfter = getLastUpdate(TripSeine.class); + Date lastUpdateAfter = getLastUpdateDate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); } - protected <T extends IdDto> void assertTripFormLabels(Form<T> form) { - - //FIXME Topia test -// Assert.assertNotNull(formDto.getLabels()); -// -// Set<Class<?>> types = ReferenceSetDtos.getTypes(formDto.getLabels()); -// Assert.assertTrue(types.contains(PersonDto.class)); -// Assert.assertTrue(types.contains(VesselDto.class)); -// Assert.assertTrue(types.contains(OceanDto.class)); -// Assert.assertTrue(types.contains(HarbourDto.class)); -// Assert.assertTrue(types.contains(ProgramDto.class)); -// Assert.assertEquals(5, types.size()); -// Assert.assertEquals(8, formDto.sizeLabels()); - - } - - } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.