Repository: incubator-unomi Updated Branches: refs/heads/master a8de6e1f7 -> 2c32e4f5d
UNOMI-118 : Surfers overwrite test, profile import Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/2c32e4f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/2c32e4f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/2c32e4f5 Branch: refs/heads/master Commit: 2c32e4f5dfca5709eb13e5deb7c64df48e027d8e Parents: a8de6e1 Author: Abdelkader Midani <amid...@apache.org> Authored: Mon Aug 14 02:39:57 2017 +0200 Committer: Abdelkader Midani <amid...@apache.org> Committed: Mon Aug 14 02:39:57 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/unomi/itests/AllITs.java | 1 + .../java/org/apache/unomi/itests/BaseIT.java | 10 +- .../unomi/itests/ProfileImportBasicIT.java | 2 +- .../unomi/itests/ProfileImportRankingIT.java | 14 +- .../itests/ProfileImportSurfersDeleteIT.java | 10 +- .../unomi/itests/ProfileImportSurfersIT.java | 2 +- .../itests/ProfileImportSurfersOverwriteIT.java | 154 +++++++++++++++++++ .../test/resources/3-surfers-delete-test.csv | 37 ----- .../test/resources/3-surfers-overwrite-test.csv | 37 +++++ itests/src/test/resources/4-ranking-test.csv | 26 ---- .../test/resources/4-surfers-delete-test.csv | 37 +++++ itests/src/test/resources/5-ranking-test.csv | 26 ++++ 12 files changed, 275 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/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 3673289..8251816 100644 --- a/itests/src/test/java/org/apache/unomi/itests/AllITs.java +++ b/itests/src/test/java/org/apache/unomi/itests/AllITs.java @@ -35,6 +35,7 @@ import org.junit.runners.Suite.SuiteClasses; ProfileServiceIT.class, ProfileImportBasicIT.class, ProfileImportSurfersIT.class, + ProfileImportSurfersOverwriteIT.class, ProfileImportSurfersDeleteIT.class, ProfileImportRankingIT.class }) http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/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 8f70f2f..ae43a60 100644 --- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java @@ -99,10 +99,12 @@ public abstract class BaseIT { "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-delete-test.csv", new File( - "src/test/resources/3-surfers-delete-test.csv")), - replaceConfigurationFile("data/tmp/recurrent_import/4-ranking-test.csv", new File( - "src/test/resources/4-ranking-test.csv")), + replaceConfigurationFile("data/tmp/recurrent_import/3-surfers-overwrite-test.csv", new File( + "src/test/resources/3-surfers-overwrite-test.csv")), + replaceConfigurationFile("data/tmp/recurrent_import/4-surfers-delete-test.csv", new File( + "src/test/resources/4-surfers-delete-test.csv")), + replaceConfigurationFile("data/tmp/recurrent_import/5-ranking-test.csv", new File( + "src/test/resources/5-ranking-test.csv")), keepRuntimeFolder(), configureConsole().ignoreLocalConsole(), logLevel(LogLevel.INFO), http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/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 a147029..c51f102 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java @@ -86,7 +86,7 @@ public class ProfileImportBasicIT extends BaseIT { } @Test - public void testImport1Basic() throws IOException, InterruptedException { + public void testImportBasic() throws IOException, InterruptedException { //Wait for the csv to be processed Thread.sleep(10000); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/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 e96175a..355ad94 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java @@ -89,7 +89,7 @@ public class ProfileImportRankingIT extends BaseIT { /*** Surfers Test ***/ ImportConfiguration importConfigRanking = new ImportConfiguration(); - importConfigRanking.setItemId("4-ranking-test"); + importConfigRanking.setItemId("5-ranking-test"); importConfigRanking.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); importConfigRanking.setMergingProperty("rank"); importConfigRanking.setOverwriteExistingProfiles(true); @@ -106,7 +106,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=4-ranking-test.csv&consumer.delay=10m&move=.done"); + importConfigRanking.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=5-ranking-test.csv&consumer.delay=10m&move=.done"); importConfigRanking.setActive(true); ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigRanking); @@ -130,7 +130,7 @@ public class ProfileImportRankingIT extends BaseIT { public void testCheckImportConfigListRanking() { List<ImportConfiguration> importConfigurations = importConfigurationService.getAll(); - Assert.assertEquals(4, importConfigurations.size()); + Assert.assertEquals(5, importConfigurations.size()); } @@ -150,15 +150,15 @@ public class ProfileImportRankingIT extends BaseIT { } @Test - public void testImport4Ranking() throws InterruptedException { + public void testImportRanking() throws InterruptedException { //Wait for data to be processed //Check import config status - ImportConfiguration importConfiguration = importConfigurationService.load("4-ranking-test"); + ImportConfiguration importConfiguration = importConfigurationService.load("5-ranking-test"); while (importConfiguration != null && !RouterConstants.CONFIG_STATUS_COMPLETE_SUCCESS.equals(importConfiguration.getStatus())) { - logger.info("$$$$ : testImport4Ranking : Waiting for data to be processed ..."); + logger.info("$$$$ : testImportRanking : Waiting for data to be processed ..."); Thread.sleep(1000); - importConfiguration = importConfigurationService.load("4-ranking-test"); + importConfiguration = importConfigurationService.load("5-ranking-test"); } Thread.sleep(10000); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java index e04956a..b2fbe55 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java @@ -80,7 +80,7 @@ public class ProfileImportSurfersDeleteIT extends BaseIT { /*** Surfers Delete Test ***/ ImportConfiguration importConfigSurfersDelete = new ImportConfiguration(); - importConfigSurfersDelete.setItemId("3-surfers-delete-test"); + importConfigSurfersDelete.setItemId("4-surfers-delete-test"); importConfigSurfersDelete.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); importConfigSurfersDelete.setMergingProperty("linkedInId"); importConfigSurfersDelete.setOverwriteExistingProfiles(true); @@ -90,7 +90,7 @@ public class ProfileImportSurfersDeleteIT extends BaseIT { importConfigSurfersDelete.getProperties().put("mapping", mappingSurfers); - importConfigSurfersDelete.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=3-surfers-delete-test.csv&consumer.delay=10m&move=.done"); + importConfigSurfersDelete.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=4-surfers-delete-test.csv&consumer.delay=10m&move=.done"); importConfigSurfersDelete.setActive(true); ImportConfiguration savedImportConfigDelete = importConfigurationService.save(importConfigSurfersDelete); @@ -114,15 +114,15 @@ public class ProfileImportSurfersDeleteIT extends BaseIT { public void testCheckImportConfigListSurfers() { List<ImportConfiguration> importConfigurations = importConfigurationService.getAll(); - Assert.assertEquals(3, importConfigurations.size()); + Assert.assertEquals(4, importConfigurations.size()); } @Test - public void testImport3SurfersDelete() throws IOException, InterruptedException { + public void testImportSurfersDelete() throws IOException, InterruptedException { //Wait for data to be processed - Thread.sleep(5000); + Thread.sleep(10000); Assert.assertEquals(3, profileService.getAllProfilesCount()); PartialList<Profile> jordyProfile = profileService.findProfilesByPropertyValue("properties.email", "jo...@smith.com", 0, 10, null); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/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 b67c78a..16caf1d 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java @@ -132,7 +132,7 @@ public class ProfileImportSurfersIT extends BaseIT { } @Test - public void testImport2Surfers() throws IOException, InterruptedException { + public void testImportSurfers() throws IOException, InterruptedException { //Wait for data to be processed Thread.sleep(10000); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java new file mode 100644 index 0000000..3d0cc8a --- /dev/null +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java @@ -0,0 +1,154 @@ +/* + * 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 + */ +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.PartialList; +import org.apache.unomi.api.Profile; +import org.apache.unomi.api.PropertyType; +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.Assert; +import org.junit.Before; +import org.junit.Test; +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; + +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 09/08/2017. + */ +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerSuite.class) +public class ProfileImportSurfersOverwriteIT extends BaseIT { + + @Inject + @Filter("(configDiscriminator=IMPORT)") + protected ImportExportConfigurationService<ImportConfiguration> importConfigurationService; + + @Inject + protected ProfileService profileService; + private Logger logger = LoggerFactory.getLogger(ProfileImportSurfersOverwriteIT.class); + + + @Before + public void setUp() throws IOException { + + /*** Surfers Test ***/ + ImportConfiguration importConfigSurfers = new ImportConfiguration(); + importConfigSurfers.setItemId("3-surfers-overwrite-test"); + importConfigSurfers.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); + importConfigSurfers.setMergingProperty("linkedInId"); + importConfigSurfers.setOverwriteExistingProfiles(true); + importConfigSurfers.setColumnSeparator(";"); + importConfigSurfers.setHasHeader(true); + importConfigSurfers.setHasDeleteColumn(true); + + Map 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); + + importConfigSurfers.getProperties().put("mapping", mappingSurfers); + File importSurfersFile = new File("data/tmp/recurrent_import/"); + importConfigSurfers.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=3-surfers-overwrite-test.csv&consumer.delay=10m&move=.done"); + importConfigSurfers.setActive(true); + + ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigSurfers); + + CloseableHttpClient httpclient = HttpClients.createDefault(); + HttpPut httpPut = new HttpPut(URL + "/configUpdate/importConfigAdmin"); + + String json = new ObjectMapper().writeValueAsString(savedImportConfig); + StringEntity entity = new StringEntity(json); + entity.setContentType(MediaType.APPLICATION_JSON); + httpPut.setEntity(entity); + + HttpResponse response = httpclient.execute(httpPut); + assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); + + httpclient.close(); + + } + + @Test + public void testCheckImportConfigListSurfersOverwrite() { + + List<ImportConfiguration> importConfigurations = importConfigurationService.getAll(); + Assert.assertEquals(3, importConfigurations.size()); + + } + + @Test + public void testCheckAddedPropertiesSurfersOverwrite() throws IOException, InterruptedException { + + //Wait for data to be processed + Thread.sleep(1000); + + PropertyType propAlive = profileService.getPropertyType("alive"); + + Assert.assertNotNull(propAlive); + + } + + @Test + public void testImportSurfersOverwrite() throws IOException, InterruptedException { + + //Wait for data to be processed + Thread.sleep(10000); + + Assert.assertEquals(39, profileService.getAllProfilesCount()); + + //Profile not to delete + PartialList<Profile> aliveProfiles = profileService.findProfilesByPropertyValue("properties.alive", "true", 0, 50, null); + PartialList<Profile> deadProfiles = profileService.findProfilesByPropertyValue("properties.alive", "false", 0, 50, null); + + Assert.assertEquals(0, aliveProfiles.getList().size()); + Assert.assertEquals(36, deadProfiles.getList().size()); + + //Profile to delete = false, was to delete + PartialList<Profile> paulineProfile = profileService.findProfilesByPropertyValue("properties.lastName", "Pauline Ado", 0, 10, null); + Assert.assertEquals(1, paulineProfile.getList().size()); + + } + +} http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/itests/src/test/resources/3-surfers-delete-test.csv ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/3-surfers-delete-test.csv b/itests/src/test/resources/3-surfers-delete-test.csv deleted file mode 100644 index f2d45ba..0000000 --- a/itests/src/test/resources/3-surfers-delete-test.csv +++ /dev/null @@ -1,37 +0,0 @@ -Linkedin ID;Last Name;Email;Facebook ID;Gender;Alive;To Delete -1;Jordy Smith;jo...@smith.com;999;male;TRUE;TRUE -2;Gabriel Medina;gabr...@medina.com;998;male;TRUE;TRUE -3;Kolohe Andino;kol...@andino.com;997;male;TRUE;TRUE -4;Matt Wilkinson;m...@wilkinson.com;996;male;TRUE;TRUE -5;Michel Bourez;mic...@bourez.com;995;male;TRUE;TRUE -6;Kelly Slater;ke...@slater.com;994;male;TRUE;TRUE -7;Julian Wilson;jul...@wilson.com;993;male;TRUE;TRUE -8;Joel Parkinson;j...@parkinson.com;992;male;TRUE;TRUE -9;Filipe Toledo;fil...@toledo.com;991;male;TRUE;TRUE -10;Adriano De Souza;adri...@souza.com;990;male;TRUE;TRUE -11;Sebastian Zietz;sebast...@zietz.com;989;male;TRUE;TRUE -12;Josh Kerr;jo...@kerr.com;988;male;TRUE;TRUE -13;Adrian Buchan;adr...@buchan.com;987;male;TRUE;TRUE -14;Italo Ferreira;it...@ferreiro.com;986;male;TRUE;TRUE -15;Mick Fanning;m...@fanning.com;985;male;TRUE;TRUE -16;Miguel Pupo;mig...@pupo.com;984;male;TRUE;TRUE -17;Nat Young;n...@young.com;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 http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/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 new file mode 100644 index 0000000..064b300 --- /dev/null +++ b/itests/src/test/resources/3-surfers-overwrite-test.csv @@ -0,0 +1,37 @@ +idnum;last;email;fbid;gender;alive;delete +1;Jordy Smith;jo...@smith.com;999;male;FALSE;FALSE +2;Gabriel Medina;gabr...@medina.com;998;male;FALSE;FALSE +3;Kolohe Andino;kol...@andino.com;997;male;FALSE;FALSE +4;Matt Wilkinson;m...@wilkinson.com;996;male;FALSE;FALSE +5;Michel Bourez;mic...@bourez.com;995;male;FALSE;FALSE +6;Kelly Slater;ke...@slater.com;994;male;FALSE;FALSE +7;Julian Wilson;jul...@wilson.com;993;male;FALSE;FALSE +8;Joel Parkinson;j...@parkinson.com;992;male;FALSE;FALSE +9;Filipe Toledo;fil...@toledo.com;991;male;FALSE;FALSE +10;Adriano De Souza;adri...@souza.com;990;male;FALSE;FALSE +11;Sebastian Zietz;sebast...@zietz.com;989;male;FALSE;FALSE +12;Josh Kerr;jo...@kerr.com;988;male;FALSE;FALSE +13;Adrian Buchan;adr...@buchan.com;987;male;FALSE;FALSE +14;Italo Ferreira;it...@ferreiro.com;986;male;FALSE;FALSE +15;Mick Fanning;m...@fanning.com;985;male;FALSE;FALSE +16;Miguel Pupo;mig...@pupo.com;984;male;FALSE;FALSE +17;Nat Young;n...@young.com;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 http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/itests/src/test/resources/4-ranking-test.csv ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/4-ranking-test.csv b/itests/src/test/resources/4-ranking-test.csv deleted file mode 100644 index 8545e7b..0000000 --- a/itests/src/test/resources/4-ranking-test.csv +++ /dev/null @@ -1,26 +0,0 @@ -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 http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/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 new file mode 100644 index 0000000..f2d45ba --- /dev/null +++ b/itests/src/test/resources/4-surfers-delete-test.csv @@ -0,0 +1,37 @@ +Linkedin ID;Last Name;Email;Facebook ID;Gender;Alive;To Delete +1;Jordy Smith;jo...@smith.com;999;male;TRUE;TRUE +2;Gabriel Medina;gabr...@medina.com;998;male;TRUE;TRUE +3;Kolohe Andino;kol...@andino.com;997;male;TRUE;TRUE +4;Matt Wilkinson;m...@wilkinson.com;996;male;TRUE;TRUE +5;Michel Bourez;mic...@bourez.com;995;male;TRUE;TRUE +6;Kelly Slater;ke...@slater.com;994;male;TRUE;TRUE +7;Julian Wilson;jul...@wilson.com;993;male;TRUE;TRUE +8;Joel Parkinson;j...@parkinson.com;992;male;TRUE;TRUE +9;Filipe Toledo;fil...@toledo.com;991;male;TRUE;TRUE +10;Adriano De Souza;adri...@souza.com;990;male;TRUE;TRUE +11;Sebastian Zietz;sebast...@zietz.com;989;male;TRUE;TRUE +12;Josh Kerr;jo...@kerr.com;988;male;TRUE;TRUE +13;Adrian Buchan;adr...@buchan.com;987;male;TRUE;TRUE +14;Italo Ferreira;it...@ferreiro.com;986;male;TRUE;TRUE +15;Mick Fanning;m...@fanning.com;985;male;TRUE;TRUE +16;Miguel Pupo;mig...@pupo.com;984;male;TRUE;TRUE +17;Nat Young;n...@young.com;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 http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/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 new file mode 100644 index 0000000..8545e7b --- /dev/null +++ b/itests/src/test/resources/5-ranking-test.csv @@ -0,0 +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
