Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · May 18, 2016 · e17e97d · e17e97d
2 parents b5cba7c + 4fca8c0
commit e17e97d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -84,7 +84,7 @@
         <derby.version>10.11.1.1</derby.version>
         <wro4j.version>1.8.0</wro4j.version>
         <jackson.version>2.3.3</jackson.version>
-        <surefire.version>2.19</surefire.version>
+        <surefire.version>2.19.1</surefire.version>
     </properties>
     <dependencyManagement>
         <dependencies>

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
@@ -1108,11 +1108,11 @@ public void test402JackChangeMinistryOfOffenseMemberToManagerByAddingRemovingAss
         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
+        // 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, ORG_MINISTRY_OF_OFFENSE_OID);
+        assertUserHasOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID);
         assertHasOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, SchemaConstants.ORG_MANAGER);
-        assertHasOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, null);
 
         // Postcondition
         assertMonkeyIslandOrgSanity();

diff --git a/model/model-intest/src/test/resources/common/user-template-org-assignment.xml b/model/model-intest/src/test/resources/common/user-template-org-assignment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright (c) 2010-2015 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.