You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by jk...@apache.org on 2021/02/23 16:08:34 UTC

[unomi] branch addITForMergeProfileAction created (now 96cd53e)

This is an automated email from the ASF dual-hosted git repository.

jkevan pushed a change to branch addITForMergeProfileAction
in repository https://gitbox.apache.org/repos/asf/unomi.git.


      at 96cd53e  UNOMI-420: provide IT for mergeProfileOnPropertyAction and forceEventProfileAsMaster option

This branch includes the following new commits:

     new 96cd53e  UNOMI-420: provide IT for mergeProfileOnPropertyAction and forceEventProfileAsMaster option

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[unomi] 01/01: UNOMI-420: provide IT for mergeProfileOnPropertyAction and forceEventProfileAsMaster option

Posted by jk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jkevan pushed a commit to branch addITForMergeProfileAction
in repository https://gitbox.apache.org/repos/asf/unomi.git

commit 96cd53ea588f246224cc8f5e965cd7ac9e420c19
Author: Kevan <ke...@jahia.com>
AuthorDate: Tue Feb 23 17:08:21 2021 +0100

    UNOMI-420: provide IT for mergeProfileOnPropertyAction and forceEventProfileAsMaster option
---
 .../test/java/org/apache/unomi/itests/AllITs.java  |   1 +
 .../org/apache/unomi/itests/ProfileMergeIT.java    | 110 +++++++++++++++++++++
 2 files changed, 111 insertions(+)

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 1ae1c9d..fcef043 100644
--- a/itests/src/test/java/org/apache/unomi/itests/AllITs.java
+++ b/itests/src/test/java/org/apache/unomi/itests/AllITs.java
@@ -39,6 +39,7 @@ import org.junit.runners.Suite.SuiteClasses;
         ProfileImportRankingIT.class,
         ProfileImportActorsIT.class,
         ProfileExportIT.class,
+        ProfileMergeIT.class,
         EventServiceIT.class,
         PropertiesUpdateActionIT.class,
         ModifyConsentIT.class,
diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileMergeIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileMergeIT.java
new file mode 100644
index 0000000..3b92bb0
--- /dev/null
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileMergeIT.java
@@ -0,0 +1,110 @@
+/*
+ * 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 org.apache.unomi.api.Event;
+import org.apache.unomi.api.Metadata;
+import org.apache.unomi.api.Profile;
+import org.apache.unomi.api.actions.Action;
+import org.apache.unomi.api.conditions.Condition;
+import org.apache.unomi.api.rules.Rule;
+import org.apache.unomi.api.services.DefinitionsService;
+import org.apache.unomi.api.services.EventService;
+import org.apache.unomi.api.services.RulesService;
+import org.junit.After;
+import org.junit.Assert;
+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 javax.inject.Inject;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+
+/**
+ * Integration test for MergeProfilesOnPropertyAction
+ */
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerSuite.class)
+public class ProfileMergeIT extends BaseIT {
+
+    @Inject @Filter(timeout = 600000)
+    protected EventService eventService;
+    @Inject @Filter(timeout = 600000)
+    protected RulesService rulesService;
+    @Inject @Filter(timeout = 600000)
+    protected DefinitionsService definitionsService;
+
+    private final static String TEST_EVENT_TYPE = "mergeProfileTestEventType";
+    private final static String TEST_RULE_ID = "mergeOnPropertyTest";
+    private final static String TEST_PROFILE_ID = "mergeOnPropertyTestProfileId";
+
+    @After
+    public void after() {
+        // cleanup created data
+        rulesService.removeRule(TEST_RULE_ID);
+    }
+
+    @Test
+    public void testProfileMergeOnPropertyAction_dont_forceEventProfileAsMaster() throws InterruptedException {
+        createMergeOnPropertyRule(false);
+
+        // A new profile should be created.
+        Assert.assertNotEquals(sendEvent().getProfile().getItemId(), TEST_PROFILE_ID);
+    }
+
+    @Test
+    public void testProfileMergeOnPropertyAction_forceEventProfileAsMaster() throws InterruptedException {
+        createMergeOnPropertyRule(true);
+
+        // No new profile should be created, instead the profile of the event should be used.
+        Assert.assertEquals(sendEvent().getProfile().getItemId(), TEST_PROFILE_ID);
+    }
+
+    private Event sendEvent() {
+        Profile profile = new Profile();
+        profile.setProperties(new HashMap<>());
+        profile.setItemId(TEST_PROFILE_ID);
+        profile.setProperty("j:nodename", "michel");
+        profile.getSystemProperties().put("mergeIdentifier", "jose");
+        Event testEvent = new Event(TEST_EVENT_TYPE, null, profile, null, null, profile, new Date());
+        eventService.send(testEvent);
+        return testEvent;
+    }
+
+    private void createMergeOnPropertyRule(boolean forceEventProfileAsMaster) throws InterruptedException {
+        Rule mergeOnPropertyTestRule = new Rule();
+        mergeOnPropertyTestRule.setMetadata(new Metadata(null, TEST_RULE_ID, TEST_RULE_ID, "Test rule for testing MergeProfilesOnPropertyAction"));
+
+        Condition condition = new Condition(definitionsService.getConditionType("eventTypeCondition"));
+        condition.setParameter("eventTypeId", TEST_EVENT_TYPE);
+        mergeOnPropertyTestRule.setCondition(condition);
+
+        final Action mergeProfilesOnPropertyAction = new Action( definitionsService.getActionType( "mergeProfilesOnPropertyAction"));
+        mergeProfilesOnPropertyAction.setParameter("mergeProfilePropertyValue", "eventProperty::target.properties(j:nodename)");
+        mergeProfilesOnPropertyAction.setParameter("mergeProfilePropertyName", "mergeIdentifier");
+        mergeProfilesOnPropertyAction.setParameter("forceEventProfileAsMaster", forceEventProfileAsMaster);
+        mergeOnPropertyTestRule.setActions(Collections.singletonList(mergeProfilesOnPropertyAction));
+
+        rulesService.setRule(mergeOnPropertyTestRule);
+        Thread.sleep(2000); // sleep for rule to be loaded by the Task
+    }
+}