Adapt rest of model-intest to schema changes

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

Hide file tree

Showing 12 changed files with 0 additions and 74 deletions.
diff --git a/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111111.xml b/infra/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/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111113.xml b/infra/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-intest/src/test/resources/password/password-policy-deprecated.xml b/model/model-intest/src/test/resources/password/password-policy-deprecated.xml
@@ -11,13 +11,6 @@
         xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <name>Deprecated Password Policy</name>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>3</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>Testing string policy</description>
         <limitations>

diff --git a/model/model-intest/src/test/resources/password/password-policy-ugly.xml b/model/model-intest/src/test/resources/password/password-policy-ugly.xml
@@ -34,5 +34,4 @@
             </limit>
         </limitations>
     </stringPolicy>
-    <minOccurs>0</minOccurs> <!-- Allow no password -->
 </valuePolicy>
diff --git a/model/model-intest/src/test/resources/sync/password-policy-azure.xml b/model/model-intest/src/test/resources/sync/password-policy-azure.xml
@@ -20,13 +20,6 @@
       <creatorRef oid="00000000-0000-0000-0000-000000000002" type="c:UserType"><!-- administrator --></creatorRef>
       <createChannel>http://midpoint.evolveum.com/xml/ns/public/model/channels-3#objectImport</createChannel>
    </metadata>
-   <lifetime>
-      <expiration>999</expiration>
-      <warnBeforeExpiration>9</warnBeforeExpiration>
-      <lockAfterExpiration>0</lockAfterExpiration>
-      <minPasswordAge>0</minPasswordAge>
-      <passwordHistoryLength>0</passwordHistoryLength>
-   </lifetime>
    <stringPolicy>
       <description>String validation policy</description>
       <limitations>

diff --git a/model/model-intest/src/test/resources/sync/role-red-judge.xml b/model/model-intest/src/test/resources/sync/role-red-judge.xml
@@ -35,9 +35,4 @@
     <authorization>
         <action>http://midpoint.evolveum.com/xml/ns/test/authorization#punish</action>
     </authorization>
-    <exclusion>
-        <description>A judge cannot be a pirate at the same time. At least not openly.</description>
-        <targetRef oid="12345678-d34d-b33f-f00d-555555556666" type="RoleType"/>
-        <policy>enforce</policy>
-    </exclusion>
 </role>
diff --git a/testing/rest/src/test/resources/repo/value-policy-general.xml b/testing/rest/src/test/resources/repo/value-policy-general.xml
@@ -11,12 +11,6 @@
     <description>Complex Password policy requires at least one lowercase letter, at least one uppercase letter, at least one digit
 and at least on special character in the password. The password must start
 with a lowercase letter and must be at least 6 characters long.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-    </lifetime>
     <stringPolicy>
         <description>String validation policy</description>
         <limitations>

diff --git a/testing/rest/src/test/resources/repo/value-policy-numeric.xml b/testing/rest/src/test/resources/repo/value-policy-numeric.xml
@@ -9,13 +9,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <name>Numeric Policy</name>
     <description>A policy useful for generating PIN.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>String validation policy</description>
         <limitations>

diff --git a/testing/rest/src/test/resources/repo/value-policy-security-answer.xml b/testing/rest/src/test/resources/repo/value-policy-security-answer.xml
@@ -11,12 +11,6 @@
     <description>Complex Password policy requires at least one lowercase letter, at least one uppercase letter, at least one digit
 and at least on special character in the password. The password must start
 with a lowercase letter and must be at least 6 characters long.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-    </lifetime>
     <stringPolicy>
         <description>String validation policy</description>
         <limitations>

diff --git a/testing/rest/src/test/resources/repo/value-policy-simple.xml b/testing/rest/src/test/resources/repo/value-policy-simple.xml
@@ -11,13 +11,6 @@
     <description>Complex Password policy requires at least one lowercase letter, at least one uppercase letter, at least one digit
 and at least on special character in the password. The password must start
 with a lowercase letter and must be at least 6 characters long.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>String validation policy</description>
         <limitations>

diff --git a/testing/story/src/test/resources/village/global-password-policy.xml b/testing/story/src/test/resources/village/global-password-policy.xml
@@ -20,13 +20,6 @@ This file is an example of Password Policy definition.
     <description>Complex Password policy requires at least one lowercase letter, at least one uppercase letter, at least one digit
 and at least on special character in the password. The password must start
 with a lowercase letter and must be at least 6 characters long.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>String validation policy</description>
         <limitations>

diff --git a/testing/story/src/test/resources/village/org-password-policy.xml b/testing/story/src/test/resources/village/org-password-policy.xml
@@ -17,13 +17,6 @@ This file is an example of Password Policy definition.
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <name>Org Password Policy</name>
     <description>Permissive Password policy limits only the password length and character uniqueness.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>String validation policy</description>
         <limitations>