This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository tutti. See http://git.codelutin.com/tutti.git commit 3598ed99bfc0d1f255927b7d774fe26375959adf Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 10:44:33 2015 +0100 Fix some other tests --- .../fr/ird/observe/services/service/AbstractServiceRestTest.java | 6 ++---- .../fr/ird/observe/services/service/ReferentialServiceRestTest.java | 2 +- .../services/service/seine/TripSeineGearUseServiceRestTest.java | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java index 285759d..d26f735 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java @@ -22,8 +22,6 @@ package fr.ird.observe.services.service; * #L% */ -import com.google.common.collect.Collections2; -import com.google.common.collect.Sets; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.TestClassResource; import fr.ird.observe.services.TestMethodResource; @@ -89,7 +87,7 @@ public abstract class AbstractServiceRestTest { Assert.assertNotNull(formDto.getLabels()); - Set<Class> types = Sets.newLinkedHashSet(Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction())); + Set<Class<?>> types = ReferenceSetDtos.getTypes(formDto.getLabels()); Assert.assertEquals(expectedTypes.length, types.size()); @@ -109,7 +107,7 @@ public abstract class AbstractServiceRestTest { Assert.assertNotNull(formDto.getLabels()); - Set<Class> types = Sets.newLinkedHashSet(Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction())); + Set<Class<?>> types = ReferenceSetDtos.getTypes(formDto.getLabels()); Assert.assertEquals(expectedTypes.length, types.size()); diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java index 5fd96a9..66b2c99 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java @@ -43,7 +43,7 @@ public class ReferentialServiceRestTest { Assert.assertNotNull(referentialReferenceSet); - LinkedHashSet<ReferenceDto> reference = referentialReferenceSet.getReference(); + LinkedHashSet<ReferenceDto<ProgramDto>> reference = referentialReferenceSet.getReference(); Assert.assertNotNull(reference); Assert.assertEquals(28, reference.size()); diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java index 1cacd88..93df71e 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java @@ -62,7 +62,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { ReferenceSetDto<TripSeineDto> allTripSeine = newService(TripSeineService.class).getAllTripSeine(); - Map<String, ReferenceDto> tripIds = IdDtos.splitById(allTripSeine.getReference()); + Map<String, ReferenceDto<TripSeineDto>> tripIds = IdDtos.splitById(allTripSeine.getReference()); Assume.assumeTrue("Marée " + TRIP_SEINE_ID_1 + " non trouvée dans cette base. Test annulé", tripIds.containsKey(TRIP_SEINE_ID_1)); FormDto<TripSeineGearUseDto> formDto = service.loadToRead(TRIP_SEINE_ID_1); @@ -124,7 +124,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { ReferenceSetDto<TripSeineDto> allTripSeine = newService(TripSeineService.class).getAllTripSeine(); - Map<String, ReferenceDto> tripIds = IdDtos.splitById(allTripSeine.getReference()); + Map<String, ReferenceDto<TripSeineDto>> tripIds = IdDtos.splitById(allTripSeine.getReference()); Assume.assumeTrue("Marée " + TRIP_SEINE_ID_1 + " non trouvée dans cette base. Test annulé", tripIds.containsKey(TRIP_SEINE_ID_1)); FormDto<TripSeineGearUseDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.