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 77d6e0def28c7d4b5cd22c114946d50be8a5dc83 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Aug 28 09:20:54 2015 +0200 corrections suite aux tests --- .../src/main/xmi/observe-services-dto-longline.properties | 8 ++++---- .../longline/SetLonglineDetailCompositionServiceTopiaTest.java | 2 +- .../seine/{RouteServiceTest.java => RouteServiceTopiaTest.java} | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties index 8d802e9..430a8a0 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -80,8 +80,8 @@ fr.ird.observe.services.dto.longline.GearUseFeaturesLongline.attribute.gear.tagV fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLongline.attribute.gearCaracteristic.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicDto fr.ird.observe.services.dto.longline.SetLonglineGlobalComposition.attribute.mitigationType.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.MitigationTypeDto -fr.ird.observe.services.dto.longline.SetLonglineDetailComposition.attribute.section.stereotype=unique -fr.ird.observe.services.dto.longline.Section.attribute.basket.stereotype=unique -fr.ird.observe.services.dto.longline.Basket.attribute.branchline.stereotype=unique -fr.ird.observe.services.dto.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.stereotype=unique +fr.ird.observe.services.dto.longline.SetLonglineDetailComposition.attribute.section.stereotype=unique,ordered +fr.ird.observe.services.dto.longline.Section.attribute.basket.stereotype=unique,ordered +fr.ird.observe.services.dto.longline.Basket.attribute.branchline.stereotype=unique,ordered +fr.ird.observe.services.dto.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.stereotype=unique,ordered diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java index bf5ae25..d22fadb 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java @@ -149,7 +149,7 @@ public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServic Assert.assertEquals(branchlineDto.getHookLost(), branchline.getHookLost()); Assert.assertEquals(branchlineDto.getTraceCutOff(), branchline.getTraceCutOff()); Assert.assertEquals(branchlineDto.getTimer(), branchline.getTimer()); - Assert.assertEquals(branchlineDto.getTimeSinceContact().longValue(), branchline.getTimeSinceContact()); + Assert.assertEquals(branchlineDto.getTimeSinceContact(), branchline.getTimeSinceContact()); Assert.assertEquals(branchlineDto.getTimerTimeOnBoard(), branchline.getTimerTimeOnBoard()); Assert.assertEquals(branchlineDto.getWeightedSnap(), branchline.getWeightedSnap()); Assert.assertEquals(branchlineDto.getSnapWeight(), branchline.getSnapWeight()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java similarity index 95% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTest.java rename to observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java index a945090..b6a2a0d 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java @@ -13,7 +13,7 @@ import java.util.Set; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class RouteServiceTest extends AbstractServiceTopiaTest{ +public class RouteServiceTopiaTest extends AbstractServiceTopiaTest{ protected RouteService service; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.