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 ed2dfa8a1ab9bb0353e7af55fc4fcade99f3cc39 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 18:54:27 2015 +0200 fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) --- .../observe/ObserveSwingApplicationContext.java | 16 +++++--- .../fr/ird/observe/db/ObserveSwingDataSource.java | 3 +- .../ui/storage/tabs/DataSelectionModel.java | 26 ++++++------- .../service/seine/TripSeineServiceRestTest.java | 44 +++++++++++----------- 4 files changed, 48 insertions(+), 41 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 756316c..abdc6d0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -706,14 +706,18 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { String programName = (String) programDtoRef.getPropertyValue("label"); log.info("- " + programName); if (ProgramDtos.isProgramSeine(programDtoRef)) { - List<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); - for (TripSeineStubDto tripSeine : tripSeines) { - log.info(" - " + tripSeine.getVesselLabel() + " " + tripSeine.getStartDate() + " - " + tripSeine.getEndDate()); + ReferenceSetDto<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); + for (ReferenceDto tripSeine : tripSeines.getReference()) { + log.info(" - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL) + + " " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE) + + " - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); } } else if (ProgramDtos.isProgramLongline(programDtoRef)) { - List<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); - for (TripLonglineStubDto tripLongline : tripLonglines) { - log.info(" - " + tripLongline.getVesselLabel() + " " + tripLongline.getStartDate() + " - " + tripLongline.getEndDate()); + ReferenceSetDto<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); + for (ReferenceDto tripLongline : tripLonglines.getReference()) { + log.info(" - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_VESSEL_LABEL) + + " " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_START_DATE) + + " - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_END_DATE)); } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index 1b9c1c7..7906baa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -80,7 +80,8 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { public Version getVersion() { Version result = null; if (connection != null) { - result = connection.getVersion(); + //FIXME +// result = connection.getVersion(); } return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java index f20ad4f..2d9ee1d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java @@ -61,7 +61,7 @@ public class DataSelectionModel implements Serializable { Preconditions.checkState(source.isOpen()); - Map<ReferenceDto<ProgramDto>, List<IdDto>> datas = Maps.newHashMap(); + Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> datas = Maps.newHashMap(); ReferentialService referentialService = source.newService(ReferentialService.class); TripSeineService tripSeineService = source.newService(TripSeineService.class); @@ -73,19 +73,19 @@ public class DataSelectionModel implements Serializable { for (ReferenceDto<ProgramDto> program : programSet.getReference()) { - List<IdDto> idDtos = Lists.newArrayList(); + List<ReferenceDto> referenceDtos = Lists.newArrayList(); if (ProgramDtos.isProgramSeine(program)) { - idDtos.addAll(tripSeineService.getTripSeineByProgram(program.getId())); + referenceDtos.addAll(tripSeineService.getTripSeineByProgram(program.getId()).getReference()); } else if (ProgramDtos.isProgramLongline(program)) { - idDtos.addAll(tripLonglineService.getTripLonglineStubByProgram(program.getId())); + referenceDtos.addAll(tripLonglineService.getTripLonglineStubByProgram(program.getId()).getReference()); } - populate(model, program, idDtos, datas); + populate(model, program, referenceDtos, datas); } model.setDatas(datas); @@ -94,8 +94,8 @@ public class DataSelectionModel implements Serializable { protected static void populate(DataSelectionModel model, ReferenceDto<ProgramDto> program, - List<IdDto> trips, - Map<ReferenceDto<ProgramDto>, List<IdDto>> datas) { + List<ReferenceDto> trips, + Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> datas) { if (!trips.isEmpty()) { @@ -136,7 +136,7 @@ public class DataSelectionModel implements Serializable { protected boolean useReferentiel; /** la liste des programs utilisables (qui ont des marees) */ - protected transient Map<ReferenceDto<ProgramDto>, List<IdDto>> datas; + protected transient Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> datas; /** la liste des marees selectionnee */ protected transient Set<IdDto> selectedData; @@ -213,7 +213,7 @@ public class DataSelectionModel implements Serializable { return selectedReferentiel; } - public Map<ReferenceDto<ProgramDto>, List<IdDto>> getDatas() { + public Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> getDatas() { if (datas == null) { datas = Maps.newHashMap(); } @@ -257,7 +257,7 @@ public class DataSelectionModel implements Serializable { if (idDto instanceof ReferenceDto) { - List<IdDto> trips = datas.get(idDto); + List<ReferenceDto> trips = datas.get(idDto); result = ! CollectionUtils.isEmpty(trips); for (IdDto trip : trips) { @@ -335,13 +335,13 @@ public class DataSelectionModel implements Serializable { firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); } - public void setDatas(Map<ReferenceDto<ProgramDto>, List<IdDto>> datas) { + public void setDatas(Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> datas) { this.datas = datas; // on compte le count de marées totale int nbTrips = 0; if (datas != null) { - for (List<IdDto> marees : datas.values()) { + for (List<ReferenceDto> marees : datas.values()) { nbTrips += marees.size(); } } @@ -379,7 +379,7 @@ public class DataSelectionModel implements Serializable { if (log.isDebugEnabled()) { log.debug("All all data."); } - for (List<IdDto> p : datas.values()) { + for (List<ReferenceDto> p : datas.values()) { getSelectedData().addAll(p); } firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); 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 677deef..b5a246e 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 @@ -26,6 +26,7 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; +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; @@ -42,7 +43,7 @@ import org.junit.Test; import org.nuiton.util.DateUtil; import java.util.Collection; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -62,37 +63,38 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ @Test public void getTripSeineByProgramTest() { - List<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertNotNull(stubDtos); - Assert.assertEquals(135, stubDtos.size()); + Assert.assertEquals(135, stubDtos.sizeReference()); - TripSeineStubDto tripSeineStub1Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_1)); + LinkedHashSet<ReferenceDto> referenceDtos = stubDtos.getReference(); + ReferenceDto tripSeineStub1Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_1)); Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineStub1Dto.getId()); - Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getStartDate()); - Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getEndDate()); - Assert.assertEquals("BERNICA", tripSeineStub1Dto.getVesselLabel()); - Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getObserverLabel()); + Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); + Assert.assertEquals("BERNICA", tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); + Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); - TripSeineStubDto tripSeineStu2Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_2)); + ReferenceDto tripSeineStu2Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_2)); Assert.assertEquals(TRIP_SEINE_ID_2, tripSeineStu2Dto.getId()); - Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStu2Dto.getStartDate()); - Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStu2Dto.getEndDate()); - Assert.assertEquals("VIA EUROS", tripSeineStu2Dto.getVesselLabel()); - Assert.assertEquals("Protat Martin", tripSeineStu2Dto.getObserverLabel()); + Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); + Assert.assertEquals("VIA EUROS", tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); + Assert.assertEquals("Protat Martin", tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); - TripSeineStubDto tripSeineStub3Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_3)); + ReferenceDto tripSeineStub3Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_3)); Assert.assertEquals(TRIP_SEINE_ID_3, tripSeineStub3Dto.getId()); - Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getStartDate()); - Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getEndDate()); - Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getVesselLabel()); - Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getObserverLabel()); + Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); + Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); + Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); } @@ -284,11 +286,11 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ 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.assertTrue(Iterables.isEmpty(IdDtos.filterById(tripSeineByProgram, TRIP_SEINE_ID_1))); + Assert.assertTrue(Iterables.isEmpty(IdDtos.filterById(tripSeineByProgram.getReference(), TRIP_SEINE_ID_1))); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.