MID-8824: Fixed use of incorrect types in deltas in tests.

Evolveum · Sep 18, 2023 · 3875791 · 3875791
1 parent 9638f45
commit 3875791
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/...l-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingComplex.java b/...l-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingComplex.java
@@ -10,6 +10,8 @@
 
 import java.io.IOException;
 
+import com.evolveum.midpoint.test.util.TestUtil;
+
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
@@ -46,7 +48,7 @@ public void testModifyObjectSetAdditionalName() throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class,
-                        MappingTestEvaluator.USER_OLD_OID, UserType.F_ADDITIONAL_NAME, "Jackie");
+                        MappingTestEvaluator.USER_OLD_OID, UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_EMPLOYEE_NUMBER, "321");
 
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping = evaluator.createMapping(
@@ -69,7 +71,7 @@ public void testModifyObjectSetAdditionalNameFalse() throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class,
-                        MappingTestEvaluator.USER_OLD_OID, UserType.F_ADDITIONAL_NAME, "Jackie");
+                        MappingTestEvaluator.USER_OLD_OID, UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_EMPLOYEE_NUMBER, "321");
 
         PrismObject<UserType> userOld = evaluator.getUserOld();

diff --git a/...el-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java b/...el-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java
@@ -63,7 +63,7 @@ public void testControlReplaceSingleValue() throws Exception {
 
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
-                        UserType.F_ADDITIONAL_NAME, "Jackie");
+                        UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_SUBTYPE, "321");
 
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
@@ -101,7 +101,7 @@ public void testControlReplaceMultiValue() throws Exception {
 
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
-                        UserType.F_ADDITIONAL_NAME, "Jackie");
+                        UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_SUBTYPE, "991", "992");
 
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
@@ -137,7 +137,7 @@ public void testReplaceMixedMultiValue() throws Exception {
 
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
-                        UserType.F_ADDITIONAL_NAME, "Jackie");
+                        UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_SUBTYPE, "X91", "992", "Y93", "994");
 
         String shortTestName = getTestNameShort();

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
@@ -292,7 +292,7 @@ public void testScriptSystemVariablesConditionTrueToFalse(String filename) throw
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
-                        evaluator.toPath("name"), "Jack");
+                        evaluator.toPath("name"), PolyString.fromOrig("Jack"));
         delta.addModificationDeleteProperty(evaluator.toPath("subtype"), "CAPTAIN");
 
         String shortTestName = getTestNameShort();
@@ -501,7 +501,7 @@ public void testNpeFalseToTrue() throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
-                        UserType.F_ADDITIONAL_NAME, "Captain Sparrow");
+                        UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Captain Sparrow"));
 
         String shortTestName = getTestNameShort();
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =

diff --git a/...ntest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java b/...ntest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
@@ -12,6 +12,7 @@
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import com.evolveum.midpoint.prism.PrismContainer;
@@ -1761,7 +1762,7 @@ public void test314RemovePasswordFail() throws Exception {
     private void setPasswordMinOccurs(Integer value, Task task, OperationResult result) throws CommonException {
         ObjectDelta<SecurityPolicyType> delta = prismContext.deltaFor(SecurityPolicyType.class)
                 .item(SecurityPolicyType.F_CREDENTIALS, CredentialsPolicyType.F_PASSWORD, PasswordCredentialsPolicyType.F_MIN_OCCURS)
-                .replace(value)
+                .replace(value != null ? value.toString() : null)
                 .asObjectDelta(getSecurityPolicyOid());
         executeChanges(delta, null, task, result);
     }