You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by am...@apache.org on 2017/11/15 17:18:05 UTC
incubator-unomi git commit: IT improvement, reactivate basic test
Repository: incubator-unomi
Updated Branches:
refs/heads/master 3732836c0 -> 5e9ead7f6
IT improvement, reactivate basic test
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/5e9ead7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/5e9ead7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/5e9ead7f
Branch: refs/heads/master
Commit: 5e9ead7f605d0f30b341733b33d902a7179fba88
Parents: 3732836
Author: Abdelkader Midani <am...@apache.org>
Authored: Wed Nov 15 18:17:17 2017 +0100
Committer: Abdelkader Midani <am...@apache.org>
Committed: Wed Nov 15 18:17:23 2017 +0100
----------------------------------------------------------------------
.../core/processor/ImportConfigByFileNameProcessor.java | 12 +++++++++++-
.../src/test/java/org/apache/unomi/itests/AllITs.java | 2 +-
.../src/test/java/org/apache/unomi/itests/BaseIT.java | 6 +++---
.../org/apache/unomi/itests/ProfileImportActorsIT.java | 2 +-
.../org/apache/unomi/itests/ProfileImportBasicIT.java | 10 ++++------
.../org/apache/unomi/itests/ProfileImportRankingIT.java | 2 +-
.../org/apache/unomi/itests/ProfileImportSurfersIT.java | 6 +++---
7 files changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/5e9ead7f/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
index b4f7bd1..c40142a 100644
--- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
@@ -22,12 +22,16 @@ import org.apache.camel.component.file.GenericFile;
import org.apache.unomi.router.api.ImportConfiguration;
import org.apache.unomi.router.api.services.ImportExportConfigurationService;
import org.apache.unomi.router.api.RouterConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Created by amidani on 22/05/2017.
*/
public class ImportConfigByFileNameProcessor implements Processor {
+ private static final Logger logger = LoggerFactory.getLogger(ImportConfigByFileNameProcessor.class.getName());
+
private ImportExportConfigurationService<ImportConfiguration> importConfigurationService;
@Override
@@ -36,7 +40,13 @@ public class ImportConfigByFileNameProcessor implements Processor {
String fileName = exchange.getIn().getBody(GenericFile.class).getFileName();
String importConfigId = fileName.substring(0, fileName.indexOf('.'));
ImportConfiguration importConfiguration = importConfigurationService.load(importConfigId);
- exchange.getIn().setHeader(RouterConstants.HEADER_IMPORT_CONFIG_ONESHOT, importConfiguration);
+ if(importConfiguration != null) {
+ logger.debug("Set a header with import configuration found for ID : {}", importConfigId);
+ exchange.getIn().setHeader(RouterConstants.HEADER_IMPORT_CONFIG_ONESHOT, importConfiguration);
+ } else {
+ logger.warn("No import configuration found with ID : {}", importConfigId);
+ exchange.setProperty(Exchange.ROUTE_STOP, Boolean.TRUE);
+ }
}
public void setImportConfigurationService(ImportExportConfigurationService<ImportConfiguration> importConfigurationService) {
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/5e9ead7f/itests/src/test/java/org/apache/unomi/itests/AllITs.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/AllITs.java b/itests/src/test/java/org/apache/unomi/itests/AllITs.java
index bcdedc1..923ef71 100644
--- a/itests/src/test/java/org/apache/unomi/itests/AllITs.java
+++ b/itests/src/test/java/org/apache/unomi/itests/AllITs.java
@@ -33,7 +33,7 @@ import org.junit.runners.Suite.SuiteClasses;
ConditionESQueryBuilderIT.class,
SegmentIT.class,
ProfileServiceIT.class,
- //ProfileImportBasicIT.class,
+ ProfileImportBasicIT.class,
ProfileImportSurfersIT.class,
ProfileImportRankingIT.class,
ProfileImportActorsIT.class,
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/5e9ead7f/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
index 261ad44..110a530 100644
--- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
@@ -94,8 +94,8 @@ public abstract class BaseIT {
.useDeployFolder(true),
replaceConfigurationFile("etc/org.apache.unomi.router.cfg", new File(
"src/test/resources/org.apache.unomi.router.cfg")),
- //replaceConfigurationFile("data/tmp/unomi_oneshot_import_configs/1-basic-test.csv", new File(
- // "src/test/resources/1-basic-test.csv")),
+ replaceConfigurationFile("data/tmp/unomi_oneshot_import_configs/1-basic-test.csv", new File(
+ "src/test/resources/1-basic-test.csv")),
replaceConfigurationFile("data/tmp/recurrent_import/2-surfers-test.csv", new File(
"src/test/resources/2-surfers-test.csv")),
replaceConfigurationFile("data/tmp/recurrent_import/3-surfers-overwrite-test.csv", new File(
@@ -108,7 +108,7 @@ public abstract class BaseIT {
"src/test/resources/6-actors-test.csv")),
keepRuntimeFolder(),
configureConsole().ignoreLocalConsole(),
- logLevel(LogLevel.INFO),
+ logLevel(LogLevel.DEBUG),
// editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", HTTP_PORT),
// systemProperty("org.osgi.service.http.port").value(HTTP_PORT),
systemProperty("org.ops4j.pax.exam.rbc.rmi.port").value("1199"),
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/5e9ead7f/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 c90df77..5d9ba37 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java
@@ -107,7 +107,7 @@ public class ProfileImportActorsIT extends BaseIT {
Thread.sleep(10000);
List<ImportConfiguration> importConfigurations = importConfigurationService.getAll();
- Assert.assertEquals(5, importConfigurations.size());
+ Assert.assertEquals(6, importConfigurations.size());
PartialList<Profile> jeanneProfile = profileService.findProfilesByPropertyValue("properties.twitterId", "4", 0, 10, null);
Assert.assertEquals(1, jeanneProfile.getList().size());
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/5e9ead7f/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
index 9245d2c..138edf4 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
@@ -72,11 +72,14 @@ public class ProfileImportBasicIT extends BaseIT {
importConfigurationService.save(importConfiguration, true);
//Wait for the csv to be processed
- Thread.sleep(5000);
+ Thread.sleep(10000);
List<ImportConfiguration> importConfigurations = importConfigurationService.getAll();
Assert.assertEquals(1, importConfigurations.size());
+ //Wait for the csv to be processed
+ Thread.sleep(50000);
+
//Check saved profiles
PartialList<Profile> profiles = profileService.findProfilesByPropertyValue("properties.email", "basic1@test.com", 0, 10, null);
Assert.assertEquals(3, profileService.getAllProfilesCount());
@@ -92,9 +95,4 @@ public class ProfileImportBasicIT extends BaseIT {
}
- @After
- public void tearDown() {
-
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/5e9ead7f/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 5617401..38c19c3 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java
@@ -110,7 +110,7 @@ public class ProfileImportRankingIT extends BaseIT {
Thread.sleep(10000);
List<ImportConfiguration> importConfigurations = importConfigurationService.getAll();
- Assert.assertEquals(4, importConfigurations.size());
+ Assert.assertEquals(5, importConfigurations.size());
PartialList<Profile> gregProfile = profileService.findProfilesByPropertyValue("properties.uciId", "10004451371", 0, 10, null);
Assert.assertEquals(1, gregProfile.getList().size());
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/5e9ead7f/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 8e2a4cc..3f6c926 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java
@@ -110,7 +110,7 @@ public class ProfileImportSurfersIT extends BaseIT {
Thread.sleep(10000);
List<ImportConfiguration> importConfigurations = importConfigurationService.getAll();
- Assert.assertEquals(1, importConfigurations.size());
+ Assert.assertEquals(2, importConfigurations.size());
//Profile not to delete
PartialList<Profile> jordyProfile = profileService.findProfilesByPropertyValue("properties.email", "jordy@smith.com", 0, 10, null);
@@ -157,7 +157,7 @@ public class ProfileImportSurfersIT extends BaseIT {
importConfigurations = importConfigurationService.getAll();
- Assert.assertEquals(2, importConfigurations.size());
+ Assert.assertEquals(3, importConfigurations.size());
//Profile not to delete
PartialList<Profile> aliveProfiles = profileService.findProfilesByPropertyValue("properties.alive", "true", 0, 50, null);
@@ -197,7 +197,7 @@ public class ProfileImportSurfersIT extends BaseIT {
Thread.sleep(10000);
importConfigurations = importConfigurationService.getAll();
- Assert.assertEquals(3, importConfigurations.size());
+ Assert.assertEquals(4, importConfigurations.size());
PartialList<Profile> jordyProfileDelete = profileService.findProfilesByPropertyValue("properties.email", "jordy@smith.com", 0, 10, null);
Assert.assertEquals(0, jordyProfileDelete.getList().size());