From 96ea1f303f49ff10af4cbfd4f53601d5906ba341 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Thu, 09 Nov 2006 15:30:20 +0000
Subject: [PATCH] Each operation for setting up and tearing down the ssl configurations were separate test cases prviously. Now they are simply steps in one test case for setting up and another test case for tearing down an ssl configuration.
---
opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml | 39 ++-----
opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml | 10 +-
opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml | 39 ++-----
opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml | 10 +-
opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml | 37 ++----
opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml | 8
opends/tests/functional-tests/shared/functions/security.xml | 34 +++---
opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml | 37 ++----
opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml | 39 ++-----
opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml | 37 ++----
10 files changed, 112 insertions(+), 178 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/security.xml b/opends/tests/functional-tests/shared/functions/security.xml
index 6e36a2c..47c8c0b 100755
--- a/opends/tests/functional-tests/shared/functions/security.xml
+++ b/opends/tests/functional-tests/shared/functions/security.xml
@@ -31,7 +31,7 @@
<function name="configureSSL">
<function-prolog>
- This function makes the configuration chnanges for SSL
+ This function makes the configuration changes for SSL
</function-prolog>
<function-map-args>
@@ -70,7 +70,7 @@
'entryToBeAdded' : '%s/security/%s/setup/enable_key_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -88,7 +88,7 @@
'entryToBeModified' : '%s/security/%s/setup/deleteTrustMgr.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -106,7 +106,7 @@
'entryToBeAdded' : '%s/security/%s/setup/enable_trust_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -124,7 +124,7 @@
'entryToBeAdded' : '%s/ldaps_port.ldif' % (STAGED_DATA_DIR) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -175,7 +175,7 @@
'entryToBeAdded' : '%s/security/%s/setup/enable_key_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -193,7 +193,7 @@
'entryToBeModified' : '%s/security/%s/setup/deleteTrustMgr.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -211,7 +211,7 @@
'entryToBeAdded' : '%s/security/%s/setup/enable_trust_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -229,7 +229,7 @@
'entryToBeAdded' : '%s/security/%s/setup/enable_startTLS.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -280,7 +280,7 @@
'entryToBeModified' : '%s/security/%s/teardown/disable_ldaps_conn_handler.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -298,7 +298,7 @@
'entryToBeModified' : '%s/security/%s/teardown/deleteTrustMgr.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -316,7 +316,7 @@
'entryToBeAdded' : '%s/security/%s/teardown/default_trust_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -334,7 +334,7 @@
'entryToBeModified' : '%s/security/%s/teardown/disable_key_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -385,7 +385,7 @@
'entryToBeModified' : '%s/security/%s/teardown/disable_startTLS.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -403,7 +403,7 @@
'entryToBeModified' : '%s/security/%s/teardown/deleteTrustMgr.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -421,7 +421,7 @@
'entryToBeAdded' : '%s/security/%s/teardown/default_trust_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -439,7 +439,7 @@
'entryToBeModified' : '%s/security/%s/teardown/disable_key_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index bdf0432..79b2626 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -59,7 +59,7 @@
#@TestPostamble
#@TestResult Success if OpenDS returns 0
-->
- <testcase name="'Security:JKS:AddEntriesThroughSSLPort'">
+ <testcase name="'Security: JKS: Add Entries'">
<sequence>
<message>
'Security: JKS: Adding Entries Through SSL Port'
@@ -96,7 +96,7 @@
#@TestPostamble
#@TestResult Success if OpenDS returns 0
-->
- <testcase name="'Security:JKS:ModifyEntryThroughSSLPort'">
+ <testcase name="'Security: JKS: Modify Entry'">
<sequence>
<message>
'Security: JKS: Modifying Entry Through SSL Port'
@@ -133,7 +133,7 @@
#@TestPostamble
#@TestResult Success if OpenDS returns 0
-->
- <testcase name="'Security:JKS:AddAttrToEntryThroughSSLPort'">
+ <testcase name="'Security: JKS: Add Attr to Entry'">
<sequence>
<message>
'Security: JKS: Adding Attr to Entry Through SSL Port'
@@ -170,7 +170,7 @@
#@TestPostamble
#@TestResult Success if OpenDS returns 0
-->
- <testcase name="'Security:JKS:ModAttrInEntryThroughSSLPort'">
+ <testcase name="'Security: JKS: Modify Attr in Entry'">
<sequence>
<message>
'Security: JKS: Modifying Attr in Entry Through SSL Port'
@@ -207,7 +207,7 @@
#@TestPostamble
#@TestResult Success if OpenDS returns 0
-->
- <testcase name="'Security:JKS:DeleteEntryThroughSSLPort'">
+ <testcase name="'Security: JKS: Delete Entry'">
<sequence>
<message>
'Security: JKS: Deleting Entry Through SSL Port'
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
index 8665b70..aec2727 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
@@ -34,45 +34,38 @@
<sequence>
- <!--- Test Case : Generate Server Cert -->
- <testcase name="'Security:JKS:GenerateServerJKSCert'">
+ <!--- Test Case : JKS Setup -->
+ <!--- Generate Server Cert -->
+ <testcase name="'Security: JKS: Preamble Setup'">
<sequence>
<message>
- 'Security: JKS: Generating Server Certicate'
+ 'Security: JKS: Preamble Step 1. Generating Server Certicate'
</message>
<call function="'genServerJKSCert'">
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Self-Sign Server Cert -->
- <testcase name="'Security:JKS:SelfSignServerJKSCert'">
- <sequence>
+ <!--- Self-Sign Server Cert -->
<message>
- 'Security: JKS: Self-Signing Server Certicate'
+ 'Security: JKS: Preamble Step 2. Self-Signing Server Certicate'
</message>
<call function="'selfSignServerJKSCert'">
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Configure JKS Keystore -->
- <testcase name="'Security:JKS:ConfigJKSKeystore'">
- <sequence>
+ <!--- Configure JKS Keystore -->
<message>
- 'Security: JKS: Configuring JKS Keystore'
+ 'Security: JKS: Preamble Step 3. Configuring JKS Keystore'
</message>
<call function="'configureSSL'">
@@ -83,18 +76,14 @@
'keystoreType' : '%s' % 'jks' }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Initial Search With SSL -->
- <testcase name="'Security:JKS:Initial Search With SSL'">
- <sequence>
+ <!--- Initial Search With SSL -->
<message>
- 'Security: JKS: Searching with SSL Connection'
+ 'Security: JKS: Preamble Step 4. Searching with SSL Connection'
</message>
<call function="'SearchObject'">
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
index 62b6055..3a9147f 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
@@ -34,11 +34,12 @@
<sequence>
- <!--- Test Case : Delete Branch through SSL port -->
- <testcase name="'Security:JKS:DeleteBranchThroughSSLPort'">
+ <!--- Test Case : JKS Teardown -->
+ <!--- Delete Branch through SSL port -->
+ <testcase name="'Security: JKS: Postamble Reset'">
<sequence>
<message>
- 'Security: JKS: Deleting Branch Through SSL Port'
+ 'Security: JKS: Postamble Step 1. Deleting Branch Through SSL Port'
</message>
<call function="'DeleteEntry'">
@@ -50,18 +51,14 @@
'extraParams' : '-Z -X -x' }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Unconfigure JKS Keystore -->
- <testcase name="'Security:JKS:UnconfigJKSKeystore'">
- <sequence>
+ <!--- Unconfigure JKS Keystore -->
<message>
- 'Security: JKS: Unconfiguring JKS Keystore'
+ 'Security: JKS: Postamble Step 2. Unconfiguring JKS Keystore'
</message>
<call function="'unconfigureSSL'">
@@ -72,18 +69,14 @@
'keystoreType' : '%s' % 'jks' }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Remove JKS Keystore -->
- <testcase name="'Security:JKS:RemoveJKSKeystore'">
- <sequence>
+ <!--- Remove JKS Keystore -->
<message>
- 'Security: JKS: Removing JKS Keystore'
+ 'Security: JKS: Postamble Step 3. Removing JKS Keystore'
</message>
<call function="'deletefile'">
@@ -91,18 +84,14 @@
'hostname' : STAF_REMOTE_HOSTNAME }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Search With Unsecure Port -->
- <testcase name="'Security:JKS:Search With Unsecure Port'">
- <sequence>
+ <!--- Search With Unsecure Port -->
<message>
- 'Security: JKS: Searching with Unsecure Connection'
+ 'Security: JKS: Postamble Step 4. Searching with Unsecure Connection'
</message>
<call function="'SearchObject'">
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index 1fc7cbe..b446113 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -34,7 +34,7 @@
<sequence>
- <testcase name="'Security:PKCS12:AddEntriesThroughSSLPort'">
+ <testcase name="'Security: PKCS12: Add Entries'">
<sequence>
<message>
'Security: PKCS12: Adding Entries Through SSL Port'
@@ -57,7 +57,7 @@
</testcase>
<!--- Test Case : Modify Entry through SSL port -->
- <testcase name="'Security:PKCS12:ModifyEntryThroughSSLPort'">
+ <testcase name="'Security: PKCS12: Modify Entry'">
<sequence>
<message>
'Security: PKCS12: Modifying Entry Through SSL Port'
@@ -80,7 +80,7 @@
</testcase>
<!--- Test Case : Add Attribute to Entry through SSL port -->
- <testcase name="'Security:PKCS12:AddAttrToEntryThroughSSLPort'">
+ <testcase name="'Security: PKCS12: Add Attr to Entry'">
<sequence>
<message>
'Security: PKCS12: Adding Attr to Entry Through SSL Port'
@@ -103,7 +103,7 @@
</testcase>
<!--- Test Case : Modify Attribute in Entry through SSL port -->
- <testcase name="'Security:PKCS12:ModAttrInEntryThroughSSLPort'">
+ <testcase name="'Security: PKCS12: Modify Attr in Entry'">
<sequence>
<message>
'Security: PKCS12: Modifying Attr in Entry Through SSL Port'
@@ -126,7 +126,7 @@
</testcase>
<!--- Test Case : Delete Entry through SSL port -->
- <testcase name="'Security:PKCS12:DeleteEntryThroughSSLPort'">
+ <testcase name="'Security: PKCS12: Delete Entry'">
<sequence>
<message>
'Security: PKCS12: Deleting Entry Through SSL Port'
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
index 252faff..59bd469 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
@@ -34,45 +34,38 @@
<sequence>
- <!--- Test Case : Generate Server Cert -->
- <testcase name="'Security:PKCS12:GenerateServerPKCS12Cert'">
+ <!--- Test Case : PKCS12 Setup -->
+ <!--- Generate Server Cert -->
+ <testcase name="'Security: PKCS12: Preamble Setup'">
<sequence>
<message>
- 'Security: PKCS12: Generating Server PKCS12 Certicate'
+ 'Security: PKCS12: Preamble Step 1. Generating Server PKCS12 Certicate'
</message>
<call function="'genServerPKCS12Cert'">
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Self-Sign Server Cert -->
- <testcase name="'Security:PKCS12:SelfSignServerPKCS12Cert'">
- <sequence>
+ <!--- Self-Sign Server Cert -->
<message>
- 'Security: PKCS12: Self-Signing Server PKCS12 Certicate'
+ 'Security: PKCS12: Preamble Step 2. Self-Signing Server PKCS12 Certicate'
</message>
<call function="'selfSignServerPKCS12Cert'">
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Configure PKCS12 Keystore -->
- <testcase name="'Security:PKCS12:ConfigPKCS12Keystore'">
- <sequence>
+ <!--- Configure PKCS12 Keystore -->
<message>
- 'Security: PKCS12: Configuring PKCS12 Keystore'
+ 'Security: PKCS12: Preamble Step 3. Configuring PKCS12 Keystore'
</message>
<call function="'configureSSL'">
@@ -83,18 +76,14 @@
'keystoreType' : '%s' % 'pkcs12' }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Initial Search With SSL -->
- <testcase name="'Security:PKCS12:Initial Search With SSL'">
- <sequence>
+ <!--- Initial Search With SSL -->
<message>
- 'Security: PKCS12: Searching with SSL Connection'
+ 'Security: PKCS12: Preamble Step 4. Searching with SSL Connection'
</message>
<call function="'SearchObject'">
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
index b61195a..e579739 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
@@ -34,11 +34,12 @@
<sequence>
- <!--- Test Case : Delete Branch through SSL port -->
- <testcase name="'Security:PKCS12:DeleteBranchThroughSSLPort'">
+ <!--- Test Case : PKCS12 Teardown -->
+ <!--- Delete Branch through SSL port -->
+ <testcase name="'Security: PKCS12: Postamble Reset'">
<sequence>
<message>
- 'Security: PKCS12: Deleting Branch Through SSL Port'
+ 'Security: PKCS12: Postamble Step 1. Deleting Branch Through SSL Port'
</message>
<call function="'DeleteEntry'">
@@ -50,18 +51,14 @@
'extraParams' : '-Z -X -x' }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Unconfigure PKCS12 Keystore -->
- <testcase name="'Security:PKCS12:UnconfigPKCS12Keystore'">
- <sequence>
+ <!--- Unconfigure PKCS12 Keystore -->
<message>
- 'Security: PKCS12: Unconfiguring PKCS12 Keystore'
+ 'Security: PKCS12: Postamble Step 2. Unconfiguring PKCS12 Keystore'
</message>
<call function="'unconfigureSSL'">
@@ -72,18 +69,14 @@
'keystoreType' : '%s' % 'pkcs12' }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
-
- <!--- Test Case : Remove PKCS12 Keystore -->
- <testcase name="'Security:PKCS12:RemovePKCS12Keystore'">
- <sequence>
+
+ <!--- Remove PKCS12 Keystore -->
<message>
- 'Security: PKCS12: Removing PKCS12 Keystore'
+ 'Security: PKCS12: Postamble Step 3. Removing PKCS12 Keystore'
</message>
<call function="'deletefile'">
@@ -91,18 +84,14 @@
'hostname' : STAF_REMOTE_HOSTNAME }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Search With Unsecure Port -->
- <testcase name="'Security:PKCS12:Search With Unsecure Port'">
- <sequence>
+ <!--- Search With Unsecure Port -->
<message>
- 'Security: PKCS12: Searching with Unsecure Connection'
+ 'Security: PKCS12: Postamble Step 4. Searching with Unsecure Connection'
</message>
<call function="'SearchObject'">
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
index 299d2c9..4002133 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
@@ -35,7 +35,7 @@
<sequence>
<!--- Test Case : Add Entries through StartTLS port -->
- <testcase name="'Security:TLS:AddEntriesThroughStartTLSPort'">
+ <testcase name="'Security: TLS: Add Entries'">
<sequence>
<message>
'Security: TLS: Adding Entries Through StartTLS Port'
@@ -58,7 +58,7 @@
</testcase>
<!--- Test Case : Add Attribute to Entry through StartTLS port -->
- <testcase name="'Security:TLS:AddAttrToEntryThroughStartTLSPort'">
+ <testcase name="'Security: TLS: Add Attr To Entry'">
<sequence>
<message>
'Security: TLS: Adding Attr to Entry Through StartTLS Port'
@@ -81,7 +81,7 @@
</testcase>
<!--- Test Case : Modify Attribute in Entry through StartTLS port -->
- <testcase name="'Security:TLS:ModAttrInEntryThroughStartTLSPort'">
+ <testcase name="'Security: TLS: Modify Attr In Entry'">
<sequence>
<message>
'Security: TLS: Modifying Attr in Entry Through StartTLS Port'
@@ -104,7 +104,7 @@
</testcase>
<!--- Test Case : Delete Entry through StartTLS port -->
- <testcase name="'Security:TLS:DeleteEntryThroughStartTLSPort'">
+ <testcase name="'Security: TLS: Delete Entry'">
<sequence>
<message>
'Security: TLS: Deleting Entry Through StartTLS Port'
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
index 46f5b2e..e5c2512 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
@@ -34,45 +34,38 @@
<sequence>
- <!--- Test Case : Generate Server Cert -->
- <testcase name="'Security:TLS:GenerateServerJKSCert'">
+ <!--- Test Case : startTLS Setup -->
+ <!--- Generate Server Cert -->
+ <testcase name="'Security: TLS: Preamble Setup'">
<sequence>
<message>
- 'Security: TLS: Generating Server Certicate'
+ 'Security: TLS: Preamble Step 1. Generating Server Certicate'
</message>
<call function="'genServerJKSCert'">
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Self-Sign Server Cert -->
- <testcase name="'Security:TLS:SelfSignServerJKSCert'">
- <sequence>
+ <!--- Self-Sign Server Cert -->
<message>
- 'Security: TLS: Self-Signing Server Certicate'
+ 'Security: TLS: Preamble Step 2. Self-Signing Server Certicate'
</message>
<call function="'selfSignServerJKSCert'">
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Configure JKS Keystore -->
- <testcase name="'Security:TLS:ConfigJKSKeystoreStartTLS'">
- <sequence>
+ <!--- Configure JKS Keystore -->
<message>
- 'Security: TLS: Configuring JKS Keystore'
+ 'Security: TLS: Preamble Step 3. Configuring JKS Keystore'
</message>
<call function="'configureTLS'">
@@ -83,18 +76,14 @@
'keystoreType' : '%s' % 'startTLS' }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Initial Search With StartTLS -->
- <testcase name="'Security:TLS:Initial Search With StartTLS'">
- <sequence>
- <message>
- 'Security: TLS: Searching with StartTLS Connection'
+ <!--- Initial Search With StartTLS -->
+ <message>
+ 'Security: TLS: Preamble Step 4. Searching with StartTLS Connection'
</message>
<call function="'SearchObject'">
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
index d5d7271..ec2e3ee 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
@@ -34,11 +34,12 @@
<sequence>
- <!--- Test Case : Delete Branch through StartTLS port -->
- <testcase name="'Security:TLS:DeleteBranchThroughStartTLSPort'">
+ <!--- Test Case : startTLS Teardown -->
+ <!--- Delete Branch through StartTLS port -->
+ <testcase name="'Security: TLS: Postamble Reset'">
<sequence>
<message>
- 'Security: TLS: Deleting Branch Through StartTLS Port'
+ 'Security: TLS: Postamble Step 1. Deleting Branch Through StartTLS Port'
</message>
<call function="'DeleteEntry'">
@@ -50,18 +51,14 @@
'extraParams' : '-q -X -x' }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Unconfigure JKS Keystore -->
- <testcase name="'Security:TLS:UnconfigJKSKeystoreStartTLS'">
- <sequence>
+ <!--- Unconfigure JKS Keystore -->
<message>
- 'Security: TLS: Unconfiguring JKS Keystore'
+ 'Security: TLS: Postamble Step 2. Unconfiguring JKS Keystore'
</message>
<call function="'unconfigureTLS'">
@@ -72,18 +69,14 @@
'keystoreType' : '%s' % 'startTLS' }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
- <!--- Test Case : Remove JKS Keystore -->
- <testcase name="'Security:TLS:RemoveJKSKeystore'">
- <sequence>
+ <!--- Remove JKS Keystore -->
<message>
- 'Security: TLS: Removing JKS Keystore'
+ 'Security: TLS: Postamble Step 3. Removing JKS Keystore'
</message>
<call function="'deletefile'">
@@ -91,18 +84,14 @@
'hostname' : STAF_REMOTE_HOSTNAME }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search With Unsecure Port -->
- <testcase name="'Security:TLS:Search With Unsecure Port'">
- <sequence>
+
+ <!--- Search With Unsecure Port -->
<message>
- 'Security: TLS: Searching with Unsecure Connection'
+ 'Security: TLS: Postamble Step 4. Searching with Unsecure Connection'
</message>
<call function="'SearchObject'">
--
Gitblit v1.10.0