Switching tests from deprecated configuration to current one.

Evolveum · Mar 20, 2017 · 6688294 · 6688294
1 parent 42f2959
commit 6688294
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/model/model-impl/src/test/resources/common/password-policy-global.xml b/model/model-impl/src/test/resources/common/password-policy-global.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2017 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,13 +19,6 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<name>Global Password Policy</name>
 	<description>Global 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/...ntest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java b/...ntest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
@@ -704,10 +704,14 @@ public void test200ApplyPasswordPolicy() throws Exception {
         assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL);
 
 		PrismReferenceValue passPolicyRef = new PrismReferenceValue(PASSWORD_POLICY_GLOBAL_OID, ValuePolicyType.COMPLEX_TYPE);
+
 		// WHEN
 		modifyObjectReplaceReference(SecurityPolicyType.class, getSecurityPolicyOid(),
 				new ItemPath(SecurityPolicyType.F_CREDENTIALS, CredentialsPolicyType.F_PASSWORD, PasswordCredentialsPolicyType.F_PASSWORD_POLICY_REF),
         		task, result, passPolicyRef);
+		modifyObjectReplaceProperty(SecurityPolicyType.class, getSecurityPolicyOid(),
+				new ItemPath(SecurityPolicyType.F_CREDENTIALS, CredentialsPolicyType.F_PASSWORD, PasswordCredentialsPolicyType.F_HISTORY_LENGTH),
+        		task, result, 3);
 
 		// THEN
 		result.computeStatus();

diff --git a/model/model-intest/src/test/resources/common/password-policy-global.xml b/model/model-intest/src/test/resources/common/password-policy-global.xml
@@ -19,13 +19,6 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<name>Global Password Policy</name>
 	<description>Global password 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>