From 355baa01fc3dc3b76dcdbc916b4ce93255edbb11 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Thu, 25 Jan 2007 21:45:57 +0000
Subject: [PATCH] Housecleaning. Made the test case names more aligned with the rest of the Security test suites. Also, made multiple tests with in test case into simply multiple operations, and made a preamble and postamle steps.
---
opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml | 62 +++++++-------------
opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml | 98 ++++++++++----------------------
2 files changed, 52 insertions(+), 108 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
index 64b477d..8a7f41f 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
@@ -34,10 +34,10 @@
<sequence>
<!--- Test Case : User Search With Password -->
- <testcase name="'Security:Pwd Policy: User Search With Password'">
+ <testcase name="'Security: Pwd Change: Preamble Setup'">
<sequence>
<message>
- 'Security: Pwd Policy: User Searching With Password'
+ 'Security: Pwd Change: Preamble Step 1 - User Searching With Password'
</message>
<call function="'SearchObject'">
@@ -50,18 +50,12 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
- <!--- Test Case : Admin Enable Exp Pwd No Warning -->
- <testcase name="'Security:Pwd Change: Admin Enable Exp Pwd No Warning'">
- <sequence>
<message>
- 'Security: Pwd Change: Admin Enabling Exp Pwd No Warning'
+ 'Security: Pwd Change: Preamble Step 2 - Admin Enabling Exp Pwd No Warning'
</message>
<call function="'modifyEntry'">
@@ -72,18 +66,12 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif' % STAGED_DATA_DIR }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
- <!--- Test Case : Admin Set Pwd Time Exp -->
- <testcase name="'Security:Pwd Change: Admin Set Pwd Time Exp'">
- <sequence>
<message>
- 'Security: Pwd Change: Admin Setting Pwd Time Exp'
+ 'Security: Pwd Change: Preamble Step 3 -Admin Setting Pwd Time Exp'
</message>
<call function="'modifyEntry'">
@@ -101,11 +89,11 @@
</sequence>
</testcase>
- <!--- Test Case : User Search With Password -->
- <testcase name="'Security:Pwd Policy: User Search With Password'">
+ <!--- Test Case : User Search With Expired Password -->
+ <testcase name="'Security: Pwd Change: User Search With Exp Password'">
<sequence>
<message>
- 'Security: Pwd Policy: User Searching With Password'
+ 'Security: Pwd Change: User Searching With Expired Password'
</message>
<call function="'SearchObject'">
@@ -127,7 +115,7 @@
</testcase>
<!--- Test Case : Admin Disable Exp Pwd No Warning -->
- <testcase name="'Security:Pwd Change: Admin Disable Exp Pwd No Warning'">
+ <testcase name="'Security: Pwd Change: Admin Disable Exp Pwd No Warning'">
<sequence>
<message>
'Security: Pwd Change: Admin Disabling Exp Pwd No Warning'
@@ -148,11 +136,11 @@
</sequence>
</testcase>
- <!--- Test Case : User Search With Password -->
- <testcase name="'Security:Pwd Policy: User Search With Password'">
+ <!--- Test Case : User Search With Expired Password 2-->
+ <testcase name="'Security: Pwd Change: User Search With Exp Password 2'">
<sequence>
<message>
- 'Security: Pwd Policy: User Searching With Password'
+ 'Security: Pwd Change: User Searching With Expired Password 2'
</message>
<call function="'SearchObject'">
@@ -177,7 +165,7 @@
</testcase>
<!--- Test Case : Admin Reset Pwd Time Exp -->
- <testcase name="'Security:Pwd Change: Admin Reset Pwd Time Exp'">
+ <testcase name="'Security: Pwd Change: Postamble Reset'">
<sequence>
<message>
'Security: Pwd Change: Admin Resetting Pwd Time Exp'
@@ -191,18 +179,12 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_force_pwd_by_time.ldif' % STAGED_DATA_DIR }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
- <!--- Test Case : User Search With Password -->
- <testcase name="'Security:Pwd Policy: User Search With Password'">
- <sequence>
<message>
- 'Security: Pwd Policy: User Searching With Password'
+ 'Security: Pwd Change: User Searching With Password'
</message>
<call function="'SearchObject'">
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
index 41823de..459878a 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
@@ -33,7 +33,7 @@
<sequence>
- <testcase name="'Security:Pwd Policy: Check Existence of ds-cfg-allow-user-password-changes'">
+ <testcase name="'Security: Pwd Policy: Preamble'">
<sequence>
<message>
'Security: Pwd Policy: Checking existence of ds-cfg-allow-user-password-changes'
@@ -57,7 +57,7 @@
</testcase>
<!--- Test Case : User Search With Password -->
- <testcase name="'Security:Pwd Policy: User Search With Password'">
+ <testcase name="'Security: Pwd Policy: User Search'">
<sequence>
<message>
'Security: Pwd Policy: User Searching With Password'
@@ -81,7 +81,7 @@
</testcase>
<!--- Test Case : User Search With Bad Password -->
- <testcase name="'Security:Pwd Policy: User Search With Bad Password'">
+ <testcase name="'Security: Pwd Policy: User Search With Bad Password'">
<sequence>
<message>
'Security: Pwd Policy: User Searching With Bad Password'
@@ -106,10 +106,10 @@
</testcase>
<!--- Test Case : User Change Password With Bad Credentials -->
- <testcase name="'Security:Pwd Policy: User Change Password With Bad Credentials'">
+ <testcase name="'Security: Pwd Policy: User With Bad Credentials Change Password '">
<sequence>
<message>
- 'Security: Pwd Policy: User Changing Password with Bad Credentials'
+ 'Security: Pwd Policy: User with Bad Credentials Changing Password'
</message>
<call function="'modifyEntry'">
@@ -129,7 +129,7 @@
</testcase>
<!--- Test Case : User Change Password -->
- <testcase name="'Security:Pwd Policy: User Change Password'">
+ <testcase name="'Security: Pwd Policy: User Change Password'">
<sequence>
<message>
'Security: Pwd Policy: User Changing Password'
@@ -143,16 +143,10 @@
'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd.ldif' % STAGED_DATA_DIR }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
- <!--- Test Case : User Search With Old Password -->
- <testcase name="'Security:Pwd Policy: User Search With Old Password'">
- <sequence>
<message>
'Security: Pwd Policy: User Searching With Old Password'
</message>
@@ -167,17 +161,10 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 1 }
- </call>
- </sequence>
- </testcase>
+ <if expr="RC != 1">
+ <tcstatus result="'fail'"/>
+ </if>
- <!--- Test Case : User Search With New Password -->
- <testcase name="'Security:Pwd Policy: User Search With New Password'">
- <sequence>
<message>
'Security: Pwd Policy: User Searching With New Password'
</message>
@@ -200,7 +187,7 @@
</testcase>
<!--- Test Case : Admin Change Password Policy -->
- <testcase name="'Security:Pwd Policy: Admin Change Password Policy'">
+ <testcase name="'Security: Pwd Policy: Admin Change Password Policy'">
<sequence>
<message>
'Security: Pwd Policy: Admin Changing Password Policy'
@@ -214,16 +201,10 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_pwd_policy.ldif' % STAGED_DATA_DIR }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
- <!--- Test Case : User Reset Password -->
- <testcase name="'Security:Pwd Policy: User Reset Password'">
- <sequence>
<message>
'Security: Pwd Policy: User Resetting Password'
</message>
@@ -245,10 +226,10 @@
</testcase>
<!--- Test Case : Admin Reset Password Policy -->
- <testcase name="'Security:Pwd Policy: Admin Reset Password Policy'">
+ <testcase name="'Security: Pwd Policy: Postamble'">
<sequence>
<message>
- 'Security: Pwd Policy: Admin Resetting Password Policy'
+ 'Security: Pwd Policy: Postamble Step 1 - Admin Resetting Password Policy'
</message>
<call function="'modifyEntry'">
@@ -259,18 +240,12 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_pwd_policy.ldif' % STAGED_DATA_DIR }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
- <!--- Test Case : User Reset Password -->
- <testcase name="'Security:Pwd Policy: User Reset Password'">
- <sequence>
<message>
- 'Security: Pwd Policy: User Resetting Password'
+ 'Security: Pwd Policy: Postamble Step 2 - User Resetting Password'
</message>
<call function="'modifyEntry'">
@@ -281,18 +256,12 @@
'entryToBeModified' : '%s/security/pwd_policy/user_reset_pwd.ldif' % STAGED_DATA_DIR }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
- <!--- Test Case : User Search With Old Password -->
- <testcase name="'Security:Pwd Policy: User Search With Old Password'">
- <sequence>
<message>
- 'Security: Pwd Policy: User Searching With Old Password'
+ 'Security: Pwd Policy: Postamble Step 3 - User Searching With Old Password'
</message>
<call function="'SearchObject'">
@@ -305,19 +274,12 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 1 }
- </call>
- </sequence>
- </testcase>
+ <if expr="RC != 1">
+ <tcstatus result="'fail'"/>
+ </if>
- <!--- Test Case : User Search With New Password -->
- <testcase name="'Security:Pwd Policy: User Search With New Password'">
- <sequence>
<message>
- 'Security: Pwd Policy: User Searching With New Password'
+ 'Security: Pwd Policy: Postamble Step 4 - User Searching With New Password'
</message>
<call function="'SearchObject'">
--
Gitblit v1.10.0