From 0da8b0049c5690c0dfa7ff8af88d66a942c4e1c1 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Mon, 25 Sep 2006 16:18:02 +0000
Subject: [PATCH] More comment blocks for parsing test specs.

---
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java |  152 ++++++++++++
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java     |   70 +++++
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java                   |   92 +++++++
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java        |   52 ++++
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java               |   85 +++++++
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java                   |   70 +++++
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java      |  156 +++++++++++++
 7 files changed, 671 insertions(+), 6 deletions(-)

diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java
index df98abe..4e56cdc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java
@@ -31,12 +31,35 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend RFC2251 Searches
+    #@TestSuitePurpose          Test the RFC2251 standards regarding searches
+    #@TestSuiteID               RFC2251 Searches
+    #@TestSuiteGroup            RFC2251 Searches
+    #@TestGroup                 RFC2251 Searches
+    #@TestScript                FrontendRFC2251_searches.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend functional tests for searches.
  */
 @Test
 public class FrontendRFC2251_searches extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 1
+    #@TestID                    FrontendUserSearch1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and attribute, uid, with value, scarter.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for one existing entry.
  *
@@ -66,6 +89,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 2
+    #@TestID                    FrontendUserSearch2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and requesting scope as "base."
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for one existing entry with the scope, "base".
  *
@@ -95,6 +131,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 3
+    #@TestID                    FrontendUserSearch3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and requesting scope as "sub," and attribute, uid, with
+				value, scarter.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for one existing entry with the scope, "sub".
  *
@@ -124,6 +174,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 4
+    #@TestID                    FrontendUserSearch4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and attribute, uid, with value, scarter, and with
+				parameter, -A.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for one existing entry and request only attribute names be returned.
  *
@@ -153,6 +217,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 5
+    #@TestID                    FrontendUserSearch5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and a filter with an ampersand.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that includes an ampersand.
  *
@@ -182,6 +259,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 6
+    #@TestID                    FrontendUserSearch6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and a filter with an ampersand that is false for all entries.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that includes an ampersand, 
  *  but the filter is false for all entries.
@@ -212,6 +302,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 7
+    #@TestID                    FrontendUserSearch7
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and a filter with a pipe.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that includes a pipe character.
  *
@@ -241,6 +344,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 8
+    #@TestID                    FrontendUserSearch8
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and a filter with a pipe that is false for all entries.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that includes a pipe character,
  *  but one of the two statements is false for all entries.
@@ -271,6 +387,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 9
+    #@TestID                    FrontendUserSearch9
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and a filter with a pipe and an exclamation mark.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that includes a pipe character
  *  an exclamation mark.
@@ -301,6 +430,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 10
+    #@TestID                    FrontendUserSearch10
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and a filter, uid=sc*r.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that contains an asterisk.
  *
@@ -330,6 +472,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Searches
+    #@TestName                  Frontend User Search 11
+    #@TestID                    FrontendUserSearch11
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,o=frontend tests, dc=example,dc=com
+				and a filter that contains the attribute, roomnumber,
+				and the less-than sign.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that contains a less-than character.
  *
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java
index 7b68c75..c359a61 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java
@@ -31,12 +31,36 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend RFC2252 Standards
+    #@TestSuitePurpose          Test the RFC2252 standards regarding standards
+    #@TestSuiteID               RFC2252 Standards
+    #@TestSuiteGroup            RFC2252 Standards
+    #@TestGroup                 RFC2252 Standards
+    #@TestScript                FrontendRFC2252_standards.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend functional tests for standards.
  */
 @Test
 public class FrontendRFC2252_standards extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2252 Standards
+    #@TestName                  Frontend User Standard 1
+    #@TestID                    FrontendUserStandard1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=jreuter,ou=People,o=frontend tests, 
+				dc=example,dc=com and attribute, createTimeStamp,
+				with value, 2006.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPCompare.mainCompare(), returns 0
+*/
 /**
  *  Verify the existence of the attribute, createTimestamp, 
  *  for an existing entry.
@@ -67,6 +91,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2252 Standards
+    #@TestName                  Frontend User Standard 2
+    #@TestID                    FrontendUserStandard2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=jreuter,ou=People,o=frontend tests, 
+				dc=example,dc=com and attribute, creatorsName,
+				with value, cn=Directory Manager,cn=Root DNs,cn=config.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPCompare.mainCompare(), returns 0
+*/
 /**
  *  Verify the existence of the attribute, creatorsName, 
  *  for an existing entry.
@@ -97,6 +135,22 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2252 Standards
+    #@TestName                  Frontend User Standard 3
+    #@TestID                    FrontendUserStandard3
+    #@TestPreamble
+    #@TestSteps                 Client calls LDAPModify.mainModify() with the
+				appropriate ldif file.
+				Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=jreuter,ou=People,o=frontend tests, 
+				dc=example,dc=com and attribute, modifyTimeStamp,
+				with value, 2006.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPCompare.mainCompare(), returns 0
+*/
 /**
  *  Verify the existence of the attribute, modifyTimestamp, 
  *  for an existing entry.
@@ -137,6 +191,22 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2252 Standards
+    #@TestName                  Frontend User Standard 4
+    #@TestID                    FrontendUserStandard4
+    #@TestPreamble
+    #@TestSteps                 Client calls LDAPModify.mainModify() with the
+				appropriate ldif file.
+				Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=jreuter,ou=People,o=frontend tests, 
+				dc=example,dc=com and attribute, modifiersName,
+				with value, cn=Directory Manager,cn=Root DNs,cn=config.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPCompare.mainCompare(), returns 0
+*/
 /**
  *  Verify the existence of the attribute, modifiersName, 
  *  for an existing entry.
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java
index 27fe58e..c563530 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java
@@ -31,12 +31,36 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend RFC2252 Syntax
+    #@TestSuitePurpose          Test the RFC2252 standards regarding syntax
+    #@TestSuiteID               RFC2252 Syntax
+    #@TestSuiteGroup            RFC2252 Syntax
+    #@TestGroup                 RFC2252 Syntax
+    #@TestScript                FrontendRFC2252_syntax.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend functional tests for syntax.
  */
 @Test
 public class FrontendRFC2252_syntax extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2252 Syntax
+    #@TestName                  Frontend User Syntax 1
+    #@TestID                    FrontendUserSyntax1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder,ou=People,ou=syntax,o=frontend tests,
+                                dc=example,dc=com and a filter with the hexadecimal
+				number, 27.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that contains a single quote
  *  character as the hexadecimal value, 27.
@@ -67,6 +91,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2252 Syntax
+    #@TestName                  Frontend User Syntax 2
+    #@TestID                    FrontendUserSyntax2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=cnewport,ou=People,ou=syntax,o=frontend tests,
+                                dc=example,dc=com and a filter with the hexadecimal
+				number, 5C.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that contains a single back slash.
  *
@@ -96,6 +134,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2252 Syntax
+    #@TestName                  Frontend User Syntax 3
+    #@TestID                    FrontendUserSyntax3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=elott,ou=People,ou=syntax,o=frontend tests,
+                                dc=example,dc=com and a filter with the hexadecimal
+				number, 23.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries with a filter that contains an oglethorpe
  *  character as the hexadecimal value, 23.
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java
index 221d932..bb2f0a9 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java
@@ -31,12 +31,35 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend RFC2253 Relationships
+    #@TestSuitePurpose          Test the RFC2253 standards regarding realtionships
+    #@TestSuiteID               RFC2253 Relationships
+    #@TestSuiteGroup            RFC2253 Relationships
+    #@TestGroup                 RFC2253 Relationships
+    #@TestScript                FrontendRFC2253_relationships.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend functional tests for relationships in DNs.
  */
 @Test
 public class FrontendRFC2253_relationships extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 1
+    #@TestID                    FrontendUserRelationship1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder;ou=People;o=frontend tests,
+                                dc=example,dc=com and filter, objectclass=*. 
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries that have a base DN that contains semicolons.
  *
@@ -66,6 +89,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 2
+    #@TestID                    FrontendUserRelationship2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder,ou=People,o=frontend tests,
+                                dc=example,dc=com, with extra spaces and filter, objectclass=*. 
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries that have a base DN that contains extra spaces.
  *
@@ -95,6 +131,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 3
+    #@TestID                    FrontendUserRelationship3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder,ou=People,o=frontend tests,
+                                dc=example,dc=com, with quote marks and filter, objectclass=*.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries that have a base DN that contains quote marks.
  *
@@ -124,6 +173,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 4
+    #@TestID                    FrontendUserRelationship4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder, and Sons,ou=People,o=frontend tests,
+                                dc=example,dc=com, with quote marks  and filter, objectclass=*.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries that have a base DN that contains quote marks
  *  and a comma.
@@ -154,8 +216,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 5
+    #@TestID                    FrontendUserRelationship5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder=superguy,ou=People,o=frontend tests,
+                                dc=example,dc=com, with quote marks  and filter, objectclass=*.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
- *  Search for entries that have a base DN that contains an equal sign.
+ *  Search for entries that have a base DN where the lowest level contains an equal sign.
  *
  *  @param  hostname               The hostname for the server where OpenDS
  *                                 is installed.
@@ -183,8 +258,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 6
+    #@TestID                    FrontendUserRelationship6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder+football=superguy,ou=People,o=frontend tests,
+                                dc=example,dc=com, with quote marks  and filter, objectclass=*.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
- *  Search for entries that have a base DN that contains an equal sign 
+ *  Search for entries that have a base DN where the lowest level contains an equal sign 
  *  and a plus sign.
  *
  *  @param  hostname               The hostname for the server where OpenDS
@@ -213,9 +301,22 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 7
+    #@TestID                    FrontendUserRelationship7
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder>Sons,ou=People,o=frontend tests,
+                                dc=example,dc=com, with quote marks and filter, objectclass=*.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
- *  Search for entries that have a base DN that contains an equal sign 
- *  and a greater-than sign.
+ *  Search for entries that have a base DN where the lowest level contains 
+ *  a greater-than sign.
  *
  *  @param  hostname               The hostname for the server where OpenDS
  *                                 is installed.
@@ -243,6 +344,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 8
+    #@TestID                    FrontendUserRelationship8
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder[less-than-sign]Boss,ou=People,o=frontend tests,
+                                dc=example,dc=com, with quote marks and filter, objectclass=*.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
  *  Search for entries that have a base DN that contains an equal sign 
  *  and a less-than sign.
@@ -273,8 +387,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 9
+    #@TestID                    FrontendUserRelationship9
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder#Sons,ou=People,o=frontend tests,
+                                dc=example,dc=com, with quote marks and filter, objectclass=*.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
- *  Search for entries that have a base DN that contains an oglethorpe.
+ *  Search for entries that have a base DN where the lowest level contains an oglethorpe.
  *
  *  @param  hostname               The hostname for the server where OpenDS
  *                                 is installed.
@@ -302,8 +429,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2253 Relationships
+    #@TestName                  Frontend User Relationship 10
+    #@TestID                    FrontendUserRelationship10
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, uid=jvedder;Sons,ou=People,o=frontend tests,
+                                dc=example,dc=com, with quote marks and filter, objectclass=*.
+    #@TestPostamble
+    #@TestResult                Success if the static method, LDAPSearch.mainSearch(), returns 0
+*/
 /**
- *  Search for entries that have a base DN that contains a semicolon.
+ *  Search for entries that have a base DN where the lowest level contains a semicolon.
  *
  *  @param  hostname               The hostname for the server where OpenDS
  *                                 is installed.
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java
index 04c941b..f14a129 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java
@@ -30,12 +30,34 @@
 import org.testng.annotations.*;
 import org.opends.server.tools.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Security Bob Tests
+    #@TestSuitePurpose          Perform Bob tests through secure port 636
+    #@TestSuiteID               Security Bob Tests
+    #@TestSuiteGroup            Security Bob Tests
+    #@TestGroup                 Security Bob Tests
+    #@TestScript                JKSBobTests.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the SSL JKS bob tests.
  */
 @Test
 public class JKSBobTests extends JKSTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Bob Tests
+    #@TestName                  JKS Bob Test 1
+    #@TestID                    JKSBobTest1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0 
+*/
 /**
  *  Add the entries by ssl that are needed for all the Security Tests.
  *
@@ -66,6 +88,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Bob Tests
+    #@TestName                  JKS Bob Test 2
+    #@TestID                    JKSBobTest2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0 
+*/
 /**
  *  Add an RDN to an existing entry through an SSL connection.
  *
@@ -96,6 +130,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Bob Tests
+    #@TestName                  JKS Bob Test 3
+    #@TestID                    JKSBobTest3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0 
+*/
 /**
  *  Add a jpeg photo to an existing entry through an SSL connection.
  *
@@ -126,6 +172,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Bob Tests
+    #@TestName                  JKS Bob Test 4
+    #@TestID                    JKSBobTest4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0 
+*/
 /**
  *  Replace a jpeg photo in an existing entry through an SSL connection.
  *
@@ -156,6 +214,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Bob Tests
+    #@TestName                  JKS Bob Test 5
+    #@TestID                    JKSBobTest5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0 
+*/
 /**
  *  Delete an existing entry through an SSL connection.
  *
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java
index 8e86a65..30f2886 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java
@@ -30,12 +30,37 @@
 import org.testng.annotations.*;
 import org.opends.server.tools.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Security Setup
+    #@TestSuitePurpose          Setup methods for the Security test suites
+    #@TestSuiteID               Security Setup
+    #@TestSuiteGroup            Security Setup
+    #@TestGroup                 Security Setup
+    #@TestScript                JKSStartupTests.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the SSL JKS startup.
  */
 @Test
 public class JKSStartupTests extends JKSTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Setup
+    #@TestName                  JKS Setup 1
+    #@TestID                    JKSSetup1
+    #@TestPreamble
+    #@TestSteps                 The script, generate_server_cert.sh in unix
+				systems, and the script, generate_server_cert.bat
+				in Windows systems are called by Runtime.exec().
+				The server certificate is generated and copied 
+				to [opends_home]/config directory.
+    #@TestPostamble
+    #@TestResult                 -
+*/
 /**
  *  Generate the server certificate and copy it to the config subdirectory
  *  in the OpenDS installation.
@@ -105,6 +130,18 @@
     compareExitCode(0, 0);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Setup
+    #@TestName                  JKS Setup 2
+    #@TestID                    JKSSetup2
+    #@TestPreamble
+    #@TestSteps                 Client calls LDAPModify.mainModify() with the
+				filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Modify the entry, cn=Key Manager Provider,cn=SSL,cn=config.
  *
@@ -135,6 +172,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Setup
+    #@TestName                  JKS Setup 3 prep
+    #@TestID                    JKSSetup3prep
+    #@TestPreamble
+    #@TestSteps                 Client calls LDAPModify.mainModify() with the
+				filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Delete the default entry, cn=Trust Manager Provider,cn=SSL,cn=config.
  *
@@ -165,6 +214,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Setup
+    #@TestName                  JKS Setup 3
+    #@TestID                    JKSSetup3
+    #@TestPreamble
+    #@TestSteps                 Client calls LDAPModify.mainModify() with the
+				filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add the new entry, cn=Trust Manager Provider,cn=SSL,cn=config.
  *
@@ -195,6 +256,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Setup
+    #@TestName                  JKS Setup 4
+    #@TestID                    JKSSetup4
+    #@TestPreamble
+    #@TestSteps                 Client calls LDAPModify.mainModify() with the
+				filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add the entry, cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
  *
@@ -225,6 +298,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security Setup
+    #@TestName                  JKS Setup 5
+    #@TestID                    JKSSetup5
+    #@TestPreamble
+    #@TestSteps                 Client calls LDAPSearch.mainSearch() with the
+				port 636 and with -Z and -X extra parameters.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add the entry, cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config.
  *
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java
index 7037364..19c0806 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java
@@ -30,12 +30,34 @@
 import org.testng.annotations.*;
 import org.opends.server.tools.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Security TLS Tests
+    #@TestSuitePurpose          Enable TLS using port 389; perform Bob tests through secure port 389
+    #@TestSuiteID               Security TLS Tests
+    #@TestSuiteGroup            Security TLS Tests
+    #@TestGroup                 Security TLS Tests
+    #@TestScript                JKSTLSTests.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the SSL JKS TLS tests.
  */
 @Test
 public class JKSTLSTests extends JKSTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security TLS Tests
+    #@TestName                  JKS TLS Test 1
+    #@TestID                    JKSTLSTest1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Enable startTLS by modifying the entry, 
  *  cn=LDAP Connection Handler,cn=Connection Handlers,cn=config.
@@ -67,6 +89,17 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security TLS Tests
+    #@TestName                  JKS TLS Test 2
+    #@TestID                    JKSTLSTest2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Search for entries through the startTLS port.
  *
@@ -96,6 +129,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security TLS Tests
+    #@TestName                  JKS TLS Test 3
+    #@TestID                    JKSTLSTest3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add a jpeg photo to an existing entry through a startTLS connection.
  *
@@ -126,6 +171,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security TLS Tests
+    #@TestName                  JKS TLS Test 4
+    #@TestID                    JKSTLSTest4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a jpeg photo in an existing entry through a startTLS connection.
  *
@@ -156,6 +213,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security TLS Tests
+    #@TestName                  JKS TLS Test 5
+    #@TestID                    JKSTLSTest5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Delete an existing entry through a startTLS connection.
  *
@@ -186,6 +255,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security TLS Tests
+    #@TestName                  JKS TLS Test 6
+    #@TestID                    JKSTLSTest6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Disable startTLS by modifying the entry, 
  *  cn=LDAP Connection Handler,cn=Connection Handlers,cn=config.
@@ -217,6 +298,17 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Security TLS Tests
+    #@TestName                  JKS TLS Test 7
+    #@TestID                    JKSTLSTest7
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 1
+*/
 /**
  *  Search for entries through the startTLS port which was disabled in the last test.
  *

--
Gitblit v1.10.0