From 5b60d7b8eb74780e99f170655a43e8f435ed3e3a Mon Sep 17 00:00:00 2001
From: maudj <maudj@localhost>
Date: Tue, 29 Jul 2008 07:47:41 +0000
Subject: [PATCH] add missing tags and manage-account subcommands
---
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml | 151 ++++++++++++++++++++++++++---
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml | 16 +-
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml | 28 ++++
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml | 30 +++++
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml | 20 +++-
5 files changed, 207 insertions(+), 38 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
index 6109c4f..526e70c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
@@ -36,7 +36,17 @@
<block name="'account-activation'">
<sequence>
-
+
+ <!--- Test Group information
+ #@TestGroupName Security
+ #@TestGroupPurpose To test the security functionality.
+ #@TestSubgroupName Account Activation
+ -->
+ <script>
+ securityPath = '%s/testcases/security' % (TESTS_DIR)
+ securityAcc = '%s/account_activation' % securityPath
+ </script>
+
<script>
if not CurrentTestPath.has_key('group'):
CurrentTestPath['group']='security'
@@ -53,19 +63,19 @@
<import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/account_activation/security_setup_account_activation.xml' % (TESTS_DIR)"/>
+ file="'%s/security_setup_account_activation.xml' % securityAcc"/>
<call function="'setup_account_activation'" />
<import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/account_activation/security_test_account.xml' % (TESTS_DIR)"/>
+ file="'%s/security_test_account.xml' % securityAcc"/>
<call function="'test_account'" />
<import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/account_activation/security_account_expiration.xml' % (TESTS_DIR)"/>
+ file="'%s/security_account_expiration.xml' % securityAcc"/>
<call function="'account_expiration'" />
<import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/account_activation/security_teardown_account_activation.xml' % (TESTS_DIR)"/>
+ file="'%s/security_teardown_account_activation.xml' % securityAcc"/>
<call function="'teardown_account_activation'" />
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index 5e7cc39..fc53d12 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -42,11 +42,13 @@
<!--- Define default value for basedn -->
<script>
- basedn1 = 'ou=people,ou=activation tests,o=Account Activation Tests,'
- basedn = '%s dc=example,dc=com' % basedn1
+ basedn1 = 'ou=people,ou=activation tests,o=Account Activation Tests'
+ basedn = '%s, dc=example,dc=com' % basedn1
msg = 'Security: Account Expiration:'
msg1 = '%s : Postamble' % msg
- </script>
+ msg2 = 'get-seconds-until-password-expiration-warning'
+ msg3 = 'Password Expiration Warning'
+ </script>
<!--- Test Case information
#@TestMarker Account Expiration
@@ -55,8 +57,9 @@
#@TestPurpose User Bind Before Deactivation
#@TestPreamble none
#@TestStep User binds RC 0
+ #@TestStep Check manage-account get-password-policy-dn
#@TestPostamble none
- #@TestResult Success if the test is PASS
+ #@TestResult Success if the 2 tests are PASS
-->
<testcase name="getTestCaseName('Preamble')">
<sequence>
@@ -74,6 +77,28 @@
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
+
+ <message>
+ '%s Check manage-account get-password-policy-dn' % msg
+ </message>
+
+ <call function="'manageAccountWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'get-password-policy-dn' ,
+ 'targetDn' : 'uid=abergin,%s' % basedn }
+ </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'Password Policy DN:' }
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -119,13 +144,18 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-account-expiration-time' ,
- 'targetDn' : 'uid=abergin,ou=people,%s' % basedn }
+ 'targetDn' : 'uid=abergin,%s' % basedn }
</call>
- <script>
- knownIssue(3396)
+ <script>
+ returnString = STAXResult[0][1]
</script>
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'Account Expiration Time: ' }
+ </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -170,12 +200,17 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-authentication-failure-times' ,
- 'targetDn' : 'uid=abergin,ou=people,%s' % basedn }
+ 'targetDn' : 'uid=abergin,%s' % basedn }
</call>
- <script>
- knownIssue(3396)
+ <script>
+ returnString = STAXResult[0][1]
</script>
+
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'Authentication Failure Times:' }
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -221,13 +256,18 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-account-expiration-time' ,
- 'targetDn' : 'uid=abergin,ou=people,%s' % basedn }
+ 'targetDn' : 'uid=abergin,%s' % basedn }
</call>
- <script>
- knownIssue(3396)
+ <script>
+ returnString = STAXResult[0][1]
</script>
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'Account Expiration Time:' }
+ </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -274,8 +314,12 @@
#@TestStep Check User Bind After Removing Expiration RC 0
#@TestStep verify with manageAccountWithScript
get-account-expiration-time
+ #@TestStep verify with manageAccountWithScript
+ get-password-expiration-warned-time
+ #@TestStep verify with manageAccountWithScript
+ get-seconds-until-password-expiration
#@TestPostamble none
- #@TestResult Success if the 2 test are PASS
+ #@TestResult Success if the 5 tests are PASS
-->
<testcase name="getTestCaseName('Postamble')">
<sequence>
@@ -310,7 +354,7 @@
</call>
<message>
- '%s Step 3. Verify with manage-account ' % msg
+ '%s Step 3. get-account-expiration-time with manage-account' % msg1
</message>
<call function="'manageAccountWithScript'">
@@ -319,12 +363,83 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-account-expiration-time' ,
- 'targetDn' : 'uid=abergin,ou=people,%s' % basedn }
+ 'targetDn' : 'uid=abergin,%s' % basedn }
</call>
- <script>
- knownIssue(3396)
+ <script>
+ returnString = STAXResult[0][1]
</script>
+
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'Account Expiration Time:' }
+ </call>
+
+ <message>
+ '%s Step 4. Check get-password-expiration-warned-time ' % msg1
+ </message>
+
+ <call function="'manageAccountWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'get-password-expiration-warned-time' ,
+ 'targetDn' : 'uid=abergin,%s' % basedn }
+ </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'Password Expiration Warned Time:' }
+ </call>
+
+ <message>
+ '%s Step 5. Check get-seconds-until-password-expiration' % msg1
+ </message>
+
+ <call function="'manageAccountWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'get-seconds-until-password-expiration' ,
+ 'targetDn' : 'uid=abergin,%s' % basedn }
+ </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'Seconds Until Password Expiration:' }
+ </call>
+
+ <message>
+ '%s Step 5. Check manage-account %s' % (msg1,msg2)
+ </message>
+
+ <call function="'manageAccountWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : msg2 ,
+ 'targetDn' : 'uid=abergin,%s' % basedn }
+ </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'Seconds Until %s:' % msg3 }
+ </call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
index 33d12b5..983744f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
@@ -32,8 +32,31 @@
<function name="setup_account_activation">
<sequence>
-
- <!--- Test Case : Add Entries for Acount Activation Tests -->
+
+
+ <!--- Test Suite information
+ #@TestSuiteName setup Account Activation
+ #@TestSuitePurpose Setup for the Account Activation test suite.
+ #@TestSuiteGroup setup Account Activation
+ #@TestScript security_setup_account_activation.xml
+ -->
+
+ <script>
+ securityPath = '%s/security/account_activation' \
+ % logsRemoteDataDir
+ </script>
+
+ <!--- Test Case information
+ #@TestMarker setup Account Activation
+ #@TestName setup: Add Initials Entries
+ #@TestIssue none
+ #@TestPurpose Add Entries for Acount Activation Tests
+ #@TestPreamble none
+ #@TestStep Add account_activation_startup.ldif
+ #@TestPostamble none
+ #@TestResult Success if addEntry returns 0.
+ -->
+
<testcase name="getTestCaseName('Add Initial Entries')">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -46,7 +69,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/account_activation/account_activation_startup.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/account_activation_startup.ldif' \
+ % securityPath,
'expectedRC' : 0 }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
index 5489512..891edc4 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
@@ -32,9 +32,29 @@
<function name="teardown_account_activation">
<sequence>
-
- <!--- Test Case : Password Policy Teardown -->
- <!--- Delete Branch -->
+
+ <!--- Test Suite information
+ #@TestSuiteName Teardown Account Activation
+ #@TestSuitePurpose Test Teardown Account Activation
+ #@TestSuiteGroup Teardown Account Activation
+ #@TestScript security_teardown_account_activation.xml
+ -->
+
+ <!--- Define default value for basedn -->
+ <script>
+ basedn = 'o=Account Activation Tests,dc=example,dc=com'
+ </script>
+
+ <!--- Test Case information
+ #@TestMarker Teardown Account Activation
+ #@TestName Password Policy Teardown
+ #@TestIssue none
+ #@TestPurpose Delete Branch
+ #@TestPreamble none
+ #@TestStep DeleteEntry o=Account Activation Tests
+ #@TestPostamble none
+ #@TestResult Success if DeleteEntry returns 0.
+ -->
<testcase name="getTestCaseName('Reset')">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -47,7 +67,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'o=Account Activation Tests,dc=example,dc=com' ,
+ 'dsBaseDN' : '%s' % basedn ,
'extraParams' : '-x',
'expectedRC' : 0 }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
index 560302b..2eaf6dd 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
@@ -42,8 +42,8 @@
<!--- Define default value for basedn -->
<script>
- basedn1 = 'ou=activation tests,o=Account Activation Tests,'
- basedn = '%s dc=example,dc=com' % basedn1
+ basedn1 = 'ou=people,ou=activation tests,o=Account Activation Tests'
+ basedn = '%s, dc=example,dc=com' % basedn1
msg = 'Security: Account Activation:'
</script>
@@ -73,7 +73,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-account-is-disabled' ,
- 'targetDn' : 'uid=scarter,ou=people,%s' % basedn }
+ 'targetDn' : 'uid=scarter,%s' % basedn }
</call>
<script>
@@ -92,7 +92,7 @@
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=scarter,ou=people,%s' % basedn ,
+ 'dsInstanceDn' : 'uid=scarter,%s' % basedn ,
'dsInstancePswd' : 'sprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
@@ -128,7 +128,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-account-is-disabled' ,
'dsOperationValue' : 'true' ,
- 'targetDn' : 'uid=scarter,ou=people,%s' % basedn }
+ 'targetDn' : 'uid=scarter,%s' % basedn }
</call>
<script>
@@ -165,7 +165,7 @@
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=scarter,ou=people,%s' % basedn,
+ 'dsInstanceDn' : 'uid=scarter,%s' % basedn,
'dsInstancePswd' : 'sprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
@@ -201,7 +201,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'clear-account-is-disabled' ,
- 'targetDn' : 'uid=scarter,ou=people,%s' % basedn }
+ 'targetDn' : 'uid=scarter,%s' % basedn }
</call>
<script>
@@ -220,7 +220,7 @@
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=scarter,ou=people,%s' % basedn ,
+ 'dsInstanceDn' : 'uid=scarter,%s' % basedn ,
'dsInstancePswd' : 'sprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
--
Gitblit v1.10.0