Adapted TestPolicyRules (pruned conflicting roles and their conflicts…

… are no longer present in the evaluated assignment triple)
Evolveum · Mar 3, 2017 · 9c254aa · 9c254aa
1 parent 4100787
commit 9c254aa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
@@ -344,9 +344,10 @@ public void test120AssignRoleConstableToJack() throws Exception {
         dumpPolicyRules(context);
 
         assertEvaluatedRules(context, 5);
-		EvaluatedExclusionTrigger trigger = (EvaluatedExclusionTrigger) assertTriggeredRule(context, null, PolicyConstraintKindType.EXCLUSION, 1, true);
-        assertNotNull("No conflicting assignment in trigger", trigger.getConflictingAssignment());
-        assertEquals("Wrong conflicting assignment in trigger", ROLE_JUDGE_OID, trigger.getConflictingAssignment().getTarget().getOid());
+        // conflicting assignment was pruned, so the exclusion is no longer present here
+//		EvaluatedExclusionTrigger trigger = (EvaluatedExclusionTrigger) assertTriggeredRule(context, null, PolicyConstraintKindType.EXCLUSION, 1, true);
+//        assertNotNull("No conflicting assignment in trigger", trigger.getConflictingAssignment());
+//        assertEquals("Wrong conflicting assignment in trigger", ROLE_JUDGE_OID, trigger.getConflictingAssignment().getTarget().getOid());
 
         ObjectDelta<UserType> focusSecondaryDelta = context.getFocusContext().getSecondaryDelta();
         PrismAsserts.assertIsModify(focusSecondaryDelta);