branch develop updated (8d1761c -> 8935677)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 8d1761c Bien renseigné le type de toutes les popups de décoration new 8935677 fixes some tests The 1 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 893567760de6c427ebc6bc3e99771d37515dbe92 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 19:54:41 2016 +0200 fixes some tests Summary of changes: .../seine/TripSeineGearUseServiceRestTest.java | 13 +++++++--- .../seine/TripSeineGearUseServiceTopiaTest.java | 29 +++++++++++++++------- 2 files changed, 30 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 893567760de6c427ebc6bc3e99771d37515dbe92 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 19:54:41 2016 +0200 fixes some tests --- .../seine/TripSeineGearUseServiceRestTest.java | 13 +++++++--- .../seine/TripSeineGearUseServiceTopiaTest.java | 29 +++++++++++++++------- 2 files changed, 30 insertions(+), 12 deletions(-) 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 57b6585..2c530ad 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,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -193,7 +192,11 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { TripSeineGearUseDto tripSeineGearUseDto = form.getObject(); - GearUseFeaturesSeineDto featuresSeineDto = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); + GearUseFeaturesSeineDto featuresSeineDto = tripSeineGearUseDto.getGearUseFeaturesSeine() + .stream() + .filter(IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)) + .findFirst() + .get(); featuresSeineDto.setNumber(12); featuresSeineDto.setComment("Un Commentaire"); @@ -213,7 +216,11 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { tripSeineGearUseDto = formAfterSave.getObject(); - GearUseFeaturesSeineDto feature1 = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)); + GearUseFeaturesSeineDto feature1 = tripSeineGearUseDto.getGearUseFeaturesSeine() + .stream() + .filter(IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID_1)) + .findFirst() + .get(); Assert.assertEquals(GEAR_USE_FEATURES_SEINE_ID_1, feature1.getId()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java index e249708..c36f6db 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.Iterables; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; @@ -77,7 +76,11 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.sizeGearUseFeaturesSeine(), tripSeineGearUseDto.sizeGearUseFeaturesSeine()); GearUseFeaturesSeine featuresSeine = tripSeine.getGearUseFeaturesSeineByTopiaId(GEAR_USE_FEATURES_SEINE_ID); - GearUseFeaturesSeineDto featuresSeineDto = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID)); + GearUseFeaturesSeineDto featuresSeineDto = tripSeineGearUseDto.getGearUseFeaturesSeine() + .stream() + .filter(IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID)) + .findFirst() + .get(); Assert.assertEquals(featuresSeine.getTopiaId(), featuresSeineDto.getId()); assertEntityEqualsReferenceDto(featuresSeine.getGear(), featuresSeineDto.getGear()); @@ -88,9 +91,11 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(featuresSeine.sizeGearUseFeaturesMeasurement(), featuresSeineDto.sizeGearUseFeaturesMeasurement()); for (GearUseFeaturesMeasurementSeineDto measurementSeineDto : featuresSeineDto.getGearUseFeaturesMeasurement()) { - GearUseFeaturesMeasurementSeine measurementSeine = Iterables.find( - featuresSeine.getGearUseFeaturesMeasurement(), - TopiaEntities.entityHasId(measurementSeineDto.getId())); + GearUseFeaturesMeasurementSeine measurementSeine = featuresSeine.getGearUseFeaturesMeasurement() + .stream() + .filter(TopiaEntities.entityHasId(measurementSeineDto.getId())::apply) + .findFirst() + .get(); assertEntityEqualsReferenceDto(measurementSeine.getGearCaracteristic(), measurementSeineDto.getGearCaracteristic()); Assert.assertEquals(measurementSeine.getMeasurementValue(), measurementSeineDto.getMeasurementValue()); @@ -118,7 +123,11 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { TripSeineGearUseDto tripSeineGearUseDto = form.getObject(); - GearUseFeaturesSeineDto gearUseFeaturesSeineDto = Iterables.find(tripSeineGearUseDto.getGearUseFeaturesSeine(), IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID)); + GearUseFeaturesSeineDto gearUseFeaturesSeineDto = tripSeineGearUseDto.getGearUseFeaturesSeine() + .stream() + .filter(IdDtos.newIdPredicate(GEAR_USE_FEATURES_SEINE_ID)) + .findFirst() + .get(); gearUseFeaturesSeineDto.setNumber(12); gearUseFeaturesSeineDto.setComment("Un Commentaire"); @@ -145,9 +154,11 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(gearUseFeaturesSeineDto.sizeGearUseFeaturesMeasurement(), gearUseFeaturesSeine.sizeGearUseFeaturesMeasurement()); for (GearUseFeaturesMeasurementSeineDto measurementSeineDto : gearUseFeaturesSeineDto.getGearUseFeaturesMeasurement()) { - GearUseFeaturesMeasurementSeine measurementSeine = Iterables.find( - gearUseFeaturesSeine.getGearUseFeaturesMeasurement(), - TopiaEntities.entityHasId(measurementSeineDto.getId())); + GearUseFeaturesMeasurementSeine measurementSeine = gearUseFeaturesSeine.getGearUseFeaturesMeasurement() + .stream() + .filter(TopiaEntities.entityHasId(measurementSeineDto.getId())::apply) + .findFirst() + .get(); assertReferenceDtoEqualsEntity(measurementSeineDto.getGearCaracteristic(), measurementSeine.getGearCaracteristic()); Assert.assertEquals(measurementSeineDto.getMeasurementValue(), measurementSeine.getMeasurementValue()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm