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 f9dd0a60f86467d5a5b461131f602c9fc4b3ca9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:55:25 2015 +0100 Correction du test sur les marées de type seine --- .../service/seine/TripSeineServiceTopiaTest.java | 52 ++++++++++------------ 1 file changed, 24 insertions(+), 28 deletions(-) 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 c79d232..2628c00 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 @@ -22,17 +22,20 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.IdDto; 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; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -45,7 +48,6 @@ import org.junit.Test; import org.nuiton.util.DateUtil; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.Set; @@ -143,14 +145,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); - Assert.assertNotNull(formDto.getLabels()); - - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - 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.assertEquals(formDto.sizeLabels(), 7); + assertTripFormLabels(formDto); for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { @@ -184,14 +179,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); - Assert.assertNotNull(formDto.getLabels()); - - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - 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.assertEquals(formDto.sizeLabels(), 7); + assertTripFormLabels(formDto); for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { @@ -223,14 +211,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNull(tripSeineDto.getComment()); Assert.assertNull(tripSeineDto.getLastUpdate()); - Assert.assertNotNull(formDto.getLabels()); - - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - 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.assertEquals(formDto.sizeLabels(), 7); + assertTripFormLabels(formDto); for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { @@ -298,8 +279,6 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); } - - @Test public void saveUpdateTest() { @@ -356,6 +335,8 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } + + @Test(expected = ConcurrentModificationException.class) public void saveConcurrentTest() { @@ -403,5 +384,20 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } + protected <T extends IdDto> void assertTripFormLabels(FormDto<T> formDto) { + + Assert.assertNotNull(formDto.getLabels()); + + Set<Class> types = Sets.newLinkedHashSet(Iterables.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction())); + 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@list.forge.codelutin.com>.