From 0c31ca2937f208dc107c6daba3ca28e6d32cc88e Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Fri, 8 Nov 2019 11:34:05 +0100
Subject: [PATCH] Fixing failing test (4.0 schema)

---
 .../lens/password-policy-history.xml          |  9 +-------
 .../lens/password-policy-no-history.xml       |  9 +-------
 .../common/password-policy-benevolent.xml     |  3 +--
 .../src/test/resources/common/role-thief.xml  | 22 ++++++++++++-------
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/model/model-impl/src/test/resources/lens/password-policy-history.xml b/model/model-impl/src/test/resources/lens/password-policy-history.xml
index dae5f9d37e1..38a1858acc4 100644
--- a/model/model-impl/src/test/resources/lens/password-policy-history.xml
+++ b/model/model-impl/src/test/resources/lens/password-policy-history.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -10,13 +10,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <name>Testing Password History Policy</name>
     <description>Testing password history policy</description>
-    <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-impl/src/test/resources/lens/password-policy-no-history.xml b/model/model-impl/src/test/resources/lens/password-policy-no-history.xml
index f4a756826d7..143d3fb6063 100644
--- a/model/model-impl/src/test/resources/lens/password-policy-no-history.xml
+++ b/model/model-impl/src/test/resources/lens/password-policy-no-history.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -10,13 +10,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <name>Testing Password History Policy - No History</name>
     <description>Testing password history 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-intest/src/test/resources/common/password-policy-benevolent.xml b/model/model-intest/src/test/resources/common/password-policy-benevolent.xml
index 5948453e3e7..c8884dd50a4 100644
--- a/model/model-intest/src/test/resources/common/password-policy-benevolent.xml
+++ b/model/model-intest/src/test/resources/common/password-policy-benevolent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2017 Evolveum and contributors
+  ~ Copyright (c) 2017-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -15,5 +15,4 @@
             <minLength>2</minLength>
         </limitations>
     </stringPolicy>
-    <minOccurs>0</minOccurs> <!-- Allow no password -->
 </valuePolicy>
diff --git a/model/model-intest/src/test/resources/common/role-thief.xml b/model/model-intest/src/test/resources/common/role-thief.xml
index 9fcc8b24934..e0c31d73222 100644
--- a/model/model-intest/src/test/resources/common/role-thief.xml
+++ b/model/model-intest/src/test/resources/common/role-thief.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015-2016 Evolveum and contributors
+  ~ Copyright (c) 2015-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -10,11 +10,17 @@
         xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/10000000-0000-0000-0000-000000000004">
     <name>Thief</name>
     <!-- No construction here. By purpose: to test exclusivity without any constructions. -->
-    <policyConstraints>
-        <exclusion>
-            <description>A thief cannot be a pirate at the same time. At least not openly.</description>
-            <enforcement>enforce</enforcement>
-            <targetRef oid="12345111-1111-2222-1111-121212111111" type="RoleType"/> <!-- Judge -->
-        </exclusion>
-    </policyConstraints>
+    <assignment>
+        <policyRule>
+            <policyConstraints>
+                <exclusion>
+                    <description>A thief cannot be a pirate at the same time. At least not openly.</description>
+                    <targetRef oid="12345111-1111-2222-1111-121212111111" type="RoleType"/> <!-- Judge -->
+                </exclusion>
+            </policyConstraints>
+            <policyActions>
+                <enforcement/>
+            </policyActions>
+        </policyRule>
+    </assignment>
 </role>