branch feature/7458-LonglineTopiaService updated (2dd7e5c -> 6e6dc41)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-LonglineTopiaService in repository observe. See http://git.codelutin.com/observe.git from 2dd7e5c Renommage méthode new 6e6dc41 corrections suite aux 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 6e6dc414e14fef60c06c0e3e64ad6d7ce8da5bac Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Aug 28 09:20:54 2015 +0200 corrections suite aux tests Summary of changes: .../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(-) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/{RouteServiceTest.java => RouteServiceTopiaTest.java} (95%) -- 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 feature/7458-LonglineTopiaService in repository observe. See http://git.codelutin.com/observe.git commit 6e6dc414e14fef60c06c0e3e64ad6d7ce8da5bac 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>.
participants (1)
-
codelutin.com scm