more test cleanup, TEST_NAME removal from story, only bit left

Evolveum · Mar 10, 2020 · 76737c5 · 76737c5
1 parent b8858e3
commit 76737c5
Show file tree

Hide file tree

Showing 56 changed files with 829 additions and 1,756 deletions.
diff --git a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
@@ -369,7 +369,7 @@ public static void assertUserJackContent(PrismObject<UserType> user, boolean exp
         if (withIncomplete) {
             assertTrue("Assignment is not incomplete", assContainer.isIncomplete());
         }
-        assertEquals("Wrong assignement values", 2, assContainer.getValues().size());
+        assertEquals("Wrong assignment values", 2, assContainer.getValues().size());
         PrismProperty<String> a2DescProperty = assContainer.getValue(USER_ASSIGNMENT_2_ID).findProperty(descriptionName);
         assertEquals("Wrong assigment 2 description", "Assignment 2", a2DescProperty.getValue().getValue());
 

diff --git a/...on/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java b/...on/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
@@ -1167,7 +1167,7 @@ mappingFileName, getTestNameShort(), valuePolicyType,
                         null)
                 .build();
 
-        OperationResult opResult = new OperationResult(contextName());
+        OperationResult opResult = createOperationResult();
 
         // WHEN (1)
         mapping.evaluate(createTask(), opResult);

diff --git a/...on/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.java b/...on/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.java
@@ -33,8 +33,6 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.SchemaTestConstants;
 import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.PasswordType;
@@ -99,7 +97,7 @@ public void testScriptSystemVariablesConditionModifyObjectTrueGroovyUnrelated()
                 "mapping-script-system-variables-condition-groovy.xml",
                 shortTestName, "title", delta);
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -130,7 +128,7 @@ public void testScriptSystemVariablesConditionAddObjectFalse(String filename) th
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
                 evaluator.createMapping(filename, shortTestName, "title", delta);
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -161,7 +159,7 @@ public void testScriptSystemVariablesConditionAddObjectFalseNoVal(String filenam
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
                 evaluator.createMapping(filename, shortTestName, "title", delta);
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -191,7 +189,7 @@ public void testScriptSystemVariablesConditionAddObjectFalseNoProperty(String fi
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
                 evaluator.createMapping(filename, shortTestName, "title", delta);
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -220,7 +218,7 @@ public void testScriptSystemVariablesConditionTrueToTrue(String filename) throws
         user.asObjectable().getEmployeeType().add("CAPTAIN");
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -247,7 +245,7 @@ public void testScriptSystemVariablesConditionFalseToFalse(String filename) thro
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
                 evaluator.createMapping(filename, shortTestName, "title", delta);
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -273,7 +271,7 @@ public void testScriptSystemVariablesConditionFalseToTrue(String filename) throw
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
                 evaluator.createMapping(filename, shortTestName, "title", delta);
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -305,7 +303,7 @@ public void testScriptSystemVariablesConditionTrueToFalse(String filename) throw
         user.asObjectable().getEmployeeType().add("CAPTAIN");
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -357,7 +355,7 @@ public void testScriptSystemVariablesConditionEmptyTrue(final String shortTestNa
         user.asObjectable().setEmployeeNumber(null);
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -381,8 +379,8 @@ public void testScriptSystemVariablesConditionEmptySingleFalseToTrueFunction() t
         testScriptSystemVariablesConditionEmptyFalseToTrue(shortTestName, "mapping-script-system-variables-condition-empty-single-function.xml");
     }
 
-    public void testScriptSystemVariablesConditionEmptyFalseToTrue(final String shortTestName, String filename) throws Exception {
-
+    public void testScriptSystemVariablesConditionEmptyFalseToTrue(
+            final String shortTestName, String filename) throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
@@ -396,7 +394,7 @@ public void testScriptSystemVariablesConditionEmptyFalseToTrue(final String shor
         user.asObjectable().setEmployeeNumber("666");
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -448,7 +446,7 @@ public void testScriptSystemVariablesConditionEmptyFalse(final String shortTestN
         user.asObjectable().setEmployeeNumber("666");
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -470,7 +468,8 @@ public void testScriptSystemVariablesConditionEmptySingleTrueToFalseFunction() t
         testScriptSystemVariablesConditionEmptyTrueToFalse(shortTestName, "mapping-script-system-variables-condition-empty-single-function.xml");
     }
 
-    public void testScriptSystemVariablesConditionEmptyTrueToFalse(final String shortTestName, String filename) throws Exception {
+    public void testScriptSystemVariablesConditionEmptyTrueToFalse(
+            final String shortTestName, String filename) throws Exception {
 
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
@@ -485,7 +484,7 @@ public void testScriptSystemVariablesConditionEmptyTrueToFalse(final String shor
         user.asObjectable().setEmployeeNumber(null);
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -508,7 +507,7 @@ public void testNpeFalseToTrue() throws Exception {
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
                 evaluator.createMapping("mapping-npe.xml", shortTestName, "title", delta);
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -535,7 +534,7 @@ public void testNpeTrueToFalse() throws Exception {
         user.asObjectable().setAdditionalName(PrismTestUtil.createPolyStringType("Sultan of the Caribbean"));
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -558,7 +557,7 @@ public void testPathEnum() throws Exception {
         MappingImpl<PrismPropertyValue<String>, PrismPropertyDefinition<String>> mapping =
                 evaluator.createMapping("mapping-path-enum.xml", shortTestName, "costCenter", delta);
 
-        OperationResult opResult = new OperationResult(shortTestName);
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         System.out.println("WHEN");
@@ -708,7 +707,7 @@ public void testEmployeeTypeDeltaAreplaceB() throws Exception {
         setEmployeeType(user.asObjectable(), "A");
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(getTestNameShort());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -736,7 +735,7 @@ public void testEmployeeTypeDeltaNullreplaceB() throws Exception {
         setEmployeeType(user.asObjectable());
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(getTestNameShort());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -764,7 +763,7 @@ public void testEmployeeTypeDeltaBreplaceB() throws Exception {
         setEmployeeType(user.asObjectable(), "B");
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(getTestNameShort());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -840,7 +839,7 @@ public PrismValueDeltaSetTriple<PrismPropertyValue<String>> employeeTypeDeltaABA
         setEmployeeType(user.asObjectable(), oldVals);
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(getTestNameShort());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -920,7 +919,7 @@ public PrismValueDeltaSetTriple<PrismPropertyValue<String>> employeeTypeDeltaDel
         setEmployeeType(user.asObjectable(), oldVals);
         mapping.getSourceContext().recompute();
 
-        OperationResult opResult = new OperationResult(getTestNameShort());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);

diff --git a/...odel-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.java b/...odel-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.java
@@ -30,6 +30,7 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.task.api.test.NullTaskImpl;
+import com.evolveum.midpoint.test.util.OperationResultTestMixin;
 import com.evolveum.midpoint.tools.testng.AbstractUnitTest;
 import com.evolveum.midpoint.util.DOMUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
@@ -39,7 +40,8 @@
 /**
  * @author Radovan Semancik
  */
-public class TestMappingTime extends AbstractUnitTest {
+public class TestMappingTime extends AbstractUnitTest
+        implements OperationResultTestMixin {
 
     private static final String MAPPING_TIME_FROM_TO_FILENAME = "mapping-time-from-to.xml";
     private static final String MAPPING_TIME_ACTIVATION = "mapping-time-deferred-delete.xml";
@@ -62,7 +64,7 @@ public void setupFactory() throws SAXException, IOException, SchemaException {
     public void testBeforeTimeFrom() throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
-                .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
+                .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
                         UserType.F_EMPLOYEE_TYPE, "CAPTAIN");
 
         MappingImpl.Builder<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> builder =
@@ -72,7 +74,7 @@ public void testBeforeTimeFrom() throws Exception {
 
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping = builder.build();
 
-        OperationResult opResult = new OperationResult(contextName());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -91,7 +93,7 @@ private Task createTask() {
     public void testBetweenTimes() throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
-                .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
+                .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
                         UserType.F_EMPLOYEE_TYPE, "CAPTAIN");
 
         MappingImpl.Builder<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> builder =
@@ -101,7 +103,7 @@ public void testBetweenTimes() throws Exception {
 
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping = builder.build();
 
-        OperationResult opResult = new OperationResult(contextName());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -119,7 +121,7 @@ public void testBetweenTimes() throws Exception {
     public void testAfterTimeTo() throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
-                .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
+                .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
                         UserType.F_EMPLOYEE_TYPE, "CAPTAIN");
 
         MappingImpl.Builder<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> builder =
@@ -129,7 +131,7 @@ public void testAfterTimeTo() throws Exception {
 
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping = builder.build();
 
-        OperationResult opResult = new OperationResult(contextName());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -157,7 +159,7 @@ public void testExistenceBefore() throws Exception {
 
         MappingImpl<PrismPropertyValue<Boolean>, PrismPropertyDefinition<Boolean>> mapping = builder.build();
 
-        OperationResult opResult = new OperationResult(contextName());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -185,7 +187,7 @@ public void testExistenceAfter() throws Exception {
 
         MappingImpl<PrismPropertyValue<Boolean>, PrismPropertyDefinition<Boolean>> mapping = builder.build();
 
-        OperationResult opResult = new OperationResult(contextName());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -218,7 +220,7 @@ public void testNoReferenceTime() throws Exception {
 
         MappingImpl<PrismPropertyValue<Boolean>, PrismPropertyDefinition<Boolean>> mapping = builder.build();
 
-        OperationResult opResult = new OperationResult(contextName());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -238,7 +240,7 @@ public void testSetReferenceTimeBefore() throws Exception {
         userOld.asObjectable().getActivation().setDisableTimestamp(null);
 
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
-                .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
+                .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
                         ItemPath.create(UserType.F_ACTIVATION, ActivationType.F_DISABLE_TIMESTAMP),
                         disableTimestamp);
 
@@ -255,7 +257,7 @@ public void testSetReferenceTimeBefore() throws Exception {
 
         MappingImpl<PrismPropertyValue<Boolean>, PrismPropertyDefinition<Boolean>> mapping = builder.build();
 
-        OperationResult opResult = new OperationResult(contextName());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);
@@ -275,7 +277,7 @@ public void testSetReferenceTimeAfter() throws Exception {
         userOld.asObjectable().getActivation().setDisableTimestamp(null);
 
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
-                .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
+                .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
                         ItemPath.create(UserType.F_ACTIVATION, ActivationType.F_DISABLE_TIMESTAMP),
                         disableTimestamp);
 
@@ -292,7 +294,7 @@ public void testSetReferenceTimeAfter() throws Exception {
 
         MappingImpl<PrismPropertyValue<Boolean>, PrismPropertyDefinition<Boolean>> mapping = builder.build();
 
-        OperationResult opResult = new OperationResult(contextName());
+        OperationResult opResult = createOperationResult();
 
         // WHEN
         mapping.evaluate(createTask(), opResult);