[Git][ultreiaio/ird-observe][develop] reformat test + improve code

25 Oct 2017

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/bb2a1aac2e3a2dade97d38915760...

---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb2a1aac2e3a2dade97d38915760...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)