From 4b6cb4c81f4473024798d07ac6e73b743efe03c2 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Fri, 07 Sep 2007 15:07:30 +0000
Subject: [PATCH] Fixed root user password functional tests to account for the recent property name changes.

---
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml |    4 ++--
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml       |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
index 80cfd2d..dc76fda 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
@@ -82,11 +82,11 @@
                     'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
                     'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
                     'propertyName'           : 'Root Password Policy' ,
-                    'attributeName'          : 'default-password-storage-scheme' ,
-                    'attributeValue'         : 'CLEAR' }
-                </call>
+                    'attributeName'          : 'default-password-storage-scheme-dn' ,
+                    'attributeValue'         : 'cn=Clear,cn=Password Storage Schemes,cn=config' }
+            </call>
             
-                <message>
+            <message>
                    'Security: Pwd Policy Root: Root Auth, Preamble Step 2 - Admin adding new root user'
                 </message>
     
@@ -471,9 +471,9 @@
                     'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
                     'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
                     'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                    'propertyName'           : 'Default Password Policy' ,
-                    'attributeName'          : 'default-password-storage-scheme' ,
-                    'attributeValue'         : 'SSHA' }
+                    'propertyName'           : 'Root Password Policy' ,
+                    'attributeName'          : 'default-password-storage-scheme-dn' ,
+                    'attributeValue'         : 'cn=Salted SHA-512,cn=Password Storage Schemes,cn=config' }
             </call>
             
             <call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
index a546df9..430aed4 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
@@ -48,7 +48,7 @@
               'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
               'dsBaseDN'         : 'cn=Root Password Policy,cn=Password Policies,cn=config' ,
               'dsFilter'         : 'objectclass=*'  ,
-              'attributes'       : 'ds-cfg-default-password-storage-scheme' }
+              'attributes'       : 'ds-cfg-default-password-storage-scheme-dn' }
           </call>
 
           <script> 
@@ -57,7 +57,7 @@
 
           <call function="'checktestString'">
               { 'returnString'       : returnString ,
-                'expectedString'     : 'SSHA' }
+                'expectedString'     : 'cn=Salted SHA-512' }
           </call>
           
           <call function="'testCase_Postamble'"/>

--
Gitblit v1.10.0