This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c9801121259df0df95b75856dd5b4b76b49d705d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:27:25 2016 +0100 Mise à jour de tests suite aux modifications de référentiel --- .../topia/binder/BinderEngineMetadataTest.java | 4 +-- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../actions/validate/ValidateServiceTopiaTest.java | 42 +++++++++++++--------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java b/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java index 2251851..9f5ee71 100644 --- a/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java +++ b/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java @@ -83,7 +83,7 @@ public class BinderEngineMetadataTest { ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> referentialDtoToEntityTypes = binderEngine.getReferentialDtoToEntityTypes(); Assert.assertNotNull(referentialDtoToEntityTypes); - Assert.assertEquals(59, referentialDtoToEntityTypes.size()); + Assert.assertEquals(60, referentialDtoToEntityTypes.size()); Set<Class<? extends ObserveReferentialEntity>> entityTypesFromEngine = Sets.newHashSet(referentialDtoToEntityTypes.values()); Set<Class<? extends ObserveReferentialEntity>> referentialEntityTypesFromTopia = getReferentialEntityTypes(); @@ -124,7 +124,7 @@ public class BinderEngineMetadataTest { ImmutableMap<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> referentialDtoToEntityTypes = binderEngine.getReferentialEntityToDtoTypes(); Assert.assertNotNull(referentialDtoToEntityTypes); - Assert.assertEquals(2 * 59, referentialDtoToEntityTypes.size()); + Assert.assertEquals(2 * 60, referentialDtoToEntityTypes.size()); for (Class<? extends ObserveReferentialEntity> entityType : referentialDtoToEntityTypes.keySet()) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java index a0d75d3..810858a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -291,7 +291,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements // on recherche sur le couple species/speciesFate Collection<NonTargetLength> nonTargetLengths = SetSeines.getNonTargetLengths(activityContext.getSetSeine(), species, nonTargetCatch.getSpeciesFate()); - if (nonTargetLengths.isEmpty()) { + if (CollectionUtils.isEmpty(nonTargetLengths)) { // on recherche sur le couple species/null nonTargetLengths = SetSeines.getNonTargetLengths(activityContext.getSetSeine(), species, null); } diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java index f805b5b..2168911 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java @@ -24,14 +24,6 @@ package fr.ird.observe.services.topia.service.actions.validate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; -import fr.ird.observe.services.service.actions.validate.ValidateDataResult; -import fr.ird.observe.services.service.actions.validate.ValidateReferentialsRequest; -import fr.ird.observe.services.service.actions.validate.ValidateReferentialsResult; -import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; -import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType; -import fr.ird.observe.services.service.actions.validate.ValidateService; -import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; @@ -46,12 +38,15 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.ShipOwnerDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.referential.VesselTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; @@ -72,11 +67,9 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; @@ -96,10 +89,20 @@ import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; +import fr.ird.observe.services.service.actions.validate.ValidateDataResult; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsRequest; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsResult; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType; +import fr.ird.observe.services.service.actions.validate.ValidateService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; @@ -109,6 +112,8 @@ import org.junit.Before; import org.junit.Test; import org.nuiton.validator.NuitonValidatorScope; +import java.util.Map; + /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -135,7 +140,7 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNotNull(result); ImmutableMap<Class<? extends ReferentialDto>, ValidateResultForDtoType> resultByType = result.getResultByType(); Assert.assertNotNull(resultByType); - Assert.assertEquals(59, resultByType.size()); + Assert.assertEquals(60, resultByType.size()); // for (Map.Entry<Class<? extends ReferentialDto>, ValidateResultForDtoType> entry : resultByType.entrySet()) { // System.out.println("assertValidateResultForReferentialDtoType(resultByType, " + entry.getKey().getName() + ".class, " + entry.getValue().getValidationResultForDto().size() + ");"); @@ -153,12 +158,15 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { assertValidateResultForReferentialDtoType(resultByType, PersonDto.class, 390); assertValidateResultForReferentialDtoType(resultByType, ProgramDto.class, 27); assertValidateResultForReferentialDtoType(resultByType, SexDto.class, 5); + assertValidateResultForReferentialDtoType(resultByType, ShipOwnerDto.class, 27); + assertValidateResultForReferentialDtoType(resultByType, SizeMeasureTypeDto.class, 17); assertValidateResultForReferentialDtoType(resultByType, SpeciesDto.class, 275); assertValidateResultForReferentialDtoType(resultByType, SpeciesGroupDto.class, 8); assertValidateResultForReferentialDtoType(resultByType, SpeciesListDto.class, 5); assertValidateResultForReferentialDtoType(resultByType, VesselDto.class, 977); assertValidateResultForReferentialDtoType(resultByType, VesselSizeCategoryDto.class, 13); assertValidateResultForReferentialDtoType(resultByType, VesselTypeDto.class, 14); + assertValidateResultForReferentialDtoType(resultByType, WeightMeasureTypeDto.class, 3); assertValidateResultForReferentialDtoType(resultByType, BaitHaulingStatusDto.class, 5); assertValidateResultForReferentialDtoType(resultByType, BaitSettingStatusDto.class, 5); @@ -180,11 +188,9 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { assertValidateResultForReferentialDtoType(resultByType, SensorDataFormatDto.class, 2); assertValidateResultForReferentialDtoType(resultByType, SensorTypeDto.class, 4); assertValidateResultForReferentialDtoType(resultByType, SettingShapeDto.class, 6); - assertValidateResultForReferentialDtoType(resultByType, SizeMeasureTypeDto.class, 17); assertValidateResultForReferentialDtoType(resultByType, StomacFullnessDto.class, 7); assertValidateResultForReferentialDtoType(resultByType, TripTypeDto.class, 3); assertValidateResultForReferentialDtoType(resultByType, VesselActivityLonglineDto.class, 5); - assertValidateResultForReferentialDtoType(resultByType, WeightMeasureTypeDto.class, 3); assertValidateResultForReferentialDtoType(resultByType, DetectionModeDto.class, 10); assertValidateResultForReferentialDtoType(resultByType, ObjectFateDto.class, 9); @@ -219,11 +225,11 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { ImmutableMap<Class<? extends IdDto>, ValidateResultForDtoType> resultByType = result.getResultByType(); Assert.assertNotNull(resultByType); - Assert.assertEquals(7, resultByType.size()); + Assert.assertEquals(9, resultByType.size()); -// for (Map.Entry<Class<? extends IdDto>, ValidateResultForDtoType> entry : resultByType.entrySet()) { -// System.out.println("assertValidateResultForDtoType(resultByType, " + entry.getKey().getName() + ".class, " + entry.getValue().getValidationResultForDto().size() + ");"); -// } + for (Map.Entry<Class<? extends IdDto>, ValidateResultForDtoType> entry : resultByType.entrySet()) { + System.out.println("assertValidateResultForDtoType(resultByType, " + entry.getKey().getName() + ".class, " + entry.getValue().getValidateResultForDto().size() + ");"); + } assertValidateResultForDtoType(resultByType, TripSeineDto.class, 2); assertValidateResultForDtoType(resultByType, RouteDto.class, 55); @@ -232,6 +238,8 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { assertValidateResultForDtoType(resultByType, TransmittingBuoyDto.class, 42); assertValidateResultForDtoType(resultByType, SetSeineDto.class, 35); assertValidateResultForDtoType(resultByType, NonTargetCatchDto.class, 3); + assertValidateResultForDtoType(resultByType, NonTargetLengthDto.class, 1009); + assertValidateResultForDtoType(resultByType, TargetLengthDto.class, 85); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.