This is an automated email from the git hooks/post-receive script. New commit to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git commit 8f12626f0f6bbe6f516cd691f737a309b1241ae2 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 18:10:03 2015 +0200 fix tests + chargement du parent dans les listes (refs #7531) --- .../ui/content/list/ContentListUIHandler.java | 7 ++-- .../impl/longline/ActivityLonglinesUIHandler.java | 10 ++++++ .../list/impl/longline/TripLonglinesUIHandler.java | 11 ++++++ .../list/impl/seine/ActivitySeinesUIHandler.java | 10 ++++++ .../content/list/impl/seine/RoutesUIHandler.java | 11 ++++++ .../list/impl/seine/TripSeinesUIHandler.java | 11 ++++++ .../service/seine/TripSeineServiceTopiaTest.java | 40 +++++++++++----------- 7 files changed, 77 insertions(+), 23 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java index b9aa0c0..acc2ce3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java @@ -133,10 +133,9 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> ext } model.setCanReopen(canReopen); - E bean = getBean(); - //FIXME -// getDataService().loadEditEntity(getDataSource(), selectedId, getLoadExecutor()); + loadParentBean(); + E bean = getBean(); List<ReferenceDto> data = getChilds(bean); model.setData(data); @@ -267,4 +266,6 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> ext return comp; } } + + protected abstract void loadParentBean(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index d3b6aa2..848073a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -25,12 +25,15 @@ package fr.ird.observe.ui.content.list.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; +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.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDtos; import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -125,4 +128,11 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin } + @Override + protected void loadParentBean() { + TripLonglineService service = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + FormDto<TripLonglineDto> tripLonglineDtoFormDto = service.loadToEdit(getSelectedParentId()); + getModel().setFormDto(tripLonglineDtoFormDto); + TripLonglineDtos.copyTripLonglineDto(tripLonglineDtoFormDto.getForm(), getBean()); + } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index 5548135..50e062a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -25,11 +25,14 @@ package fr.ird.observe.ui.content.list.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; +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.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ProgramDtos; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; @@ -106,5 +109,13 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri return new ArrayList<>(tripLonglineStubByProgram.getReference()); } + + @Override + protected void loadParentBean() { + ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + FormDto<ProgramDto> programDtoFormDto = service.loadToEdit(ProgramDto.class, getSelectedParentId()); + getModel().setFormDto(programDtoFormDto); + ProgramDtos.copyProgramDto(programDtoFormDto.getForm(), getBean()); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index 405edc7..40d65f3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -24,12 +24,15 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; +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.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.RouteDtos; import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -122,4 +125,11 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti return new ArrayList<>(activitySeineStubByRoute.getReference()); } + @Override + protected void loadParentBean() { + RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); + FormDto<RouteDto> routeDtoFormDto = service.loadToEdit(getSelectedParentId()); + getModel().setFormDto(routeDtoFormDto); + RouteDtos.copyRouteDto(routeDtoFormDto.getForm(), getBean()); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index d424f3c..48a4067 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -24,12 +24,15 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; +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.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDtos; import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -119,4 +122,12 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto return new ArrayList<>(routeByTripSeine.getReference()); } + + @Override + protected void loadParentBean() { + TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + FormDto<TripSeineDto> tripSeineDtoFormDto = service.loadToEdit(getSelectedParentId()); + getModel().setFormDto(tripSeineDtoFormDto); + TripSeineDtos.copyTripSeineDto(tripSeineDtoFormDto.getForm(), getBean()); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index 2dcd5a4..f81d211 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -24,11 +24,14 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; +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.ProgramDto; +import fr.ird.observe.services.dto.referential.ProgramDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; @@ -104,4 +107,12 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe return new ArrayList<>(tripSeineByProgram.getReference()); } + + @Override + protected void loadParentBean() { + ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + FormDto<ProgramDto> programDtoFormDto = service.loadToEdit(ProgramDto.class, getSelectedParentId()); + getModel().setFormDto(programDtoFormDto); + ProgramDtos.copyProgramDto(programDtoFormDto.getForm(), getBean()); + } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index f5f8865..3d597b3 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; 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.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; @@ -46,7 +47,6 @@ import org.nuiton.util.DateUtil; import java.util.Calendar; import java.util.Collection; import java.util.Date; -import java.util.List; import java.util.Set; /** @@ -84,38 +84,38 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void getTripSeineByProgramTest() { - List<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertNotNull(stubDtos); - Assert.assertEquals(3, stubDtos.size()); + Assert.assertEquals(3, stubDtos.sizeReference()); - TripSeineStubDto tripSeineStubDto = stubDtos.get(0); + ReferenceDto tripSeineStubDto = stubDtos.getReference(0); TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo(tripSeineStubDto.getStartDate())); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo(tripSeineStubDto.getEndDate())); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); - tripSeineStubDto = stubDtos.get(1); + tripSeineStubDto = stubDtos.getReference(1); tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_2); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo(tripSeineStubDto.getStartDate())); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo(tripSeineStubDto.getEndDate())); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); - tripSeineStubDto = stubDtos.get(2); + tripSeineStubDto = stubDtos.getReference(2); tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_3); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo(tripSeineStubDto.getStartDate())); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo(tripSeineStubDto.getEndDate())); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); } @@ -392,9 +392,9 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { service.delete(TRIP_SEINE_ID_1); - List<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); - Assert.assertEquals(2, tripSeineByProgram.size()); + Assert.assertEquals(2, tripSeineByProgram.sizeReference()); Assert.assertFalse(dataSourceResource.exists(TripSeine.class, TRIP_SEINE_ID_1)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.