[unomi] branch addITForMergeProfileAction updated: UNOMI-420: provide IT for mergeProfileOnPropertyAction and forceEventProfileAsMaster option (cosmetic changes)

[jkevan]

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


The following commit(s) were added to refs/heads/addITForMergeProfileAction by 
this push:
     new 6eb6115  UNOMI-420: provide IT for mergeProfileOnPropertyAction and 
forceEventProfileAsMaster option (cosmetic changes)
6eb6115 is described below

commit 6eb61157b8474ea89567f370b8c0c2cb7439421a
Author: Kevan <ke...@jahia.com>
AuthorDate: Tue Feb 23 17:23:20 2021 +0100

    UNOMI-420: provide IT for mergeProfileOnPropertyAction and 
forceEventProfileAsMaster option (cosmetic changes)
---
 .../src/test/java/org/apache/unomi/itests/ProfileMergeIT.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileMergeIT.java 
b/itests/src/test/java/org/apache/unomi/itests/ProfileMergeIT.java
index 3b92bb0..aa19ae4 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileMergeIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileMergeIT.java
@@ -65,7 +65,8 @@ public class ProfileMergeIT extends BaseIT {
 
     @Test
     public void 
testProfileMergeOnPropertyAction_dont_forceEventProfileAsMaster() throws 
InterruptedException {
-        createMergeOnPropertyRule(false);
+        rulesService.setRule(createMergeOnPropertyRule(false));
+        Thread.sleep(2000); // sleep for rule to be loaded by the Task
 
         // A new profile should be created.
         Assert.assertNotEquals(sendEvent().getProfile().getItemId(), 
TEST_PROFILE_ID);
@@ -73,7 +74,8 @@ public class ProfileMergeIT extends BaseIT {
 
     @Test
     public void testProfileMergeOnPropertyAction_forceEventProfileAsMaster() 
throws InterruptedException {
-        createMergeOnPropertyRule(true);
+        rulesService.setRule(createMergeOnPropertyRule(true));
+        Thread.sleep(2000); // sleep for rule to be loaded by the Task
 
         // No new profile should be created, instead the profile of the event 
should be used.
         Assert.assertEquals(sendEvent().getProfile().getItemId(), 
TEST_PROFILE_ID);
@@ -90,7 +92,7 @@ public class ProfileMergeIT extends BaseIT {
         return testEvent;
     }
 
-    private void createMergeOnPropertyRule(boolean forceEventProfileAsMaster) 
throws InterruptedException {
+    private Rule 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"));
 
@@ -104,7 +106,6 @@ public class ProfileMergeIT extends BaseIT {
         
mergeProfilesOnPropertyAction.setParameter("forceEventProfileAsMaster", 
forceEventProfileAsMaster);
         
mergeOnPropertyTestRule.setActions(Collections.singletonList(mergeProfilesOnPropertyAction));
 
-        rulesService.setRule(mergeOnPropertyTestRule);
-        Thread.sleep(2000); // sleep for rule to be loaded by the Task
+        return mergeOnPropertyTestRule;
     }
 }