GitLab

at 2017-10-25T18:59:03+02:00

reformat test + improve code

 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;

     }

 

     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);

  */

 

 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;

 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;

 

 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;

  */

 

 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;

 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;

 

 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;

 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;

 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;

 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;

 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;

 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;

 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;

 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;

     @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

 

     }

 

-//    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 {

 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;

     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);

         if (referentialCache != null) {

             referentialCache.close();

         }

-        

+

         getTestClassResource().setTemporaryDirectoryRoot(null);

 

     }

...	...	@@ -242,7 +242,7 @@ public abstract class TestMethodResourceSupport implements TestRule {
242	242	if (referentialCache != null) {
243	243	referentialCache.close();
244	244	}
245		-
	245	+
246	246	getTestClassResource().setTemporaryDirectoryRoot(null);
247	247
248	248	}

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

Commits:

17 changed files:

Changes: