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/16 17:11:11 UTC
incubator-unomi git commit: IT : Change the way oneshot import csv
file is created
Repository: incubator-unomi
Updated Branches:
refs/heads/master 241b438f6 -> a4f5137e4
IT : Change the way oneshot import csv file is created
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/a4f5137e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/a4f5137e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/a4f5137e
Branch: refs/heads/master
Commit: a4f5137e4adb01b11d3ffe5e783a5bbb346c3def
Parents: 241b438
Author: Abdelkader Midani <am...@apache.org>
Authored: Thu Nov 16 18:11:09 2017 +0100
Committer: Abdelkader Midani <am...@apache.org>
Committed: Thu Nov 16 18:11:09 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/unomi/itests/BaseIT.java | 4 +--
.../unomi/itests/ProfileImportBasicIT.java | 32 +++++++++++++++++---
2 files changed, 28 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a4f5137e/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 110a530..2db9834 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,6 @@ 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/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 +106,7 @@ public abstract class BaseIT {
"src/test/resources/6-actors-test.csv")),
keepRuntimeFolder(),
configureConsole().ignoreLocalConsole(),
- logLevel(LogLevel.DEBUG),
+ logLevel(LogLevel.INFO),
// 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/a4f5137e/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 56d1cae..a429358 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
@@ -22,7 +22,6 @@ import org.apache.unomi.api.services.ProfileService;
import org.apache.unomi.router.api.ImportConfiguration;
import org.apache.unomi.router.api.RouterConstants;
import org.apache.unomi.router.api.services.ImportExportConfigurationService;
-import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,9 +29,15 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerSuite;
import org.ops4j.pax.exam.util.Filter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.inject.Inject;
-import java.io.IOException;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,6 +49,8 @@ import java.util.Map;
@ExamReactorStrategy(PerSuite.class)
public class ProfileImportBasicIT extends BaseIT {
+ private Logger logger = LoggerFactory.getLogger(ProfileImportBasicIT.class);
+
@Inject
@Filter("(configDiscriminator=IMPORT)")
protected ImportExportConfigurationService<ImportConfiguration> importConfigurationService;
@@ -69,16 +76,31 @@ public class ProfileImportBasicIT extends BaseIT {
importConfiguration.getProperties().put("mapping", mapping);
importConfiguration.setActive(true);
- importConfigurationService.save(importConfiguration, true);
+ logger.info("Save import config oneshot with ID : {}.", importConfiguration.getItemId());
+
+ importConfigurationService.save(importConfiguration, false);
//Wait for the csv to be processed
- Thread.sleep(10000);
+ Thread.sleep(5000);
+
+ logger.info("Check import config oneshot with ID : {}.", importConfiguration.getItemId());
List<ImportConfiguration> importConfigurations = importConfigurationService.getAll();
Assert.assertEquals(1, importConfigurations.size());
+ String content = "basic1@test.com,Basic1,User1\n" +
+ "basic2@test.com,Basic2,User2\n" +
+ "basic3@test.com,Basic3,User3";
+ File basicFile = new File("data/tmp/unomi_oneshot_import_configs/1-basic-test.csv");
+ basicFile.getParentFile().mkdirs();
+ BufferedWriter out = new BufferedWriter(new FileWriter(basicFile));
+ out.write(content);
+ out.close();
+
+ logger.info("Write the file {}.", "data/tmp/unomi_oneshot_import_configs/1-basic-test.csv");
+
//Wait for the csv to be processed
- Thread.sleep(70000);
+ Thread.sleep(75000);
//Check saved profiles
PartialList<Profile> profiles = profileService.findProfilesByPropertyValue("properties.email", "basic1@test.com", 0, 10, null);