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 442fe1571442820a77776ae6290c2f0509e8fb9e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 16:51:52 2016 +0100 mise à jour de la base de référentiel de test --- .../topia/entity/LengthWeightParemetersTest.java | 20 ++++---- .../java/fr/ird/observe/test/ObserveFixtures.java | 56 ++++++++++----------- test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 143865 -> 181714 bytes 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java index 7bbb816..13054bf 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java @@ -68,7 +68,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); - Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("DOL").tryFindUnique().orNull()); + Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("ALB").tryFindUnique().orNull()); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); Optional<Sex> optionalUndeterminedSex = Optional.ofNullable(sexDao.forCodeEquals("0").tryFindUnique().orNull()); @@ -149,7 +149,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); - Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("DOL").tryFindUnique().orNull()); + Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("ALB").tryFindUnique().orNull()); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); Optional<Sex> optionalUndeterminedSex = Optional.ofNullable(sexDao.forCodeEquals("0").tryFindUnique().orNull()); @@ -198,18 +198,18 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, maleSex, maleSex, date2011, date2011); assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, femaleSex, undeterminedSex, date2011, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2009, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2009); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2009); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, date2009); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, date2009); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2010, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2010); assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2010, date2010); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2010, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, date2010); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2011, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2011); assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2011, date2011); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2011, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, date2011); assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, undeterminedSex, date2010); assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, maleSex, date2010); diff --git a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java index 3e337b4..232534b 100644 --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -64,28 +64,28 @@ public class ObserveFixtures { public static final ImmutableMap<String, Long> REFERENTIAL_COMMON_TABLES_COUNT = ImmutableMap .<String, Long>builder() - .put("observe_common.country", 46L) - .put("observe_common.fpazone", 41L) + .put("observe_common.country", 72L) + .put("observe_common.fpazone", 42L) .put("observe_common.gear", 26L) .put("observe_common.gear_gearcaracteristic", 29L) .put("observe_common.gearcaracteristic", 22L) .put("observe_common.gearcaracteristictype", 6L) - .put("observe_common.harbour", 72L) + .put("observe_common.harbour", 74L) .put("observe_common.lastupdatedate", 96L) - .put("observe_common.lengthweightparameter", 352L) + .put("observe_common.lengthweightparameter", 365L) .put("observe_common.ocean", 3L) - .put("observe_common.ocean_species", 359L) - .put("observe_common.organism", 6L) - .put("observe_common.person", 344L) - .put("observe_common.program", 23L) + .put("observe_common.ocean_species", 500L) + .put("observe_common.organism", 9L) + .put("observe_common.person", 512L) + .put("observe_common.program", 27L) .put("observe_common.shipOwner", 27L) .put("observe_common.sex", 5L) - .put("observe_common.sizemeasuretype", 18L) - .put("observe_common.species", 211L) - .put("observe_common.species_specieslist", 255L) - .put("observe_common.speciesgroup", 8L) - .put("observe_common.specieslist", 5L) - .put("observe_common.vessel", 906L) + .put("observe_common.sizemeasuretype", 17L) + .put("observe_common.species", 285L) + .put("observe_common.species_specieslist", 401L) + .put("observe_common.speciesgroup", 11L) + .put("observe_common.specieslist", 6L) + .put("observe_common.vessel", 1172L) .put("observe_common.vesselsizecategory", 13L) .put("observe_common.vesseltype", 14L) .put("observe_common.weightmeasuretype", 3L) @@ -93,38 +93,38 @@ public class ObserveFixtures { public static final ImmutableMap<String, Long> REFERENTIAL_SEINE_TABLES_COUNT = ImmutableMap .<String, Long>builder() - .put("observe_seine.detectionmode", 10L) + .put("observe_seine.detectionmode", 11L) .put("observe_seine.objectfate", 9L) .put("observe_seine.objectoperation", 4L) - .put("observe_seine.objecttype", 23L) + .put("observe_seine.objecttype", 27L) .put("observe_seine.observedsystem", 21L) .put("observe_seine.reasonfordiscard", 5L) .put("observe_seine.reasonfornofishing", 13L) .put("observe_seine.reasonfornullset", 10L) - .put("observe_seine.speciesfate", 9L) - .put("observe_seine.speciesstatus", 3L) + .put("observe_seine.speciesfate", 10L) + .put("observe_seine.speciesstatus", 4L) .put("observe_seine.surroundingactivity", 8L) .put("observe_seine.transmittingbuoyoperation", 3L) .put("observe_seine.transmittingbuoytype", 12L) .put("observe_seine.vesselactivity", 23L) - .put("observe_seine.weightcategory", 101L) + .put("observe_seine.weightcategory", 110L) .put("observe_seine.wind", 13L) .build(); public static final ImmutableMap<String, Long> REFERENTIAL_LONGLINE_TABLES_COUNT = ImmutableMap .<String, Long>builder() - .put("observe_longline.baithaulingstatus", 4L) - .put("observe_longline.baitsettingstatus", 4L) - .put("observe_longline.baittype", 10L) - .put("observe_longline.catchfate", 6L) + .put("observe_longline.baithaulingstatus", 5L) + .put("observe_longline.baitsettingstatus", 5L) + .put("observe_longline.baittype", 16L) + .put("observe_longline.catchfate", 5L) .put("observe_longline.encountertype", 12L) .put("observe_longline.healthness", 6L) .put("observe_longline.hookposition", 13L) - .put("observe_longline.hooksize", 21L) - .put("observe_longline.hooktype", 12L) + .put("observe_longline.hooksize", 22L) + .put("observe_longline.hooktype", 13L) .put("observe_longline.itemverticalposition", 3L) .put("observe_longline.itemhorizontalposition", 3L) - .put("observe_longline.lightstickscolor", 6L) + .put("observe_longline.lightstickscolor", 7L) .put("observe_longline.lightstickstype", 2L) .put("observe_longline.linetype", 8L) .put("observe_longline.maturitystatus", 12L) @@ -132,8 +132,8 @@ public class ObserveFixtures { .put("observe_longline.sensorbrand", 4L) .put("observe_longline.sensordataformat", 2L) .put("observe_longline.sensortype", 4L) - .put("observe_longline.settingshape", 5L) - .put("observe_longline.stomacfullness", 6L) + .put("observe_longline.settingshape", 6L) + .put("observe_longline.stomacfullness", 7L) .put("observe_longline.triptype", 3L) .put("observe_longline.vesselactivity", 5L) .build(); diff --git a/test/src/main/resources/db/5.1/referentiel.sql.gz b/test/src/main/resources/db/5.1/referentiel.sql.gz index 72a4111..65c8038 100644 Binary files a/test/src/main/resources/db/5.1/referentiel.sql.gz and b/test/src/main/resources/db/5.1/referentiel.sql.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.