This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 20522a7cb921b494ff4a41c0f5b994a0b1fe1309 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon May 2 14:18:01 2016 +0200 Fix voyage creation with ports --- .../ui/actions/removedata/AbstractRemoveDataServiceTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java index f50bd82..a114b7b 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java @@ -69,6 +69,7 @@ import fr.ifremer.echobase.entities.references.Gear; import fr.ifremer.echobase.entities.references.GearMetadata; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.entities.references.OperationMetadata; +import fr.ifremer.echobase.entities.references.Port; import fr.ifremer.echobase.entities.references.SampleDataType; import fr.ifremer.echobase.entities.references.SampleType; import fr.ifremer.echobase.entities.references.Species; @@ -183,7 +184,7 @@ public abstract class AbstractRemoveDataServiceTest extends EchoBaseTestServiceS protected static final String lengthAgeKey1Id = "fr.ifremer.echobase.entities.data.LengthAgeKey#1#1"; protected static final String lengthWeightKey1Id = "fr.ifremer.echobase.entities.data.LengthWeightKey#1#1"; - + protected String importCommonVoyage2Id; protected String importCommonTransect2Id; @@ -379,8 +380,8 @@ public abstract class AbstractRemoveDataServiceTest extends EchoBaseTestServiceS Voyage.PROPERTY_NAME, "voyage1", Voyage.PROPERTY_START_DATE, newDate(), Voyage.PROPERTY_END_DATE, newDate(), - Voyage.PROPERTY_START_PORT, "voyage1StartPort", - Voyage.PROPERTY_END_PORT, "voyage1EndPort", + Voyage.PROPERTY_START_PORT, getFirstEntity(Port.class), + Voyage.PROPERTY_END_PORT, getFirstEntity(Port.class), Voyage.PROPERTY_DESCRIPTION, "voyage1Description", Voyage.PROPERTY_DATUM, "voyage1Datum" ); @@ -404,8 +405,8 @@ public abstract class AbstractRemoveDataServiceTest extends EchoBaseTestServiceS Voyage.PROPERTY_NAME, "voyage2", Voyage.PROPERTY_START_DATE, newDate(), Voyage.PROPERTY_END_DATE, newDate(), - Voyage.PROPERTY_START_PORT, "voyage2StartPort", - Voyage.PROPERTY_END_PORT, "voyage2EndPort", + Voyage.PROPERTY_START_PORT, getFirstEntity(Port.class), + Voyage.PROPERTY_END_PORT, getFirstEntity(Port.class), Voyage.PROPERTY_DESCRIPTION, "voyage2Description", Voyage.PROPERTY_DATUM, "voyage2Datum" ); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.