Extended provisioning entitlement tests. Fixed model-intest TestIgnor…

…eCase.
Evolveum · Aug 25, 2015 · 772d97d · 772d97d
1 parent 853936e
commit 772d97d
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 deletions.
diff --git a/model/model-intest/src/test/resources/common/group-shadow-dummy-upcase-joker.xml b/model/model-intest/src/test/resources/common/group-shadow-dummy-upcase-joker.xml
@@ -22,7 +22,7 @@
 	xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
 	xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
 	<name>JOKER</name>
-	<resourceRef oid="10000000-0000-0000-0000-000000000004"/>
+	<resourceRef oid="10000000-0000-0000-0000-000000001204"/>
 	<objectClass>ri:GroupObjectClass</objectClass>
 	<kind>entitlement</kind>
 	<intent>group</intent>

diff --git a/model/model-intest/src/test/resources/common/resource-dummy-upcase.xml b/model/model-intest/src/test/resources/common/resource-dummy-upcase.xml
@@ -290,6 +290,10 @@
         	<intent>group</intent>
         	<default>true</default>
         	<objectClass>ri:GroupObjectClass</objectClass>
+        	<attribute>
+				<ref>icfs:uid</ref>
+				<matchingRule>mr:stringIgnoreCase</matchingRule>
+			</attribute>
         	<attribute>
 				<ref>icfs:name</ref>
 				<displayName>Groupname</displayName>

diff --git a/model/model-intest/src/test/resources/logback-test.xml b/model/model-intest/src/test/resources/logback-test.xml
@@ -59,7 +59,7 @@
  	<logger name="com.evolveum.midpoint.model.impl.util" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.model.impl.sync" level="DEBUG" />
  	<logger name="com.evolveum.midpoint.model.impl.sync.CorrelationConfirmationEvaluator" level="DEBUG" />
-    <logger name="com.evolveum.midpoint.provisioning" level="DEBUG" />
+    <logger name="com.evolveum.midpoint.provisioning" level="TRACE" />
     <logger name="com.evolveum.midpoint.provisioning.impl.ResourceManager" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.expression" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.model.common.expression" level="DEBUG" />

diff --git a/...ovisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java b/...ovisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
@@ -3233,6 +3233,12 @@ public void test222EntitleAccountWillPillage() throws Exception {
 
 		syncServiceMock.assertNotifySuccessOnly();
 		assertDummyResourceGroupMembersReadCountIncrement(null, 0);
+
+		PrismObject<ShadowType> shadow = provisioningService.getObject(ShadowType.class, ACCOUNT_WILL_OID, null, task, result);
+		display("Shadow after", shadow);
+		assertEntitlementGroup(shadow, GROUP_PIRATES_OID);
+		assertEntitlementPriv(shadow, PRIVILEGE_PILLAGE_OID);
+
 		assertSteadyResource();
 	}
 
@@ -3280,7 +3286,7 @@ public void test222bEntitleAccountWillBargain() throws Exception {
         assertMember(group, transformNameFromResource(getWillRepoIcfName()));
 
         syncServiceMock.assertNotifySuccessOnly();
-
+        
         assertSteadyResource();
     }
 
@@ -3462,6 +3468,12 @@ public void test228DetitleAccountWillPirates() throws Exception {
 
         assertDummyResourceGroupMembersReadCountIncrement(null, 0);
 		syncServiceMock.assertNotifySuccessOnly();
+
+        PrismObject<ShadowType> shadow = provisioningService.getObject(ShadowType.class, ACCOUNT_WILL_OID, null, task, result);
+		display("Shadow after", shadow);
+		assertEntitlementPriv(shadow, PRIVILEGE_PILLAGE_OID);
+		assertEntitlementPriv(shadow, PRIVILEGE_BARGAIN_OID);
+
 		assertSteadyResource();
 	}
 
@@ -3506,6 +3518,12 @@ public void test229DetitleAccountWillPillage() throws Exception {
 		assertNotNull("Privilege object is gone!", priv);
 
 		syncServiceMock.assertNotifySuccessOnly();
+
+        PrismObject<ShadowType> shadow = provisioningService.getObject(ShadowType.class, ACCOUNT_WILL_OID, null, task, result);
+		display("Shadow after", shadow);
+		assertEntitlementPriv(shadow, PRIVILEGE_BARGAIN_OID);
+
+
 		assertSteadyResource();
 	}
 

diff --git a/...-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnore.java b/...-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnore.java
@@ -30,6 +30,7 @@
 import com.evolveum.icf.dummy.resource.DummyAccount;
 import com.evolveum.icf.dummy.resource.DummyGroup;
 import com.evolveum.icf.dummy.resource.DummyPrivilege;
+import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.prism.match.MatchingRule;
 import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
@@ -156,6 +157,10 @@ public void test280EntitleAccountWillPiratesAlreadyThere() throws Exception {
 
 		syncServiceMock.assertNotifySuccessOnly();
 
+		PrismObject<ShadowType> shadow = provisioningService.getObject(ShadowType.class, ACCOUNT_WILL_OID, null, task, result);
+		display("Shadow after", shadow);
+		assertEntitlementGroup(shadow, GROUP_PIRATES_OID);
+
 		assertSteadyResource();
 	}
 
@@ -234,6 +239,10 @@ public void test285EntitleAccountWillPiratesAlreadyThereCaseIgnore() throws Exce
 
 		syncServiceMock.assertNotifySuccessOnly();
 
+		PrismObject<ShadowType> shadow = provisioningService.getObject(ShadowType.class, ACCOUNT_WILL_OID, null, task, result);
+		display("Shadow after", shadow);
+		assertEntitlementGroup(shadow, GROUP_PIRATES_OID);
+
 		assertSteadyResource();
 	}