Fixed TestAssignmentEvaluatorDynamic.

Evolveum · Dec 14, 2017 · 937b594 · 937b594
1 parent caaa84a
commit 937b594
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.../src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java b/.../src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
@@ -114,6 +114,10 @@ public abstract class TestAbstractAssignmentEvaluator extends AbstractLensTest {
 	@Override
 	public void initSystem(Task initTask, OperationResult initResult) throws Exception {
 		super.initSystem(initTask, initResult);
+		addObject(ORG_BRETHREN_FILE);
+		addObject(TEMPLATE_DYNAMIC_ORG_ASSIGNMENT_FILE);
+
+		setDefaultObjectTemplate(UserType.COMPLEX_TYPE, DYNAMIC_ORG_ASSIGNMENT_EMPLOYEE_TYPE, TEMPLATE_DYNAMIC_ORG_ASSIGNMENT_OID, initResult);
 	}
 
 	@Test

diff --git a/...del-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java b/...del-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
@@ -17,7 +17,6 @@
 
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
@@ -51,10 +50,6 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
         super.initSystem(initTask, initResult);
 
         addObjects(getRoleCorpFiles());
-	    addObject(ORG_BRETHREN_FILE);
-	    addObject(TEMPLATE_DYNAMIC_ORG_ASSIGNMENT_FILE);
-
-	    setDefaultObjectTemplate(UserType.COMPLEX_TYPE, DYNAMIC_ORG_ASSIGNMENT_EMPLOYEE_TYPE, TEMPLATE_DYNAMIC_ORG_ASSIGNMENT_OID, initResult);
     }
 
     @Override