From 1063bf864abeb0ab17077912fc72bfb57f754814 Mon Sep 17 00:00:00 2001
From: maudj <maudj@localhost>
Date: Mon, 23 Mar 2009 13:33:03 +0000
Subject: [PATCH] fix broken postamble for character set- maudjsecurity_character_set.xml

---
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml    |   29 ++++++++++++++++++++++++++++-
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml |   10 +++++-----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
index 112a4c0..39682396 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
@@ -522,14 +522,14 @@
             '%s Postamble Step 1. Admin Resetting password-validator' % msg
             </message>
 
-            <call function="'modifyPwdPolicy'">
+            <call function="'modifyPwdValidator'">
                   { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
                     'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
                     'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                    'propertyName'           : 'Default Password Policy' ,
-                    'attributeName'          : 'password-validator' ,
-                    'attributeValue'         : 'Character Set' ,
-                    'modifyType'             : 'remove' }
+                    'propertyName'           : 'Character Set' ,
+                    'attributeName'          : 'enabled' ,
+                    'attributeValue'         : 'false' ,
+                    'modifyType'             : 'set' }
             </call>
             
             <!--- User Change Password -->
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
index f707165..1c2ffac 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
@@ -310,6 +310,33 @@
                     'attributeValue'         : 'Dictionary' ,
                     'modifyType'             : 'remove' }
             </call>
+
+            <call function="'modifyPwdValidator'">
+                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
+                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
+                    'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
+                    'propertyName'           : 'Dictionary' ,
+                    'attributeName'          : 'enabled' ,
+                    'attributeValue'         : 'false' ,
+                    'modifyType'             : 'set' }
+            </call>
+
+            <call function="'dsconfig'">
+                  { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
+                    'dsInstanceDn'         : DIRECTORY_INSTANCE_DN ,
+                    'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD ,
+                    'subcommand'           : 'list-password-validators' ,
+                    'expectedRC'           : 0 }
+            </call>
+
+            <script>
+             returnString = STAXResult[0][1]
+            </script>
+
+            <call function="'checktestString'">
+                { 'returnString'       : returnString ,
+                  'expectedString'     : 'dictionary          : false' }
+            </call>
             
             <!--- User Change Password -->
             <message>
@@ -322,7 +349,7 @@
                     'dsInstanceDn'           : 'dn:uid=abergin,%s' % basedn ,
                     'dsInstancePswd'         : 'tcilfni' ,
                     'dsAuthzID'              : 'dn:uid=abergin, %s' % basedn,
-                    'dsNewPassword'          : 'zymochemistry'  }
+                    'dsNewPassword'          : 'chemistry'  }
             </call>
             
             <message>

--
Gitblit v1.10.0