Repository: incubator-unomi Updated Branches: refs/heads/master 38ddefc48 -> 723cc079b
UNOMI-199 add readme with some explanation, fix unstable test, remove dependencies between tests Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/723cc079 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/723cc079 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/723cc079 Branch: refs/heads/master Commit: 723cc079be9f5e2a57cff5f7218139ec5d813d0e Parents: 38ddefc Author: dgaillard <[email protected]> Authored: Fri Sep 21 19:53:58 2018 +0200 Committer: dgaillard <[email protected]> Committed: Fri Sep 21 19:53:58 2018 +0200 ---------------------------------------------------------------------- itests/README.md | 50 ++++++++ .../java/org/apache/unomi/itests/BaseIT.java | 3 - .../unomi/itests/ConditionEvaluatorIT.java | 5 +- .../apache/unomi/itests/ModifyConsentIT.java | 7 +- .../apache/unomi/itests/ProfileExportIT.java | 113 ++++++++++--------- .../unomi/itests/ProfileImportActorsIT.java | 16 ++- .../unomi/itests/ProfileImportBasicIT.java | 19 +--- .../unomi/itests/ProfileImportRankingIT.java | 36 +++--- .../unomi/itests/ProfileImportSurfersIT.java | 51 +++++---- .../apache/unomi/itests/ProfileServiceIT.java | 6 +- .../unomi/itests/PropertiesUpdateActionIT.java | 8 +- .../java/org/apache/unomi/itests/SegmentIT.java | 4 +- itests/src/test/resources/2-surfers-test.csv | 74 ++++++------ .../test/resources/3-surfers-overwrite-test.csv | 74 ++++++------ .../test/resources/4-surfers-delete-test.csv | 74 ++++++------ itests/src/test/resources/5-ranking-test.csv | 52 ++++----- itests/src/test/resources/6-actors-test.csv | 14 +-- 17 files changed, 338 insertions(+), 268 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/README.md ---------------------------------------------------------------------- diff --git a/itests/README.md b/itests/README.md new file mode 100644 index 0000000..5a3236c --- /dev/null +++ b/itests/README.md @@ -0,0 +1,50 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +Apache Unomi Integration tests +================================= + +## Information +You will likely run into situation where you need to wait for the execution of your test. +To do so please avoid long Thread.sleep(10000) it tend to make the test unstable, prefer a shorter sleep that you will repeat. +e.g: +```java +boolean isDone = false; +while (!isDone) { + importConfiguration = importConfigurationService.load(itemId); + if (importConfiguration != null && importConfiguration.getStatus() != null) { + isDone = importConfiguration.getStatus().equals(RouterConstants.CONFIG_STATUS_COMPLETE_SUCCESS); + } + Thread.sleep(1000); +} +``` + +**NEVER** create dependencies between your test, even in the same class, the execution order is not guaranteed therefore you may not +have what you expect and it could work fine on your machine but not on others. + +If possible clean what your test created at the end of its execution or at the very least make sure to use unique IDs + +When you need a service from Unomi to execute your test inject it with a filer: +```java +@Inject @Filter(timeout = 60000) +protected ProfileService profileService; +``` +This will ensure the service is available before starting the test and if you need a resource like an URL you can do something like this: +```java +@Inject @Filter(value="(configDiscriminator=IMPORT)", timeout = 60000) +protected ImportExportConfigurationService<ImportConfiguration> importConfigurationService; +``` http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/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 3d3e610..635c52c 100644 --- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java @@ -38,11 +38,8 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.*; public abstract class BaseIT { protected static final String HTTP_PORT = "8181"; - protected static final String URL = "http://localhost:"; + HTTP_PORT; - protected static final String KARAF_DIR = "target/exam"; - protected static final String UNOMI_KEY = "670c26d1cc413346c3b2fd9ce65dab41"; @Configuration http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java index 954a451..b233ed6 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java @@ -45,10 +45,11 @@ import static org.junit.Assert.*; public class ConditionEvaluatorIT extends BaseIT { protected ConditionBuilder builder; - @Inject @Filter(timeout = 60000) - protected PersistenceService persistenceService; protected Item item; protected Date lastVisit; + + @Inject @Filter(timeout = 60000) + protected PersistenceService persistenceService; @Inject @Filter(timeout = 60000) private DefinitionsService definitionsService; http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/java/org/apache/unomi/itests/ModifyConsentIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ModifyConsentIT.java b/itests/src/test/java/org/apache/unomi/itests/ModifyConsentIT.java index 6b53d79..d84a97f 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ModifyConsentIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ModifyConsentIT.java @@ -30,6 +30,7 @@ import org.junit.runner.RunWith; 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; @@ -43,15 +44,13 @@ import java.util.Date; @RunWith(PaxExam.class) @ExamReactorStrategy(PerSuite.class) public class ModifyConsentIT extends BaseIT { - private final static Logger LOGGER = LoggerFactory.getLogger(ModifyConsentIT.class); private final static String PROFILE_TEST_ID = "profile-consent"; - @Inject + @Inject @Filter(timeout = 60000) protected ProfileService profileService; - - @Inject + @Inject @Filter(timeout = 60000) protected EventService eventService; @Before http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/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 eecb3c6..13893e9 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java @@ -16,11 +16,9 @@ */ package org.apache.unomi.itests; -import org.apache.unomi.api.Metadata; -import org.apache.unomi.api.conditions.Condition; -import org.apache.unomi.api.segments.Segment; -import org.apache.unomi.api.services.DefinitionsService; -import org.apache.unomi.api.services.SegmentService; +import org.apache.unomi.api.PartialList; +import org.apache.unomi.api.Profile; +import org.apache.unomi.api.services.ProfileService; import org.apache.unomi.router.api.ExportConfiguration; import org.apache.unomi.router.api.RouterConstants; import org.apache.unomi.router.api.services.ImportExportConfigurationService; @@ -36,9 +34,7 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by amidani on 14/08/2017. @@ -46,75 +42,84 @@ import java.util.Map; @RunWith(PaxExam.class) @ExamReactorStrategy(PerSuite.class) public class ProfileExportIT extends BaseIT { - - @Inject - @Filter("(configDiscriminator=EXPORT)") - protected ImportExportConfigurationService<ExportConfiguration> exportConfigurationService; - - @Inject - protected SegmentService segmentService; - - @Inject - protected DefinitionsService definitionsService; - private Logger logger = LoggerFactory.getLogger(ProfileExportIT.class); - File exportDir; + @Inject @Filter(value="(configDiscriminator=EXPORT)", timeout = 60000) + protected ImportExportConfigurationService<ExportConfiguration> exportConfigurationService; + @Inject @Filter(timeout = 60000) + protected ProfileService profileService; @Test public void testExport() throws InterruptedException { - - Condition condition = new Condition(); - condition.setConditionType(definitionsService.getConditionType("profilePropertyCondition")); - condition.setParameter("propertyName", "properties.twitterId"); - condition.setParameter("propertyValue", "3"); - condition.setParameter("comparisonOperator", "greaterThanOrEqualTo"); - - Segment segment = new Segment(new Metadata("integration", "exportItSeg", "Export IT Segment", "Export IT Segment")); - segment.setItemId("exportItSeg"); - segment.setCondition(condition); - segment.setScope("integration"); - - segmentService.setSegmentDefinition(segment); - - Thread.sleep(10000); - - segment = segmentService.getSegmentDefinition("exportItSeg"); - - Assert.assertNotNull(segment); - Assert.assertEquals("Export IT Segment", segment.getMetadata().getName()); + Date timestamp = new Date(); + + Set<String> segments = new TreeSet<>(); + segments.add("exportItSeg"); + + Profile profile1 = new Profile(UUID.randomUUID().toString()); + profile1.setProperty("firstVisit", timestamp); + profile1.setProperty("firstName", "Pablo"); + profile1.setProperty("lastName", "Esco"); + profile1.setProperty("city", "exportCity"); + profile1.setSegments(segments); + profileService.save(profile1); + + Profile profile2 = new Profile(UUID.randomUUID().toString()); + profile2.setProperty("firstVisit", timestamp); + profile2.setProperty("firstName", "Amado"); + profile2.setProperty("lastName", "Carri"); + profile2.setProperty("city", "exportCity"); + profile2.setSegments(segments); + profileService.save(profile2); + + Profile profile3 = new Profile(UUID.randomUUID().toString()); + profile3.setProperty("firstVisit", timestamp); + profile3.setProperty("firstName", "Joaquin"); + profile3.setProperty("lastName", "Guz"); + profile3.setProperty("city", "exportCity"); + profile3.setSegments(segments); + profileService.save(profile3); + + PartialList<Profile> profiles = null; + while (profiles == null || profiles.getTotalSize() != 3) { + Thread.sleep(1000); + profiles = profileService.findProfilesByPropertyValue("segments", "exportItSeg", 0, 10, null); + } /*** Export Test ***/ + String itemId = "export-test"; ExportConfiguration exportConfiguration = new ExportConfiguration(); - exportConfiguration.setItemId("export-test"); + exportConfiguration.setItemId(itemId); exportConfiguration.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); exportConfiguration.setColumnSeparator(";"); exportConfiguration.setMultiValueDelimiter("()"); exportConfiguration.setMultiValueSeparator(";"); - Map mapping = new HashMap(); - mapping.put("0", "lastName"); - mapping.put("1", "email"); - mapping.put("2", "movieGenres"); + Map<String, String> mapping = new HashMap<>(); + mapping.put("0", "firstName"); + mapping.put("1", "lastName"); + mapping.put("2", "city"); exportConfiguration.getProperties().put("mapping", mapping); exportConfiguration.getProperties().put("segment", "exportItSeg"); - exportConfiguration.getProperties().put("period", "10m"); - exportDir = new File("data/tmp/recurrent_export/"); - exportConfiguration.getProperties().put("destination", "file://" + exportDir.getAbsolutePath() + "?fileName=profiles-actors-export.csv"); + exportConfiguration.getProperties().put("period", "1m"); + File exportDir = new File("data/tmp/"); + exportConfiguration.getProperties().put("destination", "file://" + exportDir.getAbsolutePath() + "?fileName=profiles-export.csv"); exportConfiguration.setActive(true); exportConfigurationService.save(exportConfiguration, true); - - Thread.sleep(10000); + File exportResult = new File("data/tmp/profiles-export.csv"); + while (!exportResult.exists()) { + Thread.sleep(1000); + exportResult = new File("data/tmp/profiles-export.csv"); + } + logger.info("PATH : {}", exportResult.getAbsolutePath()); + Assert.assertTrue(exportResult.exists()); List<ExportConfiguration> exportConfigurations = exportConfigurationService.getAll(); Assert.assertEquals(1, exportConfigurations.size()); - File exportResult = new File(exportDir+"/profiles-actors-export.csv"); - logger.info("PATH : {}", exportResult.getAbsolutePath()); - Assert.assertTrue(exportResult.exists()); + exportConfigurationService.delete(itemId); } - } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/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 308009a..a6bfa20 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java @@ -74,8 +74,9 @@ public class ProfileImportActorsIT extends BaseIT { /*** Actors Test ***/ + String itemId = "6-actors-test"; ImportConfiguration importConfigActors = new ImportConfiguration(); - importConfigActors.setItemId("6-actors-test"); + importConfigActors.setItemId(itemId); importConfigActors.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); importConfigActors.setMergingProperty("twitterId"); importConfigActors.setOverwriteExistingProfiles(true); @@ -85,11 +86,12 @@ public class ProfileImportActorsIT extends BaseIT { importConfigActors.setHasHeader(true); importConfigActors.setHasDeleteColumn(false); - Map mappingActors = new HashMap(); + Map<String, Integer> mappingActors = new HashMap<>(); mappingActors.put("twitterId", 0); mappingActors.put("lastName", 1); mappingActors.put("email", 2); mappingActors.put("movieGenres", 3); + mappingActors.put("city", 4); importConfigActors.getProperties().put("mapping", mappingActors); File importSurfersFile = new File("data/tmp/recurrent_import/"); @@ -99,10 +101,14 @@ public class ProfileImportActorsIT extends BaseIT { importConfigurationService.save(importConfigActors, true); //Wait for data to be processed - Thread.sleep(10000); + PartialList<Profile> profiles = null; + while (profiles == null || profiles.getTotalSize() != 6) { + Thread.sleep(1000); + profiles = profileService.findProfilesByPropertyValue("properties.city", "hollywood", 0, 10, null); + } List<ImportConfiguration> importConfigurations = importConfigurationService.getAll(); - Assert.assertEquals(6, importConfigurations.size()); + Assert.assertEquals(1, importConfigurations.size()); PartialList<Profile> jeanneProfile = profileService.findProfilesByPropertyValue("properties.twitterId", "4", 0, 10, null); Assert.assertEquals(1, jeanneProfile.getList().size()); @@ -118,6 +124,6 @@ public class ProfileImportActorsIT extends BaseIT { Assert.assertEquals("[email protected]", rockProfile.get(0).getProperty("email")); Assert.assertEquals(Arrays.asList("Adventure", "Action", "Romance", "Comedy"), rockProfile.get(0).getProperty("movieGenres")); + importConfigurationService.delete(itemId); } - } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/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 e2b1898..4523bee 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java @@ -87,26 +87,19 @@ public class ProfileImportBasicIT extends BaseIT { File basicFile = new File("data/tmp/1-basic-test.csv"); Files.copy(basicFile.toPath(), new File("data/tmp/unomi_oneshot_import_configs/1-basic-test.csv").toPath(), StandardCopyOption.REPLACE_EXISTING); - // Wait for the csv to be processed - boolean isDone = false; - while (!isDone) { - importConfiguration = importConfigurationService.load(itemId); - if (importConfiguration != null && importConfiguration.getStatus() != null) { - isDone = importConfiguration.getStatus().equals(RouterConstants.CONFIG_STATUS_COMPLETE_SUCCESS); - } + //Wait for the csv to be processed + PartialList<Profile> profiles = null; + while (profiles == null || profiles.getTotalSize() != 3) { Thread.sleep(1000); + profiles = profileService.findProfilesByPropertyValue("properties.city", "oneShotImportCity", 0, 10, null); } - // Check import config status - Assert.assertEquals(RouterConstants.CONFIG_STATUS_COMPLETE_SUCCESS, importConfiguration.getStatus()); - Assert.assertEquals(1, importConfiguration.getExecutions().size()); - - // Check saved profiles - PartialList<Profile> profiles = profileService.findProfilesByPropertyValue("properties.city", "oneShotImportCity", 0, 10, null); Assert.assertEquals(3, profiles.getList().size()); checkProfiles(1); checkProfiles(2); checkProfiles(3); + + importConfigurationService.delete(itemId); } private void checkProfiles(int profileNumber) { http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/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 b4663ec..4ae3c42 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java @@ -79,8 +79,9 @@ public class ProfileImportRankingIT extends BaseIT { /*** Surfers Test ***/ + String itemId = "5-ranking-test"; ImportConfiguration importConfigRanking = new ImportConfiguration(); - importConfigRanking.setItemId("5-ranking-test"); + importConfigRanking.setItemId(itemId); importConfigRanking.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); importConfigRanking.setMergingProperty("rank"); importConfigRanking.setOverwriteExistingProfiles(true); @@ -88,12 +89,13 @@ public class ProfileImportRankingIT extends BaseIT { importConfigRanking.setHasHeader(true); importConfigRanking.setHasDeleteColumn(false); - Map mappingRanking = new HashMap(); + Map<String, Integer> mappingRanking = new HashMap<>(); mappingRanking.put("rank", 0); mappingRanking.put("uciId", 1); mappingRanking.put("lastName", 2); mappingRanking.put("nationality", 3); mappingRanking.put("age", 4); + mappingRanking.put("city", 5); importConfigRanking.getProperties().put("mapping", mappingRanking); File importSurfersFile = new File("data/tmp/recurrent_import/"); @@ -104,20 +106,24 @@ public class ProfileImportRankingIT extends BaseIT { //Wait for data to be processed - Thread.sleep(10000); + PartialList<Profile> profiles = null; + while (profiles == null || profiles.getTotalSize() != 25) { + Thread.sleep(1000); + profiles = profileService.findProfilesByPropertyValue("properties.city", "rankingCity", 0, 50, null); + } List<ImportConfiguration> importConfigurations = importConfigurationService.getAll(); - Assert.assertEquals(5, importConfigurations.size()); - - PartialList<Profile> gregProfile = profileService.findProfilesByPropertyValue("properties.uciId", "10004451371", 0, 10, null); - Assert.assertEquals(1, gregProfile.getList().size()); - Assert.assertNotNull(gregProfile.get(0)); - Assert.assertEquals(1, gregProfile.get(0).getProperty("rank")); - Assert.assertEquals("VAN AVERMAET Greg", gregProfile.get(0).getProperty("lastName")); - Assert.assertEquals("BELGIUM", gregProfile.get(0).getProperty("nationality")); - Assert.assertEquals(32, gregProfile.get(0).getProperty("age")); - - + Assert.assertEquals(1, importConfigurations.size()); + + PartialList<Profile> gregProfileList = profileService.findProfilesByPropertyValue("properties.uciId", "10004451371", 0, 10, null); + Assert.assertEquals(1, gregProfileList.getList().size()); + Profile gregProfile = gregProfileList.get(0); + Assert.assertNotNull(gregProfile); + Assert.assertEquals(1, gregProfile.getProperty("rank")); + Assert.assertEquals("VAN AVERMAET Greg", gregProfile.getProperty("lastName")); + Assert.assertEquals("BELGIUM", gregProfile.getProperty("nationality")); + Assert.assertEquals(32, gregProfile.getProperty("age")); + + importConfigurationService.delete(itemId); } - } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/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 a845206..4129edc 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java @@ -77,7 +77,8 @@ public class ProfileImportSurfersIT extends BaseIT { /*** Surfers Test ***/ ImportConfiguration importConfigSurfers = new ImportConfiguration(); - importConfigSurfers.setItemId("2-surfers-test"); + String itemId1 = "2-surfers-test"; + importConfigSurfers.setItemId(itemId1); importConfigSurfers.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); importConfigSurfers.setMergingProperty("linkedInId"); importConfigSurfers.setOverwriteExistingProfiles(true); @@ -85,14 +86,14 @@ public class ProfileImportSurfersIT extends BaseIT { importConfigSurfers.setHasHeader(true); importConfigSurfers.setHasDeleteColumn(true); - Map mappingSurfers = new HashMap(); + Map<String, Integer> mappingSurfers = new HashMap<>(); mappingSurfers.put("linkedInId", 0); mappingSurfers.put("lastName", 1); mappingSurfers.put("email", 2); mappingSurfers.put("facebookId", 3); mappingSurfers.put("gender", 4); mappingSurfers.put("alive", 5); - + mappingSurfers.put("city", 6); importConfigSurfers.getProperties().put("mapping", mappingSurfers); File importSurfersFile = new File("data/tmp/recurrent_import/"); @@ -104,10 +105,14 @@ public class ProfileImportSurfersIT extends BaseIT { logger.info("ProfileImportSurfersIT setup successfully."); //Wait for data to be processed - Thread.sleep(10000); + PartialList<Profile> profiles = null; + while (profiles == null || profiles.getTotalSize() != 34) { + Thread.sleep(1000); + profiles = profileService.findProfilesByPropertyValue("properties.city", "surfersCity", 0, 50, null); + } List<ImportConfiguration> importConfigurations = importConfigurationService.getAll(); - Assert.assertEquals(2, importConfigurations.size()); + Assert.assertEquals(1, importConfigurations.size()); //Profile not to delete PartialList<Profile> jordyProfile = profileService.findProfilesByPropertyValue("properties.email", "[email protected]", 0, 10, null); @@ -124,16 +129,15 @@ public class ProfileImportSurfersIT extends BaseIT { Assert.assertEquals(0, paulineProfile.getList().size()); //Check import config status - ImportConfiguration importConfiguration = importConfigurationService.load("2-surfers-test"); + ImportConfiguration importConfiguration = importConfigurationService.load(itemId1); Assert.assertEquals(RouterConstants.CONFIG_STATUS_COMPLETE_SUCCESS, importConfiguration.getStatus()); Assert.assertEquals(1, importConfiguration.getExecutions().size()); - - //Wait for data to be processed - Thread.sleep(10000); + importConfigurationService.delete(itemId1); /*** Surfers Test OVERWRITE ***/ ImportConfiguration importConfigSurfersOverwrite = new ImportConfiguration(); - importConfigSurfersOverwrite.setItemId("3-surfers-overwrite-test"); + String itemId2 = "3-surfers-overwrite-test"; + importConfigSurfersOverwrite.setItemId(itemId2); importConfigSurfersOverwrite.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); importConfigSurfersOverwrite.setMergingProperty("linkedInId"); importConfigSurfersOverwrite.setOverwriteExistingProfiles(true); @@ -150,11 +154,14 @@ public class ProfileImportSurfersIT extends BaseIT { logger.info("ProfileImportSurfersOverwriteIT setup successfully."); //Wait for data to be processed - Thread.sleep(10000); - + profiles = null; + while (profiles == null || profiles.getTotalSize() != 36) { + Thread.sleep(1000); + profiles = profileService.findProfilesByPropertyValue("properties.city", "surfersCity", 0, 50, null); + } importConfigurations = importConfigurationService.getAll(); - Assert.assertEquals(3, importConfigurations.size()); + Assert.assertEquals(1, importConfigurations.size()); //Profile not to delete PartialList<Profile> aliveProfiles = profileService.findProfilesByPropertyValue("properties.alive", "true", 0, 50, null); @@ -166,14 +173,13 @@ public class ProfileImportSurfersIT extends BaseIT { //Profile to delete = false, was to delete PartialList<Profile> paulineProfileOverwrite = profileService.findProfilesByPropertyValue("properties.lastName", "Pauline Ado", 0, 10, null); Assert.assertEquals(1, paulineProfileOverwrite.getList().size()); - - //Wait for data to be processed - Thread.sleep(10000); + importConfigurationService.delete(itemId2); /*** Surfers Delete Test ***/ ImportConfiguration importConfigSurfersDelete = new ImportConfiguration(); - importConfigSurfersDelete.setItemId("4-surfers-delete-test"); + String itemId3 = "4-surfers-delete-test"; + importConfigSurfersDelete.setItemId(itemId3); importConfigSurfersDelete.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); importConfigSurfersDelete.setMergingProperty("linkedInId"); importConfigSurfersDelete.setOverwriteExistingProfiles(true); @@ -191,15 +197,18 @@ public class ProfileImportSurfersIT extends BaseIT { logger.info("ProfileImportSurfersDeleteIT setup successfully."); //Wait for data to be processed - Thread.sleep(10000); + profiles = null; + while (profiles == null || profiles.getTotalSize() != 0) { + Thread.sleep(1000); + profiles = profileService.findProfilesByPropertyValue("properties.city", "surfersCity", 0, 50, null); + } importConfigurations = importConfigurationService.getAll(); - Assert.assertEquals(4, importConfigurations.size()); + Assert.assertEquals(1, importConfigurations.size()); PartialList<Profile> jordyProfileDelete = profileService.findProfilesByPropertyValue("properties.email", "[email protected]", 0, 10, null); Assert.assertEquals(0, jordyProfileDelete.getList().size()); - + importConfigurationService.delete(itemId3); } - } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/java/org/apache/unomi/itests/ProfileServiceIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileServiceIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileServiceIT.java index f2acbf9..514a766 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileServiceIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileServiceIT.java @@ -23,6 +23,7 @@ import org.junit.runner.RunWith; 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; @@ -34,10 +35,11 @@ import javax.inject.Inject; @RunWith(PaxExam.class) @ExamReactorStrategy(PerSuite.class) public class ProfileServiceIT extends BaseIT { - private final static Logger LOGGER = LoggerFactory.getLogger(ProfileServiceIT.class); + private final static String TEST_PROFILE_ID = "test-profile-id"; - @Inject + + @Inject @Filter(timeout = 60000) protected ProfileService profileService; @Test http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java b/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java index 9007c95..3c894e3 100644 --- a/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java @@ -29,6 +29,7 @@ import org.junit.runner.RunWith; 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; @@ -45,15 +46,14 @@ import java.util.Map; @RunWith(PaxExam.class) @ExamReactorStrategy(PerSuite.class) public class PropertiesUpdateActionIT extends BaseIT { - private final static Logger LOGGER = LoggerFactory.getLogger(PropertiesUpdateActionIT.class); + private final static String PROFILE_TARGET_TEST_ID = "profile-target-event"; private final static String PROFILE_TEST_ID = "profile-to-update-by-event"; - @Inject + @Inject @Filter(timeout = 60000) protected ProfileService profileService; - - @Inject + @Inject @Filter(timeout = 60000) protected EventService eventService; @Before http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java b/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java index 721ab8f..2179272 100644 --- a/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/SegmentIT.java @@ -25,6 +25,7 @@ import org.junit.runner.RunWith; 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; @@ -35,7 +36,8 @@ import java.util.List; @ExamReactorStrategy(PerSuite.class) public class SegmentIT extends BaseIT { private final static Logger LOGGER = LoggerFactory.getLogger(SegmentIT.class); - @Inject + + @Inject @Filter(timeout = 60000) protected SegmentService segmentService; @Test http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/resources/2-surfers-test.csv ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/2-surfers-test.csv b/itests/src/test/resources/2-surfers-test.csv index bee4ef9..9daab60 100644 --- a/itests/src/test/resources/2-surfers-test.csv +++ b/itests/src/test/resources/2-surfers-test.csv @@ -1,37 +1,37 @@ -Linkedin ID;Last Name;Email;Facebook ID;Gender;Alive;To Delete -1;Jordy Smith;[email protected];999;male;TRUE;FALSE -2;Gabriel Medina;[email protected];998;male;TRUE;FALSE -3;Kolohe Andino;[email protected];997;male;TRUE;FALSE -4;Matt Wilkinson;[email protected];996;male;TRUE;FALSE -5;Michel Bourez;[email protected];995;male;TRUE;FALSE -6;Kelly Slater;[email protected];994;male;TRUE;FALSE -7;Julian Wilson;[email protected];993;male;TRUE;FALSE -8;Joel Parkinson;[email protected];992;male;TRUE;FALSE -9;Filipe Toledo;[email protected];991;male;TRUE;FALSE -10;Adriano De Souza;[email protected];990;male;TRUE;FALSE -11;Sebastian Zietz;[email protected];989;male;TRUE;TRUE -12;Josh Kerr;[email protected];988;male;TRUE;FALSE -13;Adrian Buchan;[email protected];987;male;TRUE;FALSE -14;Italo Ferreira;[email protected];986;male;TRUE;FALSE -15;Mick Fanning;[email protected];985;male;TRUE;FALSE -16;Miguel Pupo;[email protected];984;male;TRUE;FALSE -17;Nat Young;[email protected];983;male;TRUE;FALSE -18;Keanu Asing;;982;male;TRUE;FALSE -19;Tyler Wright;;981;male;TRUE;FALSE -20;Courtney Conlogue;;980;female;TRUE;FALSE -21;Carissa Moore;;979;female;TRUE;FALSE -22;Tatiana Weston-Webb;;978;female;TRUE;FALSE -23;Johanne Defay;;977;female;TRUE;FALSE -24;Stephanie Gilmore;;976;female;TRUE;FALSE -25;Malia Manuel;;975;female;TRUE;FALSE -26;Sally Fitzgibbons;;974;female;TRUE;FALSE -27;Sage Erickson;;973;female;TRUE;FALSE -28;Laura Enever;;972;female;TRUE;FALSE -29;Nikki Van Dijk;;971;female;TRUE;FALSE -30;Bianca Buitendag;;970;female;TRUE;FALSE -31;Coco Ho;;969;female;TRUE;FALSE -32;Alessa Quizon;;968;female;TRUE;FALSE -33;Lakey Peterson;;967;female;TRUE;FALSE -34;Bronte Macaulay;;966;female;TRUE;FALSE -35;Pauline Ado;;965;female;TRUE;TRUE -36;Silvana Lima;;964;female;TRUE;FALSE \ No newline at end of file +Linkedin ID;Last Name;Email;Facebook ID;Gender;Alive;City;To Delete +1;Jordy Smith;[email protected];999;male;TRUE;surfersCity;FALSE +2;Gabriel Medina;[email protected];998;male;TRUE;surfersCity;FALSE +3;Kolohe Andino;[email protected];997;male;TRUE;surfersCity;FALSE +4;Matt Wilkinson;[email protected];996;male;TRUE;surfersCity;FALSE +5;Michel Bourez;[email protected];995;male;TRUE;surfersCity;FALSE +6;Kelly Slater;[email protected];994;male;TRUE;surfersCity;FALSE +7;Julian Wilson;[email protected];993;male;TRUE;surfersCity;FALSE +8;Joel Parkinson;[email protected];992;male;TRUE;surfersCity;FALSE +9;Filipe Toledo;[email protected];991;male;TRUE;surfersCity;FALSE +10;Adriano De Souza;[email protected];990;male;TRUE;surfersCity;FALSE +11;Sebastian Zietz;[email protected];989;male;TRUE;surfersCity;TRUE +12;Josh Kerr;[email protected];988;male;TRUE;surfersCity;FALSE +13;Adrian Buchan;[email protected];987;male;TRUE;surfersCity;FALSE +14;Italo Ferreira;[email protected];986;male;TRUE;surfersCity;FALSE +15;Mick Fanning;[email protected];985;male;TRUE;surfersCity;FALSE +16;Miguel Pupo;[email protected];984;male;TRUE;surfersCity;FALSE +17;Nat Young;[email protected];983;male;TRUE;surfersCity;FALSE +18;Keanu Asing;;982;male;TRUE;surfersCity;FALSE +19;Tyler Wright;;981;male;TRUE;surfersCity;FALSE +20;Courtney Conlogue;;980;female;TRUE;surfersCity;FALSE +21;Carissa Moore;;979;female;TRUE;surfersCity;FALSE +22;Tatiana Weston-Webb;;978;female;TRUE;surfersCity;FALSE +23;Johanne Defay;;977;female;TRUE;surfersCity;FALSE +24;Stephanie Gilmore;;976;female;TRUE;surfersCity;FALSE +25;Malia Manuel;;975;female;TRUE;surfersCity;FALSE +26;Sally Fitzgibbons;;974;female;TRUE;surfersCity;FALSE +27;Sage Erickson;;973;female;TRUE;surfersCity;FALSE +28;Laura Enever;;972;female;TRUE;surfersCity;FALSE +29;Nikki Van Dijk;;971;female;TRUE;surfersCity;FALSE +30;Bianca Buitendag;;970;female;TRUE;surfersCity;FALSE +31;Coco Ho;;969;female;TRUE;surfersCity;FALSE +32;Alessa Quizon;;968;female;TRUE;surfersCity;FALSE +33;Lakey Peterson;;967;female;TRUE;surfersCity;FALSE +34;Bronte Macaulay;;966;female;TRUE;surfersCity;FALSE +35;Pauline Ado;;965;female;TRUE;surfersCity;TRUE +36;Silvana Lima;;964;female;TRUE;surfersCity;FALSE \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/resources/3-surfers-overwrite-test.csv ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/3-surfers-overwrite-test.csv b/itests/src/test/resources/3-surfers-overwrite-test.csv index 064b300..a31840d 100644 --- a/itests/src/test/resources/3-surfers-overwrite-test.csv +++ b/itests/src/test/resources/3-surfers-overwrite-test.csv @@ -1,37 +1,37 @@ -idnum;last;email;fbid;gender;alive;delete -1;Jordy Smith;[email protected];999;male;FALSE;FALSE -2;Gabriel Medina;[email protected];998;male;FALSE;FALSE -3;Kolohe Andino;[email protected];997;male;FALSE;FALSE -4;Matt Wilkinson;[email protected];996;male;FALSE;FALSE -5;Michel Bourez;[email protected];995;male;FALSE;FALSE -6;Kelly Slater;[email protected];994;male;FALSE;FALSE -7;Julian Wilson;[email protected];993;male;FALSE;FALSE -8;Joel Parkinson;[email protected];992;male;FALSE;FALSE -9;Filipe Toledo;[email protected];991;male;FALSE;FALSE -10;Adriano De Souza;[email protected];990;male;FALSE;FALSE -11;Sebastian Zietz;[email protected];989;male;FALSE;FALSE -12;Josh Kerr;[email protected];988;male;FALSE;FALSE -13;Adrian Buchan;[email protected];987;male;FALSE;FALSE -14;Italo Ferreira;[email protected];986;male;FALSE;FALSE -15;Mick Fanning;[email protected];985;male;FALSE;FALSE -16;Miguel Pupo;[email protected];984;male;FALSE;FALSE -17;Nat Young;[email protected];983;male;FALSE;FALSE -18;Keanu Asing;;982;male;FALSE;FALSE -19;Tyler Wright;;981;male;FALSE;FALSE -20;Courtney Conlogue;;980;female;FALSE;FALSE -21;Carissa Moore;;979;female;FALSE;FALSE -22;Tatiana Weston-Webb;;978;female;FALSE;FALSE -23;Johanne Defay;;977;female;FALSE;FALSE -24;Stephanie Gilmore;;976;female;FALSE;FALSE -25;Malia Manuel;;975;female;FALSE;FALSE -26;Sally Fitzgibbons;;974;female;FALSE;FALSE -27;Sage Erickson;;973;female;FALSE;FALSE -28;Laura Enever;;972;female;FALSE;FALSE -29;Nikki Van Dijk;;971;female;FALSE;FALSE -30;Bianca Buitendag;;970;female;FALSE;FALSE -31;Coco Ho;;969;female;FALSE;FALSE -32;Alessa Quizon;;968;female;FALSE;FALSE -33;Lakey Peterson;;967;female;FALSE;FALSE -34;Bronte Macaulay;;966;female;FALSE;FALSE -35;Pauline Ado;;965;female;FALSE;FALSE -36;Silvana Lima;;964;female;FALSE;FALSE \ No newline at end of file +idnum;last;email;fbid;gender;alive;city;delete +1;Jordy Smith;[email protected];999;male;FALSE;surfersCity;FALSE +2;Gabriel Medina;[email protected];998;male;FALSE;surfersCity;FALSE +3;Kolohe Andino;[email protected];997;male;FALSE;surfersCity;FALSE +4;Matt Wilkinson;[email protected];996;male;FALSE;surfersCity;FALSE +5;Michel Bourez;[email protected];995;male;FALSE;surfersCity;FALSE +6;Kelly Slater;[email protected];994;male;FALSE;surfersCity;FALSE +7;Julian Wilson;[email protected];993;male;FALSE;surfersCity;FALSE +8;Joel Parkinson;[email protected];992;male;FALSE;surfersCity;FALSE +9;Filipe Toledo;[email protected];991;male;FALSE;surfersCity;FALSE +10;Adriano De Souza;[email protected];990;male;FALSE;surfersCity;FALSE +11;Sebastian Zietz;[email protected];989;male;FALSE;surfersCity;FALSE +12;Josh Kerr;[email protected];988;male;FALSE;surfersCity;FALSE +13;Adrian Buchan;[email protected];987;male;FALSE;surfersCity;FALSE +14;Italo Ferreira;[email protected];986;male;FALSE;surfersCity;FALSE +15;Mick Fanning;[email protected];985;male;FALSE;surfersCity;FALSE +16;Miguel Pupo;[email protected];984;male;FALSE;surfersCity;FALSE +17;Nat Young;[email protected];983;male;FALSE;surfersCity;FALSE +18;Keanu Asing;;982;male;FALSE;surfersCity;FALSE +19;Tyler Wright;;981;male;FALSE;surfersCity;FALSE +20;Courtney Conlogue;;980;female;FALSE;surfersCity;FALSE +21;Carissa Moore;;979;female;FALSE;surfersCity;FALSE +22;Tatiana Weston-Webb;;978;female;FALSE;surfersCity;FALSE +23;Johanne Defay;;977;female;FALSE;surfersCity;FALSE +24;Stephanie Gilmore;;976;female;FALSE;surfersCity;FALSE +25;Malia Manuel;;975;female;FALSE;surfersCity;FALSE +26;Sally Fitzgibbons;;974;female;FALSE;surfersCity;FALSE +27;Sage Erickson;;973;female;FALSE;surfersCity;FALSE +28;Laura Enever;;972;female;FALSE;surfersCity;FALSE +29;Nikki Van Dijk;;971;female;FALSE;surfersCity;FALSE +30;Bianca Buitendag;;970;female;FALSE;surfersCity;FALSE +31;Coco Ho;;969;female;FALSE;surfersCity;FALSE +32;Alessa Quizon;;968;female;FALSE;surfersCity;FALSE +33;Lakey Peterson;;967;female;FALSE;surfersCity;FALSE +34;Bronte Macaulay;;966;female;FALSE;surfersCity;FALSE +35;Pauline Ado;;965;female;FALSE;surfersCity;FALSE +36;Silvana Lima;;964;female;FALSE;surfersCity;FALSE \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/resources/4-surfers-delete-test.csv ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/4-surfers-delete-test.csv b/itests/src/test/resources/4-surfers-delete-test.csv index f2d45ba..5e87241 100644 --- a/itests/src/test/resources/4-surfers-delete-test.csv +++ b/itests/src/test/resources/4-surfers-delete-test.csv @@ -1,37 +1,37 @@ -Linkedin ID;Last Name;Email;Facebook ID;Gender;Alive;To Delete -1;Jordy Smith;[email protected];999;male;TRUE;TRUE -2;Gabriel Medina;[email protected];998;male;TRUE;TRUE -3;Kolohe Andino;[email protected];997;male;TRUE;TRUE -4;Matt Wilkinson;[email protected];996;male;TRUE;TRUE -5;Michel Bourez;[email protected];995;male;TRUE;TRUE -6;Kelly Slater;[email protected];994;male;TRUE;TRUE -7;Julian Wilson;[email protected];993;male;TRUE;TRUE -8;Joel Parkinson;[email protected];992;male;TRUE;TRUE -9;Filipe Toledo;[email protected];991;male;TRUE;TRUE -10;Adriano De Souza;[email protected];990;male;TRUE;TRUE -11;Sebastian Zietz;[email protected];989;male;TRUE;TRUE -12;Josh Kerr;[email protected];988;male;TRUE;TRUE -13;Adrian Buchan;[email protected];987;male;TRUE;TRUE -14;Italo Ferreira;[email protected];986;male;TRUE;TRUE -15;Mick Fanning;[email protected];985;male;TRUE;TRUE -16;Miguel Pupo;[email protected];984;male;TRUE;TRUE -17;Nat Young;[email protected];983;male;TRUE;TRUE -18;Keanu Asing;;982;male;TRUE;TRUE -19;Tyler Wright;;981;male;TRUE;TRUE -20;Courtney Conlogue;;980;female;TRUE;TRUE -21;Carissa Moore;;979;female;TRUE;TRUE -22;Tatiana Weston-Webb;;978;female;TRUE;TRUE -23;Johanne Defay;;977;female;TRUE;TRUE -24;Stephanie Gilmore;;976;female;TRUE;TRUE -25;Malia Manuel;;975;female;TRUE;TRUE -26;Sally Fitzgibbons;;974;female;TRUE;TRUE -27;Sage Erickson;;973;female;TRUE;TRUE -28;Laura Enever;;972;female;TRUE;TRUE -29;Nikki Van Dijk;;971;female;TRUE;TRUE -30;Bianca Buitendag;;970;female;TRUE;TRUE -31;Coco Ho;;969;female;TRUE;TRUE -32;Alessa Quizon;;968;female;TRUE;TRUE -33;Lakey Peterson;;967;female;TRUE;TRUE -34;Bronte Macaulay;;966;female;TRUE;TRUE -35;Pauline Ado;;965;female;TRUE;TRUE -36;Silvana Lima;;964;female;TRUE;TRUE \ No newline at end of file +Linkedin ID;Last Name;Email;Facebook ID;Gender;Alive;City;To Delete +1;Jordy Smith;[email protected];999;male;TRUE;surfersCity;TRUE +2;Gabriel Medina;[email protected];998;male;TRUE;surfersCity;TRUE +3;Kolohe Andino;[email protected];997;male;TRUE;surfersCity;TRUE +4;Matt Wilkinson;[email protected];996;male;TRUE;surfersCity;TRUE +5;Michel Bourez;[email protected];995;male;TRUE;surfersCity;TRUE +6;Kelly Slater;[email protected];994;male;TRUE;surfersCity;TRUE +7;Julian Wilson;[email protected];993;male;TRUE;surfersCity;TRUE +8;Joel Parkinson;[email protected];992;male;TRUE;surfersCity;TRUE +9;Filipe Toledo;[email protected];991;male;TRUE;surfersCity;TRUE +10;Adriano De Souza;[email protected];990;male;TRUE;surfersCity;TRUE +11;Sebastian Zietz;[email protected];989;male;TRUE;surfersCity;TRUE +12;Josh Kerr;[email protected];988;male;TRUE;surfersCity;TRUE +13;Adrian Buchan;[email protected];987;male;TRUE;surfersCity;TRUE +14;Italo Ferreira;[email protected];986;male;TRUE;surfersCity;TRUE +15;Mick Fanning;[email protected];985;male;TRUE;surfersCity;TRUE +16;Miguel Pupo;[email protected];984;male;TRUE;surfersCity;TRUE +17;Nat Young;[email protected];983;male;TRUE;surfersCity;TRUE +18;Keanu Asing;;982;male;TRUE;surfersCity;TRUE +19;Tyler Wright;;981;male;TRUE;surfersCity;TRUE +20;Courtney Conlogue;;980;female;TRUE;surfersCity;TRUE +21;Carissa Moore;;979;female;TRUE;surfersCity;TRUE +22;Tatiana Weston-Webb;;978;female;TRUE;surfersCity;TRUE +23;Johanne Defay;;977;female;TRUE;surfersCity;TRUE +24;Stephanie Gilmore;;976;female;TRUE;surfersCity;TRUE +25;Malia Manuel;;975;female;TRUE;surfersCity;TRUE +26;Sally Fitzgibbons;;974;female;TRUE;surfersCity;TRUE +27;Sage Erickson;;973;female;TRUE;surfersCity;TRUE +28;Laura Enever;;972;female;TRUE;surfersCity;TRUE +29;Nikki Van Dijk;;971;female;TRUE;surfersCity;TRUE +30;Bianca Buitendag;;970;female;TRUE;surfersCity;TRUE +31;Coco Ho;;969;female;TRUE;surfersCity;TRUE +32;Alessa Quizon;;968;female;TRUE;surfersCity;TRUE +33;Lakey Peterson;;967;female;TRUE;surfersCity;TRUE +34;Bronte Macaulay;;966;female;TRUE;surfersCity;TRUE +35;Pauline Ado;;965;female;TRUE;surfersCity;TRUE +36;Silvana Lima;;964;female;TRUE;surfersCity;TRUE \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/resources/5-ranking-test.csv ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/5-ranking-test.csv b/itests/src/test/resources/5-ranking-test.csv index 8545e7b..783f6d7 100644 --- a/itests/src/test/resources/5-ranking-test.csv +++ b/itests/src/test/resources/5-ranking-test.csv @@ -1,26 +1,26 @@ -Rank;UCI ID;Name;Nationality;Age -1;10004451371;VAN AVERMAET Greg;BELGIUM;32 -2;10005460373;SAGAN Peter;SLOVAKIA;27 -3;10006738854;QUINTANA Nairo;COLOMBIA;27 -4;10001457509;VALVERDE Alejandro;SPAIN;37 -5;10004393676;FROOME Chris;GREAT BRITAIN;32 -6;10007389259;DUMOULIN Tom;NETHERLANDS;27 -7;10002416694;GILBERT Philippe;BELGIUM;35 -8;10005760164;PORTE Richie;AUSTRALIA;32 -9;10003224828;MARTIN Daniel;IRELAND;31 -10;10051842945;CONTADOR VELASCO Alberto;SPAIN;35 -11;10003269183;KRISTOFF Alexander;NORWAY;30 -12;10006291947;MATTHEWS Michael;AUSTRALIA;27 -13;10006491708;BARDET Romain;FRANCE;27 -14;10005379339;DEGENKOLB John;GERMANY;28 -15;10005467952;ULISSI Diego;ITALY;28 -16;10005852821;KWIATKOWSKI Michal;POLAND;27 -17;10009365433;NAESEN Oliver;BELGIUM;27 -18;10042236612;IZAGIRRE INSAUSTI Ion;SPAIN;28 -19;10008656828;GAVIRIA RENDON Fernando;COLOMBIA;23 -20;10007587303;CHAVES RUBIO Jhoan Esteban;COLOMBIA;27 -21;10007058954;YATES Simon;GREAT BRITAIN;25 -22;10006467052;DEMARE Arnaud;FRANCE;26 -23;10006468062;COLBRELLI Sonny;ITALY;27 -24;10005982456;FELLINE Fabio;ITALY;27 -25;10005961440;BOUHANNI Nacer;FRANCE;27 \ No newline at end of file +Rank;UCI ID;Name;Nationality;Age;City +1;10004451371;VAN AVERMAET Greg;BELGIUM;32;rankingCity +2;10005460373;SAGAN Peter;SLOVAKIA;27;rankingCity +3;10006738854;QUINTANA Nairo;COLOMBIA;27;rankingCity +4;10001457509;VALVERDE Alejandro;SPAIN;37;rankingCity +5;10004393676;FROOME Chris;GREAT BRITAIN;32;rankingCity +6;10007389259;DUMOULIN Tom;NETHERLANDS;27;rankingCity +7;10002416694;GILBERT Philippe;BELGIUM;35;rankingCity +8;10005760164;PORTE Richie;AUSTRALIA;32;rankingCity +9;10003224828;MARTIN Daniel;IRELAND;31;rankingCity +10;10051842945;CONTADOR VELASCO Alberto;SPAIN;35;rankingCity +11;10003269183;KRISTOFF Alexander;NORWAY;30;rankingCity +12;10006291947;MATTHEWS Michael;AUSTRALIA;27;rankingCity +13;10006491708;BARDET Romain;FRANCE;27;rankingCity +14;10005379339;DEGENKOLB John;GERMANY;28;rankingCity +15;10005467952;ULISSI Diego;ITALY;28;rankingCity +16;10005852821;KWIATKOWSKI Michal;POLAND;27;rankingCity +17;10009365433;NAESEN Oliver;BELGIUM;27;rankingCity +18;10042236612;IZAGIRRE INSAUSTI Ion;SPAIN;28;rankingCity +19;10008656828;GAVIRIA RENDON Fernando;COLOMBIA;23;rankingCity +20;10007587303;CHAVES RUBIO Jhoan Esteban;COLOMBIA;27;rankingCity +21;10007058954;YATES Simon;GREAT BRITAIN;25;rankingCity +22;10006467052;DEMARE Arnaud;FRANCE;26;rankingCity +23;10006468062;COLBRELLI Sonny;ITALY;27;rankingCity +24;10005982456;FELLINE Fabio;ITALY;27;rankingCity +25;10005961440;BOUHANNI Nacer;FRANCE;27;rankingCity \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/723cc079/itests/src/test/resources/6-actors-test.csv ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/6-actors-test.csv b/itests/src/test/resources/6-actors-test.csv index 0180fdc..ff18656 100644 --- a/itests/src/test/resources/6-actors-test.csv +++ b/itests/src/test/resources/6-actors-test.csv @@ -1,7 +1,7 @@ -Twitter Id;Last name;email;Movie genres -1;Sigourney Weaver;[email protected];"[Horror;Action]" -2;Kevin Hart;[email protected];"[Comedy;Action]" -3;Vincent Van GOGH;[email protected];[] -4;"Jeanne; D'arc";[email protected];[] -5;Jessica Alba;[email protected];[Romance] -6;The Rock;[email protected];"[Adventure;Action;Romance;Comedy]" \ No newline at end of file +Twitter Id;Last name;email;Movie genres;City +1;Sigourney Weaver;[email protected];"[Horror;Action]";hollywood +2;Kevin Hart;[email protected];"[Comedy;Action]";hollywood +3;Vincent Van GOGH;[email protected];[];hollywood +4;"Jeanne; D'arc";[email protected];[];hollywood +5;Jessica Alba;[email protected];[Romance];hollywood +6;The Rock;[email protected];"[Adventure;Action;Romance;Comedy]";hollywood \ No newline at end of file
