Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

18 changed files:

Changes:

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2018.37</version>
    29 
    +    <version>2018.38</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -138,8 +138,6 @@
    138 138
    139 139 
       <properties>
    140 140
    141 
    -    <lib.version.java4all.eugene>3.0-alpha-22-SNAPSHOT</lib.version.java4all.eugene>
    142 
    -
    143 141 
         <organizationId>ultreiaio</organizationId>
    144 142 
         <projectId>ird-observe</projectId>
    145 143 
         <stageId>frirdobserve</stageId>
    ... ... @@ -154,9 +152,10 @@
    154 152 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    155 153 
         <buildDate>${maven.build.timestamp}</buildDate>
    156 154
    157 
    -    <lib.version.java4all.topia>1.1</lib.version.java4all.topia>
    158 155 
         <observeToolkitVersion>4.0</observeToolkitVersion>
    159 156
    157 
    +    <!--<lib.version.java4all.topia>1.1</lib.version.java4all.topia>-->
    158 
    +    <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
    160 159 
         <!--<lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx>-->
    161 160 
         <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
    162 161 
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>

  • services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java
    ... ... @@ -23,89 +23,9 @@ package fr.ird.observe.services.local.service.actions.validate;
    23 23 
      */
    24 24
    25 25 
     import com.google.common.collect.ArrayListMultimap;
    26 
    +import com.google.common.collect.ImmutableMap;
    26 27 
     import com.google.common.collect.ImmutableSet;
    27 28 
     import fr.ird.observe.dto.IdDto;
    28 
    -import fr.ird.observe.dto.data.seine.ActivitySeineDto;
    29 
    -import fr.ird.observe.dto.data.seine.FloatingObjectDto;
    30 
    -import fr.ird.observe.dto.data.seine.NonTargetCatchDto;
    31 
    -import fr.ird.observe.dto.data.seine.NonTargetLengthDto;
    32 
    -import fr.ird.observe.dto.data.seine.RouteDto;
    33 
    -import fr.ird.observe.dto.data.seine.SetSeineDto;
    34 
    -import fr.ird.observe.dto.data.seine.TargetLengthDto;
    35 
    -import fr.ird.observe.dto.data.seine.TransmittingBuoyDto;
    36 
    -import fr.ird.observe.dto.data.seine.TripSeineDto;
    37 
    -import fr.ird.observe.dto.referential.CountryDto;
    38 
    -import fr.ird.observe.dto.referential.DataQualityDto;
    39 
    -import fr.ird.observe.dto.referential.FpaZoneDto;
    40 
    -import fr.ird.observe.dto.referential.GearCaracteristicDto;
    41 
    -import fr.ird.observe.dto.referential.GearCaracteristicTypeDto;
    42 
    -import fr.ird.observe.dto.referential.GearDto;
    43 
    -import fr.ird.observe.dto.referential.HarbourDto;
    44 
    -import fr.ird.observe.dto.referential.LengthMeasureMethodDto;
    45 
    -import fr.ird.observe.dto.referential.LengthWeightParameterDto;
    46 
    -import fr.ird.observe.dto.referential.OceanDto;
    47 
    -import fr.ird.observe.dto.referential.OrganismDto;
    48 
    -import fr.ird.observe.dto.referential.PersonDto;
    49 
    -import fr.ird.observe.dto.referential.ProgramDto;
    50 
    -import fr.ird.observe.dto.referential.SexDto;
    51 
    -import fr.ird.observe.dto.referential.ShipOwnerDto;
    52 
    -import fr.ird.observe.dto.referential.SizeMeasureTypeDto;
    53 
    -import fr.ird.observe.dto.referential.SpeciesDto;
    54 
    -import fr.ird.observe.dto.referential.SpeciesGroupDto;
    55 
    -import fr.ird.observe.dto.referential.SpeciesGroupReleaseModeDto;
    56 
    -import fr.ird.observe.dto.referential.SpeciesListDto;
    57 
    -import fr.ird.observe.dto.referential.VesselDto;
    58 
    -import fr.ird.observe.dto.referential.VesselSizeCategoryDto;
    59 
    -import fr.ird.observe.dto.referential.VesselTypeDto;
    60 
    -import fr.ird.observe.dto.referential.WeightMeasureMethodDto;
    61 
    -import fr.ird.observe.dto.referential.WeightMeasureTypeDto;
    62 
    -import fr.ird.observe.dto.referential.WindDto;
    63 
    -import fr.ird.observe.dto.referential.longline.BaitHaulingStatusDto;
    64 
    -import fr.ird.observe.dto.referential.longline.BaitSettingStatusDto;
    65 
    -import fr.ird.observe.dto.referential.longline.BaitTypeDto;
    66 
    -import fr.ird.observe.dto.referential.longline.CatchFateLonglineDto;
    67 
    -import fr.ird.observe.dto.referential.longline.ConservationDto;
    68 
    -import fr.ird.observe.dto.referential.longline.DataSourceDto;
    69 
    -import fr.ird.observe.dto.referential.longline.EncounterTypeDto;
    70 
    -import fr.ird.observe.dto.referential.longline.HealthnessDto;
    71 
    -import fr.ird.observe.dto.referential.longline.HookPositionDto;
    72 
    -import fr.ird.observe.dto.referential.longline.HookSizeDto;
    73 
    -import fr.ird.observe.dto.referential.longline.HookTypeDto;
    74 
    -import fr.ird.observe.dto.referential.longline.ItemHorizontalPositionDto;
    75 
    -import fr.ird.observe.dto.referential.longline.ItemVerticalPositionDto;
    76 
    -import fr.ird.observe.dto.referential.longline.LightsticksColorDto;
    77 
    -import fr.ird.observe.dto.referential.longline.LightsticksTypeDto;
    78 
    -import fr.ird.observe.dto.referential.longline.LineTypeDto;
    79 
    -import fr.ird.observe.dto.referential.longline.LogbookTripTypeDto;
    80 
    -import fr.ird.observe.dto.referential.longline.MaturityStatusDto;
    81 
    -import fr.ird.observe.dto.referential.longline.MitigationTypeDto;
    82 
    -import fr.ird.observe.dto.referential.longline.ObservationTripTypeDto;
    83 
    -import fr.ird.observe.dto.referential.longline.OnBoardProcessingDto;
    84 
    -import fr.ird.observe.dto.referential.longline.SensorBrandDto;
    85 
    -import fr.ird.observe.dto.referential.longline.SensorDataFormatDto;
    86 
    -import fr.ird.observe.dto.referential.longline.SensorTypeDto;
    87 
    -import fr.ird.observe.dto.referential.longline.SettingShapeDto;
    88 
    -import fr.ird.observe.dto.referential.longline.StomacFullnessDto;
    89 
    -import fr.ird.observe.dto.referential.longline.TripTypeDto;
    90 
    -import fr.ird.observe.dto.referential.longline.VesselActivityLonglineDto;
    91 
    -import fr.ird.observe.dto.referential.seine.DetectionModeDto;
    92 
    -import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseConformityDto;
    93 
    -import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseStatusDto;
    94 
    -import fr.ird.observe.dto.referential.seine.NonTargetCatchReleasingTimeDto;
    95 
    -import fr.ird.observe.dto.referential.seine.ObjectMaterialDto;
    96 
    -import fr.ird.observe.dto.referential.seine.ObjectMaterialTypeDto;
    97 
    -import fr.ird.observe.dto.referential.seine.ObjectOperationDto;
    98 
    -import fr.ird.observe.dto.referential.seine.ObservedSystemDto;
    99 
    -import fr.ird.observe.dto.referential.seine.ReasonForDiscardDto;
    100 
    -import fr.ird.observe.dto.referential.seine.ReasonForNoFishingDto;
    101 
    -import fr.ird.observe.dto.referential.seine.ReasonForNullSetDto;
    102 
    -import fr.ird.observe.dto.referential.seine.SpeciesFateDto;
    103 
    -import fr.ird.observe.dto.referential.seine.SpeciesStatusDto;
    104 
    -import fr.ird.observe.dto.referential.seine.SurroundingActivityDto;
    105 
    -import fr.ird.observe.dto.referential.seine.TransmittingBuoyOperationDto;
    106 
    -import fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeDto;
    107 
    -import fr.ird.observe.dto.referential.seine.VesselActivitySeineDto;
    108 
    -import fr.ird.observe.dto.referential.seine.WeightCategorySeineDto;
    109 29 
     import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
    110 30 
     import fr.ird.observe.services.service.actions.validate.DataValidationRequest;
    111 31 
     import fr.ird.observe.services.service.actions.validate.ReferentialValidationRequest;
    ... ... @@ -122,6 +42,8 @@ import org.junit.Before;
    122 42 
     import org.junit.Test;
    123 43 
     import org.nuiton.validator.NuitonValidatorScope;
    124 44
    45 
    +import java.util.Map;
    46 
    +
    125 47 
     /**
    126 48 
      * @author Tony Chemit - dev@tchemit.fr
    127 49 
      */
    ... ... @@ -135,6 +57,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport {
    135 57 
             service = localTestMethodResource.newService(ValidateService.class);
    136 58 
         }
    137 59
    60 
    +    @SuppressWarnings("unchecked")
    138 61 
         @Test
    139 62 
         public void testValidateReferential() {
    140 63
    ... ... @@ -153,151 +76,15 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport {
    153 76 
                 ImmutableSet<ValidationResultDtoMessage> messages = result.getMessagesForType(type);
    154 77 
                 System.out.println("assertValidateResult(result, " + type.getSimpleName() + ".class, " + messages.size() + ");");
    155 78 
             }
    156 
    -        // no data of LengthLegnthParameter, WeightDeterminationMethod, WeightCategoryLongline, Compagnies
    157 
    -        Assert.assertEquals(DtoModelClasses.REFERENTIAL_TYPES.size() - 4, types.size());
    158 
    -
    159 
    -        assertValidateResult(result, DataQualityDto.class, 1);
    160 
    -        assertValidateResult(result, SpeciesGroupReleaseModeDto.class, 2);
    161 
    -        assertValidateResult(result, SettingShapeDto.class, 3);
    162 
    -        assertValidateResult(result, BaitHaulingStatusDto.class, 3);
    163 
    -        assertValidateResult(result, ObservationTripTypeDto.class, 1);
    164 
    -        assertValidateResult(result, TransmittingBuoyOperationDto.class, 3);
    165 
    -        assertValidateResult(result, WeightCategorySeineDto.class, 3);
    166 
    -        assertValidateResult(result, LengthMeasureMethodDto.class, 2);
    167 
    -        assertValidateResult(result, WeightMeasureMethodDto.class, 3);
    168 
    -        assertValidateResult(result, ReasonForNoFishingDto.class, 3);
    169 
    -        assertValidateResult(result, ObservedSystemDto.class, 4);
    170 
    -        assertValidateResult(result, SpeciesDto.class, 13);
    171 
    -        assertValidateResult(result, PersonDto.class, 4);
    172 
    -        assertValidateResult(result, HookPositionDto.class, 1);
    173 
    -        assertValidateResult(result, HookTypeDto.class, 1);
    174 
    -        assertValidateResult(result, SpeciesListDto.class, 2);
    175 
    -        assertValidateResult(result, LightsticksColorDto.class, 2);
    176 
    -        assertValidateResult(result, BaitSettingStatusDto.class, 1);
    177 
    -        assertValidateResult(result, VesselTypeDto.class, 4);
    178 
    -        assertValidateResult(result, SexDto.class, 2);
    179 
    -        assertValidateResult(result, NonTargetCatchReleaseConformityDto.class, 2);
    180 
    -
    181 
    -        assertValidateResult(result, MaturityStatusDto.class, 3);
    182 
    -        assertValidateResult(result, LengthWeightParameterDto.class, 7);
    183 
    -        assertValidateResult(result, NonTargetCatchReleaseStatusDto.class, 2);
    184 
    -        assertValidateResult(result, SurroundingActivityDto.class, 3);
    185 
    -        assertValidateResult(result, ItemVerticalPositionDto.class, 1);
    186 
    -        assertValidateResult(result, OceanDto.class, 3);
    187 
    -        assertValidateResult(result, VesselActivitySeineDto.class, 4);
    188 
    -        assertValidateResult(result, HarbourDto.class, 5);
    189 
    -        assertValidateResult(result, HealthnessDto.class, 1);
    190 
    -        assertValidateResult(result, ObjectOperationDto.class, 2);
    191 
    -        assertValidateResult(result, SensorDataFormatDto.class, 2);
    192 
    -        assertValidateResult(result, ObjectMaterialTypeDto.class, 2);
    193 
    -        assertValidateResult(result, CountryDto.class, 5);
    194 
    -        assertValidateResult(result, ReasonForNullSetDto.class, 3);
    195 
    -        assertValidateResult(result, FpaZoneDto.class, 5);
    196 
    -        assertValidateResult(result, NonTargetCatchReleasingTimeDto.class, 1);
    197 
    -
    198 
    -        assertValidateResult(result, EncounterTypeDto.class, 1);
    199 
    -        assertValidateResult(result, VesselDto.class, 10);
    200 
    -        assertValidateResult(result, MitigationTypeDto.class, 1);
    201 
    -        assertValidateResult(result, VesselSizeCategoryDto.class, 1);
    202 
    -        assertValidateResult(result, SizeMeasureTypeDto.class, 3);
    203 
    -        assertValidateResult(result, ShipOwnerDto.class, 1);
    204 
    -        assertValidateResult(result, CatchFateLonglineDto.class, 1);
    205 
    -        assertValidateResult(result, GearCaracteristicTypeDto.class, 3);
    206 
    -        assertValidateResult(result, GearCaracteristicDto.class, 2);
    207 
    -        assertValidateResult(result, ReasonForDiscardDto.class, 3);
    208 
    -        assertValidateResult(result, WeightMeasureTypeDto.class, 1);
    209 
    -        assertValidateResult(result, LightsticksTypeDto.class, 1);
    210 
    -        assertValidateResult(result, ItemHorizontalPositionDto.class, 3);
    211 
    -        assertValidateResult(result, OrganismDto.class, 4);
    212 
    -        assertValidateResult(result, GearDto.class, 3);
    213 
    -        assertValidateResult(result, DetectionModeDto.class, 3);
    214 
    -        assertValidateResult(result, HookSizeDto.class, 3);
    215 
    -        assertValidateResult(result, SensorBrandDto.class, 1);
    216 
    -        assertValidateResult(result, SensorTypeDto.class, 3);
    217 
    -        assertValidateResult(result, TransmittingBuoyTypeDto.class, 3);
    218 
    -        assertValidateResult(result, SpeciesFateDto.class, 3);
    219 
    -        assertValidateResult(result, WindDto.class, 1);
    220 
    -        assertValidateResult(result, SpeciesStatusDto.class, 3);
    221 
    -        assertValidateResult(result, VesselActivityLonglineDto.class, 1);
    222 
    -        assertValidateResult(result, ObjectMaterialDto.class, 10);
    223 
    -        assertValidateResult(result, LineTypeDto.class, 2);
    224 
    -        assertValidateResult(result, ProgramDto.class, 9);
    225 
    -        assertValidateResult(result, BaitTypeDto.class, 3);
    226 
    -        assertValidateResult(result, SpeciesGroupDto.class, 2);
    227 
    -        assertValidateResult(result, StomacFullnessDto.class, 3);
    228 
    -        assertValidateResult(result, ConservationDto.class, 2);
    229 
    -        assertValidateResult(result, OnBoardProcessingDto.class, 1);
    230 
    -        assertValidateResult(result, DataSourceDto.class, 3);
    231 
    -        assertValidateResult(result, LogbookTripTypeDto.class, 3);
    232 
    -        assertValidateResult(result, TripTypeDto.class, 2);
    233 
    -
    234 
    -//        assertValidateResult(result, CountryDto.class, 53);
    235 
    -//        assertValidateResult(result, FpaZoneDto.class, 41);
    236 
    -//        assertValidateResult(result, GearCaracteristicDto.class, 22);
    237 
    -//        assertValidateResult(result, GearCaracteristicTypeDto.class, 6);
    238 
    -//        assertValidateResult(result, GearDto.class, 26);
    239 
    -//        assertValidateResult(result, HarbourDto.class, 74);
    240 
    -//        assertValidateResult(result, LengthWeightParameterDto.class, 352);
    241 
    -//        assertValidateResult(result, OceanDto.class, 3);
    242 
    -//        assertValidateResult(result, OrganismDto.class, 8);
    243 
    -//        assertValidateResult(result, PersonDto.class, 390);
    244 
    -//        assertValidateResult(result, ProgramDto.class, 27);
    245 
    -//        assertValidateResult(result, SexDto.class, 5);
    246 
    -//        assertValidateResult(result, ShipOwnerDto.class, 27);
    247 
    -//        assertValidateResult(result, SizeMeasureTypeDto.class, 17);
    248 
    -//        assertValidateResult(result, SpeciesDto.class, 275);
    249 
    -//        assertValidateResult(result, SpeciesGroupDto.class, 10);
    250 
    -//        assertValidateResult(result, SpeciesGroupReleaseModeDto.class, 10);
    251 
    -//        assertValidateResult(result, SpeciesListDto.class, 5);
    252 
    -//        assertValidateResult(result, VesselDto.class, 977);
    253 
    -//        assertValidateResult(result, VesselSizeCategoryDto.class, 13);
    254 
    -//        assertValidateResult(result, VesselTypeDto.class, 14);
    255 
    -//        assertValidateResult(result, WeightMeasureTypeDto.class, 3);
    256 
    -//
    257 
    -//        assertValidateResult(result, BaitHaulingStatusDto.class, 5);
    258 
    -//        assertValidateResult(result, BaitSettingStatusDto.class, 5);
    259 
    -//        assertValidateResult(result, BaitTypeDto.class, 16);
    260 
    -//        assertValidateResult(result, CatchFateLonglineDto.class, 5);
    261 
    -//        assertValidateResult(result, EncounterTypeDto.class, 12);
    262 
    -//        assertValidateResult(result, HealthnessDto.class, 6);
    263 
    -//        assertValidateResult(result, HookPositionDto.class, 13);
    264 
    -//        assertValidateResult(result, HookSizeDto.class, 22);
    265 
    -//        assertValidateResult(result, HookTypeDto.class, 13);
    266 
    -//        assertValidateResult(result, ItemHorizontalPositionDto.class, 3);
    267 
    -//        assertValidateResult(result, ItemVerticalPositionDto.class, 3);
    268 
    -//        assertValidateResult(result, LightsticksColorDto.class, 7);
    269 
    -//        assertValidateResult(result, LightsticksTypeDto.class, 2);
    270 
    -//        assertValidateResult(result, LineTypeDto.class, 8);
    271 
    -//        assertValidateResult(result, MaturityStatusDto.class, 12);
    272 
    -//        assertValidateResult(result, MitigationTypeDto.class, 15);
    273 
    -//        assertValidateResult(result, SensorBrandDto.class, 4);
    274 
    -//        assertValidateResult(result, SensorDataFormatDto.class, 2);
    275 
    -//        assertValidateResult(result, SensorTypeDto.class, 4);
    276 
    -//        assertValidateResult(result, SettingShapeDto.class, 6);
    277 
    -//        assertValidateResult(result, StomacFullnessDto.class, 7);
    278 
    -//        assertValidateResult(result, ObservationTripTypeDto.class, 3);
    279 
    -//        assertValidateResult(result, VesselActivityLonglineDto.class, 5);
    280 
    -//
    281 
    -//        assertValidateResult(result, DetectionModeDto.class, 10);
    282 
    -//        assertValidateResult(result, ObjectOperationDto.class, 10);
    283 
    -//        assertValidateResult(result, ObjectMaterialTypeDto.class, 4);
    284 
    -//        assertValidateResult(result, ObjectMaterialDto.class, 86);
    285 
    -//        assertValidateResult(result, ObservedSystemDto.class, 21);
    286 
    -//        assertValidateResult(result, ReasonForDiscardDto.class, 5);
    287 
    -//        assertValidateResult(result, ReasonForNoFishingDto.class, 13);
    288 
    -//        assertValidateResult(result, ReasonForNullSetDto.class, 10);
    289 
    -//        assertValidateResult(result, SpeciesFateDto.class, 9);
    290 
    -//        assertValidateResult(result, SpeciesStatusDto.class, 3);
    291 
    -//        assertValidateResult(result, SurroundingActivityDto.class, 8);
    292 
    -//        assertValidateResult(result, TransmittingBuoyOperationDto.class, 3);
    293 
    -//        assertValidateResult(result, TransmittingBuoyTypeDto.class, 12);
    294 
    -//        assertValidateResult(result, VesselActivitySeineDto.class, 23);
    295 
    -//        assertValidateResult(result, WeightCategorySeineDto.class, 101);
    296 
    -//        assertValidateResult(result, WindDto.class, 13);
    297 
    -
    298 79
    80 
    +        ImmutableMap<Class<?>, Long> fixtures = ObserveFixtures.loadFixturesMapDtoCount("validate-service-referential");
    81 
    +        Assert.assertEquals(fixtures.size(), types.size());
    82 
    +        for (Map.Entry<Class<?>, Long> entry : fixtures.entrySet()) {
    83 
    +            assertValidateResult(result, (Class) entry.getKey(), entry.getValue().intValue());
    84 
    +        }
    299 85 
         }
    300 86
    87 
    +    @SuppressWarnings("unchecked")
    301 88 
         @Test
    302 89 
         public void testValidateTripSeines() {
    303 90
    ... ... @@ -323,26 +110,17 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport {
    323 110 
                 ImmutableSet<ValidationResultDtoMessage> messages = result.getMessagesForType(type);
    324 111 
                 System.out.println("assertValidateResult(result, " + type.getSimpleName() + ".class, " + messages.size() + ");");
    325 112 
             }
    326 
    -        Assert.assertEquals(9, types.size());
    327 
    -
    328 
    -        assertValidateResult(result, TripSeineDto.class, 4);
    329 
    -        assertValidateResult(result, RouteDto.class, 38); // 55
    330 
    -        assertValidateResult(result, ActivitySeineDto.class, 68); // 1516
    331 
    -        assertValidateResult(result, TransmittingBuoyDto.class, 1);
    332 
    -        assertValidateResult(result, SetSeineDto.class, 3);
    333 
    -        assertValidateResult(result, NonTargetCatchDto.class, 3);
    334 
    -        assertValidateResult(result, NonTargetLengthDto.class, 6); // 1009 !!!
    335 
    -        assertValidateResult(result, TargetLengthDto.class, 1); // 85 !!!
    336 
    -        assertValidateResult(result, FloatingObjectDto.class, 1);
    337 113
    114 
    +        ImmutableMap<Class<?>, Long> fixtures = ObserveFixtures.loadFixturesMapDtoCount("validate-service-seine-trips");
    115 
    +        Assert.assertEquals(fixtures.size(), types.size());
    116 
    +        for (Map.Entry<Class<?>, Long> entry : fixtures.entrySet()) {
    117 
    +            assertValidateResult(result, (Class) entry.getKey(), entry.getValue().intValue());
    118 
    +        }
    338 119 
         }
    339 120
    340 121 
         private <D extends IdDto> void assertValidateResult(ValidationResult<?> result, Class<D> dtoType, int expectedCount) {
    341 
    -
    342 122 
             ImmutableSet<ValidationResultDtoMessage> messages = result.getMessagesForType(dtoType);
    343 123 
             Assert.assertEquals("For type:" + dtoType, expectedCount, messages.size());
    344 
    -
    345 124 
         }
    346 125
    347 
    -
    348 126 
     }

  • test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
    ... ... @@ -22,11 +22,22 @@ package fr.ird.observe.test;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import com.google.common.collect.ImmutableList;
    25 26 
     import com.google.common.collect.ImmutableMap;
    26 27 
     import com.google.common.collect.ImmutableSet;
    27 28 
     import org.apache.commons.lang3.mutable.MutableLong;
    28 
    -
    29 
    +import org.apache.commons.logging.Log;
    30 
    +import org.apache.commons.logging.LogFactory;
    31 
    +
    32 
    +import java.io.BufferedReader;
    33 
    +import java.io.IOException;
    34 
    +import java.io.InputStream;
    35 
    +import java.io.InputStreamReader;
    36 
    +import java.net.URL;
    37 
    +import java.util.Collection;
    29 38 
     import java.util.Map;
    39 
    +import java.util.Objects;
    40 
    +import java.util.Properties;
    30 41 
     import java.util.TreeMap;
    31 42
    32 43 
     /**
    ... ... @@ -35,313 +46,53 @@ import java.util.TreeMap;
    35 46 
      * @author Tony Chemit - dev@tchemit.fr
    36 47 
      */
    37 48 
     public class ObserveFixtures {
    38 
    -
    39 
    -    public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843";
    40 
    -    public static final String TRIP_SEINE_ID_2 = "fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215";
    41 
    -    public static final String TRIP_SEINE_ID_3 = "fr.ird.observe.entities.seine.TripSeine#1360156698296#0.6097793743126777";
    42 
    -
    43 
    -    public static final ImmutableSet<String> TRIP_SEINE_IDS = ImmutableSet.of(
    44 
    -            TRIP_SEINE_ID_1,
    45 
    -            TRIP_SEINE_ID_2,
    46 
    -            TRIP_SEINE_ID_3
    47 
    -    );
    48 
    -
    49 
    -    public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234";
    50 
    -
    51 
    -    public static final String TRIP_LONGLINE_ID_1 = "fr.ird.observe.entities.longline.TripLongline#1429538088091#0.763886003987864";
    52 
    -
    53 
    -    public static final String TRIP_LONGLINE_ID_2 = "fr.ird.observe.entities.longline.TripLongline#1429540363472#0.517173705156893";
    54 
    -
    55 
    -    public static final String TRIP_LONGLINE_ID_3 = "fr.ird.observe.entities.longline.TripLongline#1429537115030#0.493692863034084";
    56 
    -
    57 
    -//    public static final ImmutableSet<String> TRIP_LONGLINE_IDS = ImmutableSet.of(
    58 
    -//            TRIP_LONGLINE_ID_1,
    59 
    -//            TRIP_LONGLINE_ID_2,
    60 
    -//            TRIP_LONGLINE_ID_3
    61 
    -//    );
    62 
    -
    63 
    -    public static final String SET_LONGLINE_ID_1 = "fr.ird.observe.entities.longline.SetLonglineObs#1429538714446#0.0876020351424813";
    64 
    -
    65 
    -    private static final int ENTITY_BINDER_REFERENTIAL_COUNT = 76;
    66 
    -    public static final int REFERENCE_DATA_COUNT = 33;
    49 
    +    private static final Log log = LogFactory.getLog(ObserveFixtures.class);
    50 
    +    private static final ImmutableMap<String, String> GLOBAL = loadFixturesMap("global");
    51 
    +
    52 
    +    public static final String TRIP_SEINE_ID_1 = GLOBAL.get("TRIP_SEINE_ID_1");
    53 
    +    public static final String TRIP_SEINE_ID_2 = GLOBAL.get("TRIP_SEINE_ID_2");
    54 
    +    public static final String TRIP_SEINE_ID_3 = GLOBAL.get("TRIP_SEINE_ID_3");
    55 
    +    public static final String PROGRAM_ID = GLOBAL.get("PROGRAM_ID");
    56 
    +    public static final String TRIP_LONGLINE_ID_1 = GLOBAL.get("TRIP_LONGLINE_ID_1");
    57 
    +    public static final String TRIP_LONGLINE_ID_2 = GLOBAL.get("TRIP_LONGLINE_ID_2");
    58 
    +    public static final String TRIP_LONGLINE_ID_3 = GLOBAL.get("TRIP_LONGLINE_ID_3");
    59 
    +    public static final String SET_LONGLINE_ID_1 = GLOBAL.get("SET_LONGLINE_ID_1");
    60 
    +    public static final String GEAR_USE_FEATURES_SEINE_ID = GLOBAL.get("GEAR_USE_FEATURES_SEINE_ID");
    61 
    +    public static final String GEAR_USE_FEATURES_SEINE_ID_1 = GLOBAL.get("GEAR_USE_FEATURES_SEINE_ID_1");
    62 
    +    public static final String SPECIES_GROUP_ID = GLOBAL.get("SPECIES_GROUP_ID");
    63 
    +    public static final String SET_SEINE_ID = GLOBAL.get("SET_SEINE_ID");
    64 
    +    public static final int REFERENCE_DATA_COUNT = Integer.valueOf(GLOBAL.get("REFERENCE_DATA_COUNT"));
    65 
    +    public static final int DATA_FORM_COUNT = Integer.valueOf(GLOBAL.get("DATA_FORM_COUNT"));
    66 
    +    public static final int VALIDATORS_COUNT = Integer.valueOf(GLOBAL.get("VALIDATORS_COUNT"));
    67 
    +    public static final int VALIDATOR_CREATE_DATA_COUNT = Integer.valueOf(GLOBAL.get("VALIDATOR_CREATE_DATA_COUNT"));
    68 
    +    public static final int VALIDATOR_UPDATE_DATA_COUNT = Integer.valueOf(GLOBAL.get("VALIDATOR_UPDATE_DATA_COUNT"));
    69 
    +    public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT = Integer.valueOf(GLOBAL.get("VALIDATOR_UPDATE_ENTITY_DATA_COUNT"));
    70 
    +    public static final int VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT = Integer.valueOf(GLOBAL.get("VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT"));
    71 
    +    public static final int ENTITIES_LIMIT_SIZE = Integer.valueOf(GLOBAL.get("ENTITIES_LIMIT_SIZE"));
    72 
    +    private static final int ENTITY_BINDER_REFERENTIAL_COUNT = Integer.valueOf(GLOBAL.get("ENTITY_BINDER_REFERENTIAL_COUNT"));
    73 
    +
    74 
    +    public static final ImmutableMap<String, Long> TRIP_SEINE_1_TABLES_COUNT = loadFixturesMapCount("count-data-seine-1");
    75 
    +    public static final ImmutableMap<String, Long> TRIP_SEINE_2_TABLES_COUNT = loadFixturesMapCount("count-data-seine-2");
    76 
    +    public static final ImmutableMap<String, Long> TRIP_SEINE_3_TABLES_COUNT = loadFixturesMapCount("count-data-seine-3");
    77 
    +    public static final ImmutableMap<String, Long> TRIP_LONGLINE_1_TABLES_COUNT = loadFixturesMapCount("count-data-longline-1");
    78 
    +    public static final ImmutableMap<String, Long> TRIP_LONGLINE_2_TABLES_COUNT = loadFixturesMapCount("count-data-longline-2");
    79 
    +    public static final ImmutableMap<String, Long> TRIP_LONGLINE_3_TABLES_COUNT = loadFixturesMapCount("count-data-longline-3");
    80 
    +    public static final ImmutableSet<String> TRIP_SEINE_IDS = ImmutableSet.of(TRIP_SEINE_ID_1, TRIP_SEINE_ID_2, TRIP_SEINE_ID_3);
    81 
    +    public static final ImmutableMap<String, Long> ALL_TRIP_SEINE_COUNT = mergeResults(TRIP_SEINE_1_TABLES_COUNT, TRIP_SEINE_2_TABLES_COUNT, TRIP_SEINE_3_TABLES_COUNT);
    82 
    +    public static final ImmutableMap<String, Long> ALL_TRIP_LONGLINE_COUNT = mergeResults(TRIP_LONGLINE_1_TABLES_COUNT, TRIP_LONGLINE_2_TABLES_COUNT, TRIP_LONGLINE_3_TABLES_COUNT);
    67 83
    68 84 
         public static final int REFERENTIAL_FORM_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT;
    69 
    -    public static final int DATA_FORM_COUNT = 48;
    70 
    -
    71 
    -    public static final int VALIDATORS_COUNT = 210;
    72 
    -    public static final int VALIDATOR_CREATE_DATA_COUNT = 8;
    73 
    -    public static final int VALIDATOR_UPDATE_DATA_COUNT = 37;
    74 
    -    public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT = 29;
    75 85 
         public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT;
    76 86 
         public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT;
    77 
    -    public static final int VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT = 13;
    78 
    -
    79 
    -    public static final ImmutableMap<String, Long> TRIP_SEINE_1_TABLES_COUNT = ImmutableMap
    80 
    -            .<String, Long>builder()
    81 
    -            .put("observe_seine.trip", 1L)
    82 
    -            .put("observe_seine.gearusefeatures", 2L)
    83 
    -            .put("observe_seine.gearusefeaturesmeasurement", 4L)
    84 
    -            .put("observe_seine.route", 34L)
    85 
    -            .put("observe_seine.set", 35L)
    86 
    -            .put("observe_seine.activity", 862L)
    87 
    -            .put("observe_seine.floatingobject", 54L)
    88 
    -            .put("observe_seine.schoolestimate", 27L)
    89 
    -            .put("observe_seine.nontargetcatch", 109L)
    90 
    -            .put("observe_seine.nontargetsample", 20L)
    91 
    -            .put("observe_seine.nontargetlength", 767L)
    92 
    -            .put("observe_seine.targetcatch", 73L)
    93 
    -            .put("observe_seine.targetsample", 10L)
    94 
    -            .put("observe_seine.targetlength", 85L)
    95 
    -            .put("observe_seine.objectobservedspecies", 3L)
    96 
    -            .put("observe_seine.objectschoolestimate", 1L)
    97 
    -            .put("observe_seine.transmittingbuoy", 62L)
    98 
    -            .put("observe_seine.activity_observedsystem", 1182L)
    99 
    -            .put("observe_seine.nontargetcatchrelease", 0L)
    100 
    -            .put("observe_seine.floatingobjectpart", 58L)
    101 
    -            .build();
    102 
    -    public static final ImmutableMap<String, Long> TRIP_SEINE_2_TABLES_COUNT = ImmutableMap
    103 
    -            .<String, Long>builder()
    104 
    -            .put("observe_seine.trip", 1L)
    105 
    -            .put("observe_seine.gearusefeatures", 0L)
    106 
    -            .put("observe_seine.gearusefeaturesmeasurement", 0L)
    107 
    -            .put("observe_seine.route", 46L)
    108 
    -            .put("observe_seine.set", 42L)
    109 
    -            .put("observe_seine.activity", 657L)
    110 
    -            .put("observe_seine.activity_observedsystem", 652L)
    111 
    -            .put("observe_seine.floatingobject", 50L)
    112 
    -            .put("observe_seine.schoolestimate", 10L)
    113 
    -            .put("observe_seine.nontargetcatch", 112L)
    114 
    -            .put("observe_seine.nontargetcatchrelease", 0L)
    115 
    -            .put("observe_seine.floatingobjectpart", 53L)
    116 
    -            .put("observe_seine.nontargetsample", 19L)
    117 
    -            .put("observe_seine.nontargetlength", 242L)
    118 
    -            .put("observe_seine.targetcatch", 73L)
    119 
    -            .put("observe_seine.targetsample", 0L)
    120 
    -            .put("observe_seine.targetlength", 0L)
    121 
    -            .put("observe_seine.objectobservedspecies", 2L)
    122 
    -            .put("observe_seine.objectschoolestimate", 3L)
    123 
    -            .put("observe_seine.transmittingbuoy", 68L)
    124 
    -            .build();
    125 87
    126 
    -    public static final ImmutableMap<String, Long> TRIP_SEINE_3_TABLES_COUNT = ImmutableMap
    127 
    -            .<String, Long>builder()
    128 
    -            .put("observe_seine.trip", 1L)
    129 
    -            .put("observe_seine.gearusefeatures", 0L)
    130 
    -            .put("observe_seine.gearusefeaturesmeasurement", 0L)
    131 
    -            .put("observe_seine.route", 45L)
    132 
    -            .put("observe_seine.set", 35L)
    133 
    -            .put("observe_seine.activity", 816L)
    134 
    -            .put("observe_seine.floatingobject", 41L)
    135 
    -            .put("observe_seine.schoolestimate", 35L)
    136 
    -            .put("observe_seine.nontargetcatch", 104L)
    137 
    -            .put("observe_seine.nontargetsample", 16L)
    138 
    -            .put("observe_seine.nontargetlength", 1193L)
    139 
    -            .put("observe_seine.targetcatch", 118L)
    140 
    -            .put("observe_seine.targetsample", 14L)
    141 
    -            .put("observe_seine.targetlength", 53L)
    142 
    -            .put("observe_seine.objectobservedspecies", 0L)
    143 
    -            .put("observe_seine.objectschoolestimate", 24L)
    144 
    -            .put("observe_seine.transmittingbuoy", 39L)
    145 
    -            .put("observe_seine.activity_observedsystem", 321L)
    146 
    -            .put("observe_seine.nontargetcatchrelease", 0L)
    147 
    -            .put("observe_seine.floatingobjectpart", 42L)
    148 
    -            .build();
    88 
    +    private static final ImmutableMap<String, Long> REFERENTIAL_COMMON_TABLES_COUNT = loadFixturesMapCount("count-referential-common");
    149 89
    150 
    -    public static final ImmutableMap<String, Long> ALL_TRIP_SEINE_COUNT = mergeResults(
    151 
    -            TRIP_SEINE_1_TABLES_COUNT,
    152 
    -            TRIP_SEINE_2_TABLES_COUNT,
    153 
    -            TRIP_SEINE_3_TABLES_COUNT
    154 
    -    );
    90 
    +    private static final ImmutableMap<String, Long> REFERENTIAL_SEINE_TABLES_COUNT = loadFixturesMapCount("count-referential-seine");
    155 91
    156 
    -    public static final ImmutableMap<String, Long> TRIP_LONGLINE_1_TABLES_COUNT = ImmutableMap
    157 
    -            .<String, Long>builder()
    158 
    -            .put("observe_longline.trip", 1L)
    159 
    -            .put("observe_longline.setObs", 13L)
    160 
    -            .put("observe_longline.activityObs", 13L)
    161 
    -            .put("observe_longline.gearusefeatures", 0L)
    162 
    -            .put("observe_longline.gearusefeaturesmeasurement", 0L)
    163 
    -            .put("observe_longline.encounterObs", 27L)
    164 
    -            .put("observe_longline.sensorusedObs", 0L)
    165 
    -            .put("observe_longline.tdrObs", 0L)
    166 
    -            .put("observe_longline.baitscompositionObs", 13L)
    167 
    -            .put("observe_longline.floatlinescompositionObs", 65L)
    168 
    -            .put("observe_longline.hookscompositionObs", 39L)
    169 
    -            .put("observe_longline.branchlinescompositionObs", 13L)
    170 
    -            .put("observe_longline.sectionObs", 234L)
    171 
    -            .put("observe_longline.basketObs", 3042L)
    172 
    -            .put("observe_longline.branchlineObs", 18252L)
    173 
    -            .put("observe_longline.catchObs", 435L)
    174 
    -            .put("observe_longline.catchObs_predator", 49L)
    175 
    -            .put("observe_longline.sizemeasureObs", 340L)
    176 
    -            .put("observe_longline.weightmeasureObs", 0L)
    177 
    -            .put("observe_longline.tdrrecordObs", 0L)
    178 
    -            .put("observe_longline.species_tdrObs", 0L)
    179 
    -            .put("observe_longline.mitigationtype_setObs", 0L)
    180 
    -            .build();
    92 
    +    private static final ImmutableMap<String, Long> REFERENTIAL_LONGLINE_TABLES_COUNT = loadFixturesMapCount("count-referential-longline");
    181 93
    182 
    -    public static final ImmutableMap<String, Long> TRIP_LONGLINE_2_TABLES_COUNT = ImmutableMap
    183 
    -            .<String, Long>builder()
    184 
    -            .put("observe_longline.trip", 1L)
    185 
    -            .put("observe_longline.setObs", 5L)
    186 
    -            .put("observe_longline.activityObs", 5L)
    187 
    -            .put("observe_longline.gearusefeatures", 0L)
    188 
    -            .put("observe_longline.gearusefeaturesmeasurement", 0L)
    189 
    -            .put("observe_longline.encounterObs", 3L)
    190 
    -            .put("observe_longline.sensorusedObs", 0L)
    191 
    -            .put("observe_longline.tdrObs", 0L)
    192 
    -            .put("observe_longline.baitscompositionObs", 10L)
    193 
    -            .put("observe_longline.floatlinescompositionObs", 0L)
    194 
    -            .put("observe_longline.hookscompositionObs", 10L)
    195 
    -            .put("observe_longline.branchlinescompositionObs", 2L)
    196 
    -            .put("observe_longline.sectionObs", 95L)
    197 
    -            .put("observe_longline.basketObs", 1140L)
    198 
    -            .put("observe_longline.branchlineObs", 6840L)
    199 
    -            .put("observe_longline.catchObs", 152L)
    200 
    -            .put("observe_longline.sizemeasureObs", 116L)
    201 
    -            .put("observe_longline.weightmeasureObs", 0L)
    202 
    -            .put("observe_longline.tdrrecordObs", 0L)
    203 
    -            .put("observe_longline.species_tdrObs", 0L)
    204 
    -            .put("observe_longline.mitigationtype_setObs", 0L)
    205 
    -            .put("observe_longline.catchObs_predator", 9L)
    206 
    -            .build();
    94 
    +    public static final ImmutableMap<String, Long> REFERENTIAL_TABLES_COUNT = mergeResults(REFERENTIAL_COMMON_TABLES_COUNT, REFERENTIAL_LONGLINE_TABLES_COUNT, REFERENTIAL_SEINE_TABLES_COUNT);
    207 95
    208 
    -    public static final ImmutableMap<String, Long> TRIP_LONGLINE_3_TABLES_COUNT = ImmutableMap
    209 
    -            .<String, Long>builder()
    210 
    -            .put("observe_longline.trip", 1L)
    211 
    -            .put("observe_longline.setObs", 14L)
    212 
    -            .put("observe_longline.activityObs", 14L)
    213 
    -            .put("observe_longline.gearusefeatures", 0L)
    214 
    -            .put("observe_longline.gearusefeaturesmeasurement", 0L)
    215 
    -            .put("observe_longline.encounterObs", 12L)
    216 
    -            .put("observe_longline.sensorusedObs", 0L)
    217 
    -            .put("observe_longline.tdrObs", 0L)
    218 
    -            .put("observe_longline.baitscompositionObs", 14L)
    219 
    -            .put("observe_longline.floatlinescompositionObs", 36L)
    220 
    -            .put("observe_longline.hookscompositionObs", 42L)
    221 
    -            .put("observe_longline.branchlinescompositionObs", 14L)
    222 
    -            .put("observe_longline.sectionObs", 243L)
    223 
    -            .put("observe_longline.basketObs", 3229L)
    224 
    -            .put("observe_longline.branchlineObs", 19374L)
    225 
    -            .put("observe_longline.catchObs", 677L)
    226 
    -            .put("observe_longline.mitigationtype_setObs", 0L)
    227 
    -            .put("observe_longline.sizemeasureObs", 647L)
    228 
    -            .put("observe_longline.weightmeasureObs", 0L)
    229 
    -            .put("observe_longline.catchObs_predator", 25L)
    230 
    -            .put("observe_longline.tdrrecordObs", 0L)
    231 
    -            .put("observe_longline.species_tdrObs", 0L)
    232 
    -            .build();
    233 
    -
    234 
    -    public static final ImmutableMap<String, Long> ALL_TRIP_LONGLINE_COUNT = mergeResults(
    235 
    -            TRIP_LONGLINE_1_TABLES_COUNT,
    236 
    -            TRIP_LONGLINE_2_TABLES_COUNT,
    237 
    -            TRIP_LONGLINE_3_TABLES_COUNT
    238 
    -    );
    239 
    -
    240 
    -    public static final String GEAR_USE_FEATURES_SEINE_ID = "fr.ird.observe.entities.seine.GearUseFeaturesSeine#1440486230661#0.42614931015885216";
    241 
    -    public static final String GEAR_USE_FEATURES_SEINE_ID_1 = "fr.ird.observe.entities.seine.GearUseFeaturesSeine#1440486230661#0.42614931015885216";
    242 
    -    public static final String SPECIES_GROUP_ID = "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075";
    243 
    -    public static final int ENTITIES_LIMIT_SIZE = 100;
    244 
    -
    245 
    -    private static final ImmutableMap<String, Long> REFERENTIAL_COMMON_TABLES_COUNT = ImmutableMap
    246 
    -            .<String, Long>builder()
    247 
    -            .put("observe_common.country", 72L)
    248 
    -            .put("observe_common.compagnies", 0L)
    249 
    -            .put("observe_common.dataquality", 5L)
    250 
    -            .put("observe_common.fpazone", 42L)
    251 
    -            .put("observe_common.gear", 26L)
    252 
    -            .put("observe_common.gear_gearcaracteristic", 29L)
    253 
    -            .put("observe_common.gearcaracteristic", 22L)
    254 
    -            .put("observe_common.gearcaracteristictype", 6L)
    255 
    -            .put("observe_common.harbour", 74L)
    256 
    -            .put("observe_common.lastupdatedate", 114L)
    257 
    -            .put("observe_common.lengthlengthparameter", 0L)
    258 
    -            .put("observe_common.lengthmeasuremethod", 4L)
    259 
    -            .put("observe_common.lengthweightparameter", 365L)
    260 
    -            .put("observe_common.ocean", 3L)
    261 
    -            .put("observe_common.ocean_species", 500L)
    262 
    -            .put("observe_common.organism", 9L)
    263 
    -            .put("observe_common.person", 537L)
    264 
    -            .put("observe_common.program", 27L)
    265 
    -            .put("observe_common.shipowner", 27L)
    266 
    -            .put("observe_common.sex", 5L)
    267 
    -            .put("observe_common.sizemeasuretype", 17L)
    268 
    -            .put("observe_common.species", 285L)
    269 
    -            .put("observe_common.species_specieslist", 401L)
    270 
    -            .put("observe_common.speciesgroup", 11L)
    271 
    -            .put("observe_common.speciesgroupreleasemode", 9L)
    272 
    -            .put("observe_common.speciesgroup_speciesgroupreleasemode", 19L)
    273 
    -            .put("observe_common.specieslist", 7L)
    274 
    -            .put("observe_common.vessel", 1172L)
    275 
    -            .put("observe_common.vesselsizecategory", 13L)
    276 
    -            .put("observe_common.vesseltype", 16L)
    277 
    -            .put("observe_common.weightmeasuremethod", 3L)
    278 
    -            .put("observe_common.weightmeasuretype", 3L)
    279 
    -            .put("observe_common.wind", 13L)
    280 
    -            .build();
    281 
    -
    282 
    -    private static final ImmutableMap<String, Long> REFERENTIAL_SEINE_TABLES_COUNT = ImmutableMap
    283 
    -            .<String, Long>builder()
    284 
    -            .put("observe_seine.detectionmode", 11L)
    285 
    -            .put("observe_seine.nontargetcatchreleaseconformity", 5L)
    286 
    -            .put("observe_seine.nontargetcatchreleasestatus", 5L)
    287 
    -            .put("observe_seine.nontargetcatchreleasingtime", 4L)
    288 
    -            .put("observe_seine.objectoperation", 10L)
    289 
    -            .put("observe_seine.objectmaterial", 77L)
    290 
    -            .put("observe_seine.objectmaterialtype", 4L)
    291 
    -            .put("observe_seine.observedsystem", 24L)
    292 
    -            .put("observe_seine.reasonfordiscard", 5L)
    293 
    -            .put("observe_seine.reasonfornofishing", 13L)
    294 
    -            .put("observe_seine.reasonfornullset", 10L)
    295 
    -            .put("observe_seine.speciesfate", 10L)
    296 
    -            .put("observe_seine.speciesstatus", 4L)
    297 
    -            .put("observe_seine.surroundingactivity", 8L)
    298 
    -            .put("observe_seine.transmittingbuoyoperation", 3L)
    299 
    -            .put("observe_seine.transmittingbuoytype", 12L)
    300 
    -            .put("observe_seine.vesselactivity", 23L)
    301 
    -            .put("observe_seine.weightcategory", 110L)
    302 
    -            .build();
    303 
    -
    304 
    -    private static final ImmutableMap<String, Long> REFERENTIAL_LONGLINE_TABLES_COUNT = ImmutableMap
    305 
    -            .<String, Long>builder()
    306 
    -            .put("observe_longline.baithaulingstatus", 5L)
    307 
    -            .put("observe_longline.baitsettingstatus", 5L)
    308 
    -            .put("observe_longline.baittype", 16L)
    309 
    -            .put("observe_longline.catchfate", 5L)
    310 
    -            .put("observe_longline.encountertype", 12L)
    311 
    -            .put("observe_longline.healthness", 6L)
    312 
    -            .put("observe_longline.hookposition", 13L)
    313 
    -            .put("observe_longline.hooksize", 22L)
    314 
    -            .put("observe_longline.hooktype", 13L)
    315 
    -            .put("observe_longline.itemverticalposition", 3L)
    316 
    -            .put("observe_longline.itemhorizontalposition", 3L)
    317 
    -            .put("observe_longline.lightstickscolor", 7L)
    318 
    -            .put("observe_longline.lightstickstype", 2L)
    319 
    -            .put("observe_longline.linetype", 8L)
    320 
    -            .put("observe_longline.maturitystatus", 12L)
    321 
    -            .put("observe_longline.mitigationtype", 15L)
    322 
    -            .put("observe_longline.observationtriptype", 3L)
    323 
    -            .put("observe_longline.sensorbrand", 4L)
    324 
    -            .put("observe_longline.sensordataformat", 2L)
    325 
    -            .put("observe_longline.sensortype", 4L)
    326 
    -            .put("observe_longline.settingshape", 6L)
    327 
    -            .put("observe_longline.stomacfullness", 7L)
    328 
    -            .put("observe_longline.vesselactivity", 12L)
    329 
    -            .put("observe_longline.weightcategory", 0L)
    330 
    -            .put("observe_longline.datasource", 20L)
    331 
    -            .put("observe_longline.logbooktriptype", 3L)
    332 
    -            .put("observe_longline.triptype", 3L)
    333 
    -            .put("observe_longline.onboardprocessing", 5L)
    334 
    -            .put("observe_longline.conservation", 2L)
    335 
    -            .put("observe_longline.weightdeterminationmethod", 0L)
    336 
    -            .build();
    337 
    -
    338 
    -    public static final ImmutableMap<String, Long> REFERENTIAL_TABLES_COUNT = mergeResults(
    339 
    -            REFERENTIAL_COMMON_TABLES_COUNT,
    340 
    -            REFERENTIAL_LONGLINE_TABLES_COUNT,
    341 
    -            REFERENTIAL_SEINE_TABLES_COUNT
    342 
    -    );
    343 
    -
    344 
    -    public static String SET_SEINE_ID = "fr.ird.observe.entities.seine.SetSeine#1359573677233#0.016313003525718517";
    345 96
    346 97 
         @SafeVarargs
    347 98 
         private static ImmutableMap<String, Long> mergeResults(ImmutableMap<String, Long>... expectedTablesCounts) {
    ... ... @@ -375,4 +126,95 @@ public class ObserveFixtures {
    375 126 
                 return String.format("Will %s %d out of %d object(s) for %s", action, ENTITIES_LIMIT_SIZE, size, typeName);
    376 127 
             }
    377 128 
         }
    129 
    +
    130 
    +    public static ImmutableMap<String, String> loadFixturesMap(String name) {
    131 
    +        URL url = Objects.requireNonNull(ObserveFixtures.class.getClassLoader().getResource("fixtures/" + name + ".properties"));
    132 
    +        try (InputStream inputStream = url.openStream()) {
    133 
    +            log.debug(String.format("Fixture [%s] - Loading...", url));
    134 
    +            Properties p = new Properties();
    135 
    +            p.load(inputStream);
    136 
    +            log.debug(String.format("Fixture [%s] - Loaded %d properties.", url, p.size()));
    137 
    +            ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
    138 
    +            for (Map.Entry<Object, Object> entry : p.entrySet()) {
    139 
    +                builder.put(entry.getKey().toString(), entry.getValue().toString());
    140 
    +            }
    141 
    +            return builder.build();
    142 
    +        } catch (IOException e) {
    143 
    +            throw new IllegalArgumentException("Can't load fixtures " + name, e);
    144 
    +        }
    145 
    +    }
    146 
    +
    147 
    +    public static ImmutableList<String> loadFixturesList(String name) {
    148 
    +        URL url = Objects.requireNonNull(ObserveFixtures.class.getClassLoader().getResource("fixtures/" + name + ".list"));
    149 
    +        try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()))) {
    150 
    +            log.debug(String.format("Fixture [%s] - Loading...", url));
    151 
    +            ImmutableList.Builder<String> builder = ImmutableList.builder();
    152 
    +            String line;
    153 
    +            while ((line = reader.readLine()) != null) {
    154 
    +                builder.add(line);
    155 
    +            }
    156 
    +            ImmutableList<String> list = builder.build();
    157 
    +            log.debug(String.format("Fixture [%s] - Loaded %d elements.", url, list.size()));
    158 
    +            return list;
    159 
    +        } catch (IOException e) {
    160 
    +            throw new IllegalArgumentException("Can't load fixtures " + name, e);
    161 
    +        }
    162 
    +    }
    163 
    +
    164 
    +    public static ImmutableMap<String, Long> loadFixturesMapCount(String name) {
    165 
    +        ImmutableMap.Builder<String, Long> builder = ImmutableMap.builder();
    166 
    +        for (Map.Entry<String, String> entry : loadFixturesMap(name).entrySet()) {
    167 
    +            builder.put(entry.getKey(), Long.valueOf(entry.getValue()));
    168 
    +        }
    169 
    +        return builder.build();
    170 
    +    }
    171 
    +
    172 
    +    public static ImmutableMap<Class<?>, Long> loadFixturesMapDtoCount(String name) {
    173 
    +        ImmutableMap.Builder<Class<?>, Long> builder = ImmutableMap.builder();
    174 
    +        for (Map.Entry<String, String> entry : loadFixturesMap(name).entrySet()) {
    175 
    +            builder.put(toDtoClass(entry.getKey()), Long.valueOf(entry.getValue()));
    176 
    +        }
    177 
    +        return builder.build();
    178 
    +    }
    179 
    +
    180 
    +    public static ImmutableList<Class<?>> toClass(Collection<String> names, String... packageCandidates) {
    181 
    +        ImmutableList.Builder<Class<?>> builder = ImmutableList.builder();
    182 
    +        for (String name : names) {
    183 
    +            builder.add(Objects.requireNonNull(toClass(name, packageCandidates)));
    184 
    +        }
    185 
    +        return builder.build();
    186 
    +    }
    187 
    +
    188 
    +    public static Class<?> toClass(String name, String... packageCandidates) {
    189 
    +            for (String packageCandidate : packageCandidates) {
    190 
    +                String fqn = packageCandidate + name;
    191 
    +                try {
    192 
    +                    return Class.forName(fqn);
    193 
    +                } catch (ClassNotFoundException ignored) {
    194 
    +                }
    195 
    +            }
    196 
    +
    197 
    +        return null;
    198 
    +    }
    199 
    +
    200 
    +    public static final String[] dtoPackageCandidates = {
    201 
    +            "fr.ird.observe.dto.referential.",
    202 
    +            "fr.ird.observe.dto.referential.seine.",
    203 
    +            "fr.ird.observe.dto.referential.longline.",
    204 
    +            "fr.ird.observe.dto.data.",
    205 
    +            "fr.ird.observe.dto.data.seine.",
    206 
    +            "fr.ird.observe.dto.data.longline."
    207 
    +    };
    208 
    +
    209 
    +    public static Class<?> toDtoClass(String name) {
    210 
    +        return toClass(name,dtoPackageCandidates);
    211 
    +    }
    212 
    +
    213 
    +    public static ImmutableList<Class<?>> toDtoClass(Collection<String> names) {
    214 
    +        return toClass(names, dtoPackageCandidates);
    215 
    +    }
    216 
    +
    217 
    +    public static ImmutableList<Class<?>> loadFixtureDtoList(String name) {
    218 
    +        return toDtoClass(loadFixturesList(name));
    219 
    +    }
    378 220 
     }

  • test/src/main/resources/fixtures/bean-validator-detector-n1-create.list
    1 
    +ActivityLonglineObsDto
    2 
    +ActivitySeineDto
    3 
    +BaitHaulingStatusDto
    4 
    +BaitSettingStatusDto
    5 
    +BaitTypeDto
    6 
    +CatchFateLonglineDto
    7 
    +CompagniesDto
    8 
    +ConservationDto
    9 
    +CountryDto
    10 
    +DataQualityDto
    11 
    +DataSourceDto
    12 
    +DetectionModeDto
    13 
    +EncounterTypeDto
    14 
    +FloatingObjectDto
    15 
    +FpaZoneDto
    16 
    +GearCaracteristicDto
    17 
    +GearCaracteristicTypeDto
    18 
    +GearDto
    19 
    +HarbourDto
    20 
    +HealthnessDto
    21 
    +HookPositionDto
    22 
    +HookSizeDto
    23 
    +HookTypeDto
    24 
    +ItemHorizontalPositionDto
    25 
    +ItemVerticalPositionDto
    26 
    +LengthLengthParameterDto
    27 
    +LengthMeasureMethodDto
    28 
    +LengthWeightParameterDto
    29 
    +LightsticksColorDto
    30 
    +LightsticksTypeDto
    31 
    +LineTypeDto
    32 
    +LogbookTripTypeDto
    33 
    +MaturityStatusDto
    34 
    +MitigationTypeDto
    35 
    +NonTargetCatchReleaseConformityDto
    36 
    +NonTargetCatchReleaseStatusDto
    37 
    +NonTargetCatchReleasingTimeDto
    38 
    +ObjectMaterialDto
    39 
    +ObjectMaterialTypeDto
    40 
    +ObjectOperationDto
    41 
    +ObservationTripTypeDto
    42 
    +ObservedSystemDto
    43 
    +OceanDto
    44 
    +OnBoardProcessingDto
    45 
    +OrganismDto
    46 
    +PersonDto
    47 
    +ProgramDto
    48 
    +ReasonForDiscardDto
    49 
    +ReasonForNoFishingDto
    50 
    +ReasonForNullSetDto
    51 
    +RouteDto
    52 
    +SensorBrandDto
    53 
    +SensorDataFormatDto
    54 
    +SensorTypeDto
    55 
    +SetLonglineObsDto
    56 
    +SetSeineDto
    57 
    +SettingShapeDto
    58 
    +SexDto
    59 
    +ShipOwnerDto
    60 
    +SizeMeasureTypeDto
    61 
    +SpeciesDto
    62 
    +SpeciesFateDto
    63 
    +SpeciesGroupDto
    64 
    +SpeciesGroupReleaseModeDto
    65 
    +SpeciesListDto
    66 
    +SpeciesStatusDto
    67 
    +StomacFullnessDto
    68 
    +SurroundingActivityDto
    69 
    +TransmittingBuoyOperationDto
    70 
    +TransmittingBuoyTypeDto
    71 
    +TripLonglineDto
    72 
    +TripSeineDto
    73 
    +TripTypeDto
    74 
    +VesselActivityLonglineDto
    75 
    +VesselActivitySeineDto
    76 
    +VesselDto
    77 
    +VesselSizeCategoryDto
    78 
    +VesselTypeDto
    79 
    +WeightCategoryLonglineDto
    80 
    +WeightCategorySeineDto
    81 
    +WeightDeterminationMethodDto
    82 
    +WeightMeasureMethodDto
    83 
    +WeightMeasureTypeDto
    84 
    +WindDto
    \ No newline at end of file

  • test/src/main/resources/fixtures/bean-validator-detector-n1-update.list
    1 
    +ActivityLonglineObsDto
    2 
    +ActivityLonglineObsEncounterDto
    3 
    +ActivityLonglineObsSensorUsedDto
    4 
    +ActivitySeineDto
    5 
    +BaitHaulingStatusDto
    6 
    +BaitSettingStatusDto
    7 
    +BaitTypeDto
    8 
    +BaitsCompositionObsDto
    9 
    +BranchlineObsDto
    10 
    +BranchlinesCompositionObsDto
    11 
    +CatchFateLonglineDto
    12 
    +CatchLonglineObsDto
    13 
    +CompagniesDto
    14 
    +ConservationDto
    15 
    +CountryDto
    16 
    +DataQualityDto
    17 
    +DataSourceDto
    18 
    +DetectionModeDto
    19 
    +EncounterObsDto
    20 
    +EncounterTypeDto
    21 
    +FloatingObjectDto
    22 
    +FloatingObjectSchoolEstimateDto
    23 
    +FloatingObjectTransmittingBuoyDto
    24 
    +FloatlinesCompositionObsDto
    25 
    +FpaZoneDto
    26 
    +GearCaracteristicDto
    27 
    +GearCaracteristicTypeDto
    28 
    +GearDto
    29 
    +GearUseFeaturesLonglineDto
    30 
    +GearUseFeaturesSeineDto
    31 
    +HarbourDto
    32 
    +HealthnessDto
    33 
    +HookPositionDto
    34 
    +HookSizeDto
    35 
    +HookTypeDto
    36 
    +HooksCompositionObsDto
    37 
    +ItemHorizontalPositionDto
    38 
    +ItemVerticalPositionDto
    39 
    +LengthLengthParameterDto
    40 
    +LengthMeasureMethodDto
    41 
    +LengthWeightParameterDto
    42 
    +LightsticksColorDto
    43 
    +LightsticksTypeDto
    44 
    +LineTypeDto
    45 
    +LogbookTripTypeDto
    46 
    +MaturityStatusDto
    47 
    +MitigationTypeDto
    48 
    +NonTargetCatchDto
    49 
    +NonTargetCatchReleaseConformityDto
    50 
    +NonTargetCatchReleaseDto
    51 
    +NonTargetCatchReleaseStatusDto
    52 
    +NonTargetCatchReleasingTimeDto
    53 
    +NonTargetLengthDto
    54 
    +NonTargetSampleDto
    55 
    +ObjectMaterialDto
    56 
    +ObjectMaterialTypeDto
    57 
    +ObjectObservedSpeciesDto
    58 
    +ObjectOperationDto
    59 
    +ObjectSchoolEstimateDto
    60 
    +ObservationTripTypeDto
    61 
    +ObservedSystemDto
    62 
    +OceanDto
    63 
    +OnBoardProcessingDto
    64 
    +OrganismDto
    65 
    +PersonDto
    66 
    +ProgramDto
    67 
    +ReasonForDiscardDto
    68 
    +ReasonForNoFishingDto
    69 
    +ReasonForNullSetDto
    70 
    +RouteDto
    71 
    +SchoolEstimateDto
    72 
    +SensorBrandDto
    73 
    +SensorDataFormatDto
    74 
    +SensorTypeDto
    75 
    +SensorUsedObsDto
    76 
    +SetLonglineObsDto
    77 
    +SetSeineDto
    78 
    +SetSeineNonTargetCatchDto
    79 
    +SetSeineSchoolEstimateDto
    80 
    +SettingShapeDto
    81 
    +SexDto
    82 
    +ShipOwnerDto
    83 
    +SizeMeasureTypeDto
    84 
    +SpeciesDto
    85 
    +SpeciesFateDto
    86 
    +SpeciesGroupDto
    87 
    +SpeciesGroupReleaseModeDto
    88 
    +SpeciesListDto
    89 
    +SpeciesStatusDto
    90 
    +StomacFullnessDto
    91 
    +SurroundingActivityDto
    92 
    +TargetLengthDto
    93 
    +TargetSampleDto
    94 
    +TdrObsDto
    95 
    +TransmittingBuoyDto
    96 
    +TransmittingBuoyOperationDto
    97 
    +TransmittingBuoyTypeDto
    98 
    +TripLonglineDto
    99 
    +TripLonglineGearUseDto
    100 
    +TripSeineDto
    101 
    +TripSeineGearUseDto
    102 
    +TripTypeDto
    103 
    +VesselActivityLonglineDto
    104 
    +VesselActivitySeineDto
    105 
    +VesselDto
    106 
    +VesselSizeCategoryDto
    107 
    +VesselTypeDto
    108 
    +WeightCategoryLonglineDto
    109 
    +WeightCategorySeineDto
    110 
    +WeightDeterminationMethodDto
    111 
    +WeightMeasureMethodDto
    112 
    +WeightMeasureTypeDto
    113 
    +WindDto
    \ No newline at end of file

  • test/src/main/resources/fixtures/count-data-longline-1.properties
    1 
    +observe_longline.trip=1
    2 
    +observe_longline.setObs=13
    3 
    +observe_longline.activityObs=13
    4 
    +observe_longline.gearusefeatures=0
    5 
    +observe_longline.gearusefeaturesmeasurement=0
    6 
    +observe_longline.encounterObs=27
    7 
    +observe_longline.sensorusedObs=0
    8 
    +observe_longline.tdrObs=0
    9 
    +observe_longline.baitscompositionObs=13
    10 
    +observe_longline.floatlinescompositionObs=65
    11 
    +observe_longline.hookscompositionObs=39
    12 
    +observe_longline.branchlinescompositionObs=13
    13 
    +observe_longline.sectionObs=234
    14 
    +observe_longline.basketObs=3042
    15 
    +observe_longline.branchlineObs=18252
    16 
    +observe_longline.catchObs=435
    17 
    +observe_longline.catchObs_predator=49
    18 
    +observe_longline.sizemeasureObs=340
    19 
    +observe_longline.weightmeasureObs=0
    20 
    +observe_longline.tdrrecordObs=0
    21 
    +observe_longline.species_tdrObs=0
    22 
    +observe_longline.mitigationtype_setObs=0
    \ No newline at end of file

  • test/src/main/resources/fixtures/count-data-longline-2.properties
    1 
    +observe_longline.trip=1
    2 
    +observe_longline.setObs=5
    3 
    +observe_longline.activityObs=5
    4 
    +observe_longline.gearusefeatures=0
    5 
    +observe_longline.gearusefeaturesmeasurement=0
    6 
    +observe_longline.encounterObs=3
    7 
    +observe_longline.sensorusedObs=0
    8 
    +observe_longline.tdrObs=0
    9 
    +observe_longline.baitscompositionObs=10
    10 
    +observe_longline.floatlinescompositionObs=0
    11 
    +observe_longline.hookscompositionObs=10
    12 
    +observe_longline.branchlinescompositionObs=2
    13 
    +observe_longline.sectionObs=95
    14 
    +observe_longline.basketObs=1140
    15 
    +observe_longline.branchlineObs=6840
    16 
    +observe_longline.catchObs=152
    17 
    +observe_longline.sizemeasureObs=116
    18 
    +observe_longline.weightmeasureObs=0
    19 
    +observe_longline.tdrrecordObs=0
    20 
    +observe_longline.species_tdrObs=0
    21 
    +observe_longline.mitigationtype_setObs=0
    22 
    +observe_longline.catchObs_predator=9
    \ No newline at end of file

  • test/src/main/resources/fixtures/count-data-longline-3.properties
    1 
    +observe_longline.trip=1
    2 
    +observe_longline.setObs=14
    3 
    +observe_longline.activityObs=14
    4 
    +observe_longline.gearusefeatures=0
    5 
    +observe_longline.gearusefeaturesmeasurement=0
    6 
    +observe_longline.encounterObs=12
    7 
    +observe_longline.sensorusedObs=0
    8 
    +observe_longline.tdrObs=0
    9 
    +observe_longline.baitscompositionObs=14
    10 
    +observe_longline.floatlinescompositionObs=36
    11 
    +observe_longline.hookscompositionObs=42
    12 
    +observe_longline.branchlinescompositionObs=14
    13 
    +observe_longline.sectionObs=243
    14 
    +observe_longline.basketObs=3229
    15 
    +observe_longline.branchlineObs=19374
    16 
    +observe_longline.catchObs=677
    17 
    +observe_longline.mitigationtype_setObs=0
    18 
    +observe_longline.sizemeasureObs=647
    19 
    +observe_longline.weightmeasureObs=0
    20 
    +observe_longline.catchObs_predator=25
    21 
    +observe_longline.tdrrecordObs=0
    22 
    +observe_longline.species_tdrObs=0
    \ No newline at end of file

  • test/src/main/resources/fixtures/count-data-seine-1.properties
    1 
    +observe_seine.trip=1
    2 
    +observe_seine.gearusefeatures=2
    3 
    +observe_seine.gearusefeaturesmeasurement=4
    4 
    +observe_seine.route=34
    5 
    +observe_seine.set=35
    6 
    +observe_seine.activity=862
    7 
    +observe_seine.floatingobject=54
    8 
    +observe_seine.schoolestimate=27
    9 
    +observe_seine.nontargetcatch=109
    10 
    +observe_seine.nontargetsample=20
    11 
    +observe_seine.nontargetlength=767
    12 
    +observe_seine.targetcatch=73
    13 
    +observe_seine.targetsample=10
    14 
    +observe_seine.targetlength=85
    15 
    +observe_seine.objectobservedspecies=3
    16 
    +observe_seine.objectschoolestimate=1
    17 
    +observe_seine.transmittingbuoy=62
    18 
    +observe_seine.activity_observedsystem=1182
    19 
    +observe_seine.nontargetcatchrelease=0
    20 
    +observe_seine.floatingobjectpart=58
    \ No newline at end of file

  • test/src/main/resources/fixtures/count-data-seine-2.properties
    1 
    +observe_seine.trip=1
    2 
    +observe_seine.gearusefeatures=0
    3 
    +observe_seine.gearusefeaturesmeasurement=0
    4 
    +observe_seine.route=46
    5 
    +observe_seine.set=42
    6 
    +observe_seine.activity=657
    7 
    +observe_seine.activity_observedsystem=652
    8 
    +observe_seine.floatingobject=50
    9 
    +observe_seine.schoolestimate=10
    10 
    +observe_seine.nontargetcatch=112
    11 
    +observe_seine.nontargetcatchrelease=0
    12 
    +observe_seine.floatingobjectpart=53
    13 
    +observe_seine.nontargetsample=19
    14 
    +observe_seine.nontargetlength=242
    15 
    +observe_seine.targetcatch=73
    16 
    +observe_seine.targetsample=0
    17 
    +observe_seine.targetlength=0
    18 
    +observe_seine.objectobservedspecies=2
    19 
    +observe_seine.objectschoolestimate=3
    20 
    +observe_seine.transmittingbuoy=68
    \ No newline at end of file

  • test/src/main/resources/fixtures/count-data-seine-3.properties
    1 
    +observe_seine.trip=1
    2 
    +observe_seine.gearusefeatures=0
    3 
    +observe_seine.gearusefeaturesmeasurement=0
    4 
    +observe_seine.route=45
    5 
    +observe_seine.set=35
    6 
    +observe_seine.activity=816
    7 
    +observe_seine.floatingobject=41
    8 
    +observe_seine.schoolestimate=35
    9 
    +observe_seine.nontargetcatch=104
    10 
    +observe_seine.nontargetsample=16
    11 
    +observe_seine.nontargetlength=1193
    12 
    +observe_seine.targetcatch=118
    13 
    +observe_seine.targetsample=14
    14 
    +observe_seine.targetlength=53
    15 
    +observe_seine.objectobservedspecies=0
    16 
    +observe_seine.objectschoolestimate=24
    17 
    +observe_seine.transmittingbuoy=39
    18 
    +observe_seine.activity_observedsystem=321
    19 
    +observe_seine.nontargetcatchrelease=0
    20 
    +observe_seine.floatingobjectpart=42
    \ No newline at end of file

  • test/src/main/resources/fixtures/count-referential-common.properties
    1 
    +observe_common.country=72
    2 
    +observe_common.compagnies=0
    3 
    +observe_common.dataquality=5
    4 
    +observe_common.fpazone=42
    5 
    +observe_common.gear=26
    6 
    +observe_common.gear_gearcaracteristic=29
    7 
    +observe_common.gearcaracteristic=22
    8 
    +observe_common.gearcaracteristictype=6
    9 
    +observe_common.harbour=74
    10 
    +observe_common.lastupdatedate=114
    11 
    +observe_common.lengthlengthparameter=0
    12 
    +observe_common.lengthmeasuremethod=4
    13 
    +observe_common.lengthweightparameter=365
    14 
    +observe_common.ocean=3
    15 
    +observe_common.ocean_species=500
    16 
    +observe_common.organism=9
    17 
    +observe_common.person=537
    18 
    +observe_common.program=27
    19 
    +observe_common.shipowner=27
    20 
    +observe_common.sex=5
    21 
    +observe_common.sizemeasuretype=17
    22 
    +observe_common.species=285
    23 
    +observe_common.species_specieslist=401
    24 
    +observe_common.speciesgroup=11
    25 
    +observe_common.speciesgroupreleasemode=9
    26 
    +observe_common.speciesgroup_speciesgroupreleasemode=19
    27 
    +observe_common.specieslist=7
    28 
    +observe_common.vessel=1172
    29 
    +observe_common.vesselsizecategory=13
    30 
    +observe_common.vesseltype=16
    31 
    +observe_common.weightmeasuremethod=3
    32 
    +observe_common.weightmeasuretype=3
    33 
    +observe_common.wind=13
    \ No newline at end of file

  • test/src/main/resources/fixtures/count-referential-longline.properties
    1 
    +observe_longline.baithaulingstatus=5
    2 
    +observe_longline.baitsettingstatus=5
    3 
    +observe_longline.baittype=16
    4 
    +observe_longline.catchfate=5
    5 
    +observe_longline.encountertype=12
    6 
    +observe_longline.healthness=6
    7 
    +observe_longline.hookposition=13
    8 
    +observe_longline.hooksize=22
    9 
    +observe_longline.hooktype=13
    10 
    +observe_longline.itemverticalposition=3
    11 
    +observe_longline.itemhorizontalposition=3
    12 
    +observe_longline.lightstickscolor=7
    13 
    +observe_longline.lightstickstype=2
    14 
    +observe_longline.linetype=8
    15 
    +observe_longline.maturitystatus=12
    16 
    +observe_longline.mitigationtype=15
    17 
    +observe_longline.observationtriptype=3
    18 
    +observe_longline.sensorbrand=4
    19 
    +observe_longline.sensordataformat=2
    20 
    +observe_longline.sensortype=4
    21 
    +observe_longline.settingshape=6
    22 
    +observe_longline.stomacfullness=7
    23 
    +observe_longline.vesselactivity=12
    24 
    +observe_longline.weightcategory=0
    25 
    +observe_longline.datasource=20
    26 
    +observe_longline.logbooktriptype=3
    27 
    +observe_longline.triptype=3
    28 
    +observe_longline.onboardprocessing=5
    29 
    +observe_longline.conservation=2
    30 
    +observe_longline.weightdeterminationmethod=0
    \ No newline at end of file

  • test/src/main/resources/fixtures/count-referential-seine.properties
    1 
    +observe_seine.detectionmode=11
    2 
    +observe_seine.nontargetcatchreleaseconformity=5
    3 
    +observe_seine.nontargetcatchreleasestatus=5
    4 
    +observe_seine.nontargetcatchreleasingtime=4
    5 
    +observe_seine.objectoperation=10
    6 
    +observe_seine.objectmaterial=77
    7 
    +observe_seine.objectmaterialtype=4
    8 
    +observe_seine.observedsystem=24
    9 
    +observe_seine.reasonfordiscard=5
    10 
    +observe_seine.reasonfornofishing=13
    11 
    +observe_seine.reasonfornullset=10
    12 
    +observe_seine.speciesfate=10
    13 
    +observe_seine.speciesstatus=4
    14 
    +observe_seine.surroundingactivity=8
    15 
    +observe_seine.transmittingbuoyoperation=3
    16 
    +observe_seine.transmittingbuoytype=12
    17 
    +observe_seine.vesselactivity=23
    18 
    +observe_seine.weightcategory=110
    \ No newline at end of file

  • test/src/main/resources/fixtures/global.properties
    1 
    +TRIP_SEINE_ID_1=fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843
    2 
    +TRIP_SEINE_ID_2=fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215
    3 
    +TRIP_SEINE_ID_3=fr.ird.observe.entities.seine.TripSeine#1360156698296#0.6097793743126777
    4 
    +PROGRAM_ID=fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234
    5 
    +TRIP_LONGLINE_ID_1=fr.ird.observe.entities.longline.TripLongline#1429538088091#0.763886003987864
    6 
    +TRIP_LONGLINE_ID_2=fr.ird.observe.entities.longline.TripLongline#1429540363472#0.517173705156893
    7 
    +TRIP_LONGLINE_ID_3=fr.ird.observe.entities.longline.TripLongline#1429537115030#0.493692863034084
    8 
    +SET_LONGLINE_ID_1=fr.ird.observe.entities.longline.SetLonglineObs#1429538714446#0.0876020351424813
    9 
    +SET_SEINE_ID=fr.ird.observe.entities.seine.SetSeine#1359573677233#0.016313003525718517
    10 
    +GEAR_USE_FEATURES_SEINE_ID=fr.ird.observe.entities.seine.GearUseFeaturesSeine#1440486230661#0.42614931015885216
    11 
    +GEAR_USE_FEATURES_SEINE_ID_1=fr.ird.observe.entities.seine.GearUseFeaturesSeine#1440486230661#0.42614931015885216
    12 
    +SPECIES_GROUP_ID=fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075
    13 
    +REFERENCE_DATA_COUNT=33
    14 
    +DATA_FORM_COUNT=48
    15 
    +VALIDATORS_COUNT=210
    16 
    +VALIDATOR_CREATE_DATA_COUNT=8
    17 
    +VALIDATOR_UPDATE_DATA_COUNT=37
    18 
    +VALIDATOR_UPDATE_ENTITY_DATA_COUNT=29
    19 
    +VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT=13
    20 
    +ENTITIES_LIMIT_SIZE=100
    21 
    +ENTITY_BINDER_REFERENTIAL_COUNT=76
    \ No newline at end of file

  • test/src/main/resources/fixtures/validate-service-referential.properties
    1 
    +DataQualityDto=1
    2 
    +SpeciesGroupReleaseModeDto=2
    3 
    +SettingShapeDto=3
    4 
    +BaitHaulingStatusDto=3
    5 
    +ObservationTripTypeDto=1
    6 
    +TransmittingBuoyOperationDto=3
    7 
    +WeightCategorySeineDto=3
    8 
    +LengthMeasureMethodDto=2
    9 
    +WeightMeasureMethodDto=3
    10 
    +ReasonForNoFishingDto=3
    11 
    +ObservedSystemDto=4
    12 
    +SpeciesDto=13
    13 
    +PersonDto=4
    14 
    +HookPositionDto=1
    15 
    +HookTypeDto=1
    16 
    +SpeciesListDto=2
    17 
    +LightsticksColorDto=2
    18 
    +BaitSettingStatusDto=1
    19 
    +VesselTypeDto=4
    20 
    +SexDto=2
    21 
    +NonTargetCatchReleaseConformityDto=2
    22 
    +MaturityStatusDto=3
    23 
    +LengthWeightParameterDto=7
    24 
    +NonTargetCatchReleaseStatusDto=2
    25 
    +SurroundingActivityDto=3
    26 
    +ItemVerticalPositionDto=1
    27 
    +OceanDto=3
    28 
    +VesselActivitySeineDto=4
    29 
    +HarbourDto=5
    30 
    +HealthnessDto=1
    31 
    +ObjectOperationDto=2
    32 
    +SensorDataFormatDto=2
    33 
    +ObjectMaterialTypeDto=2
    34 
    +CountryDto=5
    35 
    +ReasonForNullSetDto=3
    36 
    +FpaZoneDto=5
    37 
    +NonTargetCatchReleasingTimeDto=1
    38 
    +EncounterTypeDto=1
    39 
    +VesselDto=10
    40 
    +MitigationTypeDto=1
    41 
    +VesselSizeCategoryDto=1
    42 
    +SizeMeasureTypeDto=3
    43 
    +ShipOwnerDto=1
    44 
    +CatchFateLonglineDto=1
    45 
    +GearCaracteristicTypeDto=3
    46 
    +GearCaracteristicDto=2
    47 
    +ReasonForDiscardDto=3
    48 
    +WeightMeasureTypeDto=1
    49 
    +LightsticksTypeDto=1
    50 
    +ItemHorizontalPositionDto=3
    51 
    +OrganismDto=4
    52 
    +GearDto=3
    53 
    +DetectionModeDto=3
    54 
    +HookSizeDto=3
    55 
    +SensorBrandDto=1
    56 
    +SensorTypeDto=3
    57 
    +TransmittingBuoyTypeDto=3
    58 
    +SpeciesFateDto=3
    59 
    +WindDto=1
    60 
    +SpeciesStatusDto=3
    61 
    +VesselActivityLonglineDto=1
    62 
    +ObjectMaterialDto=10
    63 
    +LineTypeDto=2
    64 
    +ProgramDto=9
    65 
    +BaitTypeDto=3
    66 
    +SpeciesGroupDto=2
    67 
    +StomacFullnessDto=3
    68 
    +ConservationDto=2
    69 
    +OnBoardProcessingDto=1
    70 
    +DataSourceDto=3
    71 
    +LogbookTripTypeDto=3
    72 
    +TripTypeDto=2
    \ No newline at end of file

  • test/src/main/resources/fixtures/validate-service-seine-trips.properties
    1 
    +TripSeineDto=4
    2 
    +RouteDto=38
    3 
    +ActivitySeineDto=68
    4 
    +TransmittingBuoyDto=1
    5 
    +SetSeineDto=3
    6 
    +NonTargetCatchDto=3
    7 
    +NonTargetLengthDto=6
    8 
    +TargetLengthDto=1
    9 
    +FloatingObjectDto=1
    \ No newline at end of file

  • validation/src/test/java/fr/ird/observe/client/validation/BeanValidatorDetectorTest.java
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.validation;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import com.google.common.collect.ImmutableList;
    25 26 
     import com.google.common.collect.ImmutableSet;
    26 27 
     import fr.ird.observe.dto.data.longline.ActivityLonglineObsDto;
    27 28 
     import fr.ird.observe.dto.data.longline.ActivityLonglineObsEncounterDto;
    ... ... @@ -207,91 +208,9 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest {
    207 208
    208 209 
             assertEquals(ObserveFixtures.VALIDATOR_CREATE_DATA_COUNT + ObserveFixtures.VALIDATOR_CREATE_REFERENTIAL_COUNT, validators.size());
    209 210
    210 
    -        assertValidatorSetWithSameContextName(validators, contextName,
    211 
    -                ActivityLonglineObsDto.class,
    212 
    -                ActivitySeineDto.class,
    213 
    -                BaitHaulingStatusDto.class,
    214 
    -                BaitSettingStatusDto.class,
    215 
    -                BaitTypeDto.class,
    216 
    -                CatchFateLonglineDto.class,
    217 
    -                CompagniesDto.class,
    218 
    -                ConservationDto.class,
    219 
    -                CountryDto.class,
    220 
    -                DataQualityDto.class,
    221 
    -                DataSourceDto.class,
    222 
    -                DetectionModeDto.class,
    223 
    -                EncounterTypeDto.class,
    224 
    -                FloatingObjectDto.class,
    225 
    -                FpaZoneDto.class,
    226 
    -                GearCaracteristicDto.class,
    227 
    -                GearCaracteristicTypeDto.class,
    228 
    -                GearDto.class,
    229 
    -                HarbourDto.class,
    230 
    -                HealthnessDto.class,
    231 
    -                HookPositionDto.class,
    232 
    -                HookSizeDto.class,
    233 
    -                HookTypeDto.class,
    234 
    -                ItemHorizontalPositionDto.class,
    235 
    -                ItemVerticalPositionDto.class,
    236 
    -                LengthLengthParameterDto.class,
    237 
    -                LengthMeasureMethodDto.class,
    238 
    -                LengthWeightParameterDto.class,
    239 
    -                LightsticksColorDto.class,
    240 
    -                LightsticksTypeDto.class,
    241 
    -                LineTypeDto.class,
    242 
    -                LogbookTripTypeDto.class,
    243 
    -                MaturityStatusDto.class,
    244 
    -                MitigationTypeDto.class,
    245 
    -                NonTargetCatchReleaseConformityDto.class,
    246 
    -                NonTargetCatchReleaseStatusDto.class,
    247 
    -                NonTargetCatchReleasingTimeDto.class,
    248 
    -                ObjectMaterialDto.class,
    249 
    -                ObjectMaterialTypeDto.class,
    250 
    -                ObjectOperationDto.class,
    251 
    -                ObservationTripTypeDto.class,
    252 
    -                ObservedSystemDto.class,
    253 
    -                OceanDto.class,
    254 
    -                OnBoardProcessingDto.class,
    255 
    -                OrganismDto.class,
    256 
    -                PersonDto.class,
    257 
    -                ProgramDto.class,
    258 
    -                ReasonForDiscardDto.class,
    259 
    -                ReasonForNoFishingDto.class,
    260 
    -                ReasonForNullSetDto.class,
    261 
    -                RouteDto.class,
    262 
    -                SensorBrandDto.class,
    263 
    -                SensorDataFormatDto.class,
    264 
    -                SensorTypeDto.class,
    265 
    -                SetLonglineObsDto.class,
    266 
    -                SetSeineDto.class,
    267 
    -                SettingShapeDto.class,
    268 
    -                SexDto.class,
    269 
    -                ShipOwnerDto.class,
    270 
    -                SizeMeasureTypeDto.class,
    271 
    -                SpeciesDto.class,
    272 
    -                SpeciesFateDto.class,
    273 
    -                SpeciesGroupDto.class,
    274 
    -                SpeciesGroupReleaseModeDto.class,
    275 
    -                SpeciesListDto.class,
    276 
    -                SpeciesStatusDto.class,
    277 
    -                StomacFullnessDto.class,
    278 
    -                SurroundingActivityDto.class,
    279 
    -                TransmittingBuoyOperationDto.class,
    280 
    -                TransmittingBuoyTypeDto.class,
    281 
    -                TripLonglineDto.class,
    282 
    -                TripSeineDto.class,
    283 
    -                TripTypeDto.class,
    284 
    -                VesselActivityLonglineDto.class,
    285 
    -                VesselActivitySeineDto.class,
    286 
    -                VesselDto.class,
    287 
    -                VesselSizeCategoryDto.class,
    288 
    -                VesselTypeDto.class,
    289 
    -                WeightCategoryLonglineDto.class,
    290 
    -                WeightCategorySeineDto.class,
    291 
    -                WeightDeterminationMethodDto.class,
    292 
    -                WeightMeasureMethodDto.class,
    293 
    -                WeightMeasureTypeDto.class,
    294 
    -                WindDto.class);
    211 
    +        ImmutableList<Class<?>> dtoNames = ObserveFixtures.loadFixtureDtoList("bean-validator-detector-n1-create");
    212 
    +
    213 
    +        assertValidatorSetWithSameContextName(validators, contextName, dtoNames.toArray(new Class<?>[0]));
    295 214 
         }
    296 215
    297 216 
         @Test
    ... ... @@ -303,121 +222,9 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest {
    303 222 
             //FIXME We miss 2 validators (if we use a validador map for all types, we got 2 more validators, find out which ones...)
    304 223 
             assertEquals(ObserveFixtures.VALIDATOR_UPDATE_DATA_COUNT + ObserveFixtures.VALIDATOR_UPDATE_REFERENTIAL_COUNT, validators.size());
    305 224
    306 
    -        assertValidatorSetWithSameContextName2(validators,
    307 
    -                contextName,
    308 
    -                ActivityLonglineObsDto.class,
    309 
    -                ActivityLonglineObsEncounterDto.class,
    310 
    -                ActivityLonglineObsSensorUsedDto.class,
    311 
    -                ActivitySeineDto.class,
    312 
    -                BaitHaulingStatusDto.class,
    313 
    -                BaitSettingStatusDto.class,
    314 
    -                BaitTypeDto.class,
    315 
    -                BaitsCompositionObsDto.class,
    316 
    -                BranchlineObsDto.class,
    317 
    -                BranchlinesCompositionObsDto.class,
    318 
    -                CatchFateLonglineDto.class,
    319 
    -                CatchLonglineObsDto.class,
    320 
    -                CompagniesDto.class,
    321 
    -                ConservationDto.class,
    322 
    -                CountryDto.class,
    323 
    -                DataQualityDto.class,
    324 
    -                DataSourceDto.class,
    325 
    -                DetectionModeDto.class,
    326 
    -                EncounterObsDto.class,
    327 
    -                EncounterTypeDto.class,
    328 
    -                FloatingObjectDto.class,
    329 
    -                FloatingObjectSchoolEstimateDto.class,
    330 
    -                FloatingObjectTransmittingBuoyDto.class,
    331 
    -                FloatlinesCompositionObsDto.class,
    332 
    -                FpaZoneDto.class,
    333 
    -                GearCaracteristicDto.class,
    334 
    -                GearCaracteristicTypeDto.class,
    335 
    -                GearDto.class,
    336 
    -                GearUseFeaturesLonglineDto.class,
    337 
    -                GearUseFeaturesSeineDto.class,
    338 
    -                HarbourDto.class,
    339 
    -                HealthnessDto.class,
    340 
    -                HookPositionDto.class,
    341 
    -                HookSizeDto.class,
    342 
    -                HookTypeDto.class,
    343 
    -                HooksCompositionObsDto.class,
    344 
    -                ItemHorizontalPositionDto.class,
    345 
    -                ItemVerticalPositionDto.class,
    346 
    -                LengthLengthParameterDto.class,
    347 
    -                LengthMeasureMethodDto.class,
    348 
    -                LengthWeightParameterDto.class,
    349 
    -                LightsticksColorDto.class,
    350 
    -                LightsticksTypeDto.class,
    351 
    -                LineTypeDto.class,
    352 
    -                LogbookTripTypeDto.class,
    353 
    -                MaturityStatusDto.class,
    354 
    -                MitigationTypeDto.class,
    355 
    -                NonTargetCatchDto.class,
    356 
    -                NonTargetCatchReleaseConformityDto.class,
    357 
    -                NonTargetCatchReleaseDto.class,
    358 
    -                NonTargetCatchReleaseStatusDto.class,
    359 
    -                NonTargetCatchReleasingTimeDto.class,
    360 
    -                NonTargetLengthDto.class,
    361 
    -                NonTargetSampleDto.class,
    362 
    -                ObjectMaterialDto.class,
    363 
    -                ObjectMaterialTypeDto.class,
    364 
    -                ObjectObservedSpeciesDto.class,
    365 
    -                ObjectOperationDto.class,
    366 
    -                ObjectSchoolEstimateDto.class,
    367 
    -                ObservationTripTypeDto.class,
    368 
    -                ObservedSystemDto.class,
    369 
    -                OceanDto.class,
    370 
    -                OnBoardProcessingDto.class,
    371 
    -                OrganismDto.class,
    372 
    -                PersonDto.class,
    373 
    -                ProgramDto.class,
    374 
    -                ReasonForDiscardDto.class,
    375 
    -                ReasonForNoFishingDto.class,
    376 
    -                ReasonForNullSetDto.class,
    377 
    -                RouteDto.class,
    378 
    -                SchoolEstimateDto.class,
    379 
    -                SensorBrandDto.class,
    380 
    -                SensorDataFormatDto.class,
    381 
    -                SensorTypeDto.class,
    382 
    -                SensorUsedObsDto.class,
    383 
    -                SetLonglineObsDto.class,
    384 
    -                SetSeineDto.class,
    385 
    -                SetSeineNonTargetCatchDto.class,
    386 
    -                SetSeineSchoolEstimateDto.class,
    387 
    -                SettingShapeDto.class,
    388 
    -                SexDto.class,
    389 
    -                ShipOwnerDto.class,
    390 
    -                SizeMeasureTypeDto.class,
    391 
    -                SpeciesDto.class,
    392 
    -                SpeciesFateDto.class,
    393 
    -                SpeciesGroupDto.class,
    394 
    -                SpeciesGroupReleaseModeDto.class,
    395 
    -                SpeciesListDto.class,
    396 
    -                SpeciesStatusDto.class,
    397 
    -                StomacFullnessDto.class,
    398 
    -                SurroundingActivityDto.class,
    399 
    -                TargetLengthDto.class,
    400 
    -                TargetSampleDto.class,
    401 
    -                TdrObsDto.class,
    402 
    -                TransmittingBuoyDto.class,
    403 
    -                TransmittingBuoyOperationDto.class,
    404 
    -                TransmittingBuoyTypeDto.class,
    405 
    -                TripLonglineDto.class,
    406 
    -                TripLonglineGearUseDto.class,
    407 
    -                TripSeineDto.class,
    408 
    -                TripSeineGearUseDto.class,
    409 
    -                TripTypeDto.class,
    410 
    -                VesselActivityLonglineDto.class,
    411 
    -                VesselActivitySeineDto.class,
    412 
    -                VesselDto.class,
    413 
    -                VesselSizeCategoryDto.class,
    414 
    -                VesselTypeDto.class,
    415 
    -                WeightCategoryLonglineDto.class,
    416 
    -                WeightCategorySeineDto.class,
    417 
    -                WeightDeterminationMethodDto.class,
    418 
    -                WeightMeasureMethodDto.class,
    419 
    -                WeightMeasureTypeDto.class,
    420 
    -                WindDto.class);
    225 
    +        ImmutableList<Class<?>> dtoNames = ObserveFixtures.loadFixtureDtoList("bean-validator-detector-n1-update");
    226 
    +
    227 
    +        assertValidatorSetWithSameContextName2(validators, contextName, dtoNames.toArray(new Class<?>[0]));
    421 228 
         }
    422 229
    423 230 
         @Test

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.