[Observe-commits] 09/11: Fix some tests

20 Nov 2015

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/refactor_reference in repository observe.

See http://git.codelutin.com/observe.git

commit 35a01690414806ad7e29e91d376cb48fc1cbaa01
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Nov 20 10:16:28 2015 +0100

    Fix some tests
---
 .../service/seine/TripSeineServiceRestTest.java    | 46 ++--------------------
 .../services/service/AbstractServiceTopiaTest.java | 12 +++++-
 .../fr/ird/observe/services/service/RigthTest.java |  4 +-
 ...tLonglineDetailCompositionServiceTopiaTest.java | 18 ++++-----
 .../seine/TargetSampleServiceTopiaTest.java        |  3 +-
 .../seine/TripSeineGearUseServiceTopiaTest.java    |  6 +--
 6 files changed, 29 insertions(+), 60 deletions(-)

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 a986048..9f17864 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
@@ -95,47 +95,9 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest {
     }
 
     @Test
-    public void loadToReadTest() throws Exception {
+    public void loadFormTest() throws Exception {
 
-        FormDto<TripSeineDto> formDto = service.loadToRead(TRIP_SEINE_ID_1);
-
-        Assert.assertNotNull(formDto);
-        TripSeineDto tripSeineDto = formDto.getForm();
-
-        Assert.assertNull(tripSeineDto.getCaptain());
-
-        Assert.assertEquals("fr.ird.observe.entities.referentiel.Person#1355399844272#0.32586441962131485", tripSeineDto.getObserver().getId());
-        Assert.assertEquals("Fanchon", tripSeineDto.getObserver().getPropertyValue(PersonDto.PROPERTY_FIRST_NAME));
-        Assert.assertEquals("Varenne", tripSeineDto.getObserver().getPropertyValue(PersonDto.PROPERTY_LAST_NAME));
-        Assert.assertNull(tripSeineDto.getDataEntryOperator());
-        Assert.assertEquals("fr.ird.observe.entities.referentiel.Vessel#1306847717532#0.7435948873477364", tripSeineDto.getVessel().getId());
-        Assert.assertEquals("835", tripSeineDto.getVessel().getPropertyValue(VesselDto.PROPERTY_CODE));
-        Assert.assertEquals("BERNICA", tripSeineDto.getVessel().getPropertyValue("label"));
-        Assert.assertEquals("fr.ird.observe.entities.referentiel.Ocean#1239832686152#0.8325731048817705", tripSeineDto.getOcean().getId());
-        Assert.assertEquals("2", tripSeineDto.getOcean().getPropertyValue(OceanDto.PROPERTY_CODE));
-        Assert.assertEquals("Indien", tripSeineDto.getOcean().getPropertyValue("label"));
-        Assert.assertNull(tripSeineDto.getDepartureHarbour());
-        Assert.assertNull(tripSeineDto.getLandingHarbour());
-        Assert.assertNull(tripSeineDto.getErsId());
-        Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineDto.getStartDate());
-        Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineDto.getEndDate());
-        Assert.assertNull(tripSeineDto.getFormsUrl());
-        Assert.assertNull(tripSeineDto.getReportsUrl());
-        Assert.assertTrue(tripSeineDto.getComment().startsWith("Caractéristiques de la senne"));
-
-        assertReadLabels(formDto, 8,
-                         ProgramDto.class,
-                         PersonDto.class,
-                         VesselDto.class,
-                         OceanDto.class,
-                         HarbourDto.class);
-
-    }
-
-    @Test
-    public void loadToEditTest() throws Exception {
-
-        FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1);
+        FormDto<TripSeineDto> formDto = service.loadForm(TRIP_SEINE_ID_1);
 
         Assert.assertNotNull(formDto);
         TripSeineDto tripSeineDto = formDto.getForm();
@@ -205,7 +167,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest {
     @Test
     public void saveUpdateTest() {
 
-        FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1);
+        FormDto<TripSeineDto> formDto = service.loadForm(TRIP_SEINE_ID_1);
 
         TripSeineDto tripSeineDto = formDto.getForm();
 
@@ -233,7 +195,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest {
 
         service.save(formDto.getForm());
 
-        FormDto<TripSeineDto> formDtoReload = service.loadToRead(TRIP_SEINE_ID_1);
+        FormDto<TripSeineDto> formDtoReload = service.loadForm(TRIP_SEINE_ID_1);
         TripSeineDto tripSeineDtoReload = formDtoReload.getForm();
 
         Assert.assertEquals(tripSeineDto.getCaptain().getId(), tripSeineDtoReload.getCaptain().getId());
diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java
index 56b9d85..a7b6ecf 100644
--- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java
+++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java
@@ -32,7 +32,10 @@ import fr.ird.observe.services.ObserveDataSourceConnectionTopiaTaiste;
 import fr.ird.observe.services.ObserveService;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
+import fr.ird.observe.services.dto.FormDto;
 import fr.ird.observe.services.dto.ReferenceDto;
+import fr.ird.observe.services.dto.referential.ReferentialDto;
+import fr.ird.observe.services.dto.referential.ReferentialReferenceDto;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Assert;
@@ -154,7 +157,12 @@ public abstract class AbstractServiceTopiaTest {
 
     }
 
-    public ObserveReferentialCache getReferentialCache() {
-        return dataSourceResource.getReferentialCache();
+    protected void loadReferenceSets(ReferenceSetService referenceSetService, FormDto<?> formDto) {
+        dataSourceResource.getReferentialCache().loadReferenceSets(referenceSetService, formDto);
     }
+
+    protected <R extends ReferentialDto> ReferentialReferenceDto<R> getReference(FormDto<?> formDto, Class<R> type, String propertyName, int index) {
+        return (ReferentialReferenceDto<R>) formDto.getReferenceSetDto(type, propertyName).getReference(index);
+    }
+
 }
diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java
index 065ac30..cb707bc 100644
--- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java
+++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java
@@ -147,7 +147,7 @@ public class RigthTest {
 
         TripSeineService service = newService(dataSourceConnection, TripSeineService.class);
 
-        service.loadToRead(TRIP_SEINE_ID);
+        service.loadForm(TRIP_SEINE_ID);
     }
 
     protected void testWriteData(String login) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException {
@@ -156,7 +156,7 @@ public class RigthTest {
 
         TripSeineService service = newService(dataSourceConnection, TripSeineService.class);
 
-        FormDto<TripSeineDto> tripSeineDtoFormDto = service.loadToEdit(TRIP_SEINE_ID);
+        FormDto<TripSeineDto> tripSeineDtoFormDto = service.loadForm(TRIP_SEINE_ID);
 
         service.save(tripSeineDtoFormDto.getForm());
     }
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 28a4fbc..30ca7a9 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
@@ -118,36 +118,36 @@ public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServic
         branchlineDto.setBranchlineLength(1.2f);
         branchlineDto.setTracelineLength(2.8f);
 
-        ReferentialReferenceDto<LineTypeDto> topType = formDto.getReferentialReferenceById(LineTypeDto.class, "fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.1");
+        ReferentialReferenceDto<LineTypeDto> topType = formDto.getReferentialReferenceById(LineTypeDto.class, BranchlineDto.PROPERTY_TOP_TYPE, "fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.1");
         branchlineDto.setTopType(topType);
-        ReferentialReferenceDto<LineTypeDto> tracelineType = formDto.getReferentialReferenceById(LineTypeDto.class, "fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.3");
+        ReferentialReferenceDto<LineTypeDto> tracelineType = formDto.getReferentialReferenceById(LineTypeDto.class, BranchlineDto.PROPERTY_TRACELINE_TYPE, "fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.3");
         branchlineDto.setTracelineType(tracelineType);
         branchlineDto.setDepthRecorder(true);
         branchlineDto.setHookLost(false);
         branchlineDto.setTraceCutOff(false);
         branchlineDto.setTimer(true);
-        branchlineDto.setTimeSinceContact(25478l);
+        branchlineDto.setTimeSinceContact(25478L);
         branchlineDto.setTimerTimeOnBoard(DateUtil.createDate(14, 57, 10, 2, 8, 2009));
         branchlineDto.setWeightedSnap(true);
         branchlineDto.setSnapWeight(0.8f);
         branchlineDto.setWeightedSwivel(true);
         branchlineDto.setSwivelWeight(0.45f);
 
-        ReferentialReferenceDto<HookTypeDto> hookType = formDto.getReferentialReferenceById(HookTypeDto.class, "fr.ird.observe.entities.referentiel.longline.HookType#1239832686152#0.2");
+        ReferentialReferenceDto<HookTypeDto> hookType = formDto.getReferentialReferenceById(HookTypeDto.class, BranchlineDto.PROPERTY_HOOK_TYPE, "fr.ird.observe.entities.referentiel.longline.HookType#1239832686152#0.2");
         branchlineDto.setHookType(hookType);
-        ReferentialReferenceDto<HookSizeDto> hookSize = formDto.getReferentialReferenceById(HookSizeDto.class, "fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.6");
+        ReferentialReferenceDto<HookSizeDto> hookSize = formDto.getReferentialReferenceById(HookSizeDto.class, BranchlineDto.PROPERTY_HOOK_SIZE, "fr.ird.observe.entities.referentiel.longline.HookSize#1239832686151#0.6");
         branchlineDto.setHookSize(hookSize);
         branchlineDto.setHookOffset(24);
-        ReferentialReferenceDto<BaitTypeDto> baitType = formDto.getReferentialReferenceById(BaitTypeDto.class, "fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#0.8");
+        ReferentialReferenceDto<BaitTypeDto> baitType = formDto.getReferentialReferenceById(BaitTypeDto.class, BranchlineDto.PROPERTY_BAIT_TYPE, "fr.ird.observe.entities.referentiel.longline.BaitType#1239832686124#0.8");
         branchlineDto.setBaitType(baitType);
-        ReferentialReferenceDto<BaitSettingStatusDto> baitSettingStatus = formDto.getReferentialReferenceById(BaitSettingStatusDto.class, "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.1");
+        ReferentialReferenceDto<BaitSettingStatusDto> baitSettingStatus = formDto.getReferentialReferenceById(BaitSettingStatusDto.class, BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, "fr.ird.observe.entities.referentiel.longline.BaitSettingStatus#1239832686123#0.1");
         branchlineDto.setBaitSettingStatus(baitSettingStatus);
-        ReferentialReferenceDto<BaitHaulingStatusDto> baitHaulingStatus = formDto.getReferentialReferenceById(BaitHaulingStatusDto.class, "fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus#1239832686122#0.4");
+        ReferentialReferenceDto<BaitHaulingStatusDto> baitHaulingStatus = formDto.getReferentialReferenceById(BaitHaulingStatusDto.class, BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, "fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus#1239832686122#0.4");
         branchlineDto.setBaitHaulingStatus(baitHaulingStatus);
 
         service.save(compositionDto);
 
-        SetLongline setLongline  = dataSourceResource.findById(SetLongline.class, SET_LONGLINE_ID);
+        SetLongline setLongline = dataSourceResource.findById(SetLongline.class, SET_LONGLINE_ID);
 
         Section section = setLongline.getSectionByTopiaId(sectionDto.getId());
         Assert.assertEquals(sectionDto.getSettingIdentifier(), section.getSettingIdentifier());
diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java
index 41625de..09f3bd7 100644
--- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java
+++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java
@@ -27,6 +27,7 @@ import fr.ird.observe.services.dto.FormDto;
 import fr.ird.observe.services.dto.ReferenceDto;
 import fr.ird.observe.services.dto.ReferenceSetDto;
 import fr.ird.observe.services.dto.referential.SpeciesDto;
+import fr.ird.observe.services.dto.seine.TargetLengthDto;
 import fr.ird.observe.services.dto.seine.TargetSampleDto;
 import fr.ird.observe.services.service.AbstractServiceTopiaTest;
 import org.junit.Assert;
@@ -82,7 +83,7 @@ public class TargetSampleServiceTopiaTest extends AbstractServiceTopiaTest {
         Assert.assertFalse(targetSampleDto.getDiscarded());
         Assert.assertTrue(targetSampleDto.isTargetLengthEmpty());
 
-        ReferenceSetDto<SpeciesDto> speciesDtoReferenceSetDto = formDto.getReferenceSetDto(SpeciesDto.class);
+        ReferenceSetDto<SpeciesDto> speciesDtoReferenceSetDto = formDto.getReferenceSetDto(SpeciesDto.class, TargetLengthDto.PROPERTY_SPECIES);
         Assert.assertEquals(1, speciesDtoReferenceSetDto.sizeReference());
         ReferenceDto referenceDto = speciesDtoReferenceSetDto.getReference(0);
         Assert.assertEquals("fr.ird.observe.entities.referentiel.Species#1239832685474#0.8943253454598569", referenceDto.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 4fbbeae..640c879 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.Collections2;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine;
@@ -43,7 +42,6 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.nuiton.topia.persistence.TopiaEntities;
 
-import java.util.Collection;
 import java.util.Set;
 
 /**
@@ -116,7 +114,7 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest {
 
         Assert.assertNotNull(formDto.getLabels());
 
-        Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction());
+        Set<Class<?>> types = ReferenceSetDtos.getTypes(formDto.getLabels());
         Assert.assertTrue(types.contains(GearDto.class));
         Assert.assertTrue(types.contains(GearCaracteristicDto.class));
         Assert.assertEquals(2, formDto.sizeLabels());
@@ -163,7 +161,7 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest {
 
         Assert.assertNotNull(formDto.getLabels());
 
-        Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction());
+        Set<Class<?>> types = ReferenceSetDtos.getTypes(formDto.getLabels());
         Assert.assertTrue(types.contains(GearDto.class));
         Assert.assertTrue(types.contains(GearCaracteristicDto.class));
         Assert.assertEquals(2, formDto.sizeLabels());

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

    

[Observe-commits] 09/11: Fix some tests

codelutin.com scm