From 9838bd11aeab5f9eef13001c29ea62d6e6082d10 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Wed, 31 Jan 2007 15:02:12 +0000
Subject: [PATCH] Adding comments for each test case that will be used with the parsing tool.

---
 opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml                |   77 +++++
 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml          |   51 +++
 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml          |   51 +++
 opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml                 |   22 +
 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml             |   65 ++++
 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml          |   51 +++
 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml              |   51 +++
 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml           |   51 +++
 opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml                    |   30 ++
 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml              |   51 +++
 opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml           |   22 +
 opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml    |   27 +
 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml             |   51 +++
 opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml                      |   67 ++--
 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml            |   65 ++++
 opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml              |   27 ++
 opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml |   20 +
 17 files changed, 730 insertions(+), 49 deletions(-)

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 d0ba919..8d82368 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
@@ -30,34 +30,31 @@
   <defaultcall function="bob_jks"/>
 
   <function name="bob_jks">
-
       <!---
             Place suite-specific test information here.
-            #@TestSuiteName             Security JKS Bob Tests
-            #@TestSuitePurpose          Perform Bob tests through a secure port using jks keystore
-            #@TestSuiteID               Security JKS Bob Tests
+            #@TestSuiteName             JKS Tests
+            #@TestSuitePurpose          Perform ldap operations through a secure port using jks keystore
             #@TestSuiteGroup            Security JKS Bob Tests
-            #@TestGroup                 Security JKS Bob Tests
             #@TestScript                security_bob_jks.xml
-            #@TestHTMLLink
       -->
       <sequence>
 
        <!--- Test Case : Add Entries through SSL port -->
        <!---
             Place test-specific test information here.
-            The tag, TestMarker, be the same as the marker, TestSuiteName.
-            #@TestMarker                Security JKS Bob Tests
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 1
-            #@TestID                    JKSBobTest1
+            #@TestIssue                 413
             #@TestPurpose               Add entries through a secure port.
-            #@TestPreamble
-            #@TestSteps                 Client calls ldapmodify 
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
                                         with the filename to the appropriate file
-                                        to OpenDS through a secure port.
-            #@TestPostamble
+                                        to OpenDS through a secure port. 
+            #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
+
         <testcase name="'Security: JKS: Add Entries'">
           <sequence>
             <message>
@@ -84,15 +81,15 @@
        <!---
             Place test-specific test information here.
             The tag, TestMarker, be the same as the marker, TestSuiteName.
-            #@TestMarker                Security JKS Bob Tests
+            #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 2
-            #@TestID                    JKSBobTest2
+            #@TestIssue                 413
             #@TestPurpose               Add an RDN to an existing entry through a secure port.
-            #@TestPreamble
-            #@TestSteps                 Client calls ldapmodify 
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
                                         with the filename to the appropriate file
                                         to OpenDS through a secure port.
-            #@TestPostamble
+            #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
         <testcase name="'Security: JKS: Modify Entry'">
@@ -121,15 +118,15 @@
        <!---
             Place test-specific test information here.
             The tag, TestMarker, be the same as the marker, TestSuiteName.
-            #@TestMarker                Security JKS Bob Tests
+            #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 3
-            #@TestID                    JKSBobTest3
+            #@TestIssue                 413
             #@TestPurpose               Add a jpeg photo to an existing entry through a secure port.
-            #@TestPreamble
-            #@TestSteps                 Client calls ldapmodify 
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
                                         with the filename to the appropriate file
-                                        to OpenDS through a secure port.
-            #@TestPostamble
+                                        to OpenDS through a secure port. 
+            #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
         <testcase name="'Security: JKS: Add Attr to Entry'">
@@ -158,15 +155,15 @@
        <!---
             Place test-specific test information here.
             The tag, TestMarker, be the same as the marker, TestSuiteName.
-            #@TestMarker                Security JKS Bob Tests
+            #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 4
-            #@TestID                    JKSBobTest4
+            #@TestIssue                 413
             #@TestPurpose               Replace a jpeg photo in an existing entry through a secure port.
-            #@TestPreamble
-            #@TestSteps                 Client calls ldapmodify 
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
                                         with the filename to the appropriate file
-                                        to OpenDS through a secure port.
-            #@TestPostamble
+                                        to OpenDS through a secure port. 
+            #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
         <testcase name="'Security: JKS: Modify Attr in Entry'">
@@ -195,15 +192,15 @@
        <!---
             Place test-specific test information here.
             The tag, TestMarker, be the same as the marker, TestSuiteName.
-            #@TestMarker                Security JKS Bob Tests
+            #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 5
-            #@TestID                    JKSBobTest5
+            #@TestIssue                 413
             #@TestPurpose               Delete an existing entry through a secure port.
-            #@TestPreamble
-            #@TestSteps                 Client calls ldapmodify 
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
                                         with the filename to the appropriate file
                                         to OpenDS through a secure port.
-            #@TestPostamble
+            #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
         <testcase name="'Security: JKS: Delete Entry'">
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 81ba9cf..ab5b21b 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
@@ -30,10 +30,36 @@
   <defaultcall function="setup_jks"/>
 
   <function name="setup_jks">
-
+      <!---
+            Place group-specific test information here.
+            #@TestGroupName             Security
+            #@TestGroupPurpose          To test the security functionality.
+            #@TestSubgroupName          JKS Keystore
+            
+            Place suite-specific test information here.
+            #@TestSuiteName             Setup Tests
+            #@TestSuitePurpose          Configure OpenDS to use JKS keystore and a secure port.
+            #@TestSuiteGroup            Security JKS Setup Tests
+            #@TestScript                security_setup_jks.xml
+      -->
       <sequence>
 
-        <!--- Test Case : JKS Setup -->
+       <!--- Test Case : JKS Setup -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                Setup Tests
+            #@TestName                  JKS Startup Test 
+            #@TestIssue                 413
+            #@TestPurpose               Setup OpenDS for JKS keystore.
+            #@TestPreamble              none
+            #@TestStep                  Generate server certificate.
+            #@TestStep                  Self-sign the server certificate.
+            #@TestStep                  Configure JKS keystore.
+            #@TestStep                  Test search with secure port.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for all operations
+        -->
         <!--- Generate Server Cert -->
         <testcase name="'Security: JKS: Preamble Setup'">
           <sequence>
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 dc6c66d..c7ce7d1 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,8 +34,30 @@
       <sequence>
 
         <!--- Test Case : JKS Teardown -->
+        <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             Teardown Tests
+            #@TestSuitePurpose          Unconfigure JKS keystore and the secure port.
+            #@TestSuiteGroup            Security JKS Teardown Tests
+            #@TestScript                security_teardown_jks.xml
+        -->
         <!--- Delete Branch through SSL port -->
         <testcase name="'Security: JKS: Postamble Reset'">
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                Teardown Tests
+            #@TestName                  JKS Teardown Test 
+            #@TestIssue                 413
+            #@TestPurpose               Unconfigure JKS keystore.
+            #@TestPreamble              none
+            #@TestStep                  Delete entries that were used for the JKS tests.
+            #@TestStep                  Unconfigure JKS keystore.
+            #@TestStep                  Remove JKS keystore.
+            #@TestStep                  Test search with unsecure port.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for all operations
+         -->
           <sequence>
             <message>
                'Security: JKS: Postamble Step 1. Deleting Branch Through SSL Port'
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 ea3c7df..30a30eb 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
@@ -31,8 +31,29 @@
 
   <function name="bob_pkcs12">
 
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             PKCS12 Tests
+            #@TestSuitePurpose          Perform ldap operations through a secure port using pkcs12 keystore
+            #@TestSuiteGroup            Security PKCS12 Bob Tests
+            #@TestScript                security_bob_pkcs12.xml
+      -->
       <sequence>
 
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                PKCS12 Tests
+            #@TestName                  PKCS12 Bob Test 1
+            #@TestIssue                 414
+            #@TestPurpose               Add entries through a secure port.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file
+                                        to OpenDS through a secure port.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: PKCS12: Add Entries'">
           <sequence>
             <message>
@@ -56,6 +77,20 @@
         </testcase>
 
         <!--- Test Case : Modify Entry through SSL port -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                PKCS12 Tests
+            #@TestName                  PKCS12 Bob Test 2
+            #@TestIssue                 414
+            #@TestPurpose               Add an RDN to an existing entry through a secure port.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file
+                                        to OpenDS through a secure port.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: PKCS12: Modify Entry'">
           <sequence>
             <message>
@@ -79,6 +114,20 @@
         </testcase>
 
         <!--- Test Case : Add Attribute to Entry through SSL port -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                PKCS12 Tests
+            #@TestName                  PKCS12 Bob Test 3
+            #@TestIssue                 414
+            #@TestPurpose               Add a jpeg photo to an existing entry through a secure port.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file
+                                        to OpenDS through a secure port.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: PKCS12: Add Attr to Entry'">
           <sequence>
             <message>
@@ -102,6 +151,20 @@
         </testcase>
 
         <!--- Test Case : Modify Attribute in Entry through SSL port -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                PKCS12 Tests
+            #@TestName                  PKCS12 Bob Test 4
+            #@TestIssue                 414
+            #@TestPurpose               Replace a jpeg photo in an existing entry through a secure port.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file
+                                        to OpenDS through a secure port.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: PKCS12: Modify Attr in Entry'">
           <sequence>
             <message>
@@ -125,6 +188,20 @@
         </testcase>
 
         <!--- Test Case : Delete Entry through SSL port -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                PKCS12 Tests
+            #@TestName                  PKCS12 Bob Test 5
+            #@TestIssue                 414
+            #@TestPurpose               Delete an existing entry through a secure port.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file
+                                        to OpenDS through a secure port.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: PKCS12: Delete Entry'">
           <sequence>
             <message>
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 cf5e370..3379046 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
@@ -30,9 +30,36 @@
   <defaultcall function="setup_pkcs12"/>
 
   <function name="setup_pkcs12">
+      <!---
+            Place group-specific test information here.
+            #@TestGroupName             Security
+            #@TestGroupPurpose          To test the security functionality.
+            #@TestSubgroupName          PKCS12 Keystore
+            
+            Place suite-specific test information here.
+            #@TestSuiteName             Setup Tests
+            #@TestSuitePurpose          Configure OpenDS to use PKCS12 keystore and a secure port.
+            #@TestSuiteGroup            Security PKCS12 Setup Tests
+            #@TestScript                security_setup_pkcs12.xml
+     -->
 
       <sequence>
 
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                Setup Tests
+            #@TestName                  PKCS12 Startup Test 
+            #@TestIssue                 414
+            #@TestPurpose               Setup OpenDS for PKCS12 keystore.
+            #@TestPreamble              none
+            #@TestStep                  Generate server certificate.
+            #@TestStep                  Self-sign the server certificate.
+            #@TestStep                  Configure PKCS12 keystore.
+            #@TestStep                  Test search with secure port.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for all operations
+        -->
         <!--- Test Case : PKCS12 Setup -->
         <!--- Generate Server Cert -->
         <testcase name="'Security: PKCS12: Preamble Setup'">
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 b1cd459..5da065f 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
@@ -31,11 +31,33 @@
 
   <function name="teardown_pkcs12">
 
+        <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             Teardown Tests
+            #@TestSuitePurpose          Unconfigure PKCS12 keystore and the secure port.
+            #@TestSuiteGroup            Security PKCS12 Teardown Tests
+            #@TestScript                security_teardown_pkcs12.xml
+       -->
       <sequence>
 
         <!--- Test Case : PKCS12 Teardown -->
         <!--- Delete Branch through SSL port -->
         <testcase name="'Security: PKCS12: Postamble Reset'">
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                Teardown Tests
+            #@TestName                  PKCS12 Teardown Test 
+            #@TestIssue                 414
+            #@TestPurpose               Unconfigure PKCS12 keystore.
+            #@TestPreamble              none
+            #@TestStep                  Delete entries that were used for the JKS tests.
+            #@TestStep                  Unconfigure JKS keystore.
+            #@TestStep                  Remove JKS keystore.
+            #@TestStep                  Test search with unsecure port.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for all operations
+         -->
           <sequence>
             <message>
                'Security: PKCS12: Postamble Step 1. Deleting Branch Through SSL Port'
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
index eadfbd1..f7ece4c 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
@@ -30,10 +30,29 @@
   <defaultcall function="pwd_BASE64"/>
 
   <function name="pwd_BASE64">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             BASE64 Tests
+            #@TestSuitePurpose          Test the BASE64 storage scheme.
+            #@TestSuiteGroup            BASE64 Storage Scheme Tests
+            #@TestScript                security_pwd_BASE64.xml
+      -->
       <sequence>
 
         <!--- Test case: Admin Change To BASE64 Storage Scheme -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                BASE64 Tests
+            #@TestName                  BASE64 Preamble
+            #@TestIssue                 310
+            #@TestPurpose               Change password storage scheme to BASE64.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: Pwd Storage BASE64: Preamble'">
           <sequence>
             <message>
@@ -56,6 +75,23 @@
         </testcase>
 
         <!--- Test Case : User Change Password BASE64 Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                BASE64 Tests
+            #@TestName                  BASE64 Test 1
+            #@TestIssue                 310
+            #@TestPurpose               Test BASE64 password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes a user's password to convert 
+                                        so it is stored as BASE64 scheme. 
+            #@TestStep                  The user binds with the new password.
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks for the required {BASE64} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {BASE64} prefix.
+        -->
         <testcase name="'Security: Pwd Storage BASE64: Pwd Change'">
           <sequence>
             <message>
@@ -120,6 +156,19 @@
 
         <!--- Test case: Admin Reset To SSHA Storage Scheme -->
         <testcase name="'Security: Pwd Storage BASE64: Postamble'">
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                BASE64 Tests
+            #@TestName                  BASE64 Postamble
+            #@TestIssue                 310
+            #@TestPurpose               Reset password storage scheme to the default, SSHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+         -->
           <sequence>
             <message>
                'Security: Pwd Storage BASE64: Postamble - Admin Resetting to SSHA Storage Scheme'
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
index b9b0d39..10e35a9 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
@@ -30,10 +30,29 @@
   <defaultcall function="pwd_CLEAR"/>
 
   <function name="pwd_CLEAR">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             CLEAR Tests
+            #@TestSuitePurpose          Test the Clear storage scheme.
+            #@TestSuiteGroup            CLEAR Storage Scheme Tests
+            #@TestScript                security_pwd_CLEAR.xml
+      -->
       <sequence>
 
         <!--- Test case: Admin Change To CLEAR Storage Scheme -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                CLEAR Tests
+            #@TestName                  CLEAR Preamble
+            #@TestIssue                 309
+            #@TestPurpose               Change password storage scheme to CLEAR.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: Pwd Storage CLEAR: Preamble'">
           <sequence>
             <message>
@@ -56,6 +75,23 @@
         </testcase>
 
         <!--- Test Case : User Change Password CLEAR Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                CLEAR Tests
+            #@TestName                  CLEAR Test 1
+            #@TestIssue                 309
+            #@TestPurpose               Test CLEAR password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes a user's password to convert 
+                                        it is stored as CLEAR scheme. 
+            #@TestStep                  The user binds with the new password.
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks for the required {CLEAR} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {CLEAR} prefix.
+        -->
         <testcase name="'Security: Pwd Storage CLEAR: Pwd Change'">
           <sequence>
             <message>
@@ -119,6 +155,20 @@
         </testcase>
 
         <!--- Test Case : Check Password-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                CLEAR Tests
+            #@TestName                  CLEAR Test 2
+            #@TestIssue                 309
+            #@TestPurpose               Test the actual CLEAR password for the user.
+            #@TestPreamble              none
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks that it is the expected string.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password is the expected string.
+        -->
         <testcase name="'Security: Pwd Storage CLEAR: Check Pwd'">
           <sequence>
             <call function="'SearchObject'">
@@ -144,6 +194,19 @@
         </testcase>
 
         <!--- Test case: Admin Reset To SSHA Storage Scheme -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                CLEAR Tests
+            #@TestName                  CLEAR Postamble
+            #@TestIssue                 309
+            #@TestPurpose               Reset password storage scheme to the default, SSHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+         -->
         <testcase name="'Security: Pwd Storage CLEAR: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
index 6430ca3..5120296 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
@@ -30,10 +30,29 @@
   <defaultcall function="pwd_MD5"/>
 
   <function name="pwd_MD5">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             MD5 Tests
+            #@TestSuitePurpose          Test the MD5 storage scheme.
+            #@TestSuiteGroup            MD5 Storage Scheme Tests
+            #@TestScript                security_pwd_MD5.xml
+      -->
       <sequence>
 
         <!--- Test case: Admin Change To MD5 Storage Scheme -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                MD5 Tests
+            #@TestName                  MD5 Preamble
+            #@TestIssue                 312
+            #@TestPurpose               Change password storage scheme to MD5.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: Pwd Storage MD5: Preamble'">
           <sequence>
             <message>
@@ -56,6 +75,23 @@
         </testcase>
 
         <!--- Test Case : User Change Password MD5 Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                MD5 Tests
+            #@TestName                  MD5 Test 1
+            #@TestIssue                 312
+            #@TestPurpose               Test MD5 password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes a user's password to convert 
+                                        so it is stored as MD5 scheme. 
+            #@TestStep                  The user binds with the new password.
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks for the required {MD5} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {MD5} prefix.
+        -->
         <testcase name="'Security: Pwd Storage MD5: Pwd Change'">
           <sequence>
             <message>
@@ -119,6 +155,19 @@
         </testcase>
 
         <!--- Test case: Admin Reset To SSHA Storage Scheme -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                MD5 Tests
+            #@TestName                  MD5 Postamble
+            #@TestIssue                 312
+            #@TestPurpose               Reset password storage scheme to the default, SSHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+         -->
         <testcase name="'Security: Pwd Storage MD5: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
index e70c615..d68e2d5 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
@@ -30,10 +30,29 @@
   <defaultcall function="pwd_SHA"/>
 
   <function name="pwd_SHA">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SHA Tests
+            #@TestSuitePurpose          Test the SHA storage scheme.
+            #@TestSuiteGroup            SHA Storage Scheme Tests
+            #@TestScript                security_pwd_SHA.xml
+      -->
       <sequence>
 
         <!--- Test case: Admin Change To SHA Storage Scheme -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SHA Tests
+            #@TestName                  SHA Preamble
+            #@TestIssue                 313
+            #@TestPurpose               Change password storage scheme to SHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: Pwd Storage SHA: Preamble'">
           <sequence>
             <message>
@@ -56,6 +75,23 @@
         </testcase>
 
         <!--- Test Case : User Change Password SHA Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SHA Tests
+            #@TestName                  SHA Test 1
+            #@TestIssue                 313
+            #@TestPurpose               Test SHA password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes a user's password to convert 
+                                        so it is stored as SHA scheme. 
+            #@TestStep                  The user binds with the new password.
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks for the required {SHA} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {SHA} prefix.
+        -->
         <testcase name="'Security: Pwd Storage SHA: Pwd Change'">
           <sequence>
             <message>
@@ -119,6 +155,19 @@
         </testcase>
 
         <!--- Test case: Admin Reset To SSHA Storage Scheme -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SHA Tests
+            #@TestName                  SHA Postamble
+            #@TestIssue                 313
+            #@TestPurpose               Reset password storage scheme to the default, SSHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+         -->
         <testcase name="'Security: Pwd Storage SHA: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
index ed502aa..ccc8eb7 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
@@ -30,10 +30,29 @@
   <defaultcall function="pwd_SMD5"/>
 
   <function name="pwd_SMD5">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SMD5 Tests
+            #@TestSuitePurpose          Test the SMD5 storage scheme.
+            #@TestSuiteGroup            SMD5 Storage Scheme Tests
+            #@TestScript                security_pwd_SMD5.xml
+      -->
       <sequence>
 
         <!--- Test case: Admin Change To SMD5 Storage Scheme -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SMD5 Tests
+            #@TestName                  SMD5 Preamble
+            #@TestIssue                 312
+            #@TestPurpose               Change password storage scheme to SMD5.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: Pwd Storage SMD5: Preamble'">
           <sequence>
             <message>
@@ -56,6 +75,23 @@
         </testcase>
 
         <!--- Test Case : User Change Password SMD5 Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SMD5 Tests
+            #@TestName                  SMD5 Test 1
+            #@TestIssue                 312
+            #@TestPurpose               Test SMD5 password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes a user's password to convert 
+                                        so it is stored as SMD5 scheme. 
+            #@TestStep                  The user binds with the new password.
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks for the required {SMD5} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {SMD5} prefix.
+        -->
         <testcase name="'Security: Pwd Storage SMD5: Pwd Change'">
           <sequence>
             <message>
@@ -119,6 +155,19 @@
         </testcase>
 
         <!--- Test case: Admin Reset To SSHA Storage Scheme -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SMD5 Tests
+            #@TestName                  SMD5 Postamble
+            #@TestIssue                 312
+            #@TestPurpose               Reset password storage scheme to the default, SSHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+         -->
         <testcase name="'Security: Pwd Storage SMD5: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index 9aff312..c5f7b58 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -30,10 +30,30 @@
   <defaultcall function="pwd_SSHA"/>
 
   <function name="pwd_SSHA">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SSHA Tests
+            #@TestSuitePurpose          Test the SSHA storage scheme.
+            #@TestSuiteGroup            SSHA Storage Scheme Tests
+            #@TestScript                security_pwd_SSHA.xml
+      -->
       <sequence>
 
         <!--- Admin Check Existence of ds-cfg-default-password-storage-scheme Attr -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA Tests
+            #@TestName                  SSHA Preamble
+            #@TestIssue                 313
+            #@TestPurpose               Check for the default storage scheme. SSHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapcompare 
+                                        with the attribute, ds-cfg-default-password-storage-scheme, 
+                                        and value, SSHA.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: Pwd Storage SSHA: Preamble'">
           <sequence>
             <message>
@@ -57,6 +77,20 @@
         </testcase>
 
         <!--- Test Case : Default SSHA Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA Tests
+            #@TestName                  SSHA Default Test
+            #@TestIssue                 313
+            #@TestPurpose               Test the default, SSHA, password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin retrieves a user's password and 
+                                        checks for the required {SSHA} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {SSHA} prefix.
+        -->
         <testcase name="'Security: Pwd Storage SSHA: Default SSHA Scheme'">
           <sequence>
             <message>
@@ -85,6 +119,23 @@
         </testcase>
 
         <!--- Test Case : User Change Password SSHA Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA Tests
+            #@TestName                  SSHA Test 1
+            #@TestIssue                 313
+            #@TestPurpose               Test SSHA password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes a user's password to convert 
+                                        so it is stored as SSHA scheme. 
+            #@TestStep                  The user binds with the new password.
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks for the required {SSHA} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {SSHA} prefix.
+        -->
         <testcase name="'Security: Pwd Storage SSHA: Pwd Change'">
           <sequence>
             <message>
@@ -148,6 +199,18 @@
         </testcase>
 
         <!--- Test Case : User Change Password SSHA Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA Tests
+            #@TestName                  SSHA Unsupported Scheme Test
+            #@TestIssue                 313
+            #@TestPurpose               Test an unsupported storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes to an unsupported storage scheme.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 53.
+        -->
         <testcase name="'Security: Pwd Storage SSHA: Unsupported Scheme'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
index 0306d11..d528ad0 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
@@ -30,10 +30,29 @@
   <defaultcall function="pwd_SSHA256"/>
 
   <function name="pwd_SSHA256">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SSHA256 Tests
+            #@TestSuitePurpose          Test the SSHA256 storage scheme.
+            #@TestSuiteGroup            SSHA256 Storage Scheme Tests
+            #@TestScript                security_pwd_SSHA256.xml
+      -->
       <sequence>
 
         <!--- Test case: Admin Change To SSHA256 Storage Scheme -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA256 Tests
+            #@TestName                  SSHA256 Preamble
+            #@TestIssue                 314
+            #@TestPurpose               Change password storage scheme to SSHA256.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: Pwd Storage SSHA256: Preamble'">
           <sequence>
             <message>
@@ -56,6 +75,23 @@
         </testcase>
 
         <!--- Test Case : User Change Password SSHA256 Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA256 Tests
+            #@TestName                  SSHA256 Test 1
+            #@TestIssue                 314
+            #@TestPurpose               Test SSHA256 password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes a user's password to convert 
+                                        so it is stored as SSHA256 scheme. 
+            #@TestStep                  The user binds with the new password.
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks for the required {SSHA256} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {SSHA256} prefix.
+        -->
         <testcase name="'Security: Pwd Storage SSHA256: Pwd Change'">
           <sequence>
             <message>
@@ -119,6 +155,19 @@
         </testcase>
 
         <!--- Test case: Admin Reset To SSHA Storage Scheme -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA256 Tests
+            #@TestName                  SSHA256 Postamble
+            #@TestIssue                 314
+            #@TestPurpose               Reset password storage scheme to the default, SSHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+         -->
         <testcase name="'Security: Pwd Storage SSHA256: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
index 20dceb5..b6b8fb7 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
@@ -30,10 +30,29 @@
   <defaultcall function="pwd_SSHA384"/>
 
   <function name="pwd_SSHA384">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SSHA384 Tests
+            #@TestSuitePurpose          Test the SSHA384 storage scheme.
+            #@TestSuiteGroup            SSHA384 Storage Scheme Tests
+            #@TestScript                security_pwd_SSHA384.xml
+      -->
       <sequence>
 
         <!--- Test case: Admin Change To SSHA384 Storage Scheme -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA384 Tests
+            #@TestName                  SSHA384 Preamble
+            #@TestIssue                 314
+            #@TestPurpose               Change password storage scheme to SSHA384.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: Pwd Storage SSHA384: Preamble'">
           <sequence>
             <message>
@@ -56,6 +75,23 @@
         </testcase>
 
         <!--- Test Case : User Change Password SSHA384 Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA384 Tests
+            #@TestName                  SSHA384 Test 1
+            #@TestIssue                 314
+            #@TestPurpose               Test SSHA384 password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes a user's password to convert 
+                                        so it is stored as SSHA384 scheme. 
+            #@TestStep                  The user binds with the new password.
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks for the required {SSHA384} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {SSHA384} prefix.
+        -->
         <testcase name="'Security: Pwd Storage SSHA384: Pwd Change'">
           <sequence>
             <message>
@@ -119,6 +155,19 @@
         </testcase>
 
         <!--- Test case: Admin Reset To SSHA Storage Scheme -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA384 Tests
+            #@TestName                  SSHA384 Postamble
+            #@TestIssue                 314
+            #@TestPurpose               Reset password storage scheme to the default, SSHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+         -->
         <testcase name="'Security: Pwd Storage SSHA384: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
index ea5a7c0..edf6f5c 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
@@ -30,10 +30,29 @@
   <defaultcall function="pwd_SSHA512"/>
 
   <function name="pwd_SSHA512">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SSHA512 Tests
+            #@TestSuitePurpose          Test the SSHA512 storage scheme.
+            #@TestSuiteGroup            SSHA512 Storage Scheme Tests
+            #@TestScript                security_pwd_SSHA512.xml
+      -->
       <sequence>
 
         <!--- Test case: Admin Change To SSHA512 Storage Scheme -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA512 Tests
+            #@TestName                  SSHA512 Preamble
+            #@TestIssue                 314
+            #@TestPurpose               Change password storage scheme to SSHA512.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+        -->
         <testcase name="'Security: Pwd Storage SSHA512: Preamble'">
           <sequence>
             <message>
@@ -56,6 +75,23 @@
         </testcase>
 
         <!--- Test Case : User Change Password SSHA512 Scheme-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA512 Tests
+            #@TestName                  SSHA512 Test 1
+            #@TestIssue                 314
+            #@TestPurpose               Test SSHA512 password storage scheme.
+            #@TestPreamble              none
+            #@TestStep                  Admin changes a user's password to convert 
+                                        so it is stored as SSHA512 scheme. 
+            #@TestStep                  The user binds with the new password.
+            #@TestStep                  Admin retrieves the user's password and 
+                                        checks for the required {SSHA512} prefix.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for the ldap
+                                        operations and the password has the {SSHA512} prefix.
+        -->
         <testcase name="'Security: Pwd Storage SSHA512: Pwd Change'">
           <sequence>
             <message>
@@ -119,6 +155,19 @@
         </testcase>
 
         <!--- Test case: Admin Reset To SSHA Storage Scheme -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SSHA512 Tests
+            #@TestName                  SSHA512 Postamble
+            #@TestIssue                 314
+            #@TestPurpose               Reset password storage scheme to the default, SSHA.
+            #@TestPreamble              none
+            #@TestStep                  Client calls ldapmodify 
+                                        with the filename to the appropriate file.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+         -->
         <testcase name="'Security: Pwd Storage SSHA512: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
index 78def29..2688e6a 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
@@ -30,10 +30,33 @@
   <defaultcall function="setup_pwd_storage"/>
 
   <function name="setup_pwd_storage">
-
+      <!---
+            Place group-specific test information here.
+            #@TestGroupName             Security
+            #@TestGroupPurpose          To test the security functionality.
+            #@TestSubgroupName          Password Storage Schemes
+            
+            Place suite-specific test information here.
+            #@TestSuiteName             Setup Tests
+            #@TestSuitePurpose          Configure OpenDS to test password storage schemes.
+            #@TestSuiteGroup            Security Password Storage Setup Tests
+            #@TestScript                security_setup_pwd_storage.xml
+      -->
       <sequence>
 
-        <!--- Test Case : Add Entries for Password Storage Tests -->
+       <!--- Test Case : Add Entries for Password Storage Tests -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                Setup Tests
+            #@TestName                  Password Storage Startup Test 
+            #@TestIssue                 none
+            #@TestPurpose               Add entries that are needed for the password storage tests.
+            #@TestPreamble              none
+            #@TestStep                  Add entries with ldapmodify.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for all operations
+        -->
         <testcase name="'Security: Pwd Storage: Add Initial Entries'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
index c72d641..385afe1 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
@@ -30,11 +30,29 @@
   <defaultcall function="teardown_pwd_storage"/>
 
   <function name="teardown_pwd_storage">
-
+        <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             Teardown Tests
+            #@TestSuitePurpose          Unconfigure OpenDS after the password storage tests.
+            #@TestSuiteGroup            Security Password Storage Teardown Tests
+            #@TestScript                security_teardown_pwd_storage.xml
+       -->
       <sequence>
 
         <!--- Test Case : Password Policy Teardown -->
         <!--- Delete Branch -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                Teardown Tests
+            #@TestName                  Password Storage Teardown Test 
+            #@TestIssue                 none
+            #@TestPurpose               Remove entries that were needed for the password storage tests.
+            #@TestPreamble              none
+            #@TestStep                  Remove entries with ldapmodify.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for all operations
+         -->
         <testcase name="'Security: Pwd Storage: Postamble Reset'">
           <sequence>
             <message>

--
Gitblit v1.10.0