Adapt tests in model-common and model-intest

Evolveum · Nov 9, 2019 · 930f218 · 930f218
1 parent a3a69ab
commit 930f218
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 35 deletions.
diff --git a/model/model-common/src/test/resources/mapping/password-policy.xml b/model/model-common/src/test/resources/mapping/password-policy.xml
@@ -8,16 +8,8 @@
 
 <object xsi:type="ValuePolicyType" version="0" xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    >
     <name>Testing Complex Password Policy</name>
     <description>Testing complex password policy</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>Testing string policy</description>
         <limitations>

diff --git a/model/model-common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111111.xml b/model/model-common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111111.xml
@@ -12,13 +12,6 @@
 
     <name>Testing Complex Password Policy</name>
     <description>Testing complex password policy</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>Testing string policy</description>
         <limitations>

diff --git a/model/model-common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111113.xml b/model/model-common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111113.xml
@@ -12,13 +12,6 @@
 
     <name>Testing Bad Password Policy</name>
     <description>This policy is intentionally insane. The limits conflict with overall length limits. This should fail.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>Testing string policy</description>
         <limitations>

diff --git a/model/model-common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111114.xml b/model/model-common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111114.xml
@@ -12,13 +12,6 @@
 
     <name>Testing Bad Password Policy</name>
     <description>This policy is intentionally insane. The limits conflict with overall length limits. This should fail.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>Testing string policy</description>
         <limitations>

diff --git a/model/model-intest/src/test/resources/rbac/sod/global-policy-rules-sod-approval.xml b/model/model-intest/src/test/resources/rbac/sod/global-policy-rules-sod-approval.xml
@@ -22,7 +22,7 @@
                     <order>30</order>
                 </compositionStrategy>
                 <approvalSchema>
-                    <level>
+                    <stage>
                         <name>SoD</name>
                         <approverRef type="OrgType">
                             <filter>
@@ -36,7 +36,7 @@
                         <evaluationStrategy>firstDecides</evaluationStrategy>
                         <outcomeIfNoApprovers>reject</outcomeIfNoApprovers>
                         <groupExpansion>onWorkItemCreation</groupExpansion>
-                    </level>
+                    </stage>
                 </approvalSchema>
             </approval>
         </policyActions>

diff --git a/model/model-intest/src/test/resources/security/role-business-1.xml b/model/model-intest/src/test/resources/security/role-business-1.xml
@@ -5,14 +5,11 @@
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <role oid="00000000-0000-0000-0000-00000000aab1"
-        xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-        xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-        xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
+        xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
     <name>Business Role One</name>
     <assignment>
         <targetRef oid="00000000-0000-0000-0000-000000000321" type="ArchetypeType"/> <!-- Business Role -->
     </assignment>
     <requestable>true</requestable>
-    <ownerRef oid="c0c010c0-d34d-b33f-f00d-111111111111" type="UserType"/>
     <subtype>business</subtype>
 </role>