Repository: incubator-unomi Updated Branches: refs/heads/master bcb77c5c8 -> a597b5ea0
UNOMI-118 : Actors 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/a597b5ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/a597b5ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/a597b5ea Branch: refs/heads/master Commit: a597b5ea0996079ed23edbc13da4eda902fd1fbe Parents: bcb77c5 Author: Abdelkader Midani <amid...@apache.org> Authored: Tue Aug 15 00:26:46 2017 +0200 Committer: Abdelkader Midani <amid...@apache.org> Committed: Tue Aug 15 00:26:46 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/unomi/itests/AllITs.java | 3 +- .../java/org/apache/unomi/itests/BaseIT.java | 2 + .../unomi/itests/ProfileImportActorsIT.java | 182 +++++++++++++++++++ itests/src/test/resources/6-actors-test.csv | 7 + 4 files changed, 193 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a597b5ea/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 8251816..507a52e 100644 --- a/itests/src/test/java/org/apache/unomi/itests/AllITs.java +++ b/itests/src/test/java/org/apache/unomi/itests/AllITs.java @@ -37,7 +37,8 @@ import org.junit.runners.Suite.SuiteClasses; ProfileImportSurfersIT.class, ProfileImportSurfersOverwriteIT.class, ProfileImportSurfersDeleteIT.class, - ProfileImportRankingIT.class + ProfileImportRankingIT.class, + ProfileImportActorsIT.class }) public class AllITs { } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a597b5ea/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 ae43a60..52f5abc 100644 --- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java @@ -105,6 +105,8 @@ public abstract class BaseIT { "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")), + replaceConfigurationFile("data/tmp/recurrent_import/6-actors-test.csv", new File( + "src/test/resources/6-actors-test.csv")), keepRuntimeFolder(), configureConsole().ignoreLocalConsole(), logLevel(LogLevel.INFO), http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a597b5ea/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 new file mode 100644 index 0000000..8ac6478 --- /dev/null +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java @@ -0,0 +1,182 @@ +/* + * 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.Metadata; +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.*; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; + +/** + * Created by amidani on 14/08/2017. + */ +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerSuite.class) +public class ProfileImportActorsIT extends BaseIT { + + @Inject + @Filter("(configDiscriminator=IMPORT)") + protected ImportExportConfigurationService<ImportConfiguration> importConfigurationService; + + @Inject + protected ProfileService profileService; + private Logger logger = LoggerFactory.getLogger(ProfileImportActorsIT.class); + + + @Before + public void setUp() throws IOException { + + /*** Create Missing Properties ***/ + PropertyType propertyTypeTwitterId = new PropertyType(new Metadata("integration", "twitterId", "Twitter ID", "Twitter ID")); + propertyTypeTwitterId.setValueTypeId("integer"); + propertyTypeTwitterId.setTagIds(Collections.singleton("basicProfileProperties")); + propertyTypeTwitterId.setTarget("profiles"); + + PropertyType propertyTypeActorsGenres = new PropertyType(new Metadata("integration", "movieGenres", "Movie Genres", "Movie Genres")); + propertyTypeActorsGenres.setValueTypeId("string"); + propertyTypeActorsGenres.setMultivalued(true); + propertyTypeActorsGenres.setTagIds(Collections.singleton("basicProfileProperties")); + propertyTypeActorsGenres.setTarget("profiles"); + + profileService.setPropertyType(propertyTypeActorsGenres); + + /*** Actors Test ***/ + ImportConfiguration importConfigActors = new ImportConfiguration(); + importConfigActors.setItemId("6-actors-test"); + importConfigActors.setConfigType(RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT); + importConfigActors.setMergingProperty("twitterId"); + importConfigActors.setOverwriteExistingProfiles(true); + importConfigActors.setColumnSeparator(";"); + importConfigActors.setMultiValueDelimiter("[]"); + importConfigActors.setMultiValueSeparator(";"); + importConfigActors.setHasHeader(true); + importConfigActors.setHasDeleteColumn(false); + + Map mappingActors = new HashMap(); + mappingActors.put("twitterId", 0); + mappingActors.put("lastName", 1); + mappingActors.put("email", 2); + mappingActors.put("movieGenres", 3); + + importConfigActors.getProperties().put("mapping", mappingActors); + File importSurfersFile = new File("data/tmp/recurrent_import/"); + importConfigActors.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=6-actors-test.csv&consumer.delay=10m&move=.done"); + importConfigActors.setActive(true); + + ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigActors); + + 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 testCheckImportConfigListActors() { + + List<ImportConfiguration> importConfigurations = importConfigurationService.getAll(); + Assert.assertEquals(6, importConfigurations.size()); + + } + + + @Test + public void testCheckAddedPropertiesActors() throws IOException, InterruptedException { + + //Wait for data to be processed + Thread.sleep(1000); + + PropertyType propTwitterId = profileService.getPropertyType("twitterId"); + Assert.assertNotNull(propTwitterId); + + PropertyType propActorsGenre = profileService.getPropertyType("movieGenres"); + Assert.assertNotNull(propActorsGenre); + + } + + @Test + public void testImportActors() throws InterruptedException { + + //Wait for data to be processed + //Check import config status + ImportConfiguration importConfiguration = importConfigurationService.load("6-actors-test"); + while (importConfiguration != null && !RouterConstants.CONFIG_STATUS_COMPLETE_SUCCESS.equals(importConfiguration.getStatus())) { + logger.info("$$$$ : testImportActors : Waiting for data to be processed ..."); + Thread.sleep(1000); + importConfiguration = importConfigurationService.load("6-actors-test"); + } + Thread.sleep(10000); + + Assert.assertEquals(1, importConfiguration.getExecutions().size()); + + Assert.assertEquals(34, profileService.getAllProfilesCount()); + + PartialList<Profile> jeanneProfile = profileService.findProfilesByPropertyValue("properties.twitterId", "4", 0, 10, null); + Assert.assertEquals(1, jeanneProfile.getList().size()); + Assert.assertNotNull(jeanneProfile.get(0)); + Assert.assertEquals("Jeanne; D'arc", jeanneProfile.get(0).getProperty("lastName")); + Assert.assertEquals("j...@darc.com", jeanneProfile.get(0).getProperty("email")); + Assert.assertArrayEquals(new String[]{}, ((List)jeanneProfile.get(0).getProperty("movieGenres")).toArray()); + + PartialList<Profile> rockProfile = profileService.findProfilesByPropertyValue("properties.twitterId", "6", 0, 10, null); + Assert.assertEquals(1, rockProfile.getList().size()); + Assert.assertNotNull(rockProfile.get(0)); + Assert.assertEquals("The Rock", rockProfile.get(0).getProperty("lastName")); + Assert.assertEquals("the.r...@gmail.com", rockProfile.get(0).getProperty("email")); + Assert.assertEquals(Arrays.asList("Adventure","Action","Romance","Comedy"), rockProfile.get(0).getProperty("movieGenres")); + + } + +} http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a597b5ea/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 new file mode 100644 index 0000000..0180fdc --- /dev/null +++ b/itests/src/test/resources/6-actors-test.csv @@ -0,0 +1,7 @@ +Twitter Id;Last name;email;Movie genres +1;Sigourney Weaver;s...@ali.en;"[Horror;Action]" +2;Kevin Hart;kev@har.t;"[Comedy;Action]" +3;Vincent Van GOGH;v...@vgo.gh;[] +4;"Jeanne; D'arc";j...@darc.com;[] +5;Jessica Alba;j...@alba.alba;[Romance] +6;The Rock;the.r...@gmail.com;"[Adventure;Action;Romance;Comedy]" \ No newline at end of file
