fix conntests (polyString as primary identifier)

Evolveum · Mar 4, 2024 · 8bdba5d · 8bdba5d
1 parent e9ee9c6
commit 8bdba5d
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/...g/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java b/...g/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
@@ -16,6 +16,7 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 
 import org.apache.commons.lang3.mutable.MutableInt;
@@ -922,7 +923,12 @@ public void test290ModifyUserBarbossaRename() throws Exception {
         PrismObject<ShadowType> repoShadow = repositoryService.getObject(ShadowType.class, shadowOid, null, result);
         display("Repo shadow after rename", repoShadow);
 
-        String repoPrimaryIdentifier = getAttributeValue(repoShadow, getPrimaryIdentifierAttributeQName(), String.class);
+        PolyString primaryIdentifier = getAttributeValue(repoShadow, getPrimaryIdentifierAttributeQName(), PolyString.class);
+        String repoPrimaryIdentifier = null;
+        if (primaryIdentifier != null) {
+            repoPrimaryIdentifier = primaryIdentifier.getOrig();
+        }
+
         if ("dn".equals(getPrimaryIdentifierAttributeName())) {
             assertEquals("Entry DN (primary identifier) was not updated in the shadow", toAccountDn(USER_CPTBARBOSSA_USERNAME).toLowerCase(), repoPrimaryIdentifier);
         } else {
@@ -969,7 +975,12 @@ public void test292ModifyUserBarbossaRenameCapitalized() throws Exception {
         PrismObject<ShadowType> repoShadow = repositoryService.getObject(ShadowType.class, shadowOid, null, result);
         display("Repo shadow after rename", repoShadow);
 
-        String repoPrimaryIdentifier = getAttributeValue(repoShadow, getPrimaryIdentifierAttributeQName(), String.class);
+        PolyString primaryIdentifier = getAttributeValue(repoShadow, getPrimaryIdentifierAttributeQName(), PolyString.class);
+        String repoPrimaryIdentifier = null;
+        if (primaryIdentifier != null) {
+            repoPrimaryIdentifier = primaryIdentifier.getOrig();
+        }
+
         if ("dn".equals(getPrimaryIdentifierAttributeName())) {
             assertEquals("Entry DN (primary identifier) was not updated in the shadow", toAccountDn(USER_CPTBARBOSSA_USERNAME).toLowerCase(), repoPrimaryIdentifier);
         } else {
@@ -1274,7 +1285,12 @@ public void test314ModifyUserBarbossaRenameBack() throws Exception {
         PrismObject<ShadowType> repoShadow = repositoryService.getObject(ShadowType.class, shadowOid, null, result);
         display("Repo shadow after rename", repoShadow);
 
-        String repoPrimaryIdentifier = getAttributeValue(repoShadow, getPrimaryIdentifierAttributeQName(), String.class);
+        PolyString primaryIdentifier = getAttributeValue(repoShadow, getPrimaryIdentifierAttributeQName(), PolyString.class);
+        String repoPrimaryIdentifier = null;
+        if (primaryIdentifier != null) {
+            repoPrimaryIdentifier = primaryIdentifier.getOrig();
+        }
+
         if ("dn".equals(getPrimaryIdentifierAttributeName())) {
             assertEquals("Entry DN (primary identifier) was not updated in the shadow", toAccountDn(USER_BARBOSSA_USERNAME).toLowerCase(), repoPrimaryIdentifier);
         } else {