From 772d97d3354f063d9ab004a69864649da3eb8d29 Mon Sep 17 00:00:00 2001 From: Radovan Semancik Date: Tue, 25 Aug 2015 12:07:33 +0200 Subject: [PATCH] Extended provisioning entitlement tests. Fixed model-intest TestIgnoreCase. --- .../group-shadow-dummy-upcase-joker.xml | 2 +- .../common/resource-dummy-upcase.xml | 4 ++++ .../src/test/resources/logback-test.xml | 2 +- .../provisioning/test/impl/TestDummy.java | 20 ++++++++++++++++++- .../test/impl/TestDummyCaseIgnore.java | 9 +++++++++ 5 files changed, 34 insertions(+), 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 index 4fbe149ae0f..51e34525db3 100644 --- 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"> JOKER - + ri:GroupObjectClass entitlement group 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 index a8e73ec37b9..7dea14b93f5 100644 --- 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 @@ group true ri:GroupObjectClass + + icfs:uid + mr:stringIgnoreCase + icfs:name Groupname diff --git a/model/model-intest/src/test/resources/logback-test.xml b/model/model-intest/src/test/resources/logback-test.xml index 8101896001c..020fe5bcaf7 100644 --- a/model/model-intest/src/test/resources/logback-test.xml +++ b/model/model-intest/src/test/resources/logback-test.xml @@ -59,7 +59,7 @@ - + diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java index 16df82a3cbb..9e33749a507 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java +++ b/provisioning/provisioning-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 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 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 shadow = provisioningService.getObject(ShadowType.class, ACCOUNT_WILL_OID, null, task, result); + display("Shadow after", shadow); + assertEntitlementPriv(shadow, PRIVILEGE_BARGAIN_OID); + + assertSteadyResource(); } diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnore.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnore.java index 056bb4f2b42..b94d7c52eb6 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnore.java +++ b/provisioning/provisioning-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 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 shadow = provisioningService.getObject(ShadowType.class, ACCOUNT_WILL_OID, null, task, result); + display("Shadow after", shadow); + assertEntitlementGroup(shadow, GROUP_PIRATES_OID); + assertSteadyResource(); }