branch develop updated (dbb7488 -> ed29196)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from dbb7488 Correction des noms de schema (en minuscule sous pg pour le requetage) new 339f51d filter le fichier de configuration des tests new 8edfb88 Suppression code mort new 83899db Calculer les types des composants d'une référence à partir de l'introspection et non plus les valeurs (si elles sont nulles, on perd le type à la sérialisation) new 9ee40dc Suppression code mort new 7f05a7a Ajout d'un test pour s'assurer que les references sont bien remontées new 3e50fd6 Correction d'un erreur de typo sur des paramètres de méthodes utilisés via paranamer... Badaboom new 6864397 Revue des tests et ajout de fimxme a regler (Sylvain) new ed29196 Suppression code mort The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ed2919682517a3531ea03677ee25688a284841c3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 22:56:30 2015 +0100 Suppression code mort commit 68643974ed2ea1c55c732e0022da46f1d1cab1a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 22:56:06 2015 +0100 Revue des tests et ajout de fimxme a regler (Sylvain) commit 3e50fd6ba52032dbd3ac0de7f63bd8ea8cb3eb2b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 22:50:29 2015 +0100 Correction d'un erreur de typo sur des paramètres de méthodes utilisés via paranamer... Badaboom commit 7f05a7ac151ea8f62e7393789d90a2d969834c6a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:20:07 2015 +0100 Ajout d'un test pour s'assurer que les references sont bien remontées commit 9ee40dc36d9fcee6030cdbb510277e77bf7d53c6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:19:16 2015 +0100 Suppression code mort commit 83899db17e10a5d7d0166890701a528c71606713 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:18:22 2015 +0100 Calculer les types des composants d'une référence à partir de l'introspection et non plus les valeurs (si elles sont nulles, on perd le type à la sérialisation) commit 8edfb88211c9cd08dde62d63469f4916db8c9e60 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:14:43 2015 +0100 Suppression code mort commit 339f51d292c3dad9d18cc8adb9f59e6fa9c6b3dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:14:29 2015 +0100 filter le fichier de configuration des tests Summary of changes: observe-application-web/pom.xml | 14 -- .../longline/TripLonglineGearUseService.java | 4 +- .../service/seine/TripSeineGearUseService.java | 4 +- .../fr/ird/observe/services/dto/ReferenceDto.java | 18 +- .../services/http/ObserveRequestBuilder.java | 10 - .../ird/observe/services/http/ObserveResponse.java | 56 ------ .../services/service/AbstractServiceRestTest.java | 49 +++++ .../service/ReferentialServiceRestTest.java | 73 +++++++ .../seine/TripSeineGearUseServiceRestTest.java | 210 ++++++++++++--------- .../service/seine/TripSeineServiceRestTest.java | 72 +++---- observe-test-data/pom.xml | 11 ++ 11 files changed, 291 insertions(+), 230 deletions(-) create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 339f51d292c3dad9d18cc8adb9f59e6fa9c6b3dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:14:29 2015 +0100 filter le fichier de configuration des tests --- observe-test-data/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/observe-test-data/pom.xml b/observe-test-data/pom.xml index e4d54b3..3695e16 100644 --- a/observe-test-data/pom.xml +++ b/observe-test-data/pom.xml @@ -83,9 +83,20 @@ <resources> <resource> <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> <includes> <include>**/*</include> </includes> + <excludes> + <exclude>*.properties</exclude> + </excludes> + <filtering>false</filtering> </resource> </resources> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 8edfb88211c9cd08dde62d63469f4916db8c9e60 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:14:43 2015 +0100 Suppression code mort --- observe-application-web/pom.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/observe-application-web/pom.xml b/observe-application-web/pom.xml index eca5565..ae8ee44 100644 --- a/observe-application-web/pom.xml +++ b/observe-application-web/pom.xml @@ -218,16 +218,6 @@ <webAppConfig> <contextPath>/${defaultWebContextPath}</contextPath> </webAppConfig> - <!--systemProperties> - <systemProperty> - <name>testDirectory</name> - <value>${defaultLogDir}</value> - </systemProperty> - <systemProperty> - <name>pollen.data.directory</name> - <value>${defaultDbDir}</value> - </systemProperty> - </systemProperties--> </configuration> </plugin> @@ -236,10 +226,6 @@ <artifactId>tomcat7-maven-plugin</artifactId> <configuration> <path>/${defaultWebContextPath}</path> - <!--systemProperties> - <pollen.data.directory>${defaultDbDir}</pollen.data.directory> - <pollen.log.dir>${defaultLogDir}</pollen.log.dir> - </systemProperties--> <uriEncoding>UTF-8</uriEncoding> </configuration> </plugin> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 83899db17e10a5d7d0166890701a528c71606713 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:18:22 2015 +0100 Calculer les types des composants d'une référence à partir de l'introspection et non plus les valeurs (si elles sont nulles, on perd le type à la sérialisation) --- .../java/fr/ird/observe/services/dto/ReferenceDto.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java index 5160dbd..3989214 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java @@ -25,6 +25,9 @@ package fr.ird.observe.services.dto; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import fr.ird.observe.services.dto.referential.I18nReferentialDto; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; import java.io.Serializable; import java.util.Arrays; @@ -59,6 +62,18 @@ public class ReferenceDto<D extends IdDto> extends AbstractReferenceDto { this.labelPropertyNames = Lists.newArrayList(labelPropertyNames); this.labelPropertyValues = new Serializable[this.labelPropertyNames.size()]; this.labelPropertyTypes = new Class[this.labelPropertyNames.size()]; + Binder<D, D> ddBinder = BinderFactory.newBinder(type); + int index=0; + for (String labelPropertyName : labelPropertyNames) { + Class<?> sourcePropertyType; + if (I18nReferentialDto.PROPERTY_LABEL.equals(labelPropertyName)) { + sourcePropertyType = String.class; + } else { + sourcePropertyType = ddBinder.getSourcePropertyType(labelPropertyName); + } + this.labelPropertyTypes[index++] = sourcePropertyType; + } + } public Serializable getPropertyValue(String propertyName) { @@ -74,7 +89,6 @@ public class ReferenceDto<D extends IdDto> extends AbstractReferenceDto { Preconditions.checkNotNull(propertyName, "propertyName parameter can't be null"); int propertyIndex = getPropertyIndex(propertyName); labelPropertyValues[propertyIndex] = propertyValue; - labelPropertyTypes[propertyIndex] = propertyValue.getClass(); } public void addPropertyValue(String propertyName, Serializable propertyValue) { @@ -94,8 +108,8 @@ public class ReferenceDto<D extends IdDto> extends AbstractReferenceDto { } else { labelPropertyValues[propertyIndex] = propertyValue; - labelPropertyTypes[propertyIndex] = propertyValue.getClass(); } + } protected int getPropertyIndex(String propertyName) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 9ee40dc36d9fcee6030cdbb510277e77bf7d53c6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:19:16 2015 +0100 Suppression code mort --- .../services/http/ObserveRequestBuilder.java | 18 +++---- .../ird/observe/services/http/ObserveResponse.java | 56 ---------------------- 2 files changed, 9 insertions(+), 65 deletions(-) diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java index ba4668f..cbfa712 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java @@ -103,15 +103,15 @@ public class ObserveRequestBuilder { return this; } - public ObserveRequestBuilder addParameter(String parameterName, int value) { - return addParameter(parameterName, String.valueOf(value)); - } - - public ObserveRequestBuilder addParameter(String parameterName, File file) { - checkParameterNotNull(parameterName, file); - files.put(parameterName, file); - return this; - } +// public ObserveRequestBuilder addParameter(String parameterName, int value) { +// return addParameter(parameterName, String.valueOf(value)); +// } +// +// public ObserveRequestBuilder addParameter(String parameterName, File file) { +// checkParameterNotNull(parameterName, file); +// files.put(parameterName, file); +// return this; +// } public ObserveRequestBuilder addParameter(String parameterName, Object toJson) throws IOException { String json = gson.toJson(toJson); diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java index c94b996..730d7aa 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java @@ -22,14 +22,11 @@ package fr.ird.observe.services.http; * #L% */ -import com.google.common.base.Preconditions; -import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.Header; import java.io.IOException; -import java.lang.reflect.Type; /** * @author Arnaud Thimel - thimel@codelutin.com @@ -93,59 +90,6 @@ public class ObserveResponse<T> { return resultObject; } - public static <T> T convertJson(String json, Type type, Gson gson) throws IOException { - - Preconditions.checkNotNull(json); - Preconditions.checkNotNull(gson); - - // we must try to convert json to a T instance - T result = null; - -// try { - - // let's first try to convert json to T - if (!Void.TYPE.equals(type)) { - result = gson.fromJson(json, type); - } - -// } catch (IOException e) { -// -// // conversion to T failed, we will throw a json exception -// RemoteCallUnexpectedJsonException remoteCallUnexpectedJsonException; -// -// try { -// -// // before, try to read json as an error message -// remoteCallUnexpectedJsonException = RemoteCallUnexpectedJsonException.newFromJson(json); -// -// if (log.isInfoEnabled()) { -// log.info("service returned a json showing an error occurred ", remoteCallUnexpectedJsonException); -// } -// -// } catch (IOException ee) { -// -// if (log.isErrorEnabled()) { -// log.error("json parsing failed, json=" + json, e); -// } -// -// // json is not of type T and not an error message, -// // throw the exception with e as cause cause it may be the real problem -// remoteCallUnexpectedJsonException = RemoteCallUnexpectedJsonException.newFromParsingException(e); -// -// } -// -// throw remoteCallUnexpectedJsonException; -// -// } - - if (log.isTraceEnabled()) { - log.trace("parsing json " + json + " returns " + result); - } - - - return result; - } - @Override public String toString() { StringBuilder buffer = new StringBuilder(). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 7f05a7ac151ea8f62e7393789d90a2d969834c6a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 21:20:07 2015 +0100 Ajout d'un test pour s'assurer que les references sont bien remontées --- .../service/ReferentialServiceRestTest.java | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java new file mode 100644 index 0000000..5fd96a9 --- /dev/null +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java @@ -0,0 +1,73 @@ +package fr.ird.observe.services.service; + +import fr.ird.observe.services.TestClassResource; +import fr.ird.observe.services.TestMethodResource; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.ObserveDataSourceConnection; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.constants.GearType; +import fr.ird.observe.services.dto.referential.ProgramDto; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; + +import java.io.IOException; +import java.util.LinkedHashSet; +import java.util.List; + +/** + * Created on 08/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ReferentialServiceRestTest { + + @ClassRule + public static final TestClassResource testClassResource = new TestClassResource(); + + @Rule + public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); + + @Test + public void testGetPrograms() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, CloneNotSupportedException, BabModelVersionException { + + ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration().clone(); + DataSourceService dataSourceService = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + ObserveDataSourceConnection connection = dataSourceService.open(dataSourceConfiguration); + + ReferentialService referentialService = testClassResource.newService(connection, ReferentialService.class); + + ReferenceSetDto<ProgramDto> referentialReferenceSet = referentialService.getReferentialReferenceSet(ProgramDto.class); + + Assert.assertNotNull(referentialReferenceSet); + + LinkedHashSet<ReferenceDto> reference = referentialReferenceSet.getReference(); + + Assert.assertNotNull(reference); + Assert.assertEquals(28, reference.size()); + + for (ReferenceDto<ProgramDto> referenceDto : reference) { + + List<String> propertyNames = referenceDto.getPropertyNames(); + Assert.assertNotNull(propertyNames); + Assert.assertEquals(4, propertyNames.size()); + Assert.assertEquals(ProgramDto.PROPERTY_CODE, propertyNames.get(0)); + Assert.assertEquals(ProgramDto.PROPERTY_GEAR_TYPE, propertyNames.get(1)); + Assert.assertEquals(ProgramDto.PROPERTY_GEAR_TYPE_PREFIX, propertyNames.get(2)); + Assert.assertEquals(ProgramDto.PROPERTY_LABEL, propertyNames.get(3)); + + Class[] types = referenceDto.getLabelPropertyTypes(); + Assert.assertNotNull(types); + Assert.assertEquals(4, types.length); + Assert.assertEquals(String.class, types[0]); + Assert.assertEquals(GearType.class, types[1]); + Assert.assertEquals(String.class, types[2]); + Assert.assertEquals(String.class, types[3]); + + } + + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3e50fd6ba52032dbd3ac0de7f63bd8ea8cb3eb2b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 22:50:29 2015 +0100 Correction d'un erreur de typo sur des paramètres de méthodes utilisés via paranamer... Badaboom --- .../observe/services/service/longline/TripLonglineGearUseService.java | 4 ++-- .../ird/observe/services/service/seine/TripSeineGearUseService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java index c66a67c..a87d49d 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java @@ -37,10 +37,10 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TripLonglineGearUseService extends ObserveService { @ReadDataPermission - FormDto<TripLonglineGearUseDto> loadToRead(String TripLonglineId); + FormDto<TripLonglineGearUseDto> loadToRead(String tripLonglineId); @WriteDataPermission - FormDto<TripLonglineGearUseDto> loadToEdit(String TripLonglineId); + FormDto<TripLonglineGearUseDto> loadToEdit(String tripLonglineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java index b3c6044..741df06 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java @@ -37,10 +37,10 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TripSeineGearUseService extends ObserveService { @ReadDataPermission - FormDto<TripSeineGearUseDto> loadToRead(String TripSeineId); + FormDto<TripSeineGearUseDto> loadToRead(String tripSeineId); @WriteDataPermission - FormDto<TripSeineGearUseDto> loadToEdit(String TripSeineId); + FormDto<TripSeineGearUseDto> loadToEdit(String tripSeineId); @Write @WriteDataPermission -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 68643974ed2ea1c55c732e0022da46f1d1cab1a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 22:56:06 2015 +0100 Revue des tests et ajout de fimxme a regler (Sylvain) --- .../services/service/AbstractServiceRestTest.java | 49 +++++ .../seine/TripSeineGearUseServiceRestTest.java | 210 ++++++++++++--------- .../service/seine/TripSeineServiceRestTest.java | 72 +++---- 3 files changed, 187 insertions(+), 144 deletions(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java index d50ca0b..285759d 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java @@ -22,16 +22,25 @@ package fr.ird.observe.services.service; * #L% */ +import com.google.common.collect.Collections2; +import com.google.common.collect.Sets; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.TestClassResource; import fr.ird.observe.services.TestMethodResource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; +import java.util.Set; + /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -76,4 +85,44 @@ public abstract class AbstractServiceRestTest { return testClassResource.newService(dataSourceConnection, serviceType); } + protected <T extends IdDto> void assertEditLabels(FormDto<T> formDto, int expectedLabels, Class<?>... expectedTypes) { + + Assert.assertNotNull(formDto.getLabels()); + + Set<Class> types = Sets.newLinkedHashSet(Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction())); + + 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.sizeReference() > 0); + + } + } + + protected <T extends IdDto> void assertReadLabels(FormDto<T> formDto, int expectedLabels, Class<?>... expectedTypes) { + + Assert.assertNotNull(formDto.getLabels()); + + Set<Class> types = Sets.newLinkedHashSet(Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction())); + + 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()); + + } + } + } diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java index db15c9a..1cacd88 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java @@ -22,23 +22,22 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; -import fr.ird.observe.services.dto.ReferenceSetDtos; -import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.service.AbstractServiceRestTest; import org.junit.Assert; +import org.junit.Assume; import org.junit.Ignore; import org.junit.Test; -import java.util.Collection; +import java.util.Map; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -56,112 +55,135 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { service = newService(TripSeineGearUseService.class); } + @Ignore //FIXME @Test public void loadToReadTest() { - FormDto<TripSeineGearUseDto> formDto = service.loadToRead(TRIP_SEINE_ID_1); - - Assert.assertNotNull(formDto); - TripSeineGearUseDto tripSeineGearUseDto = formDto.getForm(); - - Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineGearUseDto.getId()); - Assert.assertEquals(2, tripSeineGearUseDto.sizeGearUseFeaturesSeine()); - - GearUseFeaturesSeineDto feature1 = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); - - Assert.assertEquals(GEAR_USE_FEATURES_SEINE_ID_1, feature1.getId()); - Assert.assertEquals("fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25", feature1.getGear().getId()); - Assert.assertEquals("Radeau", feature1.getGear().getPropertyValue("label")); - Assert.assertEquals(new Integer(1), feature1.getNumber()); - Assert.assertEquals(Boolean.TRUE, feature1.getUsedInTrip()); - Assert.assertEquals(3, feature1.sizeGearUseFeaturesMeasurement()); - - GearUseFeaturesMeasurementSeineDto measurement1 = IdDtos.findById( - feature1.getGearUseFeaturesMeasurement(), - "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230663#0.8598592739610341"); - Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20", measurement1.getGearCaracteristic().getId()); - Assert.assertEquals("3", measurement1.getMeasurementValue()); - - - GearUseFeaturesMeasurementSeineDto measurement2 = IdDtos.findById( - feature1.getGearUseFeaturesMeasurement(), - "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230664#0.3389960469962563"); - Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21", measurement2.getGearCaracteristic().getId()); - Assert.assertEquals("true", measurement2.getMeasurementValue()); - - - GearUseFeaturesMeasurementSeineDto measurement3 = IdDtos.findById( - feature1.getGearUseFeaturesMeasurement(), - "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230665#0.018683933154531762"); - Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22", measurement3.getGearCaracteristic().getId()); - Assert.assertEquals("false", measurement3.getMeasurementValue()); - - Assert.assertNotNull(formDto.getLabels()); - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - Assert.assertTrue(types.contains(GearDto.class)); - Assert.assertTrue(types.contains(GearCaracteristicDto.class)); - Assert.assertEquals(2, formDto.sizeLabels()); + ReferenceSetDto<TripSeineDto> allTripSeine = newService(TripSeineService.class).getAllTripSeine(); - for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { - - Assert.assertEquals(0, referenceSetDto.sizeReference()); - - } - } - - @Test - public void loadToEditTest() { + Map<String, ReferenceDto> tripIds = IdDtos.splitById(allTripSeine.getReference()); + Assume.assumeTrue("Marée " + TRIP_SEINE_ID_1 + " non trouvée dans cette base. Test annulé", tripIds.containsKey(TRIP_SEINE_ID_1)); FormDto<TripSeineGearUseDto> formDto = service.loadToRead(TRIP_SEINE_ID_1); Assert.assertNotNull(formDto); + TripSeineGearUseDto tripSeineGearUseDto = formDto.getForm(); Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineGearUseDto.getId()); - Assert.assertEquals(2, tripSeineGearUseDto.sizeGearUseFeaturesSeine()); - - GearUseFeaturesSeineDto feature1 = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); - - Assert.assertEquals(GEAR_USE_FEATURES_SEINE_ID_1, feature1.getId()); - Assert.assertEquals("fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25", feature1.getGear().getId()); - Assert.assertEquals("Radeau", feature1.getGear().getPropertyValue("label")); - Assert.assertEquals(new Integer(1), feature1.getNumber()); - Assert.assertEquals(Boolean.TRUE, feature1.getUsedInTrip()); - Assert.assertEquals(3, feature1.sizeGearUseFeaturesMeasurement()); - - GearUseFeaturesMeasurementSeineDto measurement1 = IdDtos.findById( - feature1.getGearUseFeaturesMeasurement(), - "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230663#0.8598592739610341"); - Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20", measurement1.getGearCaracteristic().getId()); - Assert.assertEquals("3", measurement1.getMeasurementValue()); - - - GearUseFeaturesMeasurementSeineDto measurement2 = IdDtos.findById( - feature1.getGearUseFeaturesMeasurement(), - "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230664#0.3389960469962563"); - Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21", measurement2.getGearCaracteristic().getId()); - Assert.assertEquals("true", measurement2.getMeasurementValue()); - - - GearUseFeaturesMeasurementSeineDto measurement3 = IdDtos.findById( - feature1.getGearUseFeaturesMeasurement(), - "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230665#0.018683933154531762"); - Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22", measurement3.getGearCaracteristic().getId()); - Assert.assertEquals("false", measurement3.getMeasurementValue()); + //FIXME +// Assert.assertEquals(2, tripSeineGearUseDto.sizeGearUseFeaturesSeine()); +// +// GearUseFeaturesSeineDto feature1 = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); +// +// Assert.assertEquals(GEAR_USE_FEATURES_SEINE_ID_1, feature1.getId()); +// Assert.assertEquals("fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25", feature1.getGear().getId()); +// Assert.assertEquals("Radeau", feature1.getGear().getPropertyValue("label")); +// Assert.assertEquals(new Integer(1), feature1.getNumber()); +// Assert.assertEquals(Boolean.TRUE, feature1.getUsedInTrip()); +// Assert.assertEquals(3, feature1.sizeGearUseFeaturesMeasurement()); +// +// GearUseFeaturesMeasurementSeineDto measurement1 = IdDtos.findById( +// feature1.getGearUseFeaturesMeasurement(), +// "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230663#0.8598592739610341"); +// Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20", measurement1.getGearCaracteristic().getId()); +// Assert.assertEquals("3", measurement1.getMeasurementValue()); +// +// +// GearUseFeaturesMeasurementSeineDto measurement2 = IdDtos.findById( +// feature1.getGearUseFeaturesMeasurement(), +// "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230664#0.3389960469962563"); +// Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21", measurement2.getGearCaracteristic().getId()); +// Assert.assertEquals("true", measurement2.getMeasurementValue()); +// +// +// GearUseFeaturesMeasurementSeineDto measurement3 = IdDtos.findById( +// feature1.getGearUseFeaturesMeasurement(), +// "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230665#0.018683933154531762"); +// Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22", measurement3.getGearCaracteristic().getId()); +// Assert.assertEquals("false", measurement3.getMeasurementValue()); +// +// Assert.assertNotNull(formDto.getLabels()); +// +// Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); +// Assert.assertTrue(types.contains(GearDto.class)); +// Assert.assertTrue(types.contains(GearCaracteristicDto.class)); +// Assert.assertEquals(2, formDto.sizeLabels()); +// +// for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { +// +// Assert.assertEquals(0, referenceSetDto.sizeReference()); +// +// } + } - Assert.assertNotNull(formDto.getLabels()); + @Ignore //FIXME + @Test + public void loadToEditTest() { - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - Assert.assertTrue(types.contains(GearDto.class)); - Assert.assertTrue(types.contains(GearCaracteristicDto.class)); - Assert.assertEquals(2, formDto.sizeLabels()); + ReferenceSetDto<TripSeineDto> allTripSeine = newService(TripSeineService.class).getAllTripSeine(); - for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { + Map<String, ReferenceDto> tripIds = IdDtos.splitById(allTripSeine.getReference()); - Assert.assertTrue(referenceSetDto.sizeReference() > 0); + Assume.assumeTrue("Marée " + TRIP_SEINE_ID_1 + " non trouvée dans cette base. Test annulé", tripIds.containsKey(TRIP_SEINE_ID_1)); + FormDto<TripSeineGearUseDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); - } + Assert.assertNotNull(formDto); + //FIXME +// assertReadLabels(formDto, 2, +// GearDto.class, +// GearCaracteristicDto.class); + +// TripSeineGearUseDto tripSeineGearUseDto = formDto.getForm(); +// +// { +// Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineGearUseDto.getId()); +// Assert.assertEquals(2, tripSeineGearUseDto.sizeGearUseFeaturesSeine()); +// +// GearUseFeaturesSeineDto feature1 = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); +// +// Assert.assertEquals(GEAR_USE_FEATURES_SEINE_ID_1, feature1.getId()); +// Assert.assertEquals("fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25", feature1.getGear().getId()); +// Assert.assertEquals("Radeau", feature1.getGear().getPropertyValue("label")); +// Assert.assertEquals(new Integer(1), feature1.getNumber()); +// Assert.assertEquals(Boolean.TRUE, feature1.getUsedInTrip()); +// Assert.assertEquals(3, feature1.sizeGearUseFeaturesMeasurement()); +// +// GearUseFeaturesMeasurementSeineDto measurement1 = IdDtos.findById( +// feature1.getGearUseFeaturesMeasurement(), +// "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230663#0.8598592739610341"); +// Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20", measurement1.getGearCaracteristic().getId()); +// Assert.assertEquals("3", measurement1.getMeasurementValue()); +// +// +// GearUseFeaturesMeasurementSeineDto measurement2 = IdDtos.findById( +// feature1.getGearUseFeaturesMeasurement(), +// "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230664#0.3389960469962563"); +// Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21", measurement2.getGearCaracteristic().getId()); +// Assert.assertEquals("true", measurement2.getMeasurementValue()); +// +// +// GearUseFeaturesMeasurementSeineDto measurement3 = IdDtos.findById( +// feature1.getGearUseFeaturesMeasurement(), +// "fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine#1440486230665#0.018683933154531762"); +// Assert.assertEquals("fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22", measurement3.getGearCaracteristic().getId()); +// Assert.assertEquals("false", measurement3.getMeasurementValue()); +// +// Assert.assertNotNull(formDto.getLabels()); +// +// Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); +// Assert.assertTrue(types.contains(GearDto.class)); +// Assert.assertTrue(types.contains(GearCaracteristicDto.class)); +// Assert.assertEquals(2, formDto.sizeLabels()); +// +// for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { +// +// Assert.assertTrue(referenceSetDto.sizeReference() > 0); +// +// } +// +// } } @Ignore diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java index 0b01c17..a986048 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java @@ -22,17 +22,16 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; -import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -42,14 +41,11 @@ import org.junit.Ignore; import org.junit.Test; import org.nuiton.util.DateUtil; -import java.util.Collection; -import java.util.LinkedHashSet; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class TripSeineServiceRestTest extends AbstractServiceRestTest{ +public class TripSeineServiceRestTest extends AbstractServiceRestTest { protected TripSeineService service; @@ -67,7 +63,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ Assert.assertNotNull(stubDtos); - Assert.assertEquals(135, stubDtos.sizeReference()); + Assert.assertEquals(134, stubDtos.sizeReference()); ReferenceDto<TripSeineDto> tripSeineStub1Dto = Iterables.find(stubDtos.getReference(), ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_1)); @@ -88,7 +84,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ Assert.assertEquals("Protat Martin", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); ReferenceDto<TripSeineDto> tripSeineStub3Dto = Iterables.find(stubDtos.getReference(), - ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_3)); + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_3)); Assert.assertEquals(TRIP_SEINE_ID_3, tripSeineStub3Dto.getId()); Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); @@ -127,20 +123,12 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ Assert.assertNull(tripSeineDto.getReportsUrl()); Assert.assertTrue(tripSeineDto.getComment().startsWith("Caractéristiques de la senne")); - Assert.assertNotNull(formDto.getLabels()); - - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - Assert.assertTrue(types.contains(PersonDto.class)); - Assert.assertTrue(types.contains(VesselDto.class)); - Assert.assertTrue(types.contains(OceanDto.class)); - Assert.assertTrue(types.contains(HarbourDto.class)); - Assert.assertEquals(formDto.sizeLabels(), 4); - - for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { - - Assert.assertEquals(0, referenceSetDto.sizeReference()); - - } + assertReadLabels(formDto, 8, + ProgramDto.class, + PersonDto.class, + VesselDto.class, + OceanDto.class, + HarbourDto.class); } @@ -173,20 +161,12 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ Assert.assertNull(tripSeineDto.getReportsUrl()); Assert.assertTrue(tripSeineDto.getComment().startsWith("Caractéristiques de la senne")); - Assert.assertNotNull(formDto.getLabels()); - - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - Assert.assertTrue(types.contains(PersonDto.class)); - Assert.assertTrue(types.contains(VesselDto.class)); - Assert.assertTrue(types.contains(OceanDto.class)); - Assert.assertTrue(types.contains(HarbourDto.class)); - Assert.assertEquals(formDto.sizeLabels(), 4); - - for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { - - Assert.assertTrue(referenceSetDto.sizeReference() > 0); - - } + assertEditLabels(formDto, 8, + ProgramDto.class, + PersonDto.class, + VesselDto.class, + OceanDto.class, + HarbourDto.class); } @@ -211,20 +191,12 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ Assert.assertNull(tripSeineDto.getReportsUrl()); Assert.assertNull(tripSeineDto.getComment()); - Assert.assertNotNull(formDto.getLabels()); - - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - Assert.assertTrue(types.contains(PersonDto.class)); - Assert.assertTrue(types.contains(VesselDto.class)); - Assert.assertTrue(types.contains(OceanDto.class)); - Assert.assertTrue(types.contains(HarbourDto.class)); - Assert.assertEquals(formDto.sizeLabels(), 4); - - for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { - - Assert.assertTrue(referenceSetDto.sizeReference() > 0); - - } + assertEditLabels(formDto, 8, + ProgramDto.class, + PersonDto.class, + VesselDto.class, + OceanDto.class, + HarbourDto.class); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ed2919682517a3531ea03677ee25688a284841c3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 22:56:30 2015 +0100 Suppression code mort --- .../fr/ird/observe/services/http/ObserveRequestBuilder.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java index cbfa712..3f0c124 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java @@ -103,16 +103,6 @@ public class ObserveRequestBuilder { return this; } -// public ObserveRequestBuilder addParameter(String parameterName, int value) { -// return addParameter(parameterName, String.valueOf(value)); -// } -// -// public ObserveRequestBuilder addParameter(String parameterName, File file) { -// checkParameterNotNull(parameterName, file); -// files.put(parameterName, file); -// return this; -// } - public ObserveRequestBuilder addParameter(String parameterName, Object toJson) throws IOException { String json = gson.toJson(toJson); return addParameter(parameterName, json); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm