From af3aee071b04f9159984047dcb13de4f841e26f6 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Fri, 02 Feb 2007 18:29:23 +0000
Subject: [PATCH] Added comments for each test case for the parsing tool that generates test specifications.

---
 opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml      |   24 +++
 opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml   |  107 ++++++++++++++
 opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml   |   19 ++
 opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml |  207 +++++++++++++++++++++++++++++
 opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml       |   48 ++++++
 5 files changed, 397 insertions(+), 8 deletions(-)

diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml b/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
index b3ee3f7..c8a977b 100755
--- a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
+++ b/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
@@ -30,10 +30,28 @@
   <defaultcall function="sasl_anon"/>
 
   <function name="sasl_anon">
-
+    <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SASL ANONYMOUS Tests
+            #@TestSuitePurpose          Test the SASL ANONYMOUS functionality.
+            #@TestSuiteGroup            SASL ANONYMOUS Tests
+            #@TestScript                security_sasl_anon.xml
+      -->
       <sequence>
 
         <!--- Test case: Admin Enable ANONYMOUS SASL Mechanism -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL ANONYMOUS Tests
+            #@TestName                  SASL ANONYMOUS Preamble
+            #@TestIssue                 351
+            #@TestPurpose               Prepare for SASL ANONYMOUS tests.
+            #@TestPreamble              none
+            #@TestStep                  Admin enable SASL ANONYMOUS mechanism.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+          -->
         <testcase name="'Security: SASL ANON: Preamble'">
           <sequence>
             <message>
@@ -56,6 +74,18 @@
         </testcase>
 
         <!--- Test Case : Anonymous Bind Using ANONYMOUS SASL Mechanism-->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL ANONYMOUS Tests
+            #@TestName                  Anonymous bind
+            #@TestIssue                 351
+            #@TestPurpose               Test anonymous bind.
+            #@TestPreamble              none
+            #@TestStep                  Anonymous bind to OpenDS.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+          -->
         <testcase name="'Security: SASL ANON: Anonymous Bind With ANON SASL Mech'">
           <sequence>
             <message>
@@ -77,7 +107,21 @@
           </sequence>
         </testcase>
 
-        <!--- Test case: Admin Enable ANONYMOUS SASL Mechanism -->
+        <!--- Test case: Admin Disable ANONYMOUS SASL Mechanism -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL ANONYMOUS Tests
+            #@TestName                  SASL ANONYMOUS Postamble
+            #@TestIssue                 351
+            #@TestPurpose               Reset configuration.
+            #@TestPreamble              none
+            #@TestStep                  Admin disable SASL ANONYMOUS mechanism.
+            #@TestStep                  Anonymous bind to OpenDS.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+                                        for step 1 and returns 1 for step 2.
+          -->
         <testcase name="'Security: SASL ANON: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml b/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
index c427ced..7f8d37ca 100755
--- a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
+++ b/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
@@ -30,11 +30,31 @@
   <defaultcall function="sasl_cram-md5"/>
 
   <function name="sasl_cram-md5">
-
+    <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SASL CRAM-MD5 Tests
+            #@TestSuitePurpose          Test the SASL CRAM-MD5 functionality.
+            #@TestSuiteGroup            SASL CRAM-MD5 Tests
+            #@TestScript                security_sasl_cram-md5.xml
+      -->
       <sequence>
 
         <!--- Test case: CRAM-MD5 SASL Mechanism -->
-        <testcase name="'Security: SASL CRAM-MD5: Preamble'">
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL CRAM-MD5 Tests
+            #@TestName                  SASL CRAM-MD5 Preamble
+            #@TestIssue                 352
+            #@TestPurpose               Prepare for SASL CRAM-MD5 tests.
+            #@TestPreamble              none
+            #@TestStep                  Admin change password storage scheme to CLEAR.
+            #@TestStep                  User change his password.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 
+                                        for all ldap operations.
+          -->
+          <testcase name="'Security: SASL CRAM-MD5: Preamble'">
           <sequence>
             <message>
                'Security: SASL CRAM-MD5: Preamble Step 1 - Admin Changing Pwd Storage to CLEAR'
@@ -72,7 +92,19 @@
         </testcase>
 
         <!--- Test Case : User Bind With CRAM-MD5 SASL Mechanism-->
-        <testcase name="'Security: SASL CRAM-MD5: User (u:) Binding With CRAM-MD5 SASL Mech'">
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL CRAM-MD5 Tests
+            #@TestName                  uid (u:) Bind
+            #@TestIssue                 352
+            #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=u:[name] format.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+          -->
+          <testcase name="'Security: SASL CRAM-MD5: User (u:) Binding With CRAM-MD5 SASL Mech'">
           <sequence>
             <message>
                'Security: SASL CRAM-MD5: User (u:) Binding With CRAM-MD5 SASL Mechanism'
@@ -94,6 +126,18 @@
         </testcase>
 
         <!--- Test Case : User Bind With CRAM-MD5 SASL Mechanism-->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL CRAM-MD5 Tests
+            #@TestName                  uid (dn:) Bind
+            #@TestIssue                 352
+            #@TestPurpose               Test bind using a DN that has an authorization ID that could be mapped to a single DN.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=dn:[name] format.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+          -->
         <testcase name="'Security: SASL CRAM-MD5: User (dn:) Binding With CRAM-MD5 SASL Mech'">
           <sequence>
             <message>
@@ -116,7 +160,19 @@
         </testcase>
 
         <!--- Test Case : User Bind With CRAM-MD5 SASL Mechanism-->
-        <testcase name="'Security: SASL CRAM-MD5: User With Duplicate uid (u:) Binding'">
+     <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL CRAM-MD5 Tests
+            #@TestName                  Dupe uid (u:) Bind
+            #@TestIssue                 352
+            #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=u:[name] format.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 1.
+        -->
+          <testcase name="'Security: SASL CRAM-MD5: User With Duplicate uid (u:) Binding'">
           <sequence>
             <message>
                'Security: SASL CRAM-MD5: User With Duplicate uid (u:) Binding With CRAM-MD5 SASL Mechanism'
@@ -139,6 +195,18 @@
         </testcase>
 
         <!--- Test Case : User Bind With CRAM-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL CRAM-MD5 Tests
+            #@TestName                  Dupe uid (dn:) Bind
+            #@TestIssue                 352
+            #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to muliple DNs.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=dn:[DN] format.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+        -->
         <testcase name="'Security: SASL CRAM-MD5: User With Duplicate uid (dn:) Binding'">
           <sequence>
             <message>
@@ -161,6 +229,20 @@
         </testcase>
 
         <!--- Test Case : User Bind With CRAM-MD5 SASL Mechanism-->
+     <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL CRAM-MD5 Tests
+            #@TestName                  Dupe uid (u:) Bind 2
+            #@TestIssue                 352
+            #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs. Mutiple DNs are deleted.
+            #@TestPreamble              none
+            #@TestStep                  Admin deletes the entry whose authorization ID matches another DN.
+            #@TestStep                  User bind with authid=u:[name] format.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0
+                                        for all ldap operations.
+        -->
         <testcase name="'Security: SASL CRAM-MD5: User With Duplicate uid (u:) Binding 2'">
           <sequence>
             <message>
@@ -199,6 +281,23 @@
         </testcase>
 
         <!--- Test case: CRAM-MD5 SASL Mechanism -->
+        <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL CRAM-MD5 Tests
+            #@TestName                  SASL CRAM-MD5 Postamble
+            #@TestIssue                 352
+            #@TestPurpose               Reset configuration.
+            #@TestPreamble              none
+            #@TestStep                  Admin change pasword storage scheme to SSHA.
+            #@TestStep                  User change his password.
+            #@TestStep                  User bind with SASL CRAM-MD5.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 
+                                        for all ldap operations except step 3.
+                                        In step 3, the ldap operation should return 1
+                                        because the password is no longer stored as CLEAR.
+          -->
         <testcase name="'Security: SASL CRAM-MD5: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml b/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
index 86509e0..670e4ca 100755
--- a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
+++ b/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
@@ -30,10 +30,30 @@
   <defaultcall function="sasl_digest-md5"/>
 
   <function name="sasl_digest-md5">
-
+      <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SASL DIGEST-MD5 Tests
+            #@TestSuitePurpose          Test the SASL DIGEST-MD5 functionality.
+            #@TestSuiteGroup            SASL DIGEST-MD5 Tests
+            #@TestScript                security_sasl_digest-md5.xml
+      -->
       <sequence>
 
         <!--- Test case: DIGEST-MD5 SASL Mechanism -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  SASL DIGEST-MD5 Preamble
+            #@TestIssue                 345
+            #@TestPurpose               Prepare for SASL DIGEST-MD5 tests.
+            #@TestPreamble              none
+            #@TestStep                  Admin change password storage scheme to CLEAR.
+            #@TestStep                  User change his password.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 
+                                        for all ldap operations.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: Preamble'">
           <sequence>
             <message>
@@ -72,6 +92,18 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  Dupe uid (u:) Bind
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=u:[name] format.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 1.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (u:) Bind'">
           <sequence>
             <message>
@@ -95,6 +127,18 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  uid (u:) Bind
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=u:[name] format.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns o.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind'">
           <sequence>
             <message>
@@ -117,6 +161,18 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  Dupe uid (dn:) Bind
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to muliple DNs.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=dn:[DN] format.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (dn:) Bind'">
           <sequence>
             <message>
@@ -139,6 +195,18 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  uid (dn:) Bind
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to a single DN.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=dn:[DN] format.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind'">
           <sequence>
             <message>
@@ -161,6 +229,18 @@
         </testcase>
 
         <!--- Test case: Admin creating realm -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  Create realm
+            #@TestIssue                 345
+            #@TestPurpose               Admin add realm to SASL DIGEST-MD5 mechanism.
+            #@TestPreamble              none
+            #@TestStep                  ldapmodify used to add a realm.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: Create Realm'">
           <sequence>
             <message>
@@ -183,6 +263,19 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  Dupe uid (u:) Bind With Realm
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs. Realm specified.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=u:[name] format 
+                                        and the realm is specified.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 1.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (u:) Bind With Realm'">
           <sequence>
             <message>
@@ -206,6 +299,19 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  uid (u:) Bind With Realm
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN. Realm specified.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=u:[name] format 
+                                        and the realm is specified.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind With Realm'">
           <sequence>
             <message>
@@ -228,6 +334,19 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  Dupe uid (dn:) Bind With Realm
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to muliple DNs. Realm specified.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=dn:[DN] format 
+                                        and the realm is specified.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (dn:) Bind With Realm'">
           <sequence>
             <message>
@@ -250,6 +369,19 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  uid (dn:) Bind With Realm
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to a single DN. Realm specified.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=dn:[DN] format 
+                                        and the realm is specified.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind With Realm'">
           <sequence>
             <message>
@@ -272,6 +404,19 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  Dupe uid (u:) Bind With Undefined Realm
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs. Undefined realm specified.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=u:[name] format 
+                                        and an undefined realm is specified.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 1.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (u:) Bind With Undefined Realm'">
           <sequence>
             <message>
@@ -295,6 +440,19 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  uid (u:) Bind With Undefined Realm
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN. Undefined realm specified.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=u:[name] format 
+                                        and the realm is specified.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 1.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind With Undefined Realm'">
           <sequence>
             <message>
@@ -318,6 +476,19 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  Dupe uid (dn:) Bind With Undefined Realm
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to muliple DNs. Undefined realm specified.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=dn:[DN] format 
+                                        and the realm is specified.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 1.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (dn:) Bind With Undefined Realm'">
           <sequence>
             <message>
@@ -341,7 +512,20 @@
         </testcase>
 
         <!--- Test Case : User Bind With DIGEST-MD5 SASL Mechanism-->
-        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind With Undeined Realm'">
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  uid (dn:) Bind With Undefined Realm
+            #@TestIssue                 345
+            #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to a single DN. Undefined realm specified.
+            #@TestPreamble              none
+            #@TestStep                  User bind with authid=dn:[DN] format 
+                                        and the realm is specified.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 1.
+        -->
+        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind With Undefined Realm'">
           <sequence>
             <message>
                'Security: SASL DIGEST-MD5: User (dn:) Binding With Undefined Realm'
@@ -364,6 +548,25 @@
         </testcase>
 
         <!--- Test case: DIGEST-MD5 SASL Mechanism -->
+       <!---
+            Place test-specific test information here.
+            The tag, TestMarker, must be the same as the tag, TestSuiteName.
+            #@TestMarker                SASL DIGEST-MD5 Tests
+            #@TestName                  SASL DIGEST-MD5 Postamble
+            #@TestIssue                 345
+            #@TestPurpose               Reset configuration and entries.
+            #@TestPreamble              none
+            #@TestStep                  Admin change password storage scheme to SSHA.
+            #@TestStep                  Admin change user password.
+            #@TestStep                  Admin delete realm from SASL DIGEST-MD5.
+            #@TestStep                  User bind with simple authentication.
+            #@TestStep                  User bind with SASL DIGEST-MD5.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 
+                                        for all ldap operations except step 5.
+                                        In step 5, the ldap operation should return 1
+                                        because the password is no longer stored as CLEAR.
+        -->
         <testcase name="'Security: SASL DIGEST-MD5: Postamble'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml b/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
index 7d7087b..4a535e2 100755
--- a/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
+++ b/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
@@ -30,10 +30,34 @@
   <defaultcall function="setup_sasl"/>
 
   <function name="setup_sasl">
+      <!---
+            Place group-specific test information here.
+            #@TestGroupName             Security
+            #@TestGroupPurpose          To test the security functionality.
+            #@TestSubgroupName          SASL Mechanisms
+            
+            Place suite-specific test information here.
+            #@TestSuiteName             SASL Setup Tests
+            #@TestSuitePurpose          Configure OpenDS to test SASL mechanisms.
+            #@TestSuiteGroup            Security SASL Mechanism Setup Tests
+            #@TestScript                security_setup_sasl.xml
+      -->
 
       <sequence>
 
         <!--- 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                SASL Setup Tests
+            #@TestName                  SASL Mechanism Startup Test 
+            #@TestIssue                 none
+            #@TestPurpose               Add entries that are needed for the SASL mechanism tests.
+            #@TestPreamble              none
+            #@TestStep                  Add entries with ldapmodify.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for all operations
+        -->
         <testcase name="'Security: SASL: Add Initial Entries'">
           <sequence>
             <message>
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml b/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
index 751849a..36c7afd 100755
--- a/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
+++ b/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
@@ -30,11 +30,30 @@
   <defaultcall function="teardown_sasl"/>
 
   <function name="teardown_sasl">
+        <!---
+            Place suite-specific test information here.
+            #@TestSuiteName             SASL Teardown Tests
+            #@TestSuitePurpose          Unconfigure OpenDS after the SASL mechanism tests.
+            #@TestSuiteGroup            Security SASL Mechanism Teardown Tests
+            #@TestScript                security_teardown_sasl.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                SASL Teardown Tests
+            #@TestName                  SASL Mechanism Teardown Test 
+            #@TestIssue                 none
+            #@TestPurpose               Remove entries that were needed for the SASL mechaism tests.
+            #@TestPreamble              none
+            #@TestStep                  Remove entries with ldapmodify.
+            #@TestPostamble             none
+            #@TestResult                Success if OpenDS returns 0 for all operations
+         -->
         <testcase name="'Security: SASL: Postamble Reset'">
           <sequence>
             <message>

--
Gitblit v1.10.0