Observe-commits
Threads by month
- ----- 2026 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
October 2017
- 1 participants
- 29 discussions
[Git][ultreiaio/ird-observe][develop] review validation i18n configuration and find out 6 missing keys...
by Tony CHEMIT 29 Oct '17
by Tony CHEMIT 29 Oct '17
29 Oct '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
f63e34a6 by Tony CHEMIT at 2017-10-29T16:22:57+01:00
review validation i18n configuration and find out 6 missing keys...
- - - - -
4 changed files:
- validation/pom.xml
- validation/src/main/i18n/validation_en_GB.properties
- validation/src/main/i18n/validation_es_ES.properties
- validation/src/main/i18n/validation_fr_FR.properties
Changes:
=====================================
validation/pom.xml
=====================================
--- a/validation/pom.xml
+++ b/validation/pom.xml
@@ -215,74 +215,19 @@
<artifactId>i18n-maven-plugin</artifactId>
<executions>
<execution>
- <id>parse-java-default</id>
<phase>process-classes</phase>
<goals>
<goal>parse-java</goal>
- </goals>
- <configuration>
- <treatDefaultEntry>false</treatDefaultEntry>
- <entries>
- <entry>
- <basedir>${project.build.directory}/generated-sources/java/</basedir>
- </entry>
- </entries>
- </configuration>
- </execution>
- <execution>
- <id>parse-validation-default</id>
- <phase>process-classes</phase>
- <goals>
<goal>parse-validation</goal>
+ <goal>generate</goal>
</goals>
<configuration>
- <treatDefaultEntry>false</treatDefaultEntry>
- <entries>
- <entry>
- <basedir>${project.basedir}/src/main/resources/</basedir>
- <includes>
- <param>**/**-validation.xml</param>
- </includes>
- </entry>
- </entries>
+ <force>true</force>
</configuration>
</execution>
- <execution>
- <id>generate-default</id>
- <phase>process-classes</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
-
</executions>
</plugin>
- <!--<plugin>-->
- <!--<artifactId>maven-antrun-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>copy i18n files</id>-->
- <!--<phase>process-classes</phase>-->
- <!--<configuration>-->
- <!--<target>-->
- <!--<copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/i18n">-->
- <!--<filterset>-->
- <!--<filter value="${observe.model.version}" token="observe.model.version" />-->
- <!--</filterset>-->
- <!--<fileset dir="${project.build.directory}/generated-sources/i18n">-->
- <!--<include name="*.properties" />-->
- <!--</fileset>-->
- <!--</copy>-->
- <!--</target>-->
- <!--</configuration>-->
- <!--<goals>-->
- <!--<goal>run</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
</plugins>
</build>
</project>
=====================================
validation/src/main/i18n/validation_en_GB.properties
=====================================
--- a/validation/src/main/i18n/validation_en_GB.properties
+++ b/validation/src/main/i18n/validation_en_GB.properties
@@ -396,6 +396,12 @@ observe.validation.catchLongline.required.comment.for.speciesCatch=A comment is
observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped=Count must be filled in group mode.
observe.validation.catchLongline.required.position=Position must be filled.
observe.validation.catchLongline.required.speciesCatch=Species catch must be filled.
+observe.validation.coordinate.degree.latitude.outOfBound=Degree component of latitude is out of bound.
+observe.validation.coordinate.degree.longitude.outOfBound=Degree component of longitude is out of bound.
+observe.validation.coordinate.minute.latitude.outOfBound=Minute component of latitude is out of bound.
+observe.validation.coordinate.minute.longitude.outOfBound=Minute component of longitude is out of bound.
+observe.validation.coordinate.second.latitude.outOfBound=Second component of latitude is out of bound.
+observe.validation.coordinate.second.longitude.outOfBound=Second component of longitude is out of bound.
observe.validation.country.invalid.iso2Code.uniqueKey=Iso 2 code is not unique.
observe.validation.country.invalid.iso3Code.uniqueKey=Iso 3 code is not unique.
observe.validation.country.required.iso2Code=Iso 2 code must be filled.
=====================================
validation/src/main/i18n/validation_es_ES.properties
=====================================
--- a/validation/src/main/i18n/validation_es_ES.properties
+++ b/validation/src/main/i18n/validation_es_ES.properties
@@ -396,6 +396,12 @@ observe.validation.catchLongline.required.comment.for.speciesCatch=Se necesita u
observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped=El número es mandatorio en modo grupado.
observe.validation.catchLongline.required.position=Se necesita la posición sobre el palangre.
observe.validation.catchLongline.required.speciesCatch=Se necesita la especie.
+observe.validation.coordinate.degree.latitude.outOfBound=Degree component of latitude is out of bound. \#TODO
+observe.validation.coordinate.degree.longitude.outOfBound=Degree component of longitude is out of bound. \#TODO
+observe.validation.coordinate.minute.latitude.outOfBound=Minute component of latitude is out of bound. \#TODO
+observe.validation.coordinate.minute.longitude.outOfBound=Minute component of longitude is out of bound. \#TODO
+observe.validation.coordinate.second.latitude.outOfBound=Second component of latitude is out of bound. \#TODO
+observe.validation.coordinate.second.longitude.outOfBound=Second component of longitude is out of bound. \#TODO
observe.validation.country.invalid.iso2Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado.
observe.validation.country.invalid.iso3Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado.
observe.validation.country.required.iso2Code=Código ISO2 no especificado
=====================================
validation/src/main/i18n/validation_fr_FR.properties
=====================================
--- a/validation/src/main/i18n/validation_fr_FR.properties
+++ b/validation/src/main/i18n/validation_fr_FR.properties
@@ -396,6 +396,12 @@ observe.validation.catchLongline.required.comment.for.speciesCatch=Un commentair
observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped=Le nombre est obligatoire en mode groupé.
observe.validation.catchLongline.required.position=Pas de position renseignée sur la palangre.
observe.validation.catchLongline.required.speciesCatch=L'espèce n'est pas renseignée.
+observe.validation.coordinate.degree.latitude.outOfBound=Les degrés de la latitude sont hors borne.
+observe.validation.coordinate.degree.longitude.outOfBound=Les degrés de la longitude sont hors borne.
+observe.validation.coordinate.minute.latitude.outOfBound=Les minutes de la latitude sont hors borne.
+observe.validation.coordinate.minute.longitude.outOfBound=Les minutes de la longitude sont hors borne.
+observe.validation.coordinate.second.latitude.outOfBound=Les secondes de la latitude sont hors borne.
+observe.validation.coordinate.second.longitude.outOfBound=Les secondes de la longitude sont hors borne.
observe.validation.country.invalid.iso2Code.uniqueKey=Le code ISO2 n'est pas unique
observe.validation.country.invalid.iso3Code.uniqueKey=Le code ISO3 n'est pas unique
observe.validation.country.required.iso2Code=Code ISO2 non renseigné.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f63e34a61a1d87299b4bfeefe5d…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f63e34a61a1d87299b4bfeefe5d…
You're receiving this email because of your account on gitlab.com.
1
0
29 Oct '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
29835352 by Tony CHEMIT at 2017-10-29T15:55:46+01:00
use next i18n plugin mojos
- - - - -
24 changed files:
- client-configuration/pom.xml
- client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties → client-configuration/src/main/i18n/client-configuration_en_GB.properties
- client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties → client-configuration/src/main/i18n/client-configuration_es_ES.properties
- client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties → client-configuration/src/main/i18n/client-configuration_fr_FR.properties
- client/pom.xml
- client/src/main/resources/i18n/client_en_GB.properties → client/src/main/i18n/client_en_GB.properties
- client/src/main/resources/i18n/client_es_ES.properties → client/src/main/i18n/client_es_ES.properties
- client/src/main/resources/i18n/client_fr_FR.properties → client/src/main/i18n/client_fr_FR.properties
- dto/pom.xml
- dto/src/main/resources/i18n/dto_en_GB.properties → dto/src/main/i18n/dto_en_GB.properties
- dto/src/main/resources/i18n/dto_es_ES.properties → dto/src/main/i18n/dto_es_ES.properties
- dto/src/main/resources/i18n/dto_fr_FR.properties → dto/src/main/i18n/dto_fr_FR.properties
- pom.xml
- server-configuration/pom.xml
- server-configuration/src/main/resources/i18n/server-configuration_en_GB.properties → server-configuration/src/main/i18n/server-configuration_en_GB.properties
- server-configuration/src/main/resources/i18n/server-configuration_es_ES.properties → server-configuration/src/main/i18n/server-configuration_es_ES.properties
- server-configuration/src/main/resources/i18n/server-configuration_fr_FR.properties → server-configuration/src/main/i18n/server-configuration_fr_FR.properties
- services-local/src/main/resources/i18n/services-local_en_GB.properties → services-local/src/main/i18n/services-local_en_GB.properties
- services-local/src/main/resources/i18n/services-local_es_ES.properties → services-local/src/main/i18n/services-local_es_ES.properties
- services-local/src/main/resources/i18n/services-local_fr_FR.properties → services-local/src/main/i18n/services-local_fr_FR.properties
- validation/pom.xml
- validation/src/main/resources/i18n/validation_en_GB.properties → validation/src/main/i18n/validation_en_GB.properties
- validation/src/main/resources/i18n/validation_es_ES.properties → validation/src/main/i18n/validation_es_ES.properties
- validation/src/main/resources/i18n/validation_fr_FR.properties → validation/src/main/i18n/validation_fr_FR.properties
Changes:
=====================================
client-configuration/pom.xml
=====================================
--- a/client-configuration/pom.xml
+++ b/client-configuration/pom.xml
@@ -168,8 +168,8 @@
<execution>
<id>scan-sources</id>
<goals>
- <goal>parserJava</goal>
- <goal>gen</goal>
+ <goal>parse-java</goal>
+ <goal>generate</goal>
</goals>
<configuration>
<entries>
=====================================
client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties → client-configuration/src/main/i18n/client-configuration_en_GB.properties
=====================================
=====================================
client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties → client-configuration/src/main/i18n/client-configuration_es_ES.properties
=====================================
=====================================
client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties → client-configuration/src/main/i18n/client-configuration_fr_FR.properties
=====================================
=====================================
client/pom.xml
=====================================
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -756,13 +756,13 @@
<execution>
<id>scan-sources</id>
<goals>
- <goal>parserJava</goal>
- <goal>gen</goal>
+ <goal>parse-java</goal>
+ <goal>generate</goal>
</goals>
<configuration>
<entries>
<entry>
- <specificGoal>parserJava</specificGoal>
+ <specificGoal>parse-java</specificGoal>
<basedir>${project.build.directory}/generated-sources/java/</basedir>
</entry>
</entries>
=====================================
client/src/main/resources/i18n/client_en_GB.properties → client/src/main/i18n/client_en_GB.properties
=====================================
=====================================
client/src/main/resources/i18n/client_es_ES.properties → client/src/main/i18n/client_es_ES.properties
=====================================
=====================================
client/src/main/resources/i18n/client_fr_FR.properties → client/src/main/i18n/client_fr_FR.properties
=====================================
=====================================
dto/pom.xml
=====================================
--- a/dto/pom.xml
+++ b/dto/pom.xml
@@ -284,8 +284,8 @@
<execution>
<id>scan-sources</id>
<goals>
- <goal>parserJava</goal>
- <goal>gen</goal>
+ <goal>parse-java</goal>
+ <goal>generate</goal>
</goals>
<configuration>
<entries>
=====================================
dto/src/main/resources/i18n/dto_en_GB.properties → dto/src/main/i18n/dto_en_GB.properties
=====================================
=====================================
dto/src/main/resources/i18n/dto_es_ES.properties → dto/src/main/i18n/dto_es_ES.properties
=====================================
=====================================
dto/src/main/resources/i18n/dto_fr_FR.properties → dto/src/main/i18n/dto_fr_FR.properties
=====================================
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
<eugenePluginVersion>3.0-alpha-16</eugenePluginVersion>
<processorPluginVersion>1.3</processorPluginVersion>
- <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion>
+ <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion>
<nuitonConfigVersion>3.3</nuitonConfigVersion>
<topiaVersion>3.3</topiaVersion>
<nuitonValidatorVersion>3.1</nuitonValidatorVersion>
=====================================
server-configuration/pom.xml
=====================================
--- a/server-configuration/pom.xml
+++ b/server-configuration/pom.xml
@@ -160,8 +160,8 @@
<execution>
<id>scan-sources</id>
<goals>
- <goal>parserJava</goal>
- <goal>gen</goal>
+ <goal>parse-java</goal>
+ <goal>generate</goal>
</goals>
<configuration>
<entries>
=====================================
server-configuration/src/main/resources/i18n/server-configuration_en_GB.properties → server-configuration/src/main/i18n/server-configuration_en_GB.properties
=====================================
=====================================
server-configuration/src/main/resources/i18n/server-configuration_es_ES.properties → server-configuration/src/main/i18n/server-configuration_es_ES.properties
=====================================
=====================================
server-configuration/src/main/resources/i18n/server-configuration_fr_FR.properties → server-configuration/src/main/i18n/server-configuration_fr_FR.properties
=====================================
=====================================
services-local/src/main/resources/i18n/services-local_en_GB.properties → services-local/src/main/i18n/services-local_en_GB.properties
=====================================
=====================================
services-local/src/main/resources/i18n/services-local_es_ES.properties → services-local/src/main/i18n/services-local_es_ES.properties
=====================================
=====================================
services-local/src/main/resources/i18n/services-local_fr_FR.properties → services-local/src/main/i18n/services-local_fr_FR.properties
=====================================
=====================================
validation/pom.xml
=====================================
--- a/validation/pom.xml
+++ b/validation/pom.xml
@@ -215,58 +215,74 @@
<artifactId>i18n-maven-plugin</artifactId>
<executions>
<execution>
- <id>parse</id>
+ <id>parse-java-default</id>
<phase>process-classes</phase>
<goals>
- <goal>parserJava</goal>
- <goal>parserValidation</goal>
- <goal>gen</goal>
+ <goal>parse-java</goal>
</goals>
<configuration>
- <treateDefaultEntry>false</treateDefaultEntry>
+ <treatDefaultEntry>false</treatDefaultEntry>
+ <entries>
+ <entry>
+ <basedir>${project.build.directory}/generated-sources/java/</basedir>
+ </entry>
+ </entries>
+ </configuration>
+ </execution>
+ <execution>
+ <id>parse-validation-default</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>parse-validation</goal>
+ </goals>
+ <configuration>
+ <treatDefaultEntry>false</treatDefaultEntry>
<entries>
<entry>
- <specificGoal>parserValidation</specificGoal>
<basedir>${project.basedir}/src/main/resources/</basedir>
<includes>
<param>**/**-validation.xml</param>
</includes>
</entry>
- <entry>
- <specificGoal>parserJava</specificGoal>
- <basedir>${project.build.directory}/generated-sources/java/</basedir>
- </entry>
</entries>
</configuration>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
<execution>
- <id>copy i18n files</id>
+ <id>generate-default</id>
<phase>process-classes</phase>
- <configuration>
- <target>
- <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/i18n">
- <filterset>
- <filter value="${observe.model.version}" token="observe.model.version" />
- </filterset>
- <fileset dir="${project.build.directory}/generated-sources/i18n">
- <include name="*.properties" />
- </fileset>
- </copy>
- </target>
- </configuration>
<goals>
- <goal>run</goal>
+ <goal>generate</goal>
</goals>
</execution>
+
</executions>
</plugin>
+ <!--<plugin>-->
+ <!--<artifactId>maven-antrun-plugin</artifactId>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>copy i18n files</id>-->
+ <!--<phase>process-classes</phase>-->
+ <!--<configuration>-->
+ <!--<target>-->
+ <!--<copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/i18n">-->
+ <!--<filterset>-->
+ <!--<filter value="${observe.model.version}" token="observe.model.version" />-->
+ <!--</filterset>-->
+ <!--<fileset dir="${project.build.directory}/generated-sources/i18n">-->
+ <!--<include name="*.properties" />-->
+ <!--</fileset>-->
+ <!--</copy>-->
+ <!--</target>-->
+ <!--</configuration>-->
+ <!--<goals>-->
+ <!--<goal>run</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
+
</plugins>
</build>
</project>
=====================================
validation/src/main/resources/i18n/validation_en_GB.properties → validation/src/main/i18n/validation_en_GB.properties
=====================================
=====================================
validation/src/main/resources/i18n/validation_es_ES.properties → validation/src/main/i18n/validation_es_ES.properties
=====================================
=====================================
validation/src/main/resources/i18n/validation_fr_FR.properties → validation/src/main/i18n/validation_fr_FR.properties
=====================================
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/29835352f7cb0d13ba258f0ddec…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/29835352f7cb0d13ba258f0ddec…
You're receiving this email because of your account on gitlab.com.
1
0
28 Oct '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
9f908c7b by Tony CHEMIT at 2017-10-28T22:44:04+02:00
clean some tests
- - - - -
3313a4e7 by Tony CHEMIT at 2017-10-29T00:08:07+02:00
review validation (everything about validation in validation module (+ make this work with i18n plugin... with some tricks we are intend to fix in the plugin it-self)
- - - - -
ec662366 by Tony CHEMIT at 2017-10-29T00:18:11+02:00
use default phase for toolbox plugin
- - - - -
30 changed files:
- CONTRIBUTING.md
- client/pom.xml
- client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java
- client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java
- client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java
- client/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.java
- client/src/test/java/fr/ird/observe/client/ClientTestClassResource.java
- client/src/test/java/fr/ird/observe/client/ClientTestContext.java
- client/src/test/java/fr/ird/observe/client/ClientTestMethodResource.java
- client/src/test/java/fr/ird/observe/client/ClientTestSupport.java
- client/src/test/java/fr/ird/observe/client/tools/ObserveTextGeneratorTest.java
- persistence/src/test/java/fr/ird/observe/persistence/migration/GenerateReferentialObjectMaterial.java → persistence/src/test/java/fr/ird/observe/entities/seine/GenerateReferentialObjectMaterial.java
- services-client/pom.xml
- services-client/src/test/java/fr/ird/observe/services/client/service/DataSourceServiceClientTest.java
- services-client/src/test/java/fr/ird/observe/services/client/service/PingServiceClientTest.java
- services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java
- services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestContext.java
- services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestMethodResource.java
- services-local/pom.xml
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/EntityInterceptor.java
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidationMessageDetector.java
- services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java
- services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
- services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateDatabaseFixtures.java
- services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateTestsDatabases.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/99b151d16bccca979fc97b3cf5…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/99b151d16bccca979fc97b3cf5…
You're receiving this email because of your account on gitlab.com.
1
0
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
99b151d1 by Tony CHEMIT at 2017-10-28T22:22:53+02:00
improve replicate tests
- - - - -
8 changed files:
- dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java → services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
- test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json
- test/src/main/resources/db/6.904/empty_pg-fixtures.json
- test/src/main/resources/db/6.904/referentiel-fixtures.json
Changes:
=====================================
dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java
=====================================
--- a/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java
+++ b/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java
@@ -234,7 +234,7 @@ public class DtoModelClasses {
.addAll(LONGLINE_REFERENTIAL_TYPES)
.build();
- private static final ImmutableSet<Class<? extends DataDto>> SEINE_ENTITY_DATA_TYPES = ImmutableSet.of(
+ public static final ImmutableSet<Class<? extends DataDto>> SEINE_ENTITY_DATA_TYPES = ImmutableSet.of(
ActivitySeineDto.class,
FloatingObjectDto.class,
FloatingObjectPartDto.class,
@@ -265,7 +265,7 @@ public class DtoModelClasses {
SetSeineTargetCatchDto.class,
TripSeineGearUseDto.class);
- private static final ImmutableSet<Class<? extends DataDto>> LONGLINE_ENTITY_DATA_TYPES = ImmutableSet.of(
+ public static final ImmutableSet<Class<? extends DataDto>> LONGLINE_ENTITY_DATA_TYPES = ImmutableSet.of(
ActivityLonglineObsDto.class,
BaitsCompositionObsDto.class,
BasketDto.class,
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java → services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialTest.java
@@ -22,10 +22,15 @@ package fr.ird.observe.entity;
* #L%
*/
+import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException;
+import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException;
+import fr.ird.observe.services.service.BabModelVersionException;
+import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
+import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
-import fr.ird.observe.test.ObserveFixtures;
-import org.junit.Test;
+import fr.ird.observe.spi.DtoModelClasses;
+import java.io.IOException;
import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest;
import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
@@ -35,20 +40,23 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
* @author Tony Chemit - dev(a)tchemit.fr
*/
@DatabaseNameConfiguration(DatabaseName.referentiel)
-public class ReplicateReferentialsTest extends ReplicateTestSupport {
+public class ReplicateReferentialTest extends ReplicateTestSupport {
- @Test
- public void testReplicate() throws Exception {
+ public ReplicateReferentialTest() {
+ super(DtoModelClasses.REFERENTIAL_TYPES, null);
+ }
- TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getReferentialTables();
+ @Override
+ TopiaSqlTables createTables() {
+ return getTestMethodResource().getTopiaApplicationContext().getReferentialTables();
+ }
- ReplicateTablesRequest request
- = createReplicateTablesRequest(DatabaseName.empty_h2)
+ @Override
+ ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException {
+ return createReplicateTablesRequest(DatabaseName.empty_h2)
.setTables(tables)
.build();
- testReplicate0(request, ObserveFixtures.REFERENTIAL_TABLES_COUNT);
-
}
}
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
@@ -22,8 +22,12 @@ package fr.ird.observe.entity;
* #L%
*/
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.io.Files;
+import fr.ird.observe.dto.data.DataDto;
+import fr.ird.observe.dto.referential.ReferentialDto;
+import fr.ird.observe.entities.ObserveDataEntity;
+import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
import fr.ird.observe.persistence.ObserveTopiaApplicationContext;
import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException;
@@ -37,17 +41,16 @@ import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.ServiceLocalTestClassResource;
import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
import fr.ird.observe.services.test.ServiceTestSupport;
+import fr.ird.observe.spi.PersistenceModelHelper;
import java.io.File;
import java.io.IOException;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
-import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Assert;
+import org.junit.Test;
import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest;
-import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument;
-import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTable;
import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
import org.nuiton.util.StringUtil;
@@ -56,7 +59,7 @@ import org.nuiton.util.StringUtil;
*
* @author Tony Chemit - dev(a)tchemit.fr
*/
-class ReplicateTestSupport extends ServiceTestSupport {
+public abstract class ReplicateTestSupport extends ServiceTestSupport {
/**
* Logger.
@@ -64,7 +67,17 @@ class ReplicateTestSupport extends ServiceTestSupport {
private static final Log log = LogFactory.getLog(ReplicateTestSupport.class);
private File scriptFile;
+ private final ImmutableSet<Class<? extends ReferentialDto>> referentialTypesToTest;
+ private final ImmutableSet<Class<? extends DataDto>> dataTypesToTest;
+ abstract TopiaSqlTables createTables();
+
+ abstract ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException;
+
+ ReplicateTestSupport(ImmutableSet<Class<? extends ReferentialDto>> referentialTypesToTest, ImmutableSet<Class<? extends DataDto>> dataTypesToTest) {
+ this.referentialTypesToTest = referentialTypesToTest;
+ this.dataTypesToTest = dataTypesToTest;
+ }
@Override
public ServiceLocalTestClassResource getTestClassResource() {
@@ -76,80 +89,60 @@ class ReplicateTestSupport extends ServiceTestSupport {
return (ServiceLocalTestMethodResource) super.getTestMethodResource();
}
- ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException {
+ @Test
+ public final void testReplicate() throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException {
- File targetDatabaseDirectory = new File(getTestMethodResource().getTestDirectory(), "targetReplication");
- ObserveDataSourceConfigurationTopiaH2 targetTopiaConfiguration = getTestClassResource().createDataSourceConfiguration(getTestMethodResource().getDbVersion(), databaseName.name(), targetDatabaseDirectory, getTestMethodResource().getLogin(), getTestMethodResource().getPassword());
- ObserveTopiaApplicationContext targetTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(targetTopiaConfiguration);
+ TopiaSqlTables tables = createTables();
- scriptFile = new File(getTestMethodResource().getTestDirectory(), "script.sql");
+ ReplicateTablesRequest request = createRequest(tables);
- Writer writer = Files.newWriter(scriptFile, StandardCharsets.UTF_8);
+ log.info(String.format("Will replicate using %d tables.", tables.size()));
- return getTestMethodResource().getTopiaApplicationContext()
+ getTestMethodResource().getTopiaApplicationContext()
.getSqlBatchService()
- .replicateTablesRequestBuilder()
- .to(targetTopiaApplicationContext)
- .to(writer);
- }
-
- private static void assertReplicateTripResults(ReplicateTablesRequest replicationRequest, ImmutableMap<String, Long> expectedResults) {
-
- TopiaSqlTables tables = replicationRequest.getTables();
- try (ObserveTopiaPersistenceContext persistenceContext = (ObserveTopiaPersistenceContext) replicationRequest.getTargetTopiaApplicationContext().newPersistenceContext()) {
-
- for (TopiaSqlTable table : tables) {
-
- String fullyTableName = table.getFullyTableName();
+ .execute(request);
- if (!expectedResults.containsKey(fullyTableName.toLowerCase())) {
- Long count = persistenceContext.countTable(fullyTableName);
- System.out.println(fullyTableName + " , " + count);
+ try (ObserveTopiaPersistenceContext persistenceContext = (ObserveTopiaPersistenceContext) request.getTargetTopiaApplicationContext().newPersistenceContext()) {
+ if (referentialTypesToTest != null) {
+ for (Class<? extends ReferentialDto> aClass : referentialTypesToTest) {
+ Class<ObserveReferentialEntity> entityType = PersistenceModelHelper.fromReferentialDto(aClass).toEntityType();
+ int expectedCount = getTestMethodResource().getDatabaseFixtures().count(aClass);
+ long actualCount = persistenceContext.getDao(entityType).count();
+ Assert.assertEquals("Should have found " + expectedCount + " on " + aClass.getName() + ", but was " + actualCount, expectedCount, actualCount);
}
-
}
-
- for (Map.Entry<String, Long> entry : expectedResults.entrySet()) {
- String fullyTableName = entry.getKey();
- Long expectedCount = entry.getValue();
- Long count = persistenceContext.countTable(fullyTableName);
-
- log.debug("Found: " + fullyTableName + " , " + count);
- Assert.assertEquals("Should have found " + expectedCount + " on " + fullyTableName + ", but was " + count, expectedCount, count);
-
+ if (dataTypesToTest != null) {
+ for (Class<? extends DataDto> aClass : dataTypesToTest) {
+ Class<ObserveDataEntity> entityType = PersistenceModelHelper.fromDataDto(aClass).toEntityType();
+ int expectedCount = getTestMethodResource().getDatabaseFixtures().count(aClass);
+ long actualCount = persistenceContext.getDao(entityType).count();
+ Assert.assertEquals("Should have found " + expectedCount + " on " + aClass.getName() + ", but was " + actualCount, expectedCount, actualCount);
+ }
}
}
- }
-
- void testReplicate0(ReplicateTablesRequest request, ImmutableMap<String, Long> expectedTablesCount) {
-
- TopiaSqlTables tables = request.getTables();
- log.info(String.format("Will replicate using %d tables.", tables.size()));
-
- getTestMethodResource().getTopiaApplicationContext()
- .getSqlBatchService()
- .execute(request);
-
-
- assertReplicateTripResults(request, expectedTablesCount);
-
log.debug(String.format("Replicate to script (length: %s) :\n%s", StringUtil.convertMemory(scriptFile.length()), scriptFile));
}
- protected void testReplicate(TopiaSqlTables tables, ImmutableMap<String, Long> expectedTablesCount, Iterable<String> tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException {
+ ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException {
- ReplicateTablesRequest request
- = createReplicateTablesRequest(DatabaseName.referentiel)
- .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds))
- .setTables(tables)
- .build();
+ File targetDatabaseDirectory = new File(getTestMethodResource().getTestDirectory(), "targetReplication");
+ ObserveDataSourceConfigurationTopiaH2 targetTopiaConfiguration = getTestClassResource().createDataSourceConfiguration(getTestMethodResource().getDbVersion(), databaseName.name(), targetDatabaseDirectory, getTestMethodResource().getLogin(), getTestMethodResource().getPassword());
+ ObserveTopiaApplicationContext targetTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(targetTopiaConfiguration);
- testReplicate0(request, expectedTablesCount);
+ scriptFile = new File(getTestMethodResource().getTestDirectory(), "script.sql");
+
+ Writer writer = Files.newWriter(scriptFile, StandardCharsets.UTF_8);
+ return getTestMethodResource().getTopiaApplicationContext()
+ .getSqlBatchService()
+ .replicateTablesRequestBuilder()
+ .to(targetTopiaApplicationContext)
+ .to(writer);
}
+
}
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
@@ -23,13 +23,21 @@ package fr.ird.observe.entity;
*/
import fr.ird.observe.dto.data.longline.TripLonglineDto;
+import fr.ird.observe.dto.data.seine.TripSeineDto;
+import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException;
+import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException;
+import fr.ird.observe.services.service.BabModelVersionException;
+import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
+import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
-import fr.ird.observe.test.ObserveFixtures;
+import fr.ird.observe.spi.DtoModelClasses;
+import java.io.IOException;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
+import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest;
+import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument;
import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
/**
@@ -43,27 +51,25 @@ public class ReplicateTripLonglineTest extends ReplicateTestSupport {
/** Logger. */
private static final Log log = LogFactory.getLog(ReplicateTripLonglineTest.class);
- @Test
- public void testReplicate() throws Exception {
+ public ReplicateTripLonglineTest() {
+ super(null, DtoModelClasses.LONGLINE_ENTITY_DATA_TYPES);
+ }
+
+
+ @Override
+ TopiaSqlTables createTables() {
+ return getTestMethodResource().getTopiaApplicationContext().getTripLonglineTables();
+ }
+
+ @Override
+ protected ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException {
Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class);
log.info(String.format("will replicate %d trip(s).", ids.size()));
- TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripLonglineTables();
- testReplicate(tables, ObserveFixtures.ALL_TRIP_LONGLINE_COUNT, ids);
- }
-// @Test
-// public void testReplicateTripLonline1() throws Exception {
-// testReplicate(ObserveFixtures.TRIP_LONGLINE_1_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_1);
-// }
-//
-// @Test
-// public void testReplicateTripLonline2() throws Exception {
-// testReplicate(ObserveFixtures.TRIP_LONGLINE_2_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_2);
-// }
-//
-// @Test
-// public void testReplicateTripLonline3() throws Exception {
-// testReplicate(ObserveFixtures.TRIP_LONGLINE_3_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_3);
-// }
+ return createReplicateTablesRequest(DatabaseName.referentiel)
+ .setSelectArgument(TopiaSqlTableSelectArgument.of(ids))
+ .setTables(tables)
+ .build();
+ }
}
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
@@ -22,14 +22,22 @@ package fr.ird.observe.entity;
* #L%
*/
+import com.google.common.collect.ImmutableSet;
import fr.ird.observe.dto.data.seine.TripSeineDto;
+import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException;
+import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException;
+import fr.ird.observe.services.service.BabModelVersionException;
+import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
+import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
-import fr.ird.observe.test.ObserveFixtures;
+import fr.ird.observe.spi.DtoModelClasses;
+import java.io.IOException;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
+import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest;
+import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument;
import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
/**
@@ -39,30 +47,28 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
*/
@DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
public class ReplicateTripSeineTest extends ReplicateTestSupport {
+
/** Logger. */
private static final Log log = LogFactory.getLog(ReplicateTripSeineTest.class);
- @Test
- public void testReplicate() throws Exception {
+ public ReplicateTripSeineTest() {
+ super(null, DtoModelClasses.SEINE_ENTITY_DATA_TYPES);
+ }
+
+ @Override
+ TopiaSqlTables createTables() {
+ return getTestMethodResource().getTopiaApplicationContext().getTripSeineTables();
+ }
+
+ @Override
+ protected ReplicateTablesRequest createRequest(TopiaSqlTables tables) throws DatabaseNotFoundException, DataSourceCreateWithNoReferentialImportException, IncompatibleDataSourceCreateConfigurationException, IOException, BabModelVersionException, DatabaseConnexionNotAuthorizedException {
Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class);
log.info(String.format("will replicate %d trip(s).", ids.size()));
- TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripSeineTables();
- testReplicate(tables, ObserveFixtures.ALL_TRIP_SEINE_COUNT, ids);
- }
-// @Test
-// public void testReplicateTripSeine1() throws Exception {
-// testReplicate(ObserveFixtures.TRIP_SEINE_1_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_1);
-// }
-//
-// @Test
-// public void testReplicateTripSeine2() throws Exception {
-// testReplicate(ObserveFixtures.TRIP_SEINE_2_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_2);
-// }
-//
-// @Test
-// public void testReplicateTripSeine3() throws Exception {
-// testReplicate(ObserveFixtures.TRIP_SEINE_3_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_3);
-// }
+ return createReplicateTablesRequest(DatabaseName.referentiel)
+ .setSelectArgument(TopiaSqlTableSelectArgument.of(ids))
+ .setTables(tables)
+ .build();
+ }
}
=====================================
test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json
=====================================
--- a/test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json
+++ b/test/src/main/resources/db/6.904/dataForTestSeine-fixtures.json
@@ -10134,4 +10134,4 @@
},
"types": {}
}
-}
+}
\ No newline at end of file
=====================================
test/src/main/resources/db/6.904/empty_pg-fixtures.json
=====================================
--- a/test/src/main/resources/db/6.904/empty_pg-fixtures.json
+++ b/test/src/main/resources/db/6.904/empty_pg-fixtures.json
@@ -121,4 +121,4 @@
},
"types": {}
}
-}
+}
\ No newline at end of file
=====================================
test/src/main/resources/db/6.904/referentiel-fixtures.json
=====================================
--- a/test/src/main/resources/db/6.904/referentiel-fixtures.json
+++ b/test/src/main/resources/db/6.904/referentiel-fixtures.json
@@ -1080,6 +1080,8 @@
"fr.ird.observe.entities.referentiel.Person#1428578953995#0.8402597879270977",
"fr.ird.observe.entities.referentiel.Person#1428578984404#0.1624818954985996",
"fr.ird.observe.entities.referentiel.Person#1428579047136#0.28582733330602794",
+ "fr.ird.observe.entities.referentiel.Person#1429515754811#0.0860557500272989",
+ "fr.ird.observe.entities.referentiel.Person#1429515754847#0.704271007329226",
"fr.ird.observe.entities.referentiel.Person#1432805038273#0.5664302448691187",
"fr.ird.observe.entities.referentiel.Person#1433499200854#0.615648015402257",
"fr.ird.observe.entities.referentiel.Person#1433499201263#0.745114278979599",
@@ -1274,6 +1276,13 @@
"fr.ird.observe.entities.referentiel.ShipOwner#0#9"
],
"referential.SizeMeasureType": [
+ "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949422#0.323839171556756",
+ "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949444#0.180838016327471",
+ "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949471#0.763535852311179",
+ "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949556#0.658470877679065",
+ "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949576#0.370653854450211",
+ "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949617#0.259305257815868",
+ "fr.ird.observe.entities.referentiel.SizeMeasureType#1429515949639#0.329839885467663",
"fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336",
"fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465999#0.707568018231541",
"fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466255#0.444246932631359",
@@ -1485,6 +1494,15 @@
"fr.ird.observe.entities.referentiel.Species#1365776436586#0.42584811850930293",
"fr.ird.observe.entities.referentiel.Species#1383399210341#0.7324960169421437",
"fr.ird.observe.entities.referentiel.Species#1383400882289#0.9275723384489454",
+ "fr.ird.observe.entities.referentiel.Species#1429515782578#0.57668571616523",
+ "fr.ird.observe.entities.referentiel.Species#1429515783191#0.301721239695325",
+ "fr.ird.observe.entities.referentiel.Species#1429515783493#0.271485573379323",
+ "fr.ird.observe.entities.referentiel.Species#1429515783680#0.0288836669642478",
+ "fr.ird.observe.entities.referentiel.Species#1429515783742#0.596136273350567",
+ "fr.ird.observe.entities.referentiel.Species#1429515783863#0.310130815720186",
+ "fr.ird.observe.entities.referentiel.Species#1429515784177#0.217057247878984",
+ "fr.ird.observe.entities.referentiel.Species#1429515784214#0.543130560778081",
+ "fr.ird.observe.entities.referentiel.Species#1429515784335#0.773490378633141",
"fr.ird.observe.entities.referentiel.Species#1433499238727#0.452269877539948",
"fr.ird.observe.entities.referentiel.Species#1433499239128#0.665396141353995",
"fr.ird.observe.entities.referentiel.Species#1433499239536#0.330866874894127",
@@ -2526,6 +2544,9 @@
"fr.ird.observe.entities.referentiel.Vessel#1418400134914#0.7508690402739512",
"fr.ird.observe.entities.referentiel.Vessel#1418400258815#0.12569862197124138",
"fr.ird.observe.entities.referentiel.Vessel#1418400345435#0.5664364147475593",
+ "fr.ird.observe.entities.referentiel.Vessel#1429515780666#0.496382233686745",
+ "fr.ird.observe.entities.referentiel.Vessel#1429515780701#0.825504872016609",
+ "fr.ird.observe.entities.referentiel.Vessel#1429515781376#0.949138431344181",
"fr.ird.observe.entities.referentiel.Vessel#1433148953942#0.24272879354646504",
"fr.ird.observe.entities.referentiel.Vessel#1433499209711#0.316791892750189",
"fr.ird.observe.entities.referentiel.Vessel#1433499210648#0.808905522339046",
@@ -2849,6 +2870,7 @@
"fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.2",
"fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.3",
"fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.4",
+ "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1429515949203#0.00216103950515389",
"fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1433499460626#0.465611247578636"
],
"referential.longline.BaitType": [
@@ -2862,6 +2884,7 @@
"fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#0.8",
"fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#0.9",
"fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#1.0",
+ "fr.ird.observe.entities.referentiel.longline.BaitType#1429515949067#0.955311801983044",
"fr.ird.observe.entities.referentiel.longline.BaitType#1433499457783#0.290097113000229",
"fr.ird.observe.entities.referentiel.longline.BaitType#1433499458077#0.820353789720684",
"fr.ird.observe.entities.referentiel.longline.BaitType#1433499458372#0.785577602451667",
@@ -2874,6 +2897,7 @@
"fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.2",
"fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.3",
"fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.4",
+ "fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1429515949274#0.952565349172801",
"fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1433499462055#0.71151070506312"
],
"referential.longline.EncounterType": [
@@ -2935,6 +2959,7 @@
"fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.7",
"fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.8",
"fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.9",
+ "fr.ird.observe.entities.referentiel.longline.HookSize#1429515948468#0.511942049022764",
"fr.ird.observe.entities.referentiel.longline.HookSize#1433499436918#0.552373287733644"
],
"referential.longline.HookType": [
@@ -3038,6 +3063,7 @@
"fr.ird.observe.entities.referentiel.longline.SettingShape#1239832686128#0.3",
"fr.ird.observe.entities.referentiel.longline.SettingShape#1239832686128#0.4",
"fr.ird.observe.entities.referentiel.longline.SettingShape#1239832686128#0.5",
+ "fr.ird.observe.entities.referentiel.longline.SettingShape#1429515949392#0.162451097276062",
"fr.ird.observe.entities.referentiel.longline.SettingShape#1433499465088#0.892811479745433"
],
"referential.longline.StomacFullness": [
@@ -3047,6 +3073,7 @@
"fr.ird.observe.entities.referentiel.longline.StomacFullness#1239832686135#0.4",
"fr.ird.observe.entities.referentiel.longline.StomacFullness#1239832686135#0.5",
"fr.ird.observe.entities.referentiel.longline.StomacFullness#1239832686135#0.6",
+ "fr.ird.observe.entities.referentiel.longline.StomacFullness#1429515949368#0.204060212243348",
"fr.ird.observe.entities.referentiel.longline.StomacFullness#1433499464733#0.548250555759296"
],
"referential.longline.TripType": [
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/99b151d16bccca979fc97b3cf5a…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/99b151d16bccca979fc97b3cf5a…
You're receiving this email because of your account on gitlab.com.
1
0
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
e5b394d8 by Tony CHEMIT at 2017-10-27T13:34:13+02:00
fix db name
- - - - -
6a24f3b4 by Tony CHEMIT at 2017-10-27T13:34:40+02:00
fix some replication tests on longline model + improve some other trip management stuff
- - - - -
14 changed files:
- client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java
- persistence/src/main/models/Observe.model
- services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
- services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java
- services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java
- services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java
- test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
- test/src/main/resources/db/6.0/referentiel.sql.gz
- test/src/main/resources/db/6.904/referentiel.sql.gz
Changes:
=====================================
client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java
+++ b/client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java
@@ -332,7 +332,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa
for (TripEntry tripEntry : tripEntries) {
progressModel.incrementsCurrentStep();
- ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId());
+ ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getTripId());
ExportTripResult exportTripResult = localTripManagementService.exportTrip(exportTripRequest);
logExportResult(n("observe.actions.exportData.message.result.export.trip"),
exportTripResult,
=====================================
client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java
+++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java
@@ -326,7 +326,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple
sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr));
- ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId);
+ ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), tripId);
ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest);
logExportResult(n("observe.actions.synchro.data.result.export.right.trip"),
exportTripResult,
@@ -355,7 +355,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple
sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr));
- ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId);
+ ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), tripId);
ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest);
logExportResult(n("observe.actions.synchro.data.result.export.left.trip"),
exportTripResult,
=====================================
client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java
+++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java
@@ -154,7 +154,7 @@ public class StorageBackupUILauncher extends StorageUILauncher {
for (DataDtoReference trip : entry.getValue()) {
- ExportTripRequest exportRequest = new ExportTripRequest(false, entry.getKey().getId(), trip.getId());
+ ExportTripRequest exportRequest = new ExportTripRequest(false, trip.getId());
ExportTripResult exportTripResult = managementService.exportTrip(exportRequest);
progressModel.incrementsCurrentStep();
=====================================
persistence/src/main/models/Observe.model
=====================================
--- a/persistence/src/main/models/Observe.model
+++ b/persistence/src/main/models/Observe.model
@@ -264,7 +264,7 @@ sensorType {*:1} referentiel.longline.SensorType
sensorDataFormat {*:0..1} referentiel.longline.SensorDataFormat
sensorBrand {*:1} referentiel.longline.SensorBrand
-longline.SetLonglineObs > CommentableEntity >> ObserveSet | entity dbName=SetObs
+longline.SetLonglineObs > CommentableEntity >> ObserveSet | entity dbName=setObs
homeId + {*:1} String
number + {*:1} Integer
basketsPerSectionCount + {*:1} Integer
=====================================
services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java
=====================================
--- a/services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java
+++ b/services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java
@@ -25,6 +25,7 @@ package fr.ird.observe.services.local.service.data;
import com.google.common.collect.ImmutableSet;
import fr.ird.observe.dto.IdHelper;
import fr.ird.observe.dto.db.ObserveBlobsContainer;
+import fr.ird.observe.entities.Trip;
import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
import fr.ird.observe.services.local.ObserveServiceContextLocal;
import fr.ird.observe.services.local.service.ObserveServiceLocal;
@@ -87,7 +88,9 @@ public class TripManagementServiceLocal extends ObserveServiceLocal implements T
long time = System.nanoTime() - t0;
- return new ExportTripResult(exportRequest, tripContent, blobsContainers, time);
+ Trip trip = getTopiaPersistenceContext().findByTopiaId(tripId);
+ String programId = trip.getProgram().getTopiaId();
+ return new ExportTripResult(exportRequest, programId,tripContent, blobsContainers, time);
}
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
@@ -46,6 +46,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Assert;
import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest;
+import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument;
import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTable;
import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
import org.nuiton.util.StringUtil;
@@ -140,4 +141,15 @@ class ReplicateTestSupport extends ServiceTestSupport {
}
+ protected void testReplicate(TopiaSqlTables tables, ImmutableMap<String, Long> expectedTablesCount, Iterable<String> tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException {
+
+ ReplicateTablesRequest request
+ = createReplicateTablesRequest(DatabaseName.referentiel)
+ .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds))
+ .setTables(tables)
+ .build();
+
+ testReplicate0(request, expectedTablesCount);
+
+ }
}
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
@@ -22,71 +22,48 @@ package fr.ird.observe.entity;
* #L%
*/
-import com.google.common.collect.ImmutableMap;
-import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException;
-import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException;
-import fr.ird.observe.services.service.BabModelVersionException;
-import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
-import fr.ird.observe.services.service.DatabaseNotFoundException;
+import fr.ird.observe.dto.data.longline.TripLonglineDto;
import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.test.ObserveFixtures;
-import java.io.IOException;
-import org.junit.Ignore;
+import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.junit.Test;
-import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest;
-import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument;
import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
/**
* Created on 29/12/15.
*
* @author Tony Chemit - dev(a)tchemit.fr
- * FIXME Review database, there is some missing in new referential, so it does not work.
*/
-@Ignore
@DatabaseNameConfiguration(DatabaseName.dataForTestLongline)
public class ReplicateTripLonglineTest extends ReplicateTestSupport {
- @Test
- public void testReplicateAllTripLongline() throws Exception {
- testReplicate(ObserveFixtures.ALL_TRIP_LONGLINE_COUNT);
- }
-
- @Test
- public void testReplicateAllTripLongline2() throws Exception {
- testReplicate(ObserveFixtures.ALL_TRIP_LONGLINE_COUNT,
- ObserveFixtures.TRIP_LONGLINE_ID_1,
- ObserveFixtures.TRIP_LONGLINE_ID_2,
- ObserveFixtures.TRIP_LONGLINE_ID_3);
- }
+ /** Logger. */
+ private static final Log log = LogFactory.getLog(ReplicateTripLonglineTest.class);
@Test
- public void testReplicateTripLonline1() throws Exception {
- testReplicate(ObserveFixtures.TRIP_LONGLINE_1_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_1);
- }
-
- @Test
- public void testReplicateTripLonline2() throws Exception {
- testReplicate(ObserveFixtures.TRIP_LONGLINE_2_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_2);
- }
-
- @Test
- public void testReplicateTripLonline3() throws Exception {
- testReplicate(ObserveFixtures.TRIP_LONGLINE_3_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_3);
- }
-
- protected void testReplicate(ImmutableMap<String, Long> expectedTablesCount, String... tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException {
-
+ public void testReplicate() throws Exception {
+ Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class);
+ log.info(String.format("will replicate %d trip(s).", ids.size()));
TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripLonglineTables();
- ReplicateTablesRequest request
- = createReplicateTablesRequest(DatabaseName.referentiel)
- .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds))
- .setTables(tables)
- .build();
-
- testReplicate0(request, expectedTablesCount);
-
+ testReplicate(tables, ObserveFixtures.ALL_TRIP_LONGLINE_COUNT, ids);
}
+// @Test
+// public void testReplicateTripLonline1() throws Exception {
+// testReplicate(ObserveFixtures.TRIP_LONGLINE_1_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_1);
+// }
+//
+// @Test
+// public void testReplicateTripLonline2() throws Exception {
+// testReplicate(ObserveFixtures.TRIP_LONGLINE_2_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_2);
+// }
+//
+// @Test
+// public void testReplicateTripLonline3() throws Exception {
+// testReplicate(ObserveFixtures.TRIP_LONGLINE_3_TABLES_COUNT, ObserveFixtures.TRIP_LONGLINE_ID_3);
+// }
+
}
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
@@ -22,13 +22,14 @@ package fr.ird.observe.entity;
* #L%
*/
-import com.google.common.collect.ImmutableMap;
+import fr.ird.observe.dto.data.seine.TripSeineDto;
import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.test.ObserveFixtures;
+import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.junit.Test;
-import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest;
-import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument;
import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
/**
@@ -38,47 +39,30 @@ import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
*/
@DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
public class ReplicateTripSeineTest extends ReplicateTestSupport {
+ /** Logger. */
+ private static final Log log = LogFactory.getLog(ReplicateTripSeineTest.class);
@Test
- public void testReplicateAllTripSeine() throws Exception {
- testReplicate(ObserveFixtures.ALL_TRIP_SEINE_COUNT);
- }
-
- @Test
- public void testReplicateTripSeine1() throws Exception {
- testReplicate(ObserveFixtures.TRIP_SEINE_1_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_1);
- }
-
- @Test
- public void testReplicateAllTripSeine2() throws Exception {
- testReplicate(ObserveFixtures.ALL_TRIP_SEINE_COUNT,
- ObserveFixtures.TRIP_SEINE_ID_1,
- ObserveFixtures.TRIP_SEINE_ID_2,
- ObserveFixtures.TRIP_SEINE_ID_3);
- }
-
- @Test
- public void testReplicateTripSeine2() throws Exception {
- testReplicate(ObserveFixtures.TRIP_SEINE_2_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_2);
- }
-
- @Test
- public void testReplicateTripSeine3() throws Exception {
- testReplicate(ObserveFixtures.TRIP_SEINE_3_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_3);
- }
-
- protected void testReplicate(ImmutableMap<String, Long> expectedTablesCount, String... tripIds) throws Exception {
-
+ public void testReplicate() throws Exception {
+ Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class);
+ log.info(String.format("will replicate %d trip(s).", ids.size()));
TopiaSqlTables tables = getTestMethodResource().getTopiaApplicationContext().getTripSeineTables();
-
- ReplicateTablesRequest request
- = createReplicateTablesRequest(DatabaseName.referentiel)
- .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds))
- .setTables(tables)
- .build();
-
- testReplicate0(request, expectedTablesCount);
-
+ testReplicate(tables, ObserveFixtures.ALL_TRIP_SEINE_COUNT, ids);
}
+// @Test
+// public void testReplicateTripSeine1() throws Exception {
+// testReplicate(ObserveFixtures.TRIP_SEINE_1_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_1);
+// }
+//
+// @Test
+// public void testReplicateTripSeine2() throws Exception {
+// testReplicate(ObserveFixtures.TRIP_SEINE_2_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_2);
+// }
+//
+// @Test
+// public void testReplicateTripSeine3() throws Exception {
+// testReplicate(ObserveFixtures.TRIP_SEINE_3_TABLES_COUNT, ObserveFixtures.TRIP_SEINE_ID_3);
+// }
+
}
=====================================
services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java
@@ -22,6 +22,9 @@ package fr.ird.observe.services.service.data;
* #L%
*/
+import fr.ird.observe.dto.data.longline.TripLonglineDto;
+import fr.ird.observe.dto.data.longline.TripLonglineReference;
+import fr.ird.observe.dto.data.seine.TripSeineDto;
import fr.ird.observe.dto.data.seine.TripSeineReference;
import fr.ird.observe.dto.reference.DataDtoReferenceSet;
import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto;
@@ -41,6 +44,7 @@ import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.test.ObserveFixtures;
+import java.util.Set;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -54,19 +58,24 @@ public class TripManagementServiceTest extends ServiceTestSupport {
private TripManagementService tripManagementService;
private TripSeineService tripSeineService;
+ private TripLonglineService tripLonglineService;
@Before
public void setUp() throws Exception {
tripManagementService = getTestMethodResource().newService(TripManagementService.class);
tripSeineService = getTestMethodResource().newService(TripSeineService.class);
+ tripLonglineService = getTestMethodResource().newService(TripLonglineService.class);
}
@DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
@Test
public void exportTripSeine() {
- ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1);
- ExportTripResult result = tripManagementService.exportTrip(request);
- Assert.assertNotNull(result);
+ Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class);
+ for (String id : ids) {
+ ExportTripRequest request = new ExportTripRequest(false, id);
+ ExportTripResult result = tripManagementService.exportTrip(request);
+ Assert.assertNotNull(result);
+ }
}
@DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
@@ -74,64 +83,93 @@ public class TripManagementServiceTest extends ServiceTestSupport {
@Test
public void deleteTripSeine() {
- DataDtoReferenceSet<TripSeineReference> allTripSeineBefore = tripSeineService.getAllTripSeine();
+ Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class);
+ for (String id : ids) {
- DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1);
- DeleteTripResult result = tripManagementService.deleteTrip(request);
- Assert.assertNotNull(result);
+ DataDtoReferenceSet<TripSeineReference> allTripBefore = tripSeineService.getAllTripSeine();
+ DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, id);
+ DeleteTripResult result = tripManagementService.deleteTrip(request);
+ Assert.assertNotNull(result);
- DataDtoReferenceSet<TripSeineReference> allTripSeineAfter = tripSeineService.getAllTripSeine();
- Assert.assertTrue(allTripSeineBefore.size() == allTripSeineAfter.size() + 1);
+ DataDtoReferenceSet<TripSeineReference> allTripAfter = tripSeineService.getAllTripSeine();
+ Assert.assertTrue(allTripBefore.size() == allTripAfter.size() + 1);
+ }
}
@DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
@CopyDatabaseConfiguration
@Test
public void importTripSeine() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException {
-
- ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1);
- importTrip(request, true);
-
+ Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripSeineDto.class);
+ importTrip(true, ids);
}
- // FIXME Le test met 6 minutes, comprendre pourquoi l'import est aussi long (environ 18000 branchlines)
-// @Ignore
@DatabaseNameConfiguration(DatabaseName.dataForTestLongline)
@CopyDatabaseConfiguration
@Test
public void importTripLongline() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException {
+ Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class);
+ importTrip(false, ids);
+ }
+
+ @DatabaseNameConfiguration(DatabaseName.dataForTestLongline)
+ @CopyDatabaseConfiguration
+ @Test
+ public void deleteTripLongline() {
+ Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class);
+ for (String id : ids) {
+ DataDtoReferenceSet<TripLonglineReference> allTripBefore = tripLonglineService.getAllTripLongline();
+
+ DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, id);
+ DeleteTripResult result = tripManagementService.deleteTrip(request);
+ Assert.assertNotNull(result);
- ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_LONGLINE_ID_1);
- importTrip(request, false);
+ DataDtoReferenceSet<TripLonglineReference> allTripAfter = tripLonglineService.getAllTripLongline();
+ Assert.assertTrue(allTripBefore.size() == allTripAfter.size() + 1);
+ }
+ }
+ @DatabaseNameConfiguration(DatabaseName.dataForTestLongline)
+ @Test
+ public void exportTripLongline() {
+ Set<String> ids = getTestMethodResource().getDatabaseFixtures().ids(TripLonglineDto.class);
+ for (String id : ids) {
+ ExportTripRequest request = new ExportTripRequest(false, id);
+ ExportTripResult result = tripManagementService.exportTrip(request);
+ Assert.assertNotNull(result);
+ }
}
- private void importTrip(ExportTripRequest request, boolean forSeine) throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException {
- ExportTripResult result = tripManagementService.exportTrip(request);
+ private void importTrip(boolean forSeine, Set<String> ids) throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException {
- ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = getTestMethodResource().createDataSourceConfigurationH2(getClass(), "importTripTarget");
+ ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = getTestMethodResource().createDataSourceConfigurationH2(getClass(), "importTripTarget" + forSeine);
try (DataSourceService dataSourceService = getTestClassResource().newService(dataSourceConfiguration, DataSourceService.class)) {
DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto();
dataSourceCreateConfiguration.setImportReferentialDataSourceConfiguration(getTestMethodResource().getDataSourceConfiguration());
-
+ dataSourceCreateConfiguration.setLeaveOpenSource(true);
ObserveDataSourceConnection dataSourceConnection = dataSourceService.create(dataSourceConfiguration, dataSourceCreateConfiguration);
dataSourceConnection = new ObserveDataSourceConnectionTopiaForTest(dataSourceConnection.getAuthenticationToken());
-
TripManagementService tripManagementService = getTestClassResource().newService(dataSourceConnection, TripManagementService.class);
TripSeineService tripSeineService = getTestClassResource().newService(dataSourceConnection, TripSeineService.class);
TripLonglineService tripLonglineService = getTestClassResource().newService(dataSourceConnection, TripLonglineService.class);
- int allTripSeineBefore = forSeine ? tripSeineService.getAllTripSeine().size() :
+ int allTripBefore = forSeine ? tripSeineService.getAllTripSeine().size() :
tripLonglineService.getAllTripLongline().size();
- tripManagementService.importTrip(new ImportTripRequest(result));
+ for (String id : ids) {
- int allTripSeineAfter = forSeine ? tripSeineService.getAllTripSeine().size() :
- tripLonglineService.getAllTripLongline().size();
- Assert.assertTrue(allTripSeineAfter == allTripSeineBefore + 1);
+ ExportTripRequest request = new ExportTripRequest(false, id);
+ ExportTripResult result = this.tripManagementService.exportTrip(request);
+
+ tripManagementService.importTrip(new ImportTripRequest(result));
+
+ int allTripAfter = forSeine ? tripSeineService.getAllTripSeine().size() :
+ tripLonglineService.getAllTripLongline().size();
+ Assert.assertEquals(allTripAfter, ++allTripBefore);
+ }
}
=====================================
services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java
=====================================
--- a/services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java
+++ b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java
@@ -33,12 +33,10 @@ import fr.ird.observe.dto.ObserveDto;
public class ExportTripRequest implements ObserveDto {
private final boolean forPG;
- private final String programId;
private final String tripId;
- public ExportTripRequest(boolean forPG, String programId, String tripId) {
+ public ExportTripRequest(boolean forPG, String tripId) {
this.forPG = forPG;
- this.programId = programId;
this.tripId = tripId;
}
@@ -46,10 +44,6 @@ public class ExportTripRequest implements ObserveDto {
return forPG;
}
- public String getProgramId() {
- return programId;
- }
-
public String getTripId() {
return tripId;
}
=====================================
services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java
=====================================
--- a/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java
+++ b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java
@@ -41,10 +41,10 @@ public class ExportTripResult implements ObserveDto {
private final long time;
public ExportTripResult(ExportTripRequest request,
- byte[] sqlContent,
+ String programId, byte[] sqlContent,
ImmutableSet<ObserveBlobsContainer> blobsContainers,
long time) {
- this.programId = request.getProgramId();
+ this.programId = programId;
this.tripId = request.getTripId();
this.sqlContent = sqlContent;
this.blobsContainers = blobsContainers;
=====================================
test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
=====================================
--- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
+++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
@@ -94,19 +94,19 @@ public class ObserveFixtures {
.put("observe_common.lengthlengthparameter", 0L)
.put("observe_common.lengthweightparameter", 365L)
.put("observe_common.ocean", 3L)
- .put("observe_common.ocean_species", 500L)
+ .put("observe_common.ocean_species", 517L)
.put("observe_common.organism", 9L)
- .put("observe_common.person", 512L)
+ .put("observe_common.person", 514L)
.put("observe_common.program", 27L)
.put("observe_common.shipOwner", 27L)
- .put("observe_common.sex", 5L)
- .put("observe_common.sizemeasuretype", 17L)
- .put("observe_common.species", 285L)
- .put("observe_common.species_specieslist", 401L)
+ .put("observe_common.shipowner", 27L)
+ .put("observe_common.sizemeasuretype", 24L)
+ .put("observe_common.species", 294L)
+ .put("observe_common.species_specieslist", 410L)
.put("observe_common.speciesgroup", 11L)
- .put("observe_common.speciesgroupreleasemode", 10L)
+ .put("observe_common.speciesgroup_speciesgroupreleasemode", 20L)
.put("observe_common.specieslist", 6L)
- .put("observe_common.vessel", 1172L)
+ .put("observe_common.vessel", 1175L)
.put("observe_common.vesselsizecategory", 13L)
.put("observe_common.vesseltype", 14L)
.put("observe_common.weightmeasuretype", 3L)
@@ -135,13 +135,13 @@ public class ObserveFixtures {
private static final ImmutableMap<String, Long> REFERENTIAL_LONGLINE_TABLES_COUNT = ImmutableMap
.<String, Long>builder()
.put("observe_longline.baithaulingstatus", 5L)
- .put("observe_longline.baitsettingstatus", 5L)
- .put("observe_longline.baittype", 16L)
- .put("observe_longline.catchfate", 5L)
+ .put("observe_longline.baitsettingstatus", 6L)
+ .put("observe_longline.baittype", 17L)
+ .put("observe_longline.catchfate", 6L)
.put("observe_longline.encountertype", 12L)
.put("observe_longline.healthness", 6L)
.put("observe_longline.hookposition", 13L)
- .put("observe_longline.hooksize", 22L)
+ .put("observe_longline.hooksize", 23L)
.put("observe_longline.hooktype", 13L)
.put("observe_longline.itemverticalposition", 3L)
.put("observe_longline.itemhorizontalposition", 3L)
@@ -153,8 +153,8 @@ public class ObserveFixtures {
.put("observe_longline.sensorbrand", 4L)
.put("observe_longline.sensordataformat", 2L)
.put("observe_longline.sensortype", 4L)
- .put("observe_longline.settingshape", 6L)
- .put("observe_longline.stomacfullness", 7L)
+ .put("observe_longline.settingshape", 7L)
+ .put("observe_longline.stomacfullness", 8L)
.put("observe_longline.triptype", 3L)
.put("observe_longline.vesselactivity", 5L)
.build();
@@ -307,7 +307,7 @@ public class ObserveFixtures {
.put("observe_longline.basket", 3229L)
.put("observe_longline.branchline", 19374L)
.put("observe_longline.catch", 677L)
- .put("observe_longline.mitigationtype_set", 0L)
+ .put("observe_longline.mitigationtype_setobs", 0L)
.put("observe_longline.sizemeasure", 647L)
.put("observe_longline.weightmeasure", 0L)
.put("observe_longline.catch_predator", 25L)
=====================================
test/src/main/resources/db/6.0/referentiel.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.0/referentiel.sql.gz and b/test/src/main/resources/db/6.0/referentiel.sql.gz differ
=====================================
test/src/main/resources/db/6.904/referentiel.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.904/referentiel.sql.gz and b/test/src/main/resources/db/6.904/referentiel.sql.gz differ
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bb2a1aac2e3a2dade97d389157…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bb2a1aac2e3a2dade97d389157…
You're receiving this email because of your account on gitlab.com.
1
0
25 Oct '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
bb2a1aac by Tony CHEMIT at 2017-10-25T18:59:03+02:00
reformat test + improve code
- - - - -
17 changed files:
- services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
- services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidatorMapBuilderTest.java
- services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java
- services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineObsDetailCompositionServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/data/seine/RouteServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineTargetSampleServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java
- services-test/src/main/java/fr/ird/observe/services/test/TestMethodResourceSupport.java
Changes:
=====================================
services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java
+++ b/services-client/src/test/java/fr/ird/observe/services/test/ServiceClientTestClassResource.java
@@ -30,7 +30,6 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration;
import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest;
import fr.ird.observe.services.service.ObserveService;
-import fr.ird.observe.services.test.TestClassResourceSupport;
import fr.ird.observe.services.test.spi.DatabaseClassifier;
import java.io.IOException;
import java.net.URL;
@@ -88,11 +87,11 @@ public class ServiceClientTestClassResource extends TestClassResourceSupport {
}
public ObserveDataSourceConfigurationRest createDataSourceConfigurationRest(Class<?> testClass,
- String databaseName,
- Version dbVersion,
- URL serverUrl,
- String login,
- char... password) {
+ String databaseName,
+ Version dbVersion,
+ URL serverUrl,
+ String login,
+ char... password) {
ObserveDataSourceConfigurationRest configurationRest = new ObserveDataSourceConfigurationRest();
configurationRest.setLabel(testClass.getSimpleName() + "#" + serverUrl);
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateReferentialsTest.java
@@ -23,8 +23,8 @@ package fr.ird.observe.entity;
*/
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import org.junit.Test;
import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest;
import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables;
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripLonglineTest.java
@@ -29,8 +29,8 @@ import fr.ird.observe.services.service.BabModelVersionException;
import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import java.io.IOException;
import org.junit.Ignore;
import org.junit.Test;
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTripSeineTest.java
@@ -24,8 +24,8 @@ package fr.ird.observe.entity;
import com.google.common.collect.ImmutableMap;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import org.junit.Test;
import org.nuiton.topia.service.sql.batch.actions.ReplicateTablesRequest;
import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument;
=====================================
services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidatorMapBuilderTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidatorMapBuilderTest.java
+++ b/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidatorMapBuilderTest.java
@@ -23,8 +23,8 @@ package fr.ird.observe.services.local.service.actions.validate;
*/
import fr.ird.observe.services.service.actions.validate.ValidateService;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.validation.ValidatorsMap;
+import fr.ird.observe.test.ObserveFixtures;
import java.util.Arrays;
import java.util.List;
import org.junit.Assert;
=====================================
services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java
+++ b/services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java
@@ -34,10 +34,10 @@ import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.ServiceLocalTestClassResource;
import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
import fr.ird.observe.services.test.ServiceTestSupport;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.spi.context.DataDtoEntityContext;
import fr.ird.observe.spi.context.ReferentialDtoEntityContext;
+import fr.ird.observe.test.ObserveFixtures;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
=====================================
services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java
@@ -24,9 +24,9 @@ package fr.ird.observe.services.service.actions.report;
import fr.ird.observe.dto.reference.DtoReference;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import java.io.IOException;
import java.net.URL;
import java.util.List;
=====================================
services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java
@@ -95,10 +95,10 @@ import fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeDto;
import fr.ird.observe.dto.referential.seine.VesselActivitySeineDto;
import fr.ird.observe.dto.referential.seine.WeightCategoryDto;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.spi.DtoModelClasses;
+import fr.ird.observe.test.ObserveFixtures;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
=====================================
services-test/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineObsDetailCompositionServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineObsDetailCompositionServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineObsDetailCompositionServiceTest.java
@@ -40,10 +40,10 @@ import fr.ird.observe.entities.longline.SetLonglineObs;
import fr.ird.observe.services.action.LoadFormRequestDto;
import fr.ird.observe.services.action.SaveRequestDto;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
=====================================
services-test/src/main/java/fr/ird/observe/services/service/data/seine/RouteServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/data/seine/RouteServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/data/seine/RouteServiceTest.java
@@ -26,9 +26,9 @@ import fr.ird.observe.dto.data.seine.RouteDto;
import fr.ird.observe.dto.form.Form;
import fr.ird.observe.services.action.PreCreateFormRequestDto;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
=====================================
services-test/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineTargetSampleServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineTargetSampleServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineTargetSampleServiceTest.java
@@ -28,9 +28,9 @@ import fr.ird.observe.dto.data.seine.TargetSampleDto;
import fr.ird.observe.dto.form.Form;
import fr.ird.observe.services.action.LoadFormRequestDto;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
=====================================
services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseServiceTest.java
@@ -34,10 +34,10 @@ import fr.ird.observe.entities.seine.TripSeine;
import fr.ird.observe.services.action.LoadFormRequestDto;
import fr.ird.observe.services.action.SaveRequestDto;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
=====================================
services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java
@@ -41,10 +41,10 @@ import fr.ird.observe.services.service.ConcurrentModificationException;
import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import java.util.Calendar;
import java.util.Date;
import org.junit.Assert;
=====================================
services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java
@@ -40,7 +40,6 @@ import fr.ird.observe.services.test.DatabaseFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.spi.DtoModelClasses;
-import fr.ird.observe.spi.DtoModelHelper;
import fr.ird.observe.spi.map.ImmutableDtoMap;
import java.io.IOException;
import java.util.Date;
@@ -90,7 +89,7 @@ public class ReferentialServiceTest extends ServiceTestSupport {
@Test
public void testGetTripSeineRequest() throws Exception {
- FormDefinition<TripSeineDto> dataDefinition = DtoModelHelper.<TripSeineDto>getOptionalFormDefinition(TripSeineDto.class).orElseThrow(IllegalAccessException::new);
+ FormDefinition<TripSeineDto> dataDefinition = TripSeineDto.formDefinition();
Class<TripSeineDto> requestName = dataDefinition.getType();
//FIXME
@@ -131,7 +130,7 @@ public class ReferentialServiceTest extends ServiceTestSupport {
}
-// FIXME!!! Coming from rest See what is going on ?
+ // FIXME!!! Coming from rest See what is going on ?
@Ignore
@Test
public void testGetPrograms() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, CloneNotSupportedException, BabModelVersionException {
=====================================
services-test/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerServiceTest.java
@@ -25,9 +25,9 @@ package fr.ird.observe.services.service.sql;
import com.google.common.collect.ImmutableSet;
import fr.ird.observe.dto.referential.ProgramReference;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
=====================================
services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java
+++ b/services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java
@@ -86,6 +86,7 @@ public class ObserveTestResources {
public static URL getResourceContentUrl(String scriptPath) throws IOException {
return ObserveTestResources.class.getResource(scriptPath);
}
+
public static byte[] getResourceContent(String scriptPath) throws IOException {
URL url = getResourceContentUrl(scriptPath);
=====================================
services-test/src/main/java/fr/ird/observe/services/test/TestMethodResourceSupport.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/test/TestMethodResourceSupport.java
+++ b/services-test/src/main/java/fr/ird/observe/services/test/TestMethodResourceSupport.java
@@ -242,7 +242,7 @@ public abstract class TestMethodResourceSupport implements TestRule {
if (referentialCache != null) {
referentialCache.close();
}
-
+
getTestClassResource().setTemporaryDirectoryRoot(null);
}
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb2a1aac2e3a2dade97d3891576…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb2a1aac2e3a2dade97d3891576…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] fix isolation on services tests, happy to get back it works as it was before refactor \o/
by Tony CHEMIT 25 Oct '17
by Tony CHEMIT 25 Oct '17
25 Oct '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
3933f93e by Tony CHEMIT at 2017-10-25T18:28:23+02:00
fix isolation on services tests, happy to get back it works as it was before refactor \o/
- - - - -
5 changed files:
- services-test/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java
- services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java
- services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java
- services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java
Changes:
=====================================
services-test/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTest.java
@@ -28,6 +28,7 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.ServiceTestSupport;
+import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import java.util.Set;
import org.junit.Assert;
@@ -49,6 +50,7 @@ public class ConsolidateDataServiceTest extends ServiceTestSupport {
}
@DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
+ @CopyDatabaseConfiguration
@Test
public void testConsolidateTripSeine() {
=====================================
services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java
@@ -42,7 +42,6 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
int row = 0;
-// FIXME!!! Certaines valeurs ont changé comprendre pk ?
assertResultRow(result, row++, "[FAO]LUK [sc]Selene dorsalis [fr]Selene dorsalis", "-", "-");
assertResultRow(result, row++, "[FAO]ETA [sc]Etelis carbunculus [fr]Vivaneau rubis", "-", "-");
assertResultRow(result, row++, "[FAO]BAB [sc]Sphyraena qenie [fr]Barracuda à queue noire", "-", "-");
@@ -58,8 +57,8 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
assertResultRow(result, row++, "[FAO]BVP [sc]Balistes punctatus [fr]Baliste à taches bleues", "-", "-");
assertResultRow(result, row++, "[FAO]BAR [sc]Sphyraena spp [fr]Barracudas nca", "-", "-");
assertResultRow(result, row++, "[FAO]ALN [sc]Aluterus scriptus [fr]Bourse écriture", "+ Effectif : 1 Poids total (t) : 0.00050", "-");
- assertResultRow(result, row++, "[FAO]ALM [sc]Aluterus monoceros [fr]Bourse loulou", "-", "+ Effectif : 16 Poids total (t) : 0.01120");
- assertResultRow(result, row++, "[FAO]CNT [sc]Canthidermis maculata [fr]Baliste rude", "+ Effectif : 2 Poids total (t) : 0.00140", "+ Effectif : 2230 Poids total (t) : 1.5610");
+ assertResultRow(result, row++, "[FAO]ALM [sc]Aluterus monoceros [fr]Bourse loulou", "-", "+ Effectif : 16 Poids total (t) : 0.01060");
+ assertResultRow(result, row++, "[FAO]CNT [sc]Canthidermis maculata [fr]Baliste rude", "+ Effectif : 2 Poids total (t) : 0.00134", "+ Effectif : 2230 Poids total (t) : 1.49359");
assertResultRow(result, row++, "[FAO]BAF [sc]Ablennes hians [fr]Orphie plate ", "-", "-");
assertResultRow(result, row++, "[FAO]BIS [sc]Selar crumenophthalmus [fr]Sélar coulisou (Pêche-cavale)", "-", "-");
assertResultRow(result, row++, "[FAO]BON [sc]Sarda sarda [fr]Bonite à dos rayé", "-", "+ Effectif : 11");
@@ -69,11 +68,11 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
assertResultRow(result, row++, "[FAO]CAQ [sc]Catharacta lonnbergi [fr]Labbe brun", "-", "-");
assertResultRow(result, row++, "[FAO]CBG [sc]Cubiceps gracilis [fr]Libine", "-", "-");
assertResultRow(result, row++, "[FAO]DVH [sc]Cyclichthys orbicularis [fr]Cyclichthys orbicularis", "-", "-");
- assertResultRow(result, row++, "[FAO]MSD [sc]Decapterus macarellus [fr]Comète maquereau ", "+ Effectif : 47 Poids total (t) : 0.00235", "+ Effectif : 6 Poids total (t) : 0.0024");
+ assertResultRow(result, row++, "[FAO]MSD [sc]Decapterus macarellus [fr]Comète maquereau ", "+ Effectif : 47 Poids total (t) : 0.0024", "+ Effectif : 6 Poids total (t) : 0.0027");
assertResultRow(result, row++, "[FAO]CLP [sc]Clupeidae [fr]Famille Clupeidae", "-", "-");
assertResultRow(result, row++, "[FAO]NXU [sc]Caranx lugubris [fr]Carangue noire", "-", "-");
assertResultRow(result, row++, "[FAO]CFW [sc]Coryphaena equiselis [fr]Coryphène dauphin", "+ Effectif : 2 Poids total (t) : 0.008", "-");
- assertResultRow(result, row++, "[FAO]DOL [sc]Coryphaena hippurus [fr]Coryphène commun", "+ Effectif : 5 Poids total (t) : 0.03824", "+ Effectif : 107 Poids total (t) : 0.5774");
+ assertResultRow(result, row++, "[FAO]DOL [sc]Coryphaena hippurus [fr]Coryphène commun", "+ Effectif : 5 Poids total (t) : 0.03824", "+ Effectif : 107 Poids total (t) : 0.57632");
assertResultRow(result, row++, "[FAO]NGT [sc]Carangoides orthogrammus [fr]Carangue des îles ", "-", "-");
assertResultRow(result, row++, "[FAO]CXS [sc]Caranx sexfasciatus [fr]Carangue vorace ", "-", "+ Effectif : 22 Poids total (t) : 0.01100");
assertResultRow(result, row++, "[FAO]RUB [sc]Caranx crysos [fr]Carangue coubali", "-", "-");
@@ -85,7 +84,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
assertResultRow(result, row++, "[FAO]DIO [sc]Diodontidae [fr]Famille Diodontidae", "+ Effectif : 1 Poids total (t) : 0.00050", "-");
assertResultRow(result, row++, "[FAO]3DEY [sc]Diodon eydouxii [fr]Porc-épic", "-", "-");
assertResultRow(result, row++, "[FAO]EHN [sc]Echeneis naucrates [fr]Rémora commun ", "+ Effectif : 7 Poids total (t) : 0.00350", "-");
- assertResultRow(result, row++, "[FAO]RRU [sc]Elagatis bipinnulata [fr]Comète saumon", "-", "+ Effectif : 211 Poids total (t) : 0.45101");
+ assertResultRow(result, row++, "[FAO]RRU [sc]Elagatis bipinnulata [fr]Comète saumon", "-", "+ Effectif : 211 Poids total (t) : 0.45108");
assertResultRow(result, row++, "[FAO]HTL [sc]Phtheirichthys lineatus [fr]Rémora ", "-", "-");
assertResultRow(result, row++, "[FAO]TRI [sc]Balistidae [fr]Famille Balistidae", "-", "-");
assertResultRow(result, row++, "[FAO]BEN [sc]Belonidae [fr]Famille Belonidae", "-", "-");
@@ -117,7 +116,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
assertResultRow(result, row++, "[FAO]LEC [sc]Lepidocybium flavobrunneum [fr]Escolier noir", "-", "-");
assertResultRow(result, row++, "[FAO]LFX [sc]Lagocephalus spp [fr]Lagocephalus spp", "-", "-");
assertResultRow(result, row++, "[FAO]LGH [sc]Lagocephalus lagocephalus [fr]Compère océanique ", "-", "-");
- assertResultRow(result, row++, "[FAO]LOB [sc]Lobotes surinamensis [fr]Croupia roche ", "-", "+ Effectif : 28 Poids total (t) : 0.0676");
+ assertResultRow(result, row++, "[FAO]LOB [sc]Lobotes surinamensis [fr]Croupia roche ", "-", "+ Effectif : 28 Poids total (t) : 0.06754");
assertResultRow(result, row++, "[FAO]LOP [sc]Lophotus capellei [fr]Roi des harengs", "-", "-");
assertResultRow(result, row++, "[FAO]LVM [sc]Luvarus imperialis [fr]Luvar ", "-", "-");
assertResultRow(result, row++, "[FAO]MRW [sc]Masturus lanceolatus [fr]Poisson-lune à queue pointue", "-", "-");
@@ -151,7 +150,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
assertResultRow(result, row++, "[FAO]MAS [sc]Scomber japonicus [fr]Maquereau espagnol", "-", "-");
assertResultRow(result, row++, "[FAO]SLP [sc]Hydrurga leptonyx [fr]Léopard de mer", "-", "-");
assertResultRow(result, row++, "[FAO]SNK [sc]Thyrsites atun [fr]Escolier", "-", "-");
- assertResultRow(result, row++, "[FAO]GBA [sc]Sphyraena barracuda [fr]Barracuda", "-", "+ Effectif : 26 Poids total (t) : 0.1124");
+ assertResultRow(result, row++, "[FAO]GBA [sc]Sphyraena barracuda [fr]Barracuda", "-", "+ Effectif : 26 Poids total (t) : 0.11222");
assertResultRow(result, row++, "[FAO]BAZ [sc]Sphyraenidae [fr]Famille Sphyraenidae", "-", "-");
assertResultRow(result, row++, "[FAO]SQC [sc]Loligo spp [fr]Calmars Loligo nca", "-", "-");
assertResultRow(result, row++, "[FAO]MAC [sc]Scomber scombrus [fr]Maquereau commun", "-", "-");
@@ -169,7 +168,7 @@ public class ReportAccessoryCatch2Test extends ReportAccessoryCatchTest {
assertResultRow(result, row++, "[FAO]URU [sc]Uraspis uraspis [fr]Carangue paia ", "-", "-");
assertResultRow(result, row++, "[FAO]VLF* [sc]Very long fish nei [fr]Très longs poissons nca", "-", "-");
assertResultRow(result, row++, "[FAO]VVL* [sc]Very very long fish nei [fr]Très très longs poissons nca", "-", "-");
- assertResultRow(result, row++, "[FAO]WAH [sc]Acanthocybium solandri [fr]Thazard bâtard", "-", "+ Effectif : 90 Poids total (t) : 0.6783");
+ assertResultRow(result, row++, "[FAO]WAH [sc]Acanthocybium solandri [fr]Thazard bâtard", "-", "+ Effectif : 90 Poids total (t) : 0.6800");
assertResultRow(result, row++, "[FAO]9XXX [sc]Indéterminé [fr]Indéterminé", "-", "-");
assertResultRow(result, row++, "[FAO]XXX* [sc] [fr]", "-", "-");
assertResultRow(result, row++, "[FAO]YMO [sc]Sthenoteuthis oualaniensis [fr]Encornet bande violette", "-", "-");
=====================================
services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java
@@ -103,10 +103,8 @@ public class ReportAccessoryCatchTest extends AbstractReportServiceTest {
assertResultRow(result, row++, "[FAO]CCE [sc]Carcharhinus leucas [fr]Requin-bouledogue", "-", "-");
assertResultRow(result, row++, "[FAO]CCL [sc]Carcharhinus limbatus [fr]Requin bordé", "-", "-");
assertResultRow(result, row++, "[FAO]CCP [sc]Carcharhinus plumbeus [fr]Requin gris", "-", "-");
-// FIXME!!! Ca change ???
- assertResultRow(result, row++, "[FAO]FAL [sc]Carcharhinus falciformis [fr]Requin soyeux", "-", "+ Effectif : 17 Poids total (t) : 0.1751");
-// FIXME!!! Ca change ???
- assertResultRow(result, row++, "[FAO]OCS [sc]Carcharhinus longimanus [fr]Requin océanique", "+ Effectif : 1 Poids total (t) : 0.0446", "-");
+ assertResultRow(result, row++, "[FAO]FAL [sc]Carcharhinus falciformis [fr]Requin soyeux", "-", "+ Effectif : 17 Poids total (t) : 0.1753");
+ assertResultRow(result, row++, "[FAO]OCS [sc]Carcharhinus longimanus [fr]Requin océanique", "+ Effectif : 1 Poids total (t) : 0.0447", "-");
assertResultRow(result, row++, "[FAO]CWZ [sc]Carcharhinus spp [fr]Requins Carcharhinus nca", "-", "-");
assertResultRow(result, row++, "[FAO]DUS [sc]Carcharhinus obscurus [fr]Requin sombre", "-", "-");
assertResultRow(result, row++, "[FAO]SHL [sc]Etmopterus spp [fr]Genre Etmopterus", "-", "-");
=====================================
services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java
@@ -295,9 +295,7 @@ public class ValidateServiceTest extends ServiceTestSupport {
assertValidateResult(result, TransmittingBuoyDto.class, 1);
assertValidateResult(result, SetSeineDto.class, 3);
assertValidateResult(result, NonTargetCatchDto.class, 2);
-// FIXME!!! fr.ird.observe.entities.seine.NonTargetLength#1361823413607#0.2806937404765002 On a une erreur non connue avant
-// FIXME!!! Le poids pour cette espèce doit être compris entre 8.0 et 600.0.
- assertValidateResult(result, NonTargetLengthDto.class, 7); // 1009 !!!
+ assertValidateResult(result, NonTargetLengthDto.class, 6); // 1009 !!!
assertValidateResult(result, TargetLengthDto.class, 1); // 85 !!!
assertValidateResult(result, FloatingObjectDto.class, 1);
=====================================
services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java
=====================================
--- a/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java
+++ b/services-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceTest.java
@@ -37,13 +37,12 @@ import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.service.data.longline.TripLonglineService;
import fr.ird.observe.services.service.data.seine.TripSeineService;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -51,7 +50,6 @@ import org.junit.Test;
*
* @author Tony Chemit - dev(a)tchemit.fr
*/
-(a)DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
public class TripManagementServiceTest extends ServiceTestSupport {
private TripManagementService tripManagementService;
@@ -63,16 +61,18 @@ public class TripManagementServiceTest extends ServiceTestSupport {
tripSeineService = getTestMethodResource().newService(TripSeineService.class);
}
+ @DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
@Test
- public void exportTrip() {
+ public void exportTripSeine() {
ExportTripRequest request = new ExportTripRequest(false, ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1);
ExportTripResult result = tripManagementService.exportTrip(request);
Assert.assertNotNull(result);
}
+ @DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
@CopyDatabaseConfiguration
@Test
- public void deleteTrip() {
+ public void deleteTripSeine() {
DataDtoReferenceSet<TripSeineReference> allTripSeineBefore = tripSeineService.getAllTripSeine();
@@ -84,6 +84,8 @@ public class TripManagementServiceTest extends ServiceTestSupport {
Assert.assertTrue(allTripSeineBefore.size() == allTripSeineAfter.size() + 1);
}
+ @DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
+ @CopyDatabaseConfiguration
@Test
public void importTripSeine() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException {
@@ -93,8 +95,9 @@ public class TripManagementServiceTest extends ServiceTestSupport {
}
// FIXME Le test met 6 minutes, comprendre pourquoi l'import est aussi long (environ 18000 branchlines)
- @Ignore
+// @Ignore
@DatabaseNameConfiguration(DatabaseName.dataForTestLongline)
+ @CopyDatabaseConfiguration
@Test
public void importTripLongline() throws DatabaseConnexionNotAuthorizedException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException {
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3933f93eddbe67a47b8287cbbac…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3933f93eddbe67a47b8287cbbac…
You're receiving this email because of your account on gitlab.com.
1
0
25 Oct '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
480ee425 by Tony CHEMIT at 2017-10-25T15:26:25+02:00
clean service local tests
- - - - -
11 changed files:
- services-local/pom.xml
- services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java
- services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java
- services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
- services-local/src/test/java/fr/ird/observe/services/test/GenerateDatabaseFixtures.java → services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateDatabaseFixtures.java
- services-local/src/test/java/fr/ird/observe/services/test/MigrateTestsDatabases.java → services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateTestsDatabases.java
- services-local/src/test/java/fr/ird/observe/services/local/service/DataSourceServiceLocalTest.java
- services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java
- − services-local/src/test/java/fr/ird/observe/services/local/service/ServiceLocalTestSupport.java
- services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java
- services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java
Changes:
=====================================
services-local/pom.xml
=====================================
--- a/services-local/pom.xml
+++ b/services-local/pom.xml
@@ -236,15 +236,6 @@
<test>fr.ird.observe.services.local.ServiceLocalTestSuite</test>
</configuration>
</execution>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -254,7 +245,7 @@
<profiles>
<profile>
- <id>migrate-test-dbs</id>
+ <id>generate-test-dbs</id>
<build>
<defaultGoal>test</defaultGoal>
<plugins>
@@ -267,7 +258,7 @@
<goal>test</goal>
</goals>
<configuration>
- <test>fr.ird.observe.services.test.MigrateTestsDatabases</test>
+ <test>fr.ird.observe.services.fixtures.GenerateTestsDatabases</test>
</configuration>
</execution>
<execution>
@@ -285,7 +276,7 @@
</build>
</profile>
<profile>
- <id>update-test-fixtures</id>
+ <id>generate-test-fixtures</id>
<build>
<defaultGoal>test</defaultGoal>
<plugins>
@@ -298,7 +289,7 @@
<goal>test</goal>
</goals>
<configuration>
- <test>fr.ird.observe.services.test.GenerateDatabaseFixtures</test>
+ <test>fr.ird.observe.services.fixtures.GenerateDatabaseFixtures</test>
</configuration>
</execution>
<execution>
=====================================
services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java
+++ b/services-local/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java
@@ -40,15 +40,17 @@ import fr.ird.observe.entities.ObserveDataEntity;
import fr.ird.observe.entities.ObserveEntity;
import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
-import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
+import fr.ird.observe.services.test.ServiceLocalTestClassResource;
+import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.spi.DtoModelClasses;
import fr.ird.observe.spi.DtoModelHelper;
import fr.ird.observe.spi.PersistenceModelHelper;
import fr.ird.observe.spi.context.DataDtoEntityContext;
import fr.ird.observe.spi.context.ReferentialDtoEntityContext;
+import fr.ird.observe.test.ObserveFixtures;
import java.util.Collection;
import java.util.List;
import org.apache.commons.logging.Log;
@@ -64,7 +66,7 @@ import org.nuiton.topia.persistence.TopiaDao;
*
* @author Tony Chemit - dev(a)tchemit.fr
*/
-public class DecoratorServiceTest extends ServiceLocalTestSupport {
+public class DecoratorServiceTest extends ServiceTestSupport {
/** Logger. */
private static final Log log = LogFactory.getLog(DecoratorServiceTest.class);
@@ -72,6 +74,17 @@ public class DecoratorServiceTest extends ServiceLocalTestSupport {
private DecoratorService decoratorService;
private Collection<Class<? extends IdDto>> dtoTypes;
+
+ @Override
+ public ServiceLocalTestClassResource getTestClassResource() {
+ return (ServiceLocalTestClassResource) super.getTestClassResource();
+ }
+
+ @Override
+ public ServiceLocalTestMethodResource getTestMethodResource() {
+ return (ServiceLocalTestMethodResource) super.getTestMethodResource();
+ }
+
@Before
public void setUp() {
=====================================
services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/LengthWeightParemetersTest.java
@@ -34,7 +34,9 @@ import fr.ird.observe.entities.referentiel.Species;
import fr.ird.observe.entities.referentiel.SpeciesTopiaDao;
import fr.ird.observe.persistence.ObserveTopiaDaoSupplier;
import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
-import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
+import fr.ird.observe.services.test.ServiceLocalTestClassResource;
+import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import java.util.Date;
import java.util.Optional;
@@ -51,13 +53,24 @@ import org.nuiton.util.DateUtil;
* @author Tony Chemit - dev(a)tchemit.fr
* @since 1.8
*/
-public class LengthWeightParemetersTest extends ServiceLocalTestSupport {
+public class LengthWeightParemetersTest extends ServiceTestSupport {
/** Logger */
private static final Log log = LogFactory.getLog(LengthWeightParemetersTest.class);
private ObserveTopiaPersistenceContext persistenceContext;
+
+ @Override
+ public ServiceLocalTestClassResource getTestClassResource() {
+ return (ServiceLocalTestClassResource) super.getTestClassResource();
+ }
+
+ @Override
+ public ServiceLocalTestMethodResource getTestMethodResource() {
+ return (ServiceLocalTestMethodResource) super.getTestMethodResource();
+ }
+
@Before
public void setUp() {
=====================================
services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
+++ b/services-local/src/test/java/fr/ird/observe/entity/ReplicateTestSupport.java
@@ -30,11 +30,13 @@ import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialIm
import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException;
import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
import fr.ird.observe.services.local.ObserveTopiaApplicationContextFactory;
-import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
import fr.ird.observe.services.service.BabModelVersionException;
import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.test.DatabaseName;
+import fr.ird.observe.services.test.ServiceLocalTestClassResource;
+import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import java.io.File;
import java.io.IOException;
import java.io.Writer;
@@ -53,7 +55,7 @@ import org.nuiton.util.StringUtil;
*
* @author Tony Chemit - dev(a)tchemit.fr
*/
-class ReplicateTestSupport extends ServiceLocalTestSupport {
+class ReplicateTestSupport extends ServiceTestSupport {
/**
* Logger.
@@ -62,6 +64,17 @@ class ReplicateTestSupport extends ServiceLocalTestSupport {
private File scriptFile;
+
+ @Override
+ public ServiceLocalTestClassResource getTestClassResource() {
+ return (ServiceLocalTestClassResource) super.getTestClassResource();
+ }
+
+ @Override
+ public ServiceLocalTestMethodResource getTestMethodResource() {
+ return (ServiceLocalTestMethodResource) super.getTestMethodResource();
+ }
+
ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException {
File targetDatabaseDirectory = new File(getTestMethodResource().getTestDirectory(), "targetReplication");
=====================================
services-local/src/test/java/fr/ird/observe/services/test/GenerateDatabaseFixtures.java → services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateDatabaseFixtures.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/services/test/GenerateDatabaseFixtures.java
+++ b/services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateDatabaseFixtures.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.test;
+package fr.ird.observe.services.fixtures;
/*-
* #%L
@@ -26,7 +26,11 @@ import com.google.common.collect.ImmutableSet;
import fr.ird.observe.dto.data.DataDto;
import fr.ird.observe.dto.referential.ReferentialDto;
import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
-import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
+import fr.ird.observe.services.test.DatabaseFixtures;
+import fr.ird.observe.services.test.DatabaseName;
+import fr.ird.observe.services.test.ServiceLocalTestClassResource;
+import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.spi.DtoModelClasses;
import fr.ird.observe.spi.PersistenceModelHelper;
@@ -46,7 +50,18 @@ import org.junit.Test;
*
* @author Tony Chemit - dev(a)tchemit.fr
*/
-public class GenerateDatabaseFixtures extends ServiceLocalTestSupport {
+public class GenerateDatabaseFixtures extends ServiceTestSupport {
+
+
+ @Override
+ public ServiceLocalTestClassResource getTestClassResource() {
+ return (ServiceLocalTestClassResource) super.getTestClassResource();
+ }
+
+ @Override
+ public ServiceLocalTestMethodResource getTestMethodResource() {
+ return (ServiceLocalTestMethodResource) super.getTestMethodResource();
+ }
@DatabaseNameConfiguration(DatabaseName.referentiel)
@Test
=====================================
services-local/src/test/java/fr/ird/observe/services/test/MigrateTestsDatabases.java → services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateTestsDatabases.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/services/test/MigrateTestsDatabases.java
+++ b/services-local/src/test/java/fr/ird/observe/services/fixtures/GenerateTestsDatabases.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.test;
+package fr.ird.observe.services.fixtures;
/*-
* #%L
@@ -24,7 +24,6 @@ package fr.ird.observe.services.test;
import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException;
import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException;
-import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
import fr.ird.observe.services.service.BabModelVersionException;
import fr.ird.observe.services.service.DataSourceService;
import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
@@ -32,6 +31,11 @@ import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult;
import fr.ird.observe.services.service.sql.SqlScriptProducerService;
+import fr.ird.observe.services.test.DatabaseName;
+import fr.ird.observe.services.test.ObserveTestConfiguration;
+import fr.ird.observe.services.test.ServiceLocalTestClassResource;
+import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.services.test.spi.DatabaseVersionConfiguration;
@@ -54,16 +58,27 @@ import org.nuiton.version.Version;
* @author Tony Chemit - dev(a)tchemit.fr
*/
@DatabaseVersionConfiguration(ObserveTestConfiguration.PREVIOUS_VERSION)
-public class MigrateTestsDatabases extends ServiceLocalTestSupport {
+public class GenerateTestsDatabases extends ServiceTestSupport {
/**
* Logger.
*/
- private static final Log log = LogFactory.getLog(MigrateTestsDatabases.class);
+ private static final Log log = LogFactory.getLog(GenerateTestsDatabases.class);
protected SqlScriptProducerService service;
private DataSourceService dataSourceService;
+
+ @Override
+ public ServiceLocalTestClassResource getTestClassResource() {
+ return (ServiceLocalTestClassResource) super.getTestClassResource();
+ }
+
+ @Override
+ public ServiceLocalTestMethodResource getTestMethodResource() {
+ return (ServiceLocalTestMethodResource) super.getTestMethodResource();
+ }
+
@BeforeClass
public static void setUpClass() throws Exception {
((ServiceLocalTestClassResource) TOPIA_TEST_CLASS_RESOURCE).getDataSourcesForTestManager().clear();
=====================================
services-local/src/test/java/fr/ird/observe/services/local/service/DataSourceServiceLocalTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/services/local/service/DataSourceServiceLocalTest.java
+++ b/services-local/src/test/java/fr/ird/observe/services/local/service/DataSourceServiceLocalTest.java
@@ -37,11 +37,14 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
import fr.ird.observe.services.service.DatabaseNotFoundException;
import fr.ird.observe.services.service.referential.ReferentialService;
import fr.ird.observe.services.test.DatabaseName;
-import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.ObserveTestConfiguration;
import fr.ird.observe.services.test.ObserveTestResources;
+import fr.ird.observe.services.test.ServiceLocalTestClassResource;
+import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
+import fr.ird.observe.test.ObserveFixtures;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Modifier;
@@ -66,13 +69,23 @@ import org.nuiton.topia.persistence.TopiaPersistenceContext;
*/
@Ignore
@DatabaseNameConfiguration(DatabaseName.dataSourceTest)
-public class DataSourceServiceLocalTest extends ServiceLocalTestSupport {
+public class DataSourceServiceLocalTest extends ServiceTestSupport {
/** Logger. */
private static final Log log = LogFactory.getLog(DataSourceServiceLocalTest.class);
protected DataSourceService service;
+ @Override
+ public ServiceLocalTestClassResource getTestClassResource() {
+ return (ServiceLocalTestClassResource) super.getTestClassResource();
+ }
+
+ @Override
+ public ServiceLocalTestMethodResource getTestMethodResource() {
+ return (ServiceLocalTestMethodResource) super.getTestMethodResource();
+ }
+
@Before
public void setUp() {
=====================================
services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java
+++ b/services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java
@@ -38,6 +38,9 @@ import fr.ird.observe.services.service.data.seine.TripSeineService;
import fr.ird.observe.services.service.referential.ReferentialService;
import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.ObserveTestConfiguration;
+import fr.ird.observe.services.test.ServiceLocalTestClassResource;
+import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.DatabaseLoginConfiguration;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.services.test.spi.DatabasePasswordConfiguration;
@@ -54,13 +57,23 @@ import org.junit.Test;
@Ignore
@DatabaseNameConfiguration(DatabaseName.dataSourceTest)
@DatabasePasswordConfiguration(ObserveTestConfiguration.OBSTUNA_PASSWORD)
-public class RigthTest extends ServiceLocalTestSupport {
+public class RigthTest extends ServiceTestSupport {
public static final String TRIP_SEINE_ID = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843";
public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234";
+ @Override
+ public ServiceLocalTestClassResource getTestClassResource() {
+ return (ServiceLocalTestClassResource) super.getTestClassResource();
+ }
+
+ @Override
+ public ServiceLocalTestMethodResource getTestMethodResource() {
+ return (ServiceLocalTestMethodResource) super.getTestMethodResource();
+ }
+
@DatabaseLoginConfiguration(ObserveTestConfiguration.OBSTUNA_ADMIN_LOGIN)
@Test
public void testAdminRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException {
=====================================
services-local/src/test/java/fr/ird/observe/services/local/service/ServiceLocalTestSupport.java deleted
=====================================
--- a/services-local/src/test/java/fr/ird/observe/services/local/service/ServiceLocalTestSupport.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package fr.ird.observe.services.local.service;
-
-/*-
- * #%L
- * ObServe :: Services local implementation
- * %%
- * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import fr.ird.observe.dto.reference.ReferentialDtoReference;
-import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
-import fr.ird.observe.dto.referential.ReferentialDto;
-import fr.ird.observe.entities.ObserveEntity;
-import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
-import fr.ird.observe.services.service.BabModelVersionException;
-import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
-import fr.ird.observe.services.service.DatabaseNotFoundException;
-import fr.ird.observe.services.service.referential.ReferentialService;
-import fr.ird.observe.services.test.ServiceLocalTestClassResource;
-import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
-import fr.ird.observe.services.test.ServiceTestSupport;
-import fr.ird.observe.spi.PersistenceModelHelper;
-import fr.ird.observe.spi.context.ReferentialDtoEntityContext;
-import java.util.Date;
-import org.junit.Assert;
-
-/**
- * Created on 26/12/15.
- *
- * @author Tony Chemit - dev(a)tchemit.fr
- */
-public class ServiceLocalTestSupport extends ServiceTestSupport {
-
- @Override
- public ServiceLocalTestClassResource getTestClassResource() {
- return (ServiceLocalTestClassResource) super.getTestClassResource();
- }
-
- @Override
- public ServiceLocalTestMethodResource getTestMethodResource() {
- return (ServiceLocalTestMethodResource) super.getTestMethodResource();
- }
-
- public <E extends ObserveEntity> Date getLastUpdateDate(Class<E> entityType) {
- try (ObserveTopiaPersistenceContext persistenceContext = getTestMethodResource().newPersistenceContext()) {
- return persistenceContext.getLastUpdateDate(entityType);
- }
- }
-
- public <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> R getReference(Class<D> type, int index) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException {
-
- ReferentialDtoEntityContext<D, R, ?, ?> entityContext = PersistenceModelHelper.fromReferentialDto(type);
- Class<R> referenceType = entityContext.toReferenceType();
-
- ReferentialService referentialService = getTestMethodResource().newService(ReferentialService.class);
- ReferentialDtoReferenceSet<R> referentialReferenceSet = getTestMethodResource().getReferentialCache().getReferentialReferenceSet(referentialService, referenceType);
- return referentialReferenceSet.getReferenceByPosition(index);
-
- }
-
- protected void assertEntityEqualsReferenceDto(ObserveEntity entity, ReferentialDtoReference referenceDto) {
- if (entity == null) {
- Assert.assertNull(referenceDto);
- } else {
- Assert.assertEquals(entity.getTopiaId(), referenceDto.getId());
- }
- }
-
- protected void assertReferenceDtoEqualsEntity(ReferentialDtoReference referenceDto, ObserveEntity entity) {
- if (referenceDto == null) {
- Assert.assertNull(entity);
- } else {
- Assert.assertEquals(referenceDto.getId(), entity.getTopiaId());
- }
- }
-
-}
=====================================
services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java
+++ b/services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java
@@ -29,7 +29,6 @@ import fr.ird.observe.dto.referential.VesselDto;
import fr.ird.observe.dto.referential.seine.VesselActivitySeineDto;
import fr.ird.observe.persistence.Entities;
import fr.ird.observe.persistence.ObserveEntityEnum;
-import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService;
import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine;
import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackResults;
@@ -41,6 +40,7 @@ import fr.ird.observe.services.test.DatabaseName;
import fr.ird.observe.services.test.ObserveTestConfiguration;
import fr.ird.observe.services.test.ServiceLocalTestClassResource;
import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.services.test.spi.CopyDatabaseConfiguration;
import fr.ird.observe.services.test.spi.DatabaseClassifier;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
@@ -61,7 +61,7 @@ import org.junit.Test;
*
* @author Tony Chemit - dev(a)tchemit.fr
*/
-public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSupport {
+public class UnidirectionalSynchronizeReferentialTest extends ServiceTestSupport {
@ClassRule
public static final ServiceLocalTestClassResource TOPIA_TEST_CLASS_RESOURCE_CENTRAL = new ServiceLocalTestClassResource(DatabaseClassifier.CENTRAL);
@@ -72,6 +72,17 @@ public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSu
private UnidirectionalReferentialSynchronizeLocalService localService;
private ReferentialSynchronizeDiffsEngine diffsEngine;
+
+ @Override
+ public ServiceLocalTestClassResource getTestClassResource() {
+ return (ServiceLocalTestClassResource) super.getTestClassResource();
+ }
+
+ @Override
+ public ServiceLocalTestMethodResource getTestMethodResource() {
+ return (ServiceLocalTestMethodResource) super.getTestMethodResource();
+ }
+
@Before
public void setUp() throws Exception {
localService = getTestMethodResource().newService(UnidirectionalReferentialSynchronizeLocalService.class);
=====================================
services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java
+++ b/services-local/src/test/java/fr/ird/observe/spi/PersistenceModelHelperTest.java
@@ -30,8 +30,10 @@ import fr.ird.observe.dto.referential.ReferentialLocale;
import fr.ird.observe.entities.ObserveDataEntity;
import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
-import fr.ird.observe.services.local.service.ServiceLocalTestSupport;
import fr.ird.observe.services.test.DatabaseName;
+import fr.ird.observe.services.test.ServiceLocalTestClassResource;
+import fr.ird.observe.services.test.ServiceLocalTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import fr.ird.observe.test.ObserveFixtures;
import fr.ird.observe.services.test.spi.DatabaseNameConfiguration;
import fr.ird.observe.spi.context.DataDtoEntityContext;
@@ -49,11 +51,22 @@ import org.nuiton.topia.persistence.TopiaDao;
* @author Tony Chemit - dev(a)tchemit.fr
*/
@DatabaseNameConfiguration(DatabaseName.dataForTestSeine)
-public class PersistenceModelHelperTest extends ServiceLocalTestSupport {
+public class PersistenceModelHelperTest extends ServiceTestSupport {
/** Logger. */
private static final Log log = LogFactory.getLog(PersistenceModelHelperTest.class);
+
+ @Override
+ public ServiceLocalTestClassResource getTestClassResource() {
+ return (ServiceLocalTestClassResource) super.getTestClassResource();
+ }
+
+ @Override
+ public ServiceLocalTestMethodResource getTestMethodResource() {
+ return (ServiceLocalTestMethodResource) super.getTestMethodResource();
+ }
+
@Test
public void testTransformEntityToReferentialDto() throws Exception {
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/480ee425551eaa048f35b2b9a4e…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/480ee425551eaa048f35b2b9a4e…
You're receiving this email because of your account on gitlab.com.
1
0
25 Oct '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
a1b81a63 by Tony CHEMIT at 2017-10-25T15:11:58+02:00
clean servicxe client tests
- - - - -
10 changed files:
- services-client/pom.xml
- services-client/src/test/java/fr/ird/observe/services/client/service/DataSourceServiceClientTest.java
- services-client/src/test/java/fr/ird/observe/services/client/service/PingServiceClientTest.java
- − services-client/src/test/java/fr/ird/observe/services/client/service/ServiceClientTestSupport.java
- − services-client/src/test/java/fr/ird/observe/services/client/service/actions/consolidate/ConsolidateDataServiceClientTest.java
- − services-client/src/test/java/fr/ird/observe/services/client/service/actions/consolidate/dcp/SimplifiedObjectTypeManagerTest.java
- − services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/AbstractReportServiceClientTest.java
- − services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/ReportAccessoryCatchClientTest.java
- − services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java
- − services-client/src/test/java/fr/ird/observe/services/client/service/seine/TripSeineServiceClientTest.java
Changes:
=====================================
services-client/pom.xml
=====================================
--- a/services-client/pom.xml
+++ b/services-client/pom.xml
@@ -118,10 +118,6 @@
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
</dependency>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-validator</artifactId>
- </dependency>
<dependency>
<groupId>org.nuiton.topia</groupId>
@@ -195,15 +191,6 @@
<test>fr.ird.observe.services.client.ServiceClientTestSuite</test>
</configuration>
</execution>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
</executions>
</plugin>
=====================================
services-client/src/test/java/fr/ird/observe/services/client/service/DataSourceServiceClientTest.java
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/client/service/DataSourceServiceClientTest.java
+++ b/services-client/src/test/java/fr/ird/observe/services/client/service/DataSourceServiceClientTest.java
@@ -31,6 +31,9 @@ import fr.ird.observe.services.service.BabModelVersionException;
import fr.ird.observe.services.service.DataSourceService;
import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
import fr.ird.observe.services.service.DatabaseNotFoundException;
+import fr.ird.observe.services.test.ServiceClientTestClassResource;
+import fr.ird.observe.services.test.ServiceClientTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import java.io.IOException;
import org.junit.Assert;
import org.junit.Ignore;
@@ -41,7 +44,17 @@ import org.junit.Test;
*
* @author Tony Chemit - dev(a)tchemit.fr
*/
-public class DataSourceServiceClientTest extends ServiceClientTestSupport {
+public class DataSourceServiceClientTest extends ServiceTestSupport {
+
+ @Override
+ public ServiceClientTestMethodResource getTestMethodResource() {
+ return (ServiceClientTestMethodResource) super.getTestMethodResource();
+ }
+
+ @Override
+ public ServiceClientTestClassResource getTestClassResource() {
+ return (ServiceClientTestClassResource) super.getTestClassResource();
+ }
//FIXME
@Ignore
=====================================
services-client/src/test/java/fr/ird/observe/services/client/service/PingServiceClientTest.java
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/client/service/PingServiceClientTest.java
+++ b/services-client/src/test/java/fr/ird/observe/services/client/service/PingServiceClientTest.java
@@ -24,6 +24,8 @@ package fr.ird.observe.services.client.service;
import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest;
import fr.ird.observe.services.service.PingService;
+import fr.ird.observe.services.test.ServiceClientTestMethodResource;
+import fr.ird.observe.services.test.ServiceTestSupport;
import io.ultreia.java4all.http.HResponseNotAvailableException;
import java.net.MalformedURLException;
import java.net.URL;
@@ -34,7 +36,12 @@ import org.junit.Test;
*
* @author Tony Chemit - dev(a)tchemit.fr
*/
-public class PingServiceClientTest extends ServiceClientTestSupport {
+public class PingServiceClientTest extends ServiceTestSupport {
+
+ @Override
+ public ServiceClientTestMethodResource getTestMethodResource() {
+ return (ServiceClientTestMethodResource) super.getTestMethodResource();
+ }
@Test(expected = HResponseNotAvailableException.class)
public void testPingWithBadServerUrl() throws MalformedURLException, CloneNotSupportedException {
=====================================
services-client/src/test/java/fr/ird/observe/services/client/service/ServiceClientTestSupport.java deleted
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/client/service/ServiceClientTestSupport.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package fr.ird.observe.services.client.service;
-
-/*
- * #%L
- * ObServe :: Services client implementation
- * %%
- * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import fr.ird.observe.dto.IdDto;
-import fr.ird.observe.dto.form.Form;
-import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
-import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest;
-import fr.ird.observe.services.service.DataSourceService;
-import fr.ird.observe.services.service.ObserveService;
-import fr.ird.observe.services.test.ObserveTestConfiguration;
-import fr.ird.observe.services.test.ServiceClientTestClassResource;
-import fr.ird.observe.services.test.ServiceClientTestMethodResource;
-import fr.ird.observe.services.test.ServiceTestSupport;
-import fr.ird.observe.services.test.spi.DatabaseLoginConfiguration;
-import fr.ird.observe.services.test.spi.DatabasePasswordConfiguration;
-import fr.ird.observe.services.test.spi.DatabaseServerNameConfiguration;
-import fr.ird.observe.services.test.spi.DatabaseUrlConfiguration;
-import org.junit.After;
-import org.junit.Before;
-
-/**
- * @author Tony Chemit - dev(a)tchemit.fr
- */
-(a)DatabaseLoginConfiguration(ObserveTestConfiguration.WEB_LOGIN)
-@DatabasePasswordConfiguration(ObserveTestConfiguration.WEB_PASSWORD)
-@DatabaseUrlConfiguration
-@DatabaseServerNameConfiguration
-public abstract class ServiceClientTestSupport extends ServiceTestSupport {
-
- private ObserveDataSourceConnection dataSourceConnection;
-
- private DataSourceService dataSourceService;
-
- @Override
- public ServiceClientTestClassResource getTestClassResource() {
- return (ServiceClientTestClassResource) super.getTestClassResource();
- }
-
- @Override
- public ServiceClientTestMethodResource getTestMethodResource() {
- return (ServiceClientTestMethodResource) super.getTestMethodResource();
- }
-
- @Before
- public void setUp() throws Exception {
-
- ObserveDataSourceConfigurationRest dataSourceConfiguration = getTestMethodResource().getDataSourceConfiguration();
-
- dataSourceService = getTestClassResource().newService(dataSourceConfiguration, DataSourceService.class);
- dataSourceConnection = dataSourceService.open(dataSourceConfiguration);
- }
-
- @After
- public void tearDown() {
-
- if (dataSourceConnection != null) {
- dataSourceService.close();
- }
-
- }
-
- public <S extends ObserveService> S newService(Class<S> serviceType) {
- return getTestClassResource().newService(dataSourceConnection, serviceType);
- }
-
- protected <T extends IdDto> void assertEditLabels(Form<T> form, int expectedLabels, Class<?>... expectedTypes) {
-
- //FIXME Rest test
-// Assert.assertNotNull(formDto.getLabels());
-//
-// Set<Class<?>> types = ReferenceSetDtos.getTypes(formDto.getLabels());
-//
-// Assert.assertEquals(expectedTypes.length, types.size());
-//
-// for (Class<?> expectedType : expectedTypes) {
-// Assert.assertTrue(types.contains(expectedType));
-// }
-// Assert.assertEquals(expectedLabels, formDto.sizeLabels());
-//
-// for (ReferenceSetDto referenceSetDto : formDto.getLabels()) {
-//
-// Assert.assertTrue(referenceSetDto.size() > 0);
-//
-// }
- }
-
- protected <T extends IdDto> void assertReadLabels(Form<T> form, int expectedLabels, Class<?>... expectedTypes) {
-
- //FIXME Rest test
-// Assert.assertNotNull(formDto.getLabels());
-//
-// Set<Class<?>> types = ReferenceSetDtos.getTypes(formDto.getLabels());
-//
-// Assert.assertEquals(expectedTypes.length, types.size());
-//
-// for (Class<?> expectedType : expectedTypes) {
-// Assert.assertTrue(types.contains(expectedType));
-// }
-// Assert.assertEquals(expectedLabels, formDto.sizeLabels());
-//
-// for (ReferenceSetDto referenceSetDto : formDto.getLabels()) {
-//
-// Assert.assertTrue(referenceSetDto.isReferenceEmpty());
-//
-// }
- }
-
-}
=====================================
services-client/src/test/java/fr/ird/observe/services/client/service/actions/consolidate/ConsolidateDataServiceClientTest.java deleted
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/client/service/actions/consolidate/ConsolidateDataServiceClientTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package fr.ird.observe.services.client.service.actions.consolidate;
-
-/*
- * #%L
- * ObServe :: Services client implementation
- * %%
- * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataServiceTest;
-
-/**
- * Created on 29/08/15.
- *
- * @author Tony Chemit - dev(a)tchemit.fr
- */
-public class ConsolidateDataServiceClientTest extends ConsolidateDataServiceTest {
-
-}
=====================================
services-client/src/test/java/fr/ird/observe/services/client/service/actions/consolidate/dcp/SimplifiedObjectTypeManagerTest.java deleted
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/client/service/actions/consolidate/dcp/SimplifiedObjectTypeManagerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package fr.ird.observe.services.client.service.actions.consolidate.dcp;
-
-/*-
- * #%L
- * ObServe :: Services client implementation
- * %%
- * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-/**
- * Created by tchemit on 02/08/17.
- *
- * @author Tony Chemit - dev(a)tchemit.fr
- */
-public class SimplifiedObjectTypeManagerTest extends fr.ird.observe.services.service.actions.consolidate.dcp.SimplifiedObjectTypeManagerTest {
-
-}
=====================================
services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/AbstractReportServiceClientTest.java deleted
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/AbstractReportServiceClientTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * #%L
- * ObServe :: Services client implementation
- * %%
- * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-package fr.ird.observe.services.client.service.actions.report;
-
-
-import fr.ird.observe.dto.reference.DtoReference;
-import fr.ird.observe.services.client.service.ServiceClientTestSupport;
-import fr.ird.observe.services.service.actions.report.DataMatrix;
-import fr.ird.observe.services.service.actions.report.Report;
-import fr.ird.observe.services.service.actions.report.ReportBuilder;
-import fr.ird.observe.services.service.actions.report.ReportRequest;
-import fr.ird.observe.services.service.actions.report.ReportService;
-import fr.ird.observe.services.service.actions.report.ReportVariable;
-import fr.ird.observe.test.ObserveFixtures;
-import java.io.IOException;
-import java.net.URL;
-import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Classe abstraite de test d'un report.
- * <p>
- * On définit ici le mécanisme pour tester unitairement un report et son
- * résultat.
- *
- * @author Tony Chemit - dev(a)tchemit.fr
- * @since 1.9
- */
-public abstract class AbstractReportServiceClientTest extends ServiceClientTestSupport {
-
- /** Logger */
- private static final Log log = LogFactory.getLog(AbstractReportServiceClientTest.class);
-
- protected ReportService service;
-
- /** La liste de tous les reports connus. */
- protected static List<Report> reports;
-
- /** Le report à tester. */
- private Report report;
-
- protected abstract String getReportId();
-
- @Before
- public final void setUp() throws Exception {
-
- super.setUp();
-
- service = newService(ReportService.class);
-
- // recuperation du report à tester
- report = getReport(log, getReportId());
-
- if (log.isInfoEnabled()) {
- log.info("Will use report '" + report + "'");
- }
-
- }
-
-
- /**
- * L'unique test à lancer.
- * <p>
- * On vérifie :
- * <ul>
- * <li>la syntaxe du report via {@link #testReportSyntax(Report)}</li>
- * <li>le résultat du report via {@link #testReportResult(DataMatrix)}</li>
- * </ul>
- *
- * @throws Exception pour toute erreur lors de l'execution du report
- */
- @Test
- public final void testReport() throws Exception {
-
- // test de la syntaxe du report
- testReportSyntax(report);
-
- // creation de l'executeur de report
- report = service.populateVariables(report, ObserveFixtures.TRIP_SEINE_ID_1);
-
- // preparation des variables
- prepareVariables();
-
-
- // on execute le report
- DataMatrix result = service.executeReport(report, ObserveFixtures.TRIP_SEINE_ID_1);
-
- if (log.isInfoEnabled()) {
- log.info("Result :\n" + result.getClipboardContent(true, true, false, '\t'));
- }
-
- // on verifie le resultat
- testReportResult(result);
- }
-
- protected void prepareVariables() {
-
- }
-
- protected void setVariableValue(String variableName, String id) {
-
- for (ReportVariable variable : report.getVariables()) {
-
- if (variableName.equals(variable.getName())) {
-
- Object value = variable.getValues().stream()
- .filter(DtoReference.newIdPredicate(id))
- .findFirst()
- .orElse(null);
-
- variable.setSelectedValue(value);
-
- }
-
- }
-
- }
-
- protected abstract void testReportSyntax(Report report);
-
- protected abstract void testReportResult(DataMatrix result);
-
- protected static Report getReport(Log log, String reportId) throws IOException {
- if (reports == null) {
-
- URL reportLocation =
- AbstractReportServiceClientTest.class.getResource("/observe-reports.properties");
-
- if (log.isInfoEnabled()) {
- log.info("Loading reports from " + reportLocation);
- }
-
- ReportBuilder builder = new ReportBuilder();
-
- reports = builder.load(reportLocation);
-
- builder.clear();
-
- Assert.assertNotNull(reports);
- Assert.assertFalse(reports.isEmpty());
- }
-
- Report result = null;
- // recuperation du report à tester
- for (Report report : reports) {
- if (reportId.equals(report.getId())) {
- result = report;
- break;
- }
- }
-
- Assert.assertNotNull("Could not find report with id " + reportId, reports);
- return result;
- }
-
- protected void assertReportName(Report report,
- String name,
- String description) {
- Assert.assertEquals(getReportId(), report.getId());
- Assert.assertEquals(name, report.getName());
- Assert.assertEquals(description, report.getDescription());
- }
-
- protected void assertReportDimension(Report report,
- int rows,
- int columns,
- String[] columnsHeader,
- String[] rowsHeader) {
- Assert.assertEquals(rows, report.getRows());
- Assert.assertEquals(columns, report.getColumns());
- Assert.assertArrayEquals(columnsHeader, report.getColumnHeaders());
- Assert.assertArrayEquals(rowsHeader, report.getRowHeaders());
- }
-
- protected void assertReportNbRequests(Report report, int nbRequests) {
- ReportRequest[] requests = report.getRequests();
- Assert.assertNotNull(requests);
- Assert.assertEquals(nbRequests, requests.length);
- }
-
- protected void assertReportRequestDimension(ReportRequest request,
- ReportRequest.RequestLayout layout,
- int x,
- int y) {
- Assert.assertEquals(layout, request.getLayout());
-// Assert.assertEquals(new Point(width, height), request.getLocation());
- Assert.assertEquals(x, request.getX());
- Assert.assertEquals(y, request.getY());
- }
-
- protected void assertResultDimension(DataMatrix result,
- int width,
- int height,
- int x,
- int y) {
- Assert.assertEquals(width, result.getWidth());
- Assert.assertEquals(height, result.getHeight());
- Assert.assertEquals(x, result.getX());
- Assert.assertEquals(y, result.getY());
- }
-
- protected void assertResultRow(DataMatrix result, int rowId, Object... row) {
- Object[] actualRow = result.getData()[rowId];
- Assert.assertArrayEquals(row, actualRow);
- }
-}
=====================================
services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/ReportAccessoryCatchClientTest.java deleted
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/ReportAccessoryCatchClientTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * #%L
- * ObServe :: Services client implementation
- * %%
- * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-package fr.ird.observe.services.client.service.actions.report;
-
-
-import fr.ird.observe.services.service.actions.report.DataMatrix;
-import fr.ird.observe.services.service.actions.report.Report;
-import fr.ird.observe.services.service.actions.report.ReportRequest;
-import fr.ird.observe.test.ObserveFixtures;
-import org.junit.Assert;
-
-/**
- * Test du report {@code accessoryCatch}.
- *
- * @author Tony Chemit - dev(a)tchemit.fr
- * @since 1.9
- */
-public class ReportAccessoryCatchClientTest extends AbstractReportServiceClientTest {
-
- @Override
- protected void testReportSyntax(Report report) {
- Assert.assertNotNull(report);
- assertReportName(
- report,
- "Liste des captures accessoires selon le type de banc, filtrées par groupe",
- "Afficher les captures accessoires par groupe d'espèce\n" +
- "Les poids sont exprimés en tonnes."
- );
-
- assertReportDimension(
- report,
- -1,
- 3,
- new String[]{"Espèce",
- "Banc libre",
- "Banc objet",
- },
- null
- );
-
- assertReportNbRequests(report, 3);
-
- ReportRequest[] requests = report.getRequests();
-
- assertReportRequestDimension(
- requests[0],
- ReportRequest.RequestLayout.row,
- 0,
- 0
- );
- assertReportRequestDimension(
- requests[1],
- ReportRequest.RequestLayout.row,
- 1,
- 0
- );
- assertReportRequestDimension(
- requests[2],
- ReportRequest.RequestLayout.row,
- 2,
- 0
- );
- }
-
- @Override
- protected String getReportId() {
- return "accessoryCatch";
- }
-
- @Override
- protected void prepareVariables() {
- setVariableValue("speciesGroup", ObserveFixtures.SPECIES_GROUP_ID);
- }
-
- @Override
- protected void testReportResult(DataMatrix result) {
- assertResultDimension(result, 3, 54, 0, 0);
-
- int row = 0;
- assertResultRow(result, row++, "[FAO]MAE [sc]Aetobatus narinari [fr]Aigle de mer léopard", "-", "-");
- assertResultRow(result, row++, "[FAO]PTH [sc]Alopias pelagicus [fr]Renard pélagique", "-", "-");
- assertResultRow(result, row++, "[FAO]BTH [sc]Alopias superciliosus [fr]Renard à gros yeux", "-", "-");
- assertResultRow(result, row++, "[FAO]ALV [sc]Alopias vulpinus [fr]Renard", "-", "-");
- assertResultRow(result, row++, "[FAO]WSH [sc]Carcharodon carcharias [fr]Grand requin blanc", "-", "-");
- assertResultRow(result, row++, "[FAO]CCE [sc]Carcharhinus leucas [fr]Requin-bouledogue", "-", "-");
- assertResultRow(result, row++, "[FAO]FAL [sc]Carcharhinus falciformis [fr]Requin soyeux", "-", "+ Effectif : 17 Poids total (t) : 0.1753");
- assertResultRow(result, row++, "[FAO]OCS [sc]Carcharhinus longimanus [fr]Requin océanique", "+ Effectif : 1 Poids total (t) : 0.0447", "-");
- assertResultRow(result, row++, "[FAO]DUS [sc]Carcharhinus obscurus [fr]Requin sombre", "-", "-");
- assertResultRow(result, row++, "[FAO]PLS [sc]Dasyatys (Pteroplatytrygon) violacea [fr]Pastenague violette", "-", "-");
- assertResultRow(result, row++, "[FAO]SHL [sc]Etmopterus spp [fr]Genre Etmopterus", "-", "-");
- assertResultRow(result, row++, "[FAO]THR [sc]Alopias spp [fr]Renards de mer nca ", "-", "-");
- assertResultRow(result, row++, "[FAO]RSK [sc]Carcharhinidae spp [fr]Famille Carcharhinidae", "-", "+ Effectif : 11 Poids total (t) : 0.55");
- assertResultRow(result, row++, "[FAO]STT [sc]Dasyatidae [fr]Famille Dasyatidae", "+ Effectif : 7 Poids total (t) : 0.015", "-");
- assertResultRow(result, row++, "[FAO]MSK [sc]Lamnidae [fr]Famille Lamnidae", "-", "-");
- assertResultRow(result, row++, "[FAO]2FOD [sc]Odontaspididae [fr]Odontaspididae", "-", "-");
- assertResultRow(result, row++, "[FAO]- [sc]Rhincodontidae [fr]Famille Rhincodontidae", "-", "-");
- assertResultRow(result, row++, "[FAO]SPY [sc]Sphyrnidae [fr]Famille Sphyrnidae", "-", "+ Effectif : 1");
- assertResultRow(result, row++, "[FAO]TIG [sc]Galeocerdo cuvier [fr]Requin tigre commun", "-", "-");
- assertResultRow(result, row++, "[FAO]ISB [sc]Isistius brasiliensis [fr]Squalelet féroce", "-", "-");
- assertResultRow(result, row++, "[FAO]SMA [sc]Isurus oxyrinchus [fr]Taupe bleu", "-", "-");
- assertResultRow(result, row++, "[FAO]MAK [sc]Isurus spp [fr]Taupes", "-", "-");
- assertResultRow(result, row++, "[FAO]MAN [sc]Mobulidae [fr]Mantes, diables de mer nca ", "-", "-");
- assertResultRow(result, row++, "[FAO]MYL [sc]Myliobatis aquila [fr]Aigle commun", "-", "-");
- assertResultRow(result, row++, "[FAO]RMB [sc]Manta birostris [fr]Mante atlantique", "+ Effectif : 9 Poids total (t) : 1.1824", "-");
- assertResultRow(result, row++, "[FAO]RMT [sc]Mobula tarapacana [fr]Diable géant de Guinée", "-", "-");
- assertResultRow(result, row++, "[FAO]MNT [sc]Manta spp [fr]Raies manta", "-", "-");
- assertResultRow(result, row++, "[FAO]RMM [sc]Mobula mobular [fr]Mante mobula", "-", "-");
- assertResultRow(result, row++, "[FAO]LMP [sc]Megachasma pelagios [fr]Requin grande gueule", "-", "-");
- assertResultRow(result, row++, "[FAO]RMJ [sc]Mobula japanica [fr]Mante aiguillat", "-", "-");
- assertResultRow(result, row++, "[FAO]CVX [sc]Carcharhiniformes [fr]Ordre Carcharhiniformes", "-", "-");
- assertResultRow(result, row++, "[FAO]HDQ [sc]Heterodontiformes [fr]Ordre Heterodontiformes", "-", "-");
- assertResultRow(result, row++, "[FAO]HXW [sc]Hexanchiformes [fr]Ordre Hexanchiformes", "-", "-");
- assertResultRow(result, row++, "[FAO]LMZ [sc]Lamniformes [fr]Ordre Lamniformes", "-", "-");
- assertResultRow(result, row++, "[FAO]OCX [sc]Orectolobiformes [fr]Ordre Orectolobiformes", "-", "-");
- assertResultRow(result, row++, "[FAO]PWS [sc]Pristiophorus spp [fr]Requins-scies nca ", "-", "-");
- assertResultRow(result, row++, "[FAO]SHX [sc]Squaliformes [fr]Ordre Squaliformes", "-", "-");
- assertResultRow(result, row++, "[FAO]ASK [sc]Squatinidae [fr]Anges de mer nca ", "-", "-");
- assertResultRow(result, row++, "[FAO]BSH [sc]Prionace glauca [fr]Peau bleue", "-", "-");
- assertResultRow(result, row++, "[FAO]POR [sc]Lamna nasus [fr]Requin taupe commun", "-", "-");
- assertResultRow(result, row++, "[FAO]SRX [sc]Raie non identifiée [fr]Raie non identifiée", "-", "-");
- assertResultRow(result, row++, "[FAO]2REX [sc]Requin non identifié [fr]Requin non identifié", "-", "-");
- assertResultRow(result, row++, "[FAO]- [sc]Rhinopteridae [fr]Famille Rhinopteridae", "-", "-");
- assertResultRow(result, row++, "[FAO]NZX [sc]Rhinoptera spp [fr]Mourines", "-", "-");
- assertResultRow(result, row++, "[FAO]RMA [sc]Manta alfredi [fr]Manta Alfredi", "-", "-");
- assertResultRow(result, row++, "[FAO]RMC [sc]Mobula coilloti [fr]Mobula coilloti ", "-", "-");
- assertResultRow(result, row++, "[FAO]RMO [sc]Mobula thurstoni [fr]Mobula", "-", "-");
- assertResultRow(result, row++, "[FAO]RMV [sc]Mobula spp [fr]Mobula nca", "-", "-");
- assertResultRow(result, row++, "[FAO]BSK [sc]Cetorhinus maximus [fr]Requin pèlerin", "-", "-");
- assertResultRow(result, row++, "[FAO]RHN [sc]Rhincodon typus [fr]Requin baleine", "-", "-");
- assertResultRow(result, row++, "[FAO]SPL [sc]Sphyrna lewini [fr]Requin marteau halicorne", "-", "-");
- assertResultRow(result, row++, "[FAO]SPK [sc]Sphyrna mokarran [fr]Grand requin marteau", "-", "-");
- assertResultRow(result, row++, "[FAO]SPZ [sc]Sphyrna zygaena [fr]Requin marteau commun", "-", "-");
- assertResultRow(result, row, "[FAO]TOD [sc]Torpedinidae [fr]Torpilles, raies électriq. nca ", "-", "-");
-
-
- }
-}
=====================================
services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java deleted
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package fr.ird.observe.services.client.service.actions.validate;
-
-/*
- * #%L
- * ObServe :: Services client implementation
- * %%
- * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.collect.ImmutableSet;
-import fr.ird.observe.dto.referential.CountryDto;
-import fr.ird.observe.dto.referential.FpaZoneDto;
-import fr.ird.observe.dto.referential.GearCaracteristicDto;
-import fr.ird.observe.dto.referential.GearCaracteristicTypeDto;
-import fr.ird.observe.dto.referential.GearDto;
-import fr.ird.observe.dto.referential.HarbourDto;
-import fr.ird.observe.dto.referential.LengthWeightParameterDto;
-import fr.ird.observe.dto.referential.OceanDto;
-import fr.ird.observe.dto.referential.OrganismDto;
-import fr.ird.observe.dto.referential.PersonDto;
-import fr.ird.observe.dto.referential.ProgramDto;
-import fr.ird.observe.dto.referential.ReferentialDto;
-import fr.ird.observe.dto.referential.SexDto;
-import fr.ird.observe.dto.referential.SpeciesDto;
-import fr.ird.observe.dto.referential.SpeciesGroupDto;
-import fr.ird.observe.dto.referential.SpeciesListDto;
-import fr.ird.observe.dto.referential.VesselDto;
-import fr.ird.observe.dto.referential.VesselSizeCategoryDto;
-import fr.ird.observe.dto.referential.VesselTypeDto;
-import fr.ird.observe.services.client.service.ServiceClientTestSupport;
-import fr.ird.observe.services.service.actions.validate.DataValidationRequest;
-import fr.ird.observe.services.service.actions.validate.ReferentialValidationRequest;
-import fr.ird.observe.services.service.actions.validate.ValidateService;
-import fr.ird.observe.services.service.actions.validate.ValidationResult;
-import fr.ird.observe.test.ObserveFixtures;
-import org.junit.Assert;
-import org.junit.Test;
-import org.nuiton.validator.NuitonValidatorScope;
-
-/**
- * @author Tony Chemit - dev(a)tchemit.fr
- */
-public class ValidateServiceClientTest extends ServiceClientTestSupport {
-
- protected static final ImmutableSet<Class<? extends ReferentialDto>> REFERENTIAL_DTO_TYPES = ImmutableSet.of(
- CountryDto.class,
- FpaZoneDto.class,
- GearCaracteristicDto.class,
- GearCaracteristicTypeDto.class,
- GearDto.class,
- HarbourDto.class,
- LengthWeightParameterDto.class,
- OceanDto.class,
- OrganismDto.class,
- PersonDto.class,
- ProgramDto.class,
- SexDto.class,
- SpeciesDto.class,
- SpeciesGroupDto.class,
- SpeciesListDto.class,
- VesselDto.class,
- VesselSizeCategoryDto.class,
- VesselTypeDto.class
- );
-
- protected ValidateService service;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- service = newService(ValidateService.class);
-
- }
-
- @Test
- public void testValidateReferantials() throws Exception {
-
- ReferentialValidationRequest request = new ReferentialValidationRequest();
-
- request.setValidationContext(ValidateService.UPDATE_VALIDATION_CONTEXT);
- request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values()));
-
- request.setReferentialTypes(REFERENTIAL_DTO_TYPES);
-
- ValidationResult<ReferentialValidationRequest> result = service.validateReferential(request);
- Assert.assertNotNull(result);
- //FIXME
-
-// ImmutableMap<Class<? extends ReferentialDto>, ValidateResultForDtoType<? extends IdDto>> resultByType = result.getResultByType();
-// Assert.assertNotNull(resultByType);
-// Assert.assertEquals(59, resultByType.size());
-//
-// assertValidateResultForReferentialDtoType(resultByType, CountryDto.class, 53);
-// assertValidateResultForReferentialDtoType(resultByType, FpaZoneDto.class, 41);
-// assertValidateResultForReferentialDtoType(resultByType, GearCaracteristicDto.class, 22);
-// assertValidateResultForReferentialDtoType(resultByType, GearCaracteristicTypeDto.class, 6);
-// assertValidateResultForReferentialDtoType(resultByType, GearDto.class, 26);
-// assertValidateResultForReferentialDtoType(resultByType, HarbourDto.class, 74);
-// assertValidateResultForReferentialDtoType(resultByType, LengthWeightParameterDto.class, 352);
-// assertValidateResultForReferentialDtoType(resultByType, OceanDto.class, 3);
-// assertValidateResultForReferentialDtoType(resultByType, OrganismDto.class, 8);
-// assertValidateResultForReferentialDtoType(resultByType, PersonDto.class, 390);
-// assertValidateResultForReferentialDtoType(resultByType, ProgramDto.class, 27);
-// assertValidateResultForReferentialDtoType(resultByType, SexDto.class, 5);
-// assertValidateResultForReferentialDtoType(resultByType, SpeciesDto.class, 275);
-// assertValidateResultForReferentialDtoType(resultByType, SpeciesGroupDto.class, 8);
-// assertValidateResultForReferentialDtoType(resultByType, SpeciesListDto.class, 5);
-// assertValidateResultForReferentialDtoType(resultByType, VesselDto.class, 977);
-// assertValidateResultForReferentialDtoType(resultByType, VesselSizeCategoryDto.class, 13);
-// assertValidateResultForReferentialDtoType(resultByType, VesselTypeDto.class, 14);
-//
-// assertValidateResultForReferentialDtoType(resultByType, BaitHaulingStatusDto.class, 5);
-// assertValidateResultForReferentialDtoType(resultByType, BaitSettingStatusDto.class, 5);
-// assertValidateResultForReferentialDtoType(resultByType, BaitTypeDto.class, 16);
-// assertValidateResultForReferentialDtoType(resultByType, CatchFateLonglineDto.class, 5);
-// assertValidateResultForReferentialDtoType(resultByType, EncounterTypeDto.class, 12);
-// assertValidateResultForReferentialDtoType(resultByType, HealthnessDto.class, 6);
-// assertValidateResultForReferentialDtoType(resultByType, HookPositionDto.class, 13);
-// assertValidateResultForReferentialDtoType(resultByType, HookSizeDto.class, 22);
-// assertValidateResultForReferentialDtoType(resultByType, HookTypeDto.class, 13);
-// assertValidateResultForReferentialDtoType(resultByType, ItemHorizontalPositionDto.class, 3);
-// assertValidateResultForReferentialDtoType(resultByType, ItemVerticalPositionDto.class, 3);
-// assertValidateResultForReferentialDtoType(resultByType, LightsticksColorDto.class, 7);
-// assertValidateResultForReferentialDtoType(resultByType, LightsticksTypeDto.class, 2);
-// assertValidateResultForReferentialDtoType(resultByType, LineTypeDto.class, 8);
-// assertValidateResultForReferentialDtoType(resultByType, MaturityStatusDto.class, 12);
-// assertValidateResultForReferentialDtoType(resultByType, MitigationTypeDto.class, 15);
-// assertValidateResultForReferentialDtoType(resultByType, SensorBrandDto.class, 4);
-// assertValidateResultForReferentialDtoType(resultByType, SensorDataFormatDto.class, 2);
-// assertValidateResultForReferentialDtoType(resultByType, SensorTypeDto.class, 4);
-// assertValidateResultForReferentialDtoType(resultByType, SettingShapeDto.class, 6);
-// assertValidateResultForReferentialDtoType(resultByType, SizeMeasureTypeDto.class, 17);
-// assertValidateResultForReferentialDtoType(resultByType, StomacFullnessDto.class, 7);
-// assertValidateResultForReferentialDtoType(resultByType, TripTypeDto.class, 3);
-// assertValidateResultForReferentialDtoType(resultByType, VesselActivityLonglineDto.class, 5);
-// assertValidateResultForReferentialDtoType(resultByType, WeightMeasureTypeDto.class, 3);
-//
-// assertValidateResultForReferentialDtoType(resultByType, DetectionModeDto.class, 10);
-// assertValidateResultForReferentialDtoType(resultByType, ObjectOperationDto.class, 4);
-// assertValidateResultForReferentialDtoType(resultByType, ObservedSystemDto.class, 21);
-// assertValidateResultForReferentialDtoType(resultByType, ReasonForDiscardDto.class, 5);
-// assertValidateResultForReferentialDtoType(resultByType, ReasonForNoFishingDto.class, 13);
-// assertValidateResultForReferentialDtoType(resultByType, ReasonForNullSetDto.class, 10);
-// assertValidateResultForReferentialDtoType(resultByType, SpeciesFateDto.class, 9);
-// assertValidateResultForReferentialDtoType(resultByType, SpeciesStatusDto.class, 3);
-// assertValidateResultForReferentialDtoType(resultByType, SurroundingActivityDto.class, 8);
-// assertValidateResultForReferentialDtoType(resultByType, TransmittingBuoyOperationDto.class, 3);
-// assertValidateResultForReferentialDtoType(resultByType, TransmittingBuoyTypeDto.class, 12);
-// assertValidateResultForReferentialDtoType(resultByType, VesselActivitySeineDto.class, 23);
-// assertValidateResultForReferentialDtoType(resultByType, WeightCategoryDto.class, 101);
-// assertValidateResultForReferentialDtoType(resultByType, WindDto.class, 13);
-
- }
-
- @Test
- public void testValidateTripSeinesCreate() throws Exception {
-
- DataValidationRequest request = new DataValidationRequest();
-
- request.setValidationContext(ValidateService.UPDATE_VALIDATION_CONTEXT);
- request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values()));
- request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2));
-
- ValidationResult<DataValidationRequest> result = service.validateData(request);
- Assert.assertNotNull(result);
- //FIXME
-// ImmutableMap<Class<? extends IdDto>, ValidateResultForDtoType<? extends IdDto>> resultByType = result.getResultByType();
-// Assert.assertNotNull(resultByType);
-// Assert.assertEquals(5, resultByType.size());
-//
-// assertValidateResultForDtoType(resultByType, TripSeineDto.class, 2);
-// assertValidateResultForDtoType(resultByType, RouteDto.class, 80);
-// assertValidateResultForDtoType(resultByType, ActivitySeineDto.class, 1519);
-// assertValidateResultForDtoType(resultByType, FloatingObjectDto.class, 99);
-// assertValidateResultForDtoType(resultByType, SetSeineDto.class, 77);
-
- }
-
- @Test
- public void testValidateTripSeinesUdpate() throws Exception {
-
- DataValidationRequest request = new DataValidationRequest();
-
- request.setValidationContext(ValidateService.UPDATE_VALIDATION_CONTEXT);
- request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values()));
- request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2));
-
- ValidationResult<DataValidationRequest> result = service.validateData(request);
- Assert.assertNotNull(result);
- //FIXME
-
-// ImmutableMap<Class<? extends IdDto>, ValidateResultForDtoType<? extends IdDto>> resultByType = result.getResultByType();
-// Assert.assertNotNull(resultByType);
-// Assert.assertEquals(8, resultByType.size());
-//
-// assertValidateResultForDtoType(resultByType, TripSeineDto.class, 2);
-// assertValidateResultForDtoType(resultByType, RouteDto.class, 80);
-// assertValidateResultForDtoType(resultByType, ActivitySeineDto.class, 1519);
-// assertValidateResultForDtoType(resultByType, FloatingObjectDto.class, 99);
-// assertValidateResultForDtoType(resultByType, TransmittingBuoyDto.class, 42);
-// assertValidateResultForDtoType(resultByType, SetSeineDto.class, 77);
-// assertValidateResultForDtoType(resultByType, NonTargetCatchDto.class, 3);
-// assertValidateResultForDtoType(resultByType, SchoolEstimateDto.class, 27);
-
- }
-
-// protected <D extends ReferentialDto> void assertValidateResultForReferentialDtoType(ImmutableMap<Class<? extends ReferentialDto>, ValidateResultForDtoType<? extends IdDto>> resultByType, Class<D> dtoType, int expectedCount) {
-//
-// ValidateResultForDtoType<D> validateResultForDtoType = (ValidateResultForDtoType) resultByType.get(dtoType);
-// Assert.assertNotNull(validateResultForDtoType);
-// ImmutableSet<ValidateResultForDto<D>> validateResultForDtos = validateResultForDtoType.getValidateResultForDto();
-// Assert.assertNotNull(validateResultForDtos);
-// Assert.assertEquals(expectedCount, validateResultForDtos.size());
-// for (ValidateResultForDto<D> validateResultForDto : validateResultForDtos) {
-// Assert.assertNotNull(validateResultForDto.getMessages());
-// Assert.assertFalse(validateResultForDto.getMessages().isEmpty());
-// }
-//
-// }
-
-// protected <D extends IdDto> void assertValidateResultForDtoType(ImmutableMap<Class<? extends IdDto>, ValidateResultForDtoType<? extends IdDto>> resultByType, Class<D> dtoType, int expectedCount) {
-//
-// ValidateResultForDtoType<D> validateResultForDtoType = (ValidateResultForDtoType) resultByType.get(dtoType);
-// Assert.assertNotNull(validateResultForDtoType);
-// ImmutableSet<ValidateResultForDto<D>> validateResultForDtos = validateResultForDtoType.getValidateResultForDto();
-// Assert.assertNotNull(validateResultForDtos);
-// Assert.assertEquals(expectedCount, validateResultForDtos.size());
-// for (ValidateResultForDto<D> validateResultForDto : validateResultForDtos) {
-// Assert.assertNotNull(validateResultForDto.getMessages());
-// Assert.assertFalse(validateResultForDto.getMessages().isEmpty());
-// }
-//
-// }
-
-}
=====================================
services-client/src/test/java/fr/ird/observe/services/client/service/seine/TripSeineServiceClientTest.java deleted
=====================================
--- a/services-client/src/test/java/fr/ird/observe/services/client/service/seine/TripSeineServiceClientTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package fr.ird.observe.services.client.service.seine;
-
-/*
- * #%L
- * ObServe :: Services client implementation
- * %%
- * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.collect.Iterables;
-import fr.ird.observe.dto.data.seine.TripSeineDto;
-import fr.ird.observe.dto.data.seine.TripSeineReference;
-import fr.ird.observe.dto.form.Form;
-import fr.ird.observe.dto.reference.DataDtoReference;
-import fr.ird.observe.dto.reference.DataDtoReferenceSet;
-import fr.ird.observe.dto.referential.HarbourDto;
-import fr.ird.observe.dto.referential.OceanDto;
-import fr.ird.observe.dto.referential.PersonDto;
-import fr.ird.observe.dto.referential.ProgramDto;
-import fr.ird.observe.dto.referential.VesselDto;
-import fr.ird.observe.services.action.DeleteRequestDto;
-import fr.ird.observe.services.action.LoadFormRequestDto;
-import fr.ird.observe.services.action.PreCreateFormRequestDto;
-import fr.ird.observe.services.action.SaveRequestDto;
-import fr.ird.observe.services.client.service.ServiceClientTestSupport;
-import fr.ird.observe.services.service.data.seine.TripSeineService;
-import fr.ird.observe.test.ObserveFixtures;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.nuiton.util.DateUtil;
-
-/**
- * @author Tony Chemit - dev(a)tchemit.fr
- */
-
-public class TripSeineServiceClientTest extends ServiceClientTestSupport {
-
- protected TripSeineService service;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
-
- service = newService(TripSeineService.class);
- }
-
- @Test
- public void loadFormTest() throws Exception {
-
- Form<TripSeineDto> form = service.loadForm(LoadFormRequestDto.of(ObserveFixtures.TRIP_SEINE_ID_1));
-
- Assert.assertNotNull(form);
- TripSeineDto tripSeineDto = form.getObject();
-
- Assert.assertNull(tripSeineDto.getCaptain());
-
- Assert.assertEquals("fr.ird.observe.entities.referentiel.Person#1355399844272#0.32586441962131485", tripSeineDto.getObserver().getId());
- Assert.assertEquals("Fanchon", tripSeineDto.getObserver().getFirstName());
- Assert.assertEquals("Varenne", tripSeineDto.getObserver().getLastName());
- Assert.assertNull(tripSeineDto.getDataEntryOperator());
- Assert.assertEquals("fr.ird.observe.entities.referentiel.Vessel#1306847717532#0.7435948873477364", tripSeineDto.getVessel().getId());
- Assert.assertEquals("835", tripSeineDto.getVessel().getCode());
- Assert.assertEquals("BERNICA", tripSeineDto.getVessel().getLabel());
- Assert.assertEquals("fr.ird.observe.entities.referentiel.Ocean#1239832686152#0.8325731048817705", tripSeineDto.getOcean().getId());
- Assert.assertEquals("2", tripSeineDto.getOcean().getCode());
- Assert.assertEquals("Indien", tripSeineDto.getOcean().getLabel());
- Assert.assertNull(tripSeineDto.getDepartureHarbour());
- Assert.assertNull(tripSeineDto.getLandingHarbour());
- Assert.assertNull(tripSeineDto.getErsId());
- Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineDto.getStartDate());
- Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineDto.getEndDate());
- Assert.assertNull(tripSeineDto.getFormsUrl());
- Assert.assertNull(tripSeineDto.getReportsUrl());
- Assert.assertTrue(tripSeineDto.getComment().startsWith("Caractéristiques de la senne"));
-
- assertEditLabels(form, 8,
- ProgramDto.class,
- PersonDto.class,
- VesselDto.class,
- OceanDto.class,
- HarbourDto.class);
-
- }
-
- @Test
- public void preCreateTest() {
- Form<TripSeineDto> form = service.preCreate(PreCreateFormRequestDto.of(ObserveFixtures.PROGRAM_ID));
-
- Assert.assertNotNull(form);
- TripSeineDto tripSeineDto = form.getObject();
-
- Assert.assertNull(tripSeineDto.getCaptain());
- Assert.assertNull(tripSeineDto.getObserver());
- Assert.assertNull(tripSeineDto.getDataEntryOperator());
- Assert.assertNull(tripSeineDto.getVessel());
- Assert.assertNull(tripSeineDto.getOcean());
- Assert.assertNull(tripSeineDto.getDepartureHarbour());
- Assert.assertNull(tripSeineDto.getLandingHarbour());
- Assert.assertNull(tripSeineDto.getErsId());
- //Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getStartDate());
- //Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getEndDate());
- Assert.assertNull(tripSeineDto.getFormsUrl());
- Assert.assertNull(tripSeineDto.getReportsUrl());
- Assert.assertNull(tripSeineDto.getComment());
-
- assertEditLabels(form, 8,
- ProgramDto.class,
- PersonDto.class,
- VesselDto.class,
- OceanDto.class,
- HarbourDto.class);
-
- }
-
- //FIXME Ce test modifie la base, il faut trouver un moyen d'utiliser une autre base
- @Ignore
- @Test
- public void saveUpdateTest() {
-
- Form<TripSeineDto> form = service.loadForm(LoadFormRequestDto.of(ObserveFixtures.TRIP_SEINE_ID_1));
-
- TripSeineDto tripSeineDto = form.getObject();
-
-// ReferenceSetDto<PersonDto> personRefs = formDto.getReferenceSetDto(PersonDto.class);
-// ReferenceSetDto<OceanDto> oceanRefs = formDto.getReferenceSetDto(OceanDto.class);
-// ReferenceSetDto<HarbourDto> harbourRefs = formDto.getReferenceSetDto(HarbourDto.class);
-//
-// tripSeineDto.setCaptain((PersonReference) personRefs.toSet(0));
-// tripSeineDto.setDataEntryOperator((PersonReference) personRefs.toSet(2));
-//
-// tripSeineDto.setOcean((OceanReference) oceanRefs.toSet(0));
-//
-// tripSeineDto.setDepartureHarbour((HarbourReference) harbourRefs.toSet(0));
-// tripSeineDto.setLandingHarbour((HarbourReference) harbourRefs.toSet(1));
-
- tripSeineDto.setErsId("ersid");
-
- tripSeineDto.setStartDate(DateUtil.createDate(24, 8, 2015));
- tripSeineDto.setEndDate(DateUtil.createDate(24, 9, 2015));
-
- tripSeineDto.setFormsUrl("http://une.url.com/formulaire");
- tripSeineDto.setReportsUrl("http://une.url.com/rapport");
-
- tripSeineDto.setComment("Un commentaire");
-
- service.save(SaveRequestDto.of(form.getObject()));
-
- Form<TripSeineDto> formReload = service.loadForm(LoadFormRequestDto.of(ObserveFixtures.TRIP_SEINE_ID_1));
- TripSeineDto tripSeineDtoReload = formReload.getObject();
-
- Assert.assertEquals(tripSeineDto.getCaptain().getId(), tripSeineDtoReload.getCaptain().getId());
- Assert.assertEquals(tripSeineDto.getObserver().getId(), tripSeineDtoReload.getObserver().getId());
- Assert.assertEquals(tripSeineDto.getDataEntryOperator().getId(), tripSeineDtoReload.getDataEntryOperator().getId());
- Assert.assertEquals(tripSeineDto.getVessel().getId(), tripSeineDtoReload.getVessel().getId());
- Assert.assertEquals(tripSeineDto.getOcean().getId(), tripSeineDtoReload.getOcean().getId());
- Assert.assertEquals(tripSeineDto.getDepartureHarbour().getId(), tripSeineDtoReload.getDepartureHarbour().getId());
- Assert.assertEquals(tripSeineDto.getLandingHarbour().getId(), tripSeineDtoReload.getLandingHarbour().getId());
- Assert.assertEquals(tripSeineDto.getErsId(), tripSeineDtoReload.getErsId());
- Assert.assertEquals(tripSeineDto.getStartDate(), tripSeineDtoReload.getStartDate());
- Assert.assertEquals(tripSeineDto.getEndDate(), tripSeineDtoReload.getEndDate());
- Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeineDtoReload.getFormsUrl());
- Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeineDtoReload.getReportsUrl());
- Assert.assertEquals(tripSeineDto.getComment(), tripSeineDtoReload.getComment());
-
- }
-
- @Ignore
- @Test
- public void deleteTest() {
-
- service.delete(DeleteRequestDto.of(ObserveFixtures.TRIP_SEINE_ID_1));
-
- DataDtoReferenceSet<TripSeineReference> tripSeineByProgram = service.getAllTripSeine();
-
- Assert.assertEquals(2, tripSeineByProgram.size());
-
- Assert.assertTrue(Iterables.isEmpty(DataDtoReference.filterById(tripSeineByProgram.toSet(), ObserveFixtures.TRIP_SEINE_ID_1)));
-
- }
-
-
-}
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a1b81a639a636d5e8f656aa8f78…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a1b81a639a636d5e8f656aa8f78…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 2 commits: review tests layout, now we got common tests for services
by Tony CHEMIT 25 Oct '17
by Tony CHEMIT 25 Oct '17
25 Oct '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
fd29b00e by Tony CHEMIT at 2017-10-25T14:05:55+02:00
review tests layout, now we got common tests for services
- - - - -
c562b80e by Tony CHEMIT at 2017-10-25T14:06:21+02:00
some api changes on ui, but still not working...
- - - - -
30 changed files:
- client/pom.xml
- client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java
- client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java
- client/src/main/java/fr/ird/observe/client/form/open/ObserveOpenDataFormUIModel.java
- client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIModel.java
- client/src/main/java/fr/ird/observe/client/form/referential/ObserveReferentialFormUIModel.java
- client/src/main/java/fr/ird/observe/client/form/simple/ObserveMainDataFormUIModel.java
- client/src/main/java/fr/ird/observe/client/form/simple/ObserveSimpleDataFormUIModel.java
- client/src/main/java/fr/ird/observe/client/form/simplelist/ObserveSimpleDataListFormUIModel.java
- client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java
- client/src/test/java/fr/ird/observe/client/ClientTestClassResource.java
- services/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java → client/src/test/java/fr/ird/observe/client/ClientTestContext.java
- client/src/test/java/fr/ird/observe/client/ClientTestMethodResource.java
- client/src/test/java/fr/ird/observe/client/ClientTestSupport.java
- − client/src/test/java/fr/ird/observe/client/DataSourcesForTestManager.java
- client/src/test/java/fr/ird/observe/client/tools/ObserveTextGeneratorTest.java
- + client/src/test/resources/META-INF/services/fr.ird.observe.services.test.TestContext
- persistence/src/main/resources/db/migration/6.904/04_add_triggers-PG.sql
- pom.xml
- server/src/main/java/fr/ird/observe/server/security/ObserveWebSecurityApplicationContext.java
- services-client/pom.xml
- services-client/src/license/THIRD-PARTY.properties
- services/src/main/java/fr/ird/observe/services/service/LastUpdateDateService.java → services-client/src/test/java/fr/ird/observe/services/client/ServiceClientTestSuite.java
- services-client/src/test/java/fr/ird/observe/services/client/service/DataSourceServiceClientTest.java
- services-client/src/test/java/fr/ird/observe/services/client/service/PingServiceClientTest.java
- − services-client/src/test/java/fr/ird/observe/services/client/service/ReferentialServiceClientTest.java
- services-client/src/test/java/fr/ird/observe/services/client/service/ServiceClientTestSupport.java
- services-client/src/test/java/fr/ird/observe/services/client/service/actions/consolidate/ConsolidateDataServiceClientTest.java
- services/src/main/java/fr/ird/observe/services/service/PingService.java → services-client/src/test/java/fr/ird/observe/services/client/service/actions/consolidate/dcp/SimplifiedObjectTypeManagerTest.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/752ec262f5633837e90330943c…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/752ec262f5633837e90330943c…
You're receiving this email because of your account on gitlab.com.
1
0