Updated out-of-date test.

Evolveum · May 24, 2016 · 3752584 · 3752584
1 parent 67727a1
commit 3752584
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
@@ -1106,14 +1106,14 @@ public void test402JackChangeMinistryOfOffenseMemberToManagerByAddingRemovingAss
         // THEN
         PrismObject<UserType> userJack = getUser(USER_JACK_OID);
         display("User jack after", userJack);
-        assertUserAssignedOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID);
-        assertAssignedOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, null);                         // because of object template
-        assertAssignedOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, SchemaConstants.ORG_MANAGER);  // because of the modification
-        assertUserHasOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID, ORG_MINISTRY_OF_OFFENSE_OID);
-        assertHasOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, SchemaConstants.ORG_MANAGER);
-        assertHasOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, null);
-
-        // Postcondition
+		assertUserAssignedOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID);
+		// No assignment from object template. The object template mapping is normal. It will NOT be applied
+		// because there is primary delta.
+		assertAssignedOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, SchemaConstants.ORG_MANAGER);  // because of the modification
+		assertUserHasOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID);
+		assertHasOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, SchemaConstants.ORG_MANAGER);
+
+		// Postcondition
         assertMonkeyIslandOrgSanity();
     }