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 41aebf8295434f06402d89137231ca794fab9c50 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 11:49:18 2015 +0200 Revue des logs et ajout d'un test sur le service (See #7488) --- .../consolidate/ConsolidationDataService.java | 3 +- .../consolidate/ConsolidationDataServiceTopia.java | 31 ++++++++---- .../ConsolidationDataServiceTopiaTest.java | 55 ++++++++++++++++++++++ 3 files changed, 78 insertions(+), 11 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataService.java index 5fed694..57af31b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataService.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.ObserveService; /** * Le service pour effectuer les consolidations de données, i.e @@ -10,7 +11,7 @@ import com.google.common.collect.ImmutableSet; * * @author Tony Chemit - chemit@codelutin.com */ -public interface ConsolidationDataService { +public interface ConsolidationDataService extends ObserveService{ /** * Effectue la consolitation à partir de la demande passé en paramètre et retourne les résultats pour les marées diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopia.java index a7fb520..b07193d 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopia.java @@ -195,6 +195,13 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement for (ActivitySeine activitySeine : route.getActivitySeine()) { + if (!activitySeine.isSetOperation()) { + if (log.isDebugEnabled()) { + log.debug("No set on activity " + activitySeine); + } + continue; + } + ConsolidateActivitySeineDataResultBuilder resultBuilder = ConsolidateActivitySeineDataResultBuilder.create(applicationLocale, referenceLocale, activitySeine); ConsolidationActivitySeineDataContext activityContext = new ConsolidationActivitySeineDataContext(); @@ -211,14 +218,15 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement consolidateActivitySeine(activityContext); - Optional<ConsolidateActivitySeineDataResult> consolidateActivitySeineDataResult = resultBuilder.build(); - if (consolidateActivitySeineDataResult.isPresent()) { + Optional<ConsolidateActivitySeineDataResult> optionalConsolidateActivitySeineDataResult = resultBuilder.build(); + if (optionalConsolidateActivitySeineDataResult.isPresent()) { // Des modifications ont été enregistrées sur l'activité + ConsolidateActivitySeineDataResult consolidateActivitySeineDataResult = optionalConsolidateActivitySeineDataResult.get(); if (log.isInfoEnabled()) { - log.info("Found some modifications on activity: " + activitySeine.getTopiaId()); + log.info("Found some modifications on activity: " + consolidateActivitySeineDataResult.getActivitySeineLabel()); } - actititiesResultBuilder.add(consolidateActivitySeineDataResult.get()); + actititiesResultBuilder.add(consolidateActivitySeineDataResult); } @@ -228,16 +236,19 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement ImmutableSet<ConsolidateActivitySeineDataResult> consolidateActivitySeineDataResults = actititiesResultBuilder.build(); - ConsolidateTripSeineDataResult computationResult; + ConsolidateTripSeineDataResult consolidateTripSeineDataResult; if (consolidateActivitySeineDataResults.isEmpty()) { - computationResult = null; + consolidateTripSeineDataResult = null; } else { - computationResult = new ConsolidateTripSeineDataResult(tripSeineId, TripSeines.decorate(referenceLocale, tripSeine), consolidateActivitySeineDataResults); + consolidateTripSeineDataResult = new ConsolidateTripSeineDataResult(tripSeineId, TripSeines.decorate(referenceLocale, tripSeine), consolidateActivitySeineDataResults); + if (log.isInfoEnabled()) { + log.info("Found some modifications on trip: " + consolidateTripSeineDataResult.getTripSeineLabel()); + } } - return Optional.fromNullable(computationResult); + return Optional.fromNullable(consolidateTripSeineDataResult); } @@ -246,8 +257,8 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement ActivitySeine activity = activityContext.activity; - if (log.isInfoEnabled()) { - log.info("Start consolidate activity: " + activity.getTopiaId()); + if (log.isDebugEnabled()) { + log.debug("Start consolidate activity: " + activity.getTopiaId()); } SetSeine setSeine = activity.getSetSeine(); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopiaTest.java new file mode 100644 index 0000000..8ca5ec8 --- /dev/null +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopiaTest.java @@ -0,0 +1,55 @@ +package fr.ird.observe.services.service.actions.consolidate; + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; +import java.util.Set; + +/** + * Created on 29/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ConsolidationDataServiceTopiaTest extends AbstractServiceTopiaTest { + + protected ConsolidationDataService service; + + @Override + public Set<String> getTestNamesChangeDataBase() { + return ImmutableSet.of("testConsolidateTripSeines"); + } + + @Override + public String getScriptName() { + return "dataForTestSeine"; + } + + @Override + public void setUp() throws Exception { + super.setUp(); + service = newService(ConsolidationDataService.class); + } + + @Test + public void testConsolidateTripSeines() throws Exception { + + ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.newPersistenceContext(); + + List<String> tripSeineIds = persistenceContext.getTripSeineDao().findAllIds(); + + ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); + request.setTripSeineIds(ImmutableSet.copyOf(tripSeineIds)); + request.setFailIfLenghtWeightParameterNotFound(false); + + ImmutableSet<ConsolidateTripSeineDataResult> results = service.consolidateTripSeines(request); + Assert.assertNotNull(results); + //FIXME Il faudrait avoir des données modifiées dans la base de test + Assert.assertEquals(0, results.size()); + + + } +} \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.