[Observe-commits] 02/02: Move tests to correct packages

25 Nov 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 59525e4cee58aaa048ecce2f547d1f40e69546cb
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Nov 25 17:57:18 2016 +0100

    Move tests to correct packages
---
 .../topia/ObserveServiceContextTopiaTaiste.java      |  1 -
 .../services/topia/TopiaTestClassResource.java       |  4 ++--
 .../services/topia/TopiaTestMethodResource.java      |  2 +-
 .../services/topia/binder/BinderEngineTest.java      |  4 ++--
 .../topia/entity/LengthWeightParemetersTest.java     | 12 ++++++------
 .../services/topia/entity/ReplicateTestSupport.java  |  4 ++--
 .../topia/entity/ReplicateTripLonglineTest.java      |  8 ++++----
 .../topia/service/AbstractServiceTopiaTest.java      |  8 ++++----
 .../topia/service/DataSourceServiceTopiaTest.java    | 12 ++++++------
 .../topia/service/ReferentialServiceTopiaTest.java   |  2 +-
 .../observe/services/topia/service/RigthTest.java    |  4 ++--
 .../report/ReportAccessoryCatchByGroupTest.java      | 20 ++++++++++----------
 .../actions/report/ReportAccessoryCatchTest.java     |  6 +++---
 .../report/ReportActivityWithCommentTest.java        |  8 ++++----
 .../actions/report/ReportDailySetAndCatchTest.java   |  4 ++--
 .../actions/report/ReportSetByAssociationTest.java   | 12 ++++++------
 .../report/ReportTargetCatchByAssociationTest.java   | 12 ++++++------
 .../ReportTargetDiscardedByAssociationTest.java      | 12 ++++++------
 .../{ => data}/TripManagementServiceTopiaTest.java   |  8 +++++---
 ...SetLonglineDetailCompositionServiceTopiaTest.java |  2 +-
 .../{ => data}/seine/RouteServiceTopiaTest.java      |  3 +--
 .../seine/TargetSampleServiceTopiaTest.java          |  2 +-
 .../seine/TripSeineGearUseServiceTopiaTest.java      |  4 ++--
 .../{ => data}/seine/TripSeineServiceTopiaTest.java  |  8 ++++----
 24 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveServiceContextTopiaTaiste.java b/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveServiceContextTopiaTaiste.java
index 1eca4d0..da89dd1 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveServiceContextTopiaTaiste.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveServiceContextTopiaTaiste.java
@@ -24,7 +24,6 @@ package fr.ird.observe.services.topia;
 
 import fr.ird.observe.services.ObserveServiceFactory;
 import fr.ird.observe.services.ObserveServiceInitializer;
-import fr.ird.observe.services.topia.ObserveServiceContextTopia;
 import org.nuiton.util.DateUtil;
 
 import java.util.Date;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java
index 34968be..4c20b78 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java
@@ -24,13 +24,13 @@ package fr.ird.observe.services.topia;
 
 import fr.ird.observe.services.ObserveService;
 import fr.ird.observe.services.ObserveServiceInitializer;
-import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration;
-import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
+import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto;
 import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException;
 import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException;
+import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
 import fr.ird.observe.services.service.BabModelVersionException;
 import fr.ird.observe.services.service.DataSourceService;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java
index 118e158..35f6f24 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java
@@ -25,8 +25,8 @@ package fr.ird.observe.services.topia;
 import fr.ird.observe.ObserveTopiaApplicationContext;
 import fr.ird.observe.ObserveTopiaPersistenceContext;
 import fr.ird.observe.services.ObserveService;
-import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
+import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.services.service.BabModelVersionException;
 import fr.ird.observe.services.service.DataSourceService;
 import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java
index 929e506..91035ab 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java
@@ -69,12 +69,14 @@ import fr.ird.observe.services.dto.referential.ProgramDto;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.SexDto;
 import fr.ird.observe.services.dto.referential.ShipOwnerDto;
+import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto;
 import fr.ird.observe.services.dto.referential.SpeciesDto;
 import fr.ird.observe.services.dto.referential.SpeciesGroupDto;
 import fr.ird.observe.services.dto.referential.SpeciesListDto;
 import fr.ird.observe.services.dto.referential.VesselDto;
 import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto;
 import fr.ird.observe.services.dto.referential.VesselTypeDto;
+import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto;
 import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto;
 import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto;
 import fr.ird.observe.services.dto.referential.longline.BaitTypeDto;
@@ -95,11 +97,9 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto;
 import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto;
 import fr.ird.observe.services.dto.referential.longline.SensorTypeDto;
 import fr.ird.observe.services.dto.referential.longline.SettingShapeDto;
-import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto;
 import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto;
 import fr.ird.observe.services.dto.referential.longline.TripTypeDto;
 import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto;
-import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto;
 import fr.ird.observe.services.dto.referential.seine.DetectionModeDto;
 import fr.ird.observe.services.dto.referential.seine.ObjectFateDto;
 import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java
index be7d169..d705846 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java
@@ -200,16 +200,16 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest {
 
         assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2009, date1970);
         assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2009, date1970);
-        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex,undeterminedSex, date2009, date1970);
+        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, undeterminedSex, date2009, date1970);
         assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2009, date1970);
 
-        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2010,date2010);
+        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2010, date2010);
         assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2010, date2010);
-        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex,undeterminedSex, date2010,date2010);
+        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2010, date2010);
 
-        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2011,date2011);
+        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2011, date2011);
         assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2011, date2011);
-        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex,undeterminedSex, date2011,date2011);
+        assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2011, date2011);
 
         assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, undeterminedSex, date2010);
         assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, maleSex, date2010);
@@ -226,7 +226,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest {
 
         Assert.assertNotNull("length weith parameter not found for species " + species.getFaoCode() + " - ocean " + ocean.getLabel1() + " - sex " + (sex == null ? "null" : sex.getLabel1()) + " at " + date, lengthWeightParameter);
         Assert.assertEquals("Expected sex is " + expectedSex.getLabel1() + " but the one found was " + lengthWeightParameter.getSex().getLabel1(), expectedSex, lengthWeightParameter.getSex());
-        if (lengthWeightParameter.getStartDate()!=null) {
+        if (lengthWeightParameter.getStartDate() != null) {
             Date startDate = new Date(lengthWeightParameter.getStartDate().getTime());
             Assert.assertEquals("Expected startDate is " + expectedStartDate + " but the one found was " + startDate, expectedStartDate, startDate);
         }
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java
index 85f291b..634f5a0 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java
@@ -26,14 +26,14 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import fr.ird.observe.ObserveTopiaApplicationContext;
 import fr.ird.observe.ObserveTopiaPersistenceContext;
-import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory;
 import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException;
 import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException;
-import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest;
 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.topia.ObserveTopiaApplicationContextFactory;
+import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest;
 import fr.ird.observe.test.DatabaseName;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java
index e1daf13..0580122 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java
@@ -43,7 +43,7 @@ import java.io.IOException;
  * Created on 29/12/15.
  *
  * @author Tony Chemit - chemit@codelutin.com
- * FIXME Review database, there is some missing in new referential, so it does not work.
+ *         FIXME Review database, there is some missing in new referential, so it does not work.
  */
 @Ignore
 @DatabaseNameConfiguration(DatabaseName.dataForTestLongline)
@@ -57,9 +57,9 @@ public class ReplicateTripLonglineTest extends ReplicateTestSupport {
     @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);
+                      ObserveFixtures.TRIP_LONGLINE_ID_1,
+                      ObserveFixtures.TRIP_LONGLINE_ID_2,
+                      ObserveFixtures.TRIP_LONGLINE_ID_3);
     }
 
     @Test
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java
index c1dac94..5f9241e 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java
@@ -24,16 +24,16 @@ package fr.ird.observe.services.topia.service;
 
 import fr.ird.observe.ObserveTopiaPersistenceContext;
 import fr.ird.observe.entities.ObserveEntity;
+import fr.ird.observe.services.dto.Form;
+import fr.ird.observe.services.dto.referential.ReferentialDto;
+import fr.ird.observe.services.dto.referential.ReferentialReference;
+import fr.ird.observe.services.dto.referential.ReferentialReferenceSet;
 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.topia.TopiaTestClassResource;
 import fr.ird.observe.services.topia.TopiaTestMethodResource;
-import fr.ird.observe.services.dto.Form;
-import fr.ird.observe.services.dto.referential.ReferentialDto;
-import fr.ird.observe.services.dto.referential.ReferentialReference;
-import fr.ird.observe.services.dto.referential.ReferentialReferenceSet;
 import fr.ird.observe.test.DatabaseName;
 import fr.ird.observe.test.ObserveTestConfiguration;
 import fr.ird.observe.test.spi.DatabaseLoginConfiguration;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java
index 9bc58a4..ef588d3 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java
@@ -24,18 +24,18 @@ package fr.ird.observe.services.topia.service;
 
 import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.ObserveTopiaApplicationContext;
+import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
+import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
+import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto;
+import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException;
+import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException;
+import fr.ird.observe.services.dto.referential.GearDto;
 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.service.referential.ReferentialService;
 import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory;
-import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
-import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
-import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto;
-import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException;
-import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException;
-import fr.ird.observe.services.dto.referential.GearDto;
 import fr.ird.observe.test.DatabaseName;
 import fr.ird.observe.test.ObserveFixtures;
 import fr.ird.observe.test.ObserveTestConfiguration;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java
index 7b0877f..88ba5f2 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java
@@ -26,7 +26,6 @@ import fr.ird.observe.ObserveTopiaPersistenceContext;
 import fr.ird.observe.entities.referentiel.LengthWeightParameter;
 import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
 import fr.ird.observe.entities.referentiel.Program;
-import fr.ird.observe.services.topia.binder.BinderEngine;
 import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.IdDto;
 import fr.ird.observe.services.dto.referential.LengthWeightParameterDto;
@@ -34,6 +33,7 @@ import fr.ird.observe.services.dto.referential.ProgramDto;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.service.DataNotFoundException;
 import fr.ird.observe.services.service.referential.ReferentialService;
+import fr.ird.observe.services.topia.binder.BinderEngine;
 import fr.ird.observe.services.topia.service.referential.ReferentialServiceTopia;
 import fr.ird.observe.test.spi.CopyDatabaseConfiguration;
 import org.apache.commons.logging.Log;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java
index 56b4059..bc63a85 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java
@@ -23,8 +23,8 @@ package fr.ird.observe.services.topia.service;
  */
 
 import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider;
-import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG;
 import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
+import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG;
 import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.UnauthorizedException;
 import fr.ird.observe.services.dto.referential.ProgramDto;
@@ -32,8 +32,8 @@ import fr.ird.observe.services.dto.seine.TripSeineDto;
 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.service.data.seine.TripSeineService;
+import fr.ird.observe.services.service.referential.ReferentialService;
 import fr.ird.observe.test.DatabaseName;
 import fr.ird.observe.test.ObserveTestConfiguration;
 import fr.ird.observe.test.spi.DatabaseLoginConfiguration;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java
index bab402e..7c0ce73 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java
@@ -48,16 +48,16 @@ public class ReportAccessoryCatchByGroupTest extends AbstractReportServiceTopiaT
                 -1,
                 11,
                 new String[]{"Espèce",
-                             "Total BL",
-                             "Total BO",
-                             "Sorti vivant/échappé",
-                             "Sorti mort",
-                             "Rejeté vivant",
-                             "Rejeté mort",
-                             "Partiellement conservé",
-                             "Cuve",
-                             "Cuisine",
-                             "Autre"
+                        "Total BL",
+                        "Total BO",
+                        "Sorti vivant/échappé",
+                        "Sorti mort",
+                        "Rejeté vivant",
+                        "Rejeté mort",
+                        "Partiellement conservé",
+                        "Cuve",
+                        "Cuisine",
+                        "Autre"
                 }
         );
 
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java
index d9390d6..14e9971 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java
@@ -42,7 +42,7 @@ public class ReportAccessoryCatchTest extends AbstractReportServiceTopiaTest {
                 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."
+                        "Les poids sont exprimés en tonnes."
         );
 
         assertReportDimension(
@@ -50,8 +50,8 @@ public class ReportAccessoryCatchTest extends AbstractReportServiceTopiaTest {
                 -1,
                 3,
                 new String[]{"Espèce",
-                             "Banc libre",
-                             "Banc objet",
+                        "Banc libre",
+                        "Banc objet",
                 }
         );
 
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java
index fb58773..47c3664 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java
@@ -54,10 +54,10 @@ public class ReportActivityWithCommentTest extends AbstractReportServiceTopiaTes
                 -1,
                 5,
                 new String[]{"Jour - Heure observation",
-                             "Latitude",
-                             "Longitude",
-                             "Activité",
-                             "Commentaire"
+                        "Latitude",
+                        "Longitude",
+                        "Activité",
+                        "Commentaire"
                 }
         );
 
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java
index 436cff4..da6f9d1 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java
@@ -54,8 +54,8 @@ public class ReportDailySetAndCatchTest extends AbstractReportServiceTopiaTest {
                 -1,
                 3,
                 new String[]{"Jour observation",
-                             "Nombre de calées",
-                             "Captures thon"
+                        "Nombre de calées",
+                        "Captures thon"
                 }
         );
 
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java
index cc5d0d4..3805f03 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java
@@ -53,10 +53,10 @@ public class ReportSetByAssociationTest extends AbstractReportServiceTopiaTest {
                 3,
                 5,
                 new String[]{"BL sans baleine",
-                             "BL avec baleine",
-                             "BO avec requin-baleine",
-                             "BO sans requin-baleine",
-                             "Total"
+                        "BL avec baleine",
+                        "BO avec requin-baleine",
+                        "BO sans requin-baleine",
+                        "Total"
                 },
                 "Coups positifs", "Coups nuls", "Total");
 
@@ -119,9 +119,9 @@ public class ReportSetByAssociationTest extends AbstractReportServiceTopiaTest {
         assertResultDimension(result, 5, 3, 0, 0);
 
         int row = 0;
-        assertResultRow(result, row++, "19" ,"1" ,"0" ,"6" ,"26");
+        assertResultRow(result, row++, "19", "1", "0", "6", "26");
         assertResultRow(result, row++, "9", "0", "0", "0", "9");
-        assertResultRow(result, row, "28" ,"1" ,"0" ,"6" ,"35");
+        assertResultRow(result, row, "28", "1", "0", "6", "35");
 
     }
 }
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java
index 90b47a9..0f95573 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java
@@ -53,12 +53,12 @@ public class ReportTargetCatchByAssociationTest extends AbstractReportServiceTop
                 5,
                 7,
                 new String[]{"YFT",
-                             "SKJ",
-                             "BET",
-                             "LTA",
-                             "FRI",
-                             "Autres",
-                             "Total"
+                        "SKJ",
+                        "BET",
+                        "LTA",
+                        "FRI",
+                        "Autres",
+                        "Total"
                 },
                 "BL sans baleine",
                 "BL avec baleine",
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java
index d12f699..f1e8030 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java
@@ -53,12 +53,12 @@ public class ReportTargetDiscardedByAssociationTest extends AbstractReportServic
                 5,
                 7,
                 new String[]{"YFT",
-                             "SKJ",
-                             "BET",
-                             "LTA",
-                             "FRI",
-                             "Autres",
-                             "Total"
+                        "SKJ",
+                        "BET",
+                        "LTA",
+                        "FRI",
+                        "Autres",
+                        "Total"
                 },
                 "BL sans baleine",
                 "BL avec baleine",
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java
similarity index 97%
rename from services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java
rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java
index 138be62..a46c850 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.topia.service;
+package fr.ird.observe.services.topia.service.data;
 
 /*-
  * #%L
@@ -33,15 +33,17 @@ 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.service.data.longline.TripLonglineService;
-import fr.ird.observe.services.service.data.seine.TripSeineService;
 import fr.ird.observe.services.service.data.DeleteTripRequest;
 import fr.ird.observe.services.service.data.DeleteTripResult;
 import fr.ird.observe.services.service.data.ExportTripRequest;
 import fr.ird.observe.services.service.data.ExportTripResult;
 import fr.ird.observe.services.service.data.ImportTripRequest;
 import fr.ird.observe.services.service.data.TripManagementService;
+import fr.ird.observe.services.service.data.longline.TripLonglineService;
+import fr.ird.observe.services.service.data.seine.TripSeineService;
 import fr.ird.observe.services.topia.ObserveDataSourceConnectionTopiaTaiste;
+import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest;
+import fr.ird.observe.services.topia.service.ReferentialServiceTopiaTest;
 import fr.ird.observe.test.DatabaseName;
 import fr.ird.observe.test.ObserveFixtures;
 import fr.ird.observe.test.spi.CopyDatabaseConfiguration;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopiaTest.java
similarity index 99%
rename from services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java
rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopiaTest.java
index 7fdd407..c13c004 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopiaTest.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.topia.service.longline;
+package fr.ird.observe.services.topia.service.data.longline;
 
 /*
  * #%L
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopiaTest.java
similarity index 97%
rename from services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java
rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopiaTest.java
index ac2288b..e6953fa 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopiaTest.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.topia.service.seine;
+package fr.ird.observe.services.topia.service.data.seine;
 
 /*
  * #%L
@@ -65,7 +65,6 @@ public class RouteServiceTopiaTest extends AbstractServiceTopiaTest {
         Assert.assertNull(routeDto.getComment());
 
 
-
     }
 
 }
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopiaTest.java
similarity index 97%
rename from services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java
rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopiaTest.java
index 1492859..c69a980 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopiaTest.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.topia.service.seine;
+package fr.ird.observe.services.topia.service.data.seine;
 
 /*
  * #%L
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopiaTest.java
similarity index 99%
rename from services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java
rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopiaTest.java
index a227bfd..7a28eaa 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopiaTest.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.topia.service.seine;
+package fr.ird.observe.services.topia.service.data.seine;
 
 /*
  * #%L
@@ -31,8 +31,8 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto;
 import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto;
 import fr.ird.observe.services.dto.seine.TripSeineGearUseDto;
 import fr.ird.observe.services.service.data.seine.TripSeineGearUseService;
-import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest;
 import fr.ird.observe.services.service.referential.ReferentialService;
+import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest;
 import fr.ird.observe.test.DatabaseName;
 import fr.ird.observe.test.ObserveFixtures;
 import fr.ird.observe.test.spi.CopyDatabaseConfiguration;
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java
similarity index 99%
rename from services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java
rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java
index 4c70595..796ee20 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.topia.service.seine;
+package fr.ird.observe.services.topia.service.data.seine;
 
 /*
  * #%L
@@ -23,8 +23,6 @@ package fr.ird.observe.services.topia.service.seine;
  */
 
 import fr.ird.observe.entities.seine.TripSeine;
-import fr.ird.observe.services.service.data.seine.TripSeineService;
-import fr.ird.observe.services.topia.ObserveServiceContextTopiaTaiste;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.DataReferenceSet;
 import fr.ird.observe.services.dto.Form;
@@ -34,12 +32,14 @@ import fr.ird.observe.services.dto.referential.PersonDto;
 import fr.ird.observe.services.dto.referential.VesselDto;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
-import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest;
 import fr.ird.observe.services.service.BabModelVersionException;
 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.service.data.seine.TripSeineService;
 import fr.ird.observe.services.service.referential.ReferentialService;
+import fr.ird.observe.services.topia.ObserveServiceContextTopiaTaiste;
+import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest;
 import fr.ird.observe.test.DatabaseName;
 import fr.ird.observe.test.ObserveFixtures;
 import fr.ird.observe.test.spi.CopyDatabaseConfiguration;

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Observe-commits] 02/02: Move tests to correct packages

codelutin.com scm