Repository: incubator-unomi Updated Branches: refs/heads/master c249483b9 -> 34e27f03f
Attempting to fix the integration tests that are blocking the release Signed-off-by: Serge Huber <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/34e27f03 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/34e27f03 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/34e27f03 Branch: refs/heads/master Commit: 34e27f03fb1378ef031c8253d173f9c997f3d6ca Parents: c249483 Author: Serge Huber <[email protected]> Authored: Mon Jun 11 20:23:03 2018 +0200 Committer: Serge Huber <[email protected]> Committed: Mon Jun 11 20:23:03 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/unomi/itests/ProfileExportIT.java | 14 +------------- .../apache/unomi/itests/ProfileImportActorsIT.java | 2 +- .../apache/unomi/itests/ProfileImportRankingIT.java | 2 +- .../apache/unomi/itests/ProfileImportSurfersIT.java | 6 +++--- 4 files changed, 6 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/34e27f03/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java index c02f79e..6154c21 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java @@ -16,12 +16,6 @@ */ package org.apache.unomi.itests; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; import org.apache.unomi.api.Metadata; import org.apache.unomi.api.conditions.Condition; import org.apache.unomi.api.segments.Segment; @@ -31,7 +25,6 @@ import org.apache.unomi.router.api.ExportConfiguration; import org.apache.unomi.router.api.RouterConstants; import org.apache.unomi.router.api.services.ImportExportConfigurationService; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.junit.PaxExam; @@ -42,16 +35,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.ws.rs.core.MediaType; import java.io.File; -import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; - /** * Created by amidani on 14/08/2017. */ @@ -111,7 +99,7 @@ public class ProfileExportIT extends BaseIT { exportConfiguration.getProperties().put("mapping", mapping); exportConfiguration.getProperties().put("segment", "exportItSeg"); - exportConfiguration.getProperties().put("period", "10m"); + exportConfiguration.getProperties().put("period", "500"); exportDir = new File("data/tmp/recurrent_export/"); exportConfiguration.getProperties().put("destination", "file://" + exportDir.getAbsolutePath() + "?fileName=profiles-actors-export.csv"); exportConfiguration.setActive(true); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/34e27f03/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java index a25fbd1..8b233d8 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java @@ -95,7 +95,7 @@ public class ProfileImportActorsIT extends BaseIT { importConfigActors.getProperties().put("mapping", mappingActors); File importSurfersFile = new File("data/tmp/recurrent_import/"); - importConfigActors.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=6-actors-test.csv&consumer.delay=10m&move=.done"); + importConfigActors.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=6-actors-test.csv&move=.done"); importConfigActors.setActive(true); importConfigurationService.save(importConfigActors, true); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/34e27f03/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java index 7641348..c8c9a75 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java @@ -97,7 +97,7 @@ public class ProfileImportRankingIT extends BaseIT { importConfigRanking.getProperties().put("mapping", mappingRanking); File importSurfersFile = new File("data/tmp/recurrent_import/"); - importConfigRanking.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=5-ranking-test.csv&consumer.delay=10m&move=.done"); + importConfigRanking.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=5-ranking-test.csv&move=.done"); importConfigRanking.setActive(true); importConfigurationService.save(importConfigRanking, true); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/34e27f03/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java index d1ee1ad..ffcec12 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java @@ -93,7 +93,7 @@ public class ProfileImportSurfersIT extends BaseIT { importConfigSurfers.getProperties().put("mapping", mappingSurfers); File importSurfersFile = new File("data/tmp/recurrent_import/"); - importConfigSurfers.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=2-surfers-test.csv&consumer.delay=10m&move=.done"); + importConfigSurfers.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=2-surfers-test.csv&move=.done"); importConfigSurfers.setActive(true); importConfigurationService.save(importConfigSurfers, true); @@ -139,7 +139,7 @@ public class ProfileImportSurfersIT extends BaseIT { importConfigSurfersOverwrite.setHasDeleteColumn(true); importConfigSurfersOverwrite.getProperties().put("mapping", mappingSurfers); - importConfigSurfersOverwrite.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=3-surfers-overwrite-test.csv&consumer.delay=10m&move=.done"); + importConfigSurfersOverwrite.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=3-surfers-overwrite-test.csv&move=.done"); importConfigSurfersOverwrite.setActive(true); importConfigurationService.save(importConfigSurfersOverwrite, true); @@ -180,7 +180,7 @@ public class ProfileImportSurfersIT extends BaseIT { importConfigSurfersDelete.getProperties().put("mapping", mappingSurfers); - importConfigSurfersDelete.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=4-surfers-delete-test.csv&consumer.delay=10m&move=.done"); + importConfigSurfersDelete.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=4-surfers-delete-test.csv&move=.done"); importConfigSurfersDelete.setActive(true); importConfigurationService.save(importConfigSurfersDelete, true);
