MID-8842 ninja - authentication name/identifier processor, test impro…

…vement
Evolveum · Jul 26, 2023 · 7bf7ca8 · 7bf7ca8
1 parent c06670c
commit 7bf7ca8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/...in/java/com/evolveum/midpoint/schema/validator/processor/AuthenticationNameProcessor.java b/...in/java/com/evolveum/midpoint/schema/validator/processor/AuthenticationNameProcessor.java
@@ -54,6 +54,7 @@ public boolean process(PrismObject<SecurityPolicyType> object, ItemPath path) th
             if (auth.getIdentifier() == null) {
                 auth.setIdentifier(auth.getName());
             }
+            auth.setName(null);
             return true;
         }
 
@@ -62,6 +63,7 @@ public boolean process(PrismObject<SecurityPolicyType> object, ItemPath path) th
             if (module.getIdentifier() == null) {
                 module.setIdentifier(module.getName());
             }
+            module.setName(null);
             return true;
         }
 
@@ -70,6 +72,7 @@ public boolean process(PrismObject<SecurityPolicyType> object, ItemPath path) th
             if (module.getIdentifier() == null) {
                 module.setIdentifier(module.getName());
             }
+            module.setName(null);
             return true;
         }
 

diff --git a/infra/schema/src/test/resources/validator/expected/security-policy.xml b/infra/schema/src/test/resources/validator/expected/security-policy.xml
@@ -14,15 +14,15 @@
         <modules>
             <saml2 id="1">
                 <identifier>deprecated items</identifier>
-                <name>deprecated items</name>
             </saml2>
         </modules>
         <sequence id="2">
             <identifier>sequencename</identifier>
-            <name>sequencename</name>
             <module id="3">
                 <identifier>deprecated items</identifier>
-                <name>deprecated items</name>
+            </module>
+            <module id="4">
+                <identifier>unchanged</identifier>
             </module>
         </sequence>
     </authentication>

diff --git a/infra/schema/src/test/resources/validator/processor/security-policy.xml b/infra/schema/src/test/resources/validator/processor/security-policy.xml
@@ -25,6 +25,9 @@
             <module id="3">
                 <name>deprecated items</name>
             </module>
+            <module id="4">
+                <identifier>unchanged</identifier>
+            </module>
         </sequence>
     </authentication>
 </securityPolicy>