From 74a5ed96d6a84a2a57695e79b1dc4b7f6e9f7b9e Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Fri, 12 Jan 2007 18:20:16 +0000
Subject: [PATCH] Implement Issue 1049 proposal for testcase name standardization

---
 opends/tests/functional-tests/testcases/core/core_setup.xml            |    8 
 opends/tests/functional-tests/testcases/backends/import-tasks.xml      |  108 ++++----
 opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml |   58 ++--
 opends/tests/functional-tests/testcases/core/core_entry_cache.xml      |   28 +-
 opends/tests/functional-tests/testcases/backends/import.xml            |  112 ++++----
 opends/tests/functional-tests/testcases/core/core_search_timelimit.xml |   58 ++--
 opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml    |  226 ++++++++--------
 opends/tests/functional-tests/shared/xsl/gen-alltests-report.xsl       |    4 
 opends/tests/functional-tests/testcases/runTestJob.xml                 |   19 +
 opends/tests/functional-tests/testcases/schema/schema_setup.xml        |    2 
 opends/tests/functional-tests/testcases/core/core_version_report.xml   |    2 
 opends/tests/functional-tests/testcases/schema/schema.xml              |  135 +++++-----
 opends/tests/functional-tests/testcases/quickstart/quickstart.xml      |    2 
 opends/tests/functional-tests/testcases/core/core_tf_filters.xml       |   16 
 14 files changed, 394 insertions(+), 384 deletions(-)

diff --git a/opends/tests/functional-tests/shared/xsl/gen-alltests-report.xsl b/opends/tests/functional-tests/shared/xsl/gen-alltests-report.xsl
index c41ad9f..1ad290e 100644
--- a/opends/tests/functional-tests/shared/xsl/gen-alltests-report.xsl
+++ b/opends/tests/functional-tests/shared/xsl/gen-alltests-report.xsl
@@ -35,7 +35,7 @@
   
   <!--- Test Report Header Variables -->
   <xsl:variable name="identification"     select="qa/functional-tests/identification"/>
-  <xsl:variable name="testcase"     select="qa/functional-tests/results/testcase"/>
+  <xsl:variable name="testcase"     select="qa/functional-tests/results/testgroup/testsuite/testcase"/>
   <xsl:variable name="total-tests"  select="count($testcase)"/>
   <xsl:variable name="pass-tests"   select="count($testcase[@result='pass'])"/>
   <xsl:variable name="fail-tests"   select="count($testcase[@result='fail'])"/>
@@ -272,7 +272,7 @@
 
       </xsl:element>
 
-    <xsl:for-each select="qa/functional-tests/results/testcase">
+    <xsl:for-each select="$testcase">
 
       <xsl:element name="tr">
         <xsl:attribute name="bgcolor">
diff --git a/opends/tests/functional-tests/testcases/backends/import-tasks.xml b/opends/tests/functional-tests/testcases/backends/import-tasks.xml
index 94c20e2..c9ee809 100644
--- a/opends/tests/functional-tests/testcases/backends/import-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -91,7 +91,7 @@
               #@TestResult
             -->
 
-            <testcase name="'Import Tasks: LDIF Default'">
+            <testcase name="'Backend: Import Tasks: LDIF Default'">
       
               <sequence>
       
@@ -128,7 +128,7 @@
       
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: LDIF Non Default
+              #@TestName            Backend: Import Tasks: LDIF Non Default
               #@TestID              LDIF Non Default
               #@TestPurpose         Verify an import task of a LDIF file using a differrent backend to the default.
               #@TestPreamble
@@ -139,7 +139,7 @@
  
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Include Branch
+              #@TestName            Backend: Import Tasks: Fractional Include Branch
               #@TestID              Fractional Include Branch
               #@TestPurpose         Verify an import task of a LDIF file specifying a branch that should be included in the import.
               #@TestPreamble
@@ -148,7 +148,7 @@
               #@TestResult
             -->
             
-            <testcase name="'Import Tasks: Fractional Include Branch'">
+            <testcase name="'Backend: Import Tasks: Fractional Include Branch'">
       
               <sequence>
       
@@ -186,7 +186,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Include Branches
+              #@TestName            Backend: Import Tasks: Fractional Include Branches
               #@TestID              Fractional Include Branches
               #@TestPurpose         Verify an import task of a LDIF file specifying multiple branches that should be included in the import.
               #@TestPreamble
@@ -195,7 +195,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Fractional Include Branches'">
+            <testcase name="'Backend: Import Tasks: Fractional Include Branches'">
       
               <sequence>
       
@@ -233,7 +233,7 @@
 
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Exclude Branch
+              #@TestName            Backend: Import Tasks: Fractional Exclude Branch
               #@TestID              Fractional Exclude Branch
               #@TestPurpose         Verify an import task of a LDIF file specifying a branch that should be excluded in the import.
               #@TestPreamble
@@ -242,7 +242,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Fractional Exclude Branch'">
+            <testcase name="'Backend: Import Tasks: Fractional Exclude Branch'">
       
               <sequence>
       
@@ -282,7 +282,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Exclude Branches
+              #@TestName            Backend: Import Tasks: Fractional Exclude Branches
               #@TestID              Fractional Exclude Branches
               #@TestPurpose         Verify an import task of a LDIF file specifying multiple branches that should be excluded in the import.
               #@TestPreamble
@@ -291,7 +291,7 @@
               #@TestResult
             -->
 
-            <testcase name="'Import Tasks: Fractional Exclude Branches'">
+            <testcase name="'Backend: Import Tasks: Fractional Exclude Branches'">
       
               <sequence>
       
@@ -333,7 +333,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Branches Mix
+              #@TestName            Backend: Import Tasks: Fractional Branches Mix
               #@TestID              Fractional Branches Mix
               #@TestPurpose         Verify an import task of a LDIF file specifying a mix of include and exclude branches.
               #@TestPreamble
@@ -342,7 +342,7 @@
               #@TestResult
             -->
             
-            <testcase name="'Import Tasks: Fractional Branches Mix'">
+            <testcase name="'Backend: Import Tasks: Fractional Branches Mix'">
       
               <sequence>
       
@@ -383,7 +383,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Include Attribute
+              #@TestName            Backend: Import Tasks: Fractional Include Attribute
               #@TestID              Fractional Include Attribute
               #@TestPurpose         Verify an import task of a LDIF file specifying an attribute that should be included in the import.
               #@TestPreamble
@@ -392,7 +392,7 @@
               #@TestResult
             -->
 
-            <testcase name="'Import Tasks: Fractional Include Attribute'">
+            <testcase name="'Backend: Import Tasks: Fractional Include Attribute'">
       
               <sequence>
       
@@ -429,7 +429,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Include Attributes
+              #@TestName            Backend: Import Tasks: Fractional Include Attributes
               #@TestID              Fractional Include Attributes
               #@TestPurpose         Verify an import task of a LDIF file specifying multiple attributes that should be included in the import.
               #@TestPreamble
@@ -438,7 +438,7 @@
               #@TestResult
             -->
 
-            <testcase name="'Import Tasks: Fractional Include Attributes'">
+            <testcase name="'Backend: Import Tasks: Fractional Include Attributes'">
       
               <sequence>
       
@@ -476,7 +476,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Exclude Attribute
+              #@TestName            Backend: Import Tasks: Fractional Exclude Attribute
               #@TestID              Fractional Exclude Attribute
               #@TestPurpose         Verify an import task of a LDIF file specifying an attribute that should be excluded in the import.
               #@TestPreamble
@@ -485,7 +485,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Fractional Exclude Attribute'">
+            <testcase name="'Backend: Import Tasks: Fractional Exclude Attribute'">
       
               <sequence>
       
@@ -522,7 +522,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Exclude Attributes
+              #@TestName            Backend: Import Tasks: Fractional Exclude Attributes
               #@TestID              Fractional Exclude Attributes
               #@TestPurpose         Verify an import task of a LDIF file specifying multiple attribute that should be excluded in the import.
               #@TestPreamble
@@ -531,7 +531,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Fractional Exclude Attributes'">
+            <testcase name="'Backend: Import Tasks: Fractional Exclude Attributes'">
       
               <sequence>
       
@@ -568,7 +568,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Mix
+              #@TestName            Backend: Import Tasks: Fractional Mix
               #@TestID              Fractional Mix
               #@TestPurpose         Verify an import task of a LDIF file specifying a mix of fractional attributes and branches.
               #@TestPreamble
@@ -577,7 +577,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Fractional Mix'">
+            <testcase name="'Backend: Import Tasks: Fractional Mix'">
       
               <sequence>
       
@@ -619,7 +619,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Filtered Include
+              #@TestName            Backend: Import Tasks: Filtered Include
               #@TestID              Filtered Include
               #@TestPurpose         Verify an import task of a LDIF file specifying a search filter control which entries are included in the import.
               #@TestPreamble
@@ -628,7 +628,7 @@
               #@TestResult
             -->
 
-            <testcase name="'Import Tasks: Filtered Include'">
+            <testcase name="'Backend: Import Tasks: Filtered Include'">
       
               <sequence>
       
@@ -666,7 +666,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Filtered Exclude
+              #@TestName            Backend: Import Tasks: Filtered Exclude
               #@TestID              Filtered Exclude
               #@TestPurpose         Verify an import task of a LDIF file specifying a search filter control which entries are excluded in the import.
               #@TestPreamble
@@ -675,7 +675,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Filtered Exclude'">
+            <testcase name="'Backend: Import Tasks: Filtered Exclude'">
       
               <sequence>
       
@@ -715,7 +715,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Filtered Includes
+              #@TestName            Backend: Import Tasks: Filtered Includes
               #@TestID              Filtered Includes
               #@TestPurpose         Verify an import task of a LDIF file specifying multiple search filters control which entries are included in the import.
               #@TestPreamble
@@ -724,7 +724,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Filtered Includes'">
+            <testcase name="'Backend: Import Tasks: Filtered Includes'">
       
               <sequence>
       
@@ -764,7 +764,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Filtered Excludes
+              #@TestName            Backend: Import Tasks: Filtered Excludes
               #@TestID              Filtered Excludes
               #@TestPurpose         Verify an import task of a LDIF file specifying multiple search filters control which entries are excluded in the import.
               #@TestPreamble
@@ -773,7 +773,7 @@
               #@TestResult
             -->
      
-            <testcase name="'Import Tasks: Filtered Excludes'">
+            <testcase name="'Backend: Import Tasks: Filtered Excludes'">
       
               <sequence>
       
@@ -810,7 +810,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Filtered Includes Complex
+              #@TestName            Backend: Import Tasks: Filtered Includes Complex
               #@TestID              Filtered Includes Complex
               #@TestPurpose         Verify an import task of a LDIF file specifying complex search filters control which entries are included in the import.
               #@TestPreamble
@@ -819,7 +819,7 @@
               #@TestResult
             -->
      
-            <testcase name="'Import Tasks: Filtered Includes Complex'">
+            <testcase name="'Backend: Import Tasks: Filtered Includes Complex'">
       
               <sequence>
       
@@ -857,7 +857,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Filtered Excludes Complex
+              #@TestName            Backend: Import Tasks: Filtered Excludes Complex
               #@TestID              Filtered Excludes Complex
               #@TestPurpose         Verify an import task of a LDIF file specifying complex search filters control which entries are excluded in the import.
               #@TestPreamble
@@ -866,7 +866,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Filtered Excludes Complex'">
+            <testcase name="'Backend: Import Tasks: Filtered Excludes Complex'">
       
               <sequence>
       
@@ -903,7 +903,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Fractional Filtered Mix
+              #@TestName            Backend: Import Tasks: Fractional Filtered Mix
               #@TestID              Fractional Filtered Mix
               #@TestPurpose         Verify an import task of a LDIF file specifying a mix of fractional and filtered.
               #@TestPreamble
@@ -912,7 +912,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Fractional Filtered Mix'">
+            <testcase name="'Backend: Import Tasks: Fractional Filtered Mix'">
       
               <sequence>
       
@@ -951,7 +951,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Append
+              #@TestName            Backend: Import Tasks: Append
               #@TestID              Append
               #@TestPurpose         Verify an import task of a LDIF file specifying that the import process should append to the existing database.
               #@TestPreamble
@@ -960,7 +960,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Append'">
+            <testcase name="'Backend: Import Tasks: Append'">
       
               <sequence>
       
@@ -998,7 +998,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks:Append Replace Existing
+              #@TestName            Backend: Import Tasks:Append Replace Existing
               #@TestID              Append Replace Existing
               #@TestPurpose         Verify an import task of a LDIF file specifying that an existing entry should be replaced when appending to an existing database.
               #@TestPreamble
@@ -1007,7 +1007,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Append Replace Existing'">
+            <testcase name="'Backend: Import Tasks: Append Replace Existing'">
       
               <sequence>
       
@@ -1046,7 +1046,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Compressed
+              #@TestName            Backend: Import Tasks: Compressed
               #@TestID              Compressed
               #@TestPurpose         Verify an import task of a LDIF file specifying the data to import is compressed.
               #@TestPreamble
@@ -1055,7 +1055,7 @@
               #@TestResult
             -->
 
-            <testcase name="'Import Tasks: Compressed'">
+            <testcase name="'Backend: Import Tasks: Compressed'">
       
               <sequence>
       
@@ -1093,7 +1093,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Encrypted
+              #@TestName            Backend: Import Tasks: Encrypted
               #@TestID              Encrypted
               #@TestPurpose         Verify an import task of a LDIF file specifying the data to import is encrypted.
               #@TestPreamble
@@ -1102,7 +1102,7 @@
               #@TestResult
             -->
             
-            <testcase name="'Import Tasks: Encrypted'">
+            <testcase name="'Backend: Import Tasks: Encrypted'">
       
               <sequence>
       
@@ -1146,7 +1146,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Hashed Signed
+              #@TestName            Backend: Import Tasks: Hashed Signed
               #@TestID              Hashed Signed
               #@TestPurpose         Verify an import task of a LDIF file specifying the data to import is hashed/signed.
               #@TestPreamble
@@ -1159,7 +1159,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Rejects File
+              #@TestName            Backend: Import Tasks: Rejects File
               #@TestID              Rejects File
               #@TestPurpose         Verify an import task of a LDIF file specifying the a path to a file into which rejected entries may be written if they are not accepted during the import process, when the rejects file is not overwritten.
               #@TestPreamble
@@ -1168,7 +1168,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Rejects File'">
+            <testcase name="'Backend: Import Tasks: Rejects File'">
       
               <sequence>
       
@@ -1208,7 +1208,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Rejects File Overwrite
+              #@TestName            Backend: Import Tasks: Rejects File Overwrite
               #@TestID              Rejects File Overwrite
               #@TestPurpose         Verify an import task of a LDIF file specifying the a path to a file into which rejected entries may be written if they are not accepted during the import process, when the rejects file is overwritten.
               #@TestPreamble
@@ -1217,7 +1217,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Rejects File'">
+            <testcase name="'Backend: Import Tasks: Rejects File'">
       
               <sequence>
       
@@ -1258,7 +1258,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Skip Schema Validation Accept
+              #@TestName            Backend: Import Tasks: Skip Schema Validation Accept
               #@TestID              Skip Schema Validation Accept
               #@TestPurpose         Verify an import task of a LDIF file containing invalided schema is accepted when skip schema validation is specified
               #@TestPreamble
@@ -1267,7 +1267,7 @@
               #@TestResult
             -->
       
-            <testcase name="'Import Tasks: Skip Schema Validation Accept'">
+            <testcase name="'Backend: Import Tasks: Skip Schema Validation Accept'">
       
               <sequence>
       
@@ -1305,7 +1305,7 @@
             
             <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Skip Schema Validation Reject
+              #@TestName            Backend: Import Tasks: Skip Schema Validation Reject
               #@TestID              Skip Schema Validation Reject
               #@TestPurpose         Verify an import task of a LDIF file containing invalided schema is rejected when skip schema validation is not specified
               #@TestPreamble
@@ -1314,7 +1314,7 @@
               #@TestResult
             -->
             
-            <testcase name="'Import Tasks: Skip Schema Validation Reject'">
+            <testcase name="'Backend: Import Tasks: Skip Schema Validation Reject'">
       
               <sequence>
       
@@ -1352,7 +1352,7 @@
 
              <!--- Test Case information
               #@TestMarker          Backend Import Tasks Tests
-              #@TestName            Import Tasks: Error Codes
+              #@TestName            Backend: Import Tasks: Error Codes
               #@TestID              Error Codes
               #@TestPurpose         Verify an import task fails with an error code.
               #@TestPreamble
diff --git a/opends/tests/functional-tests/testcases/backends/import.xml b/opends/tests/functional-tests/testcases/backends/import.xml
index 455fbd6..e2c36c9 100644
--- a/opends/tests/functional-tests/testcases/backends/import.xml
+++ b/opends/tests/functional-tests/testcases/backends/import.xml
@@ -46,7 +46,7 @@
  
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: LDIF Default
+      #@TestName            Backend: Import: LDIF Default
       #@TestID              LDIF Default
       #@TestPurpose         Verify an import of a LDIF file using the default backend.
       #@TestPreamble
@@ -55,7 +55,7 @@
       #@TestResult
       -->
         
-      <testcase name="'Import: LDIF Default'">
+      <testcase name="'Backend: Import: LDIF Default'">
 
         <sequence>
 
@@ -84,7 +84,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: LDIF Non Default
+      #@TestName            Backend: Import: LDIF Non Default
       #@TestID              LDIF Non Default
       #@TestPurpose         Verify an import of a LDIF file using a differrent backend to the default.
       #@TestPreamble
@@ -94,7 +94,7 @@
       -->
 
 <!--  Not clear how to create a second backend    
-      <testcase name="'Import: LDIF Non Default'">
+      <testcase name="'Backend: Import: LDIF Non Default'">
 
         <sequence>
 
@@ -123,7 +123,7 @@
 
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Include Branch
+      #@TestName            Backend: Import: Fractional Include Branch
       #@TestID              Fractional Include Branch
       #@TestPurpose         Verify an import of a LDIF file specifying a branch that should be included in the import.
       #@TestPreamble
@@ -132,7 +132,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Include Branch'">
+      <testcase name="'Backend: Import: Fractional Include Branch'">
 
         <sequence>
 
@@ -163,7 +163,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Include Branches
+      #@TestName            Backend: Import: Fractional Include Branches
       #@TestID              Fractional Include Branches
       #@TestPurpose         Verify an import of a LDIF file specifying multiple branches that should be included in the import.
       #@TestPreamble
@@ -172,7 +172,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Include Branches'">
+      <testcase name="'Backend: Import: Fractional Include Branches'">
 
         <sequence>
 
@@ -203,7 +203,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Exclude Branch
+      #@TestName            Backend: Import: Fractional Exclude Branch
       #@TestID              Fractional Exclude Branch
       #@TestPurpose         Verify an import of a LDIF file specifying a branch that should be excluded in the import.
       #@TestPreamble
@@ -212,7 +212,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Exclude Branch'">
+      <testcase name="'Backend: Import: Fractional Exclude Branch'">
 
         <sequence>
 
@@ -246,7 +246,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Exclude Branches
+      #@TestName            Backend: Import: Fractional Exclude Branches
       #@TestID              Fractional Exclude Branches
       #@TestPurpose         Verify an import of a LDIF file specifying multiple branches that should be excluded in the import.
       #@TestPreamble
@@ -255,7 +255,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Exclude Branches'">
+      <testcase name="'Backend: Import: Fractional Exclude Branches'">
 
         <sequence>
 
@@ -289,7 +289,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Branches Mix
+      #@TestName            Backend: Import: Fractional Branches Mix
       #@TestID              Fractional Branches Mix
       #@TestPurpose         Verify an import of a LDIF file specifying a mix of include and exclude branches.
       #@TestPreamble
@@ -298,7 +298,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Branches Mix'">
+      <testcase name="'Backend: Import: Fractional Branches Mix'">
 
         <sequence>
 
@@ -332,7 +332,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Include Attribute
+      #@TestName            Backend: Import: Fractional Include Attribute
       #@TestID              Fractional Include Attribute
       #@TestPurpose         Verify an import of a LDIF file specifying an attribute that should be included in the import.
       #@TestPreamble
@@ -341,7 +341,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Include Attribute'">
+      <testcase name="'Backend: Import: Fractional Include Attribute'">
 
         <sequence>
 
@@ -372,7 +372,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Include Attributes
+      #@TestName            Backend: Import: Fractional Include Attributes
       #@TestID              Fractional Include Attributes
       #@TestPurpose         Verify an import of a LDIF file specifying multiple attributes that should be included in the import.
       #@TestPreamble
@@ -381,7 +381,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Include Attributes'">
+      <testcase name="'Backend: Import: Fractional Include Attributes'">
 
         <sequence>
 
@@ -413,7 +413,7 @@
 
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Exclude Attribute
+      #@TestName            Backend: Import: Fractional Exclude Attribute
       #@TestID              Fractional Exclude Attribute
       #@TestPurpose         Verify an import of a LDIF file specifying an attribute that should be excluded in the import.
       #@TestPreamble
@@ -422,7 +422,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Exclude Attribute'">
+      <testcase name="'Backend: Import: Fractional Exclude Attribute'">
 
         <sequence>
 
@@ -453,7 +453,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Exclude Attributes
+      #@TestName            Backend: Import: Fractional Exclude Attributes
       #@TestID              Fractional Exclude Attributes
       #@TestPurpose         Verify an import of a LDIF file specifying multiple attribute that should be excluded in the import.
       #@TestPreamble
@@ -462,7 +462,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Exclude Attributes'">
+      <testcase name="'Backend: Import: Fractional Exclude Attributes'">
 
         <sequence>
 
@@ -493,7 +493,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Mix
+      #@TestName            Backend: Import: Fractional Mix
       #@TestID              Fractional Mix
       #@TestPurpose         Verify an import of a LDIF file specifying a mix of fractional attributes and branches.
       #@TestPreamble
@@ -502,7 +502,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Mix'">
+      <testcase name="'Backend: Import: Fractional Mix'">
 
         <sequence>
 
@@ -536,7 +536,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Filtered Include
+      #@TestName            Backend: Import: Filtered Include
       #@TestID              Filtered Include
       #@TestPurpose         Verify an import of a LDIF file specifying a search filter control which entries are included in the import.
       #@TestPreamble
@@ -545,7 +545,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Filtered Include'">
+      <testcase name="'Backend: Import: Filtered Include'">
 
         <sequence>
 
@@ -577,7 +577,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Filtered Exclude
+      #@TestName            Backend: Import: Filtered Exclude
       #@TestID              Filtered Exclude
       #@TestPurpose         Verify an import of a LDIF file specifying a search filter control which entries are excluded in the import.
       #@TestPreamble
@@ -586,7 +586,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Filtered Exclude'">
+      <testcase name="'Backend: Import: Filtered Exclude'">
 
         <sequence>
 
@@ -620,7 +620,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Filtered Includes
+      #@TestName            Backend: Import: Filtered Includes
       #@TestID              Filtered Includes
       #@TestPurpose         Verify an import of a LDIF file specifying multiple search filters control which entries are included in the import.
       #@TestPreamble
@@ -629,7 +629,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Filtered Includes'">
+      <testcase name="'Backend: Import: Filtered Includes'">
 
         <sequence>
 
@@ -663,7 +663,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Filtered Excludes
+      #@TestName            Backend: Import: Filtered Excludes
       #@TestID              Filtered Excludes
       #@TestPurpose         Verify an import of a LDIF file specifying multiple search filters control which entries are excluded in the import.
       #@TestPreamble
@@ -672,7 +672,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Filtered Excludes'">
+      <testcase name="'Backend: Import: Filtered Excludes'">
 
         <sequence>
 
@@ -703,7 +703,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Filtered Includes Complex
+      #@TestName            Backend: Import: Filtered Includes Complex
       #@TestID              Filtered Includes Complex
       #@TestPurpose         Verify an import of a LDIF file specifying complex search filters control which entries are included in the import.
       #@TestPreamble
@@ -712,7 +712,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Filtered Includes Complex'">
+      <testcase name="'Backend: Import: Filtered Includes Complex'">
 
         <sequence>
 
@@ -744,7 +744,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Filtered Excludes Complex
+      #@TestName            Backend: Import: Filtered Excludes Complex
       #@TestID              Filtered Excludes Complex
       #@TestPurpose         Verify an import of a LDIF file specifying complex search filters control which entries are excluded in the import.
       #@TestPreamble
@@ -753,7 +753,7 @@
       #@TestResult
       -->
       
-      <testcase name="'Import: Filtered Excludes Complex'">
+      <testcase name="'Backend: Import: Filtered Excludes Complex'">
 
         <sequence>
 
@@ -784,7 +784,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Fractional Filtered Mix
+      #@TestName            Backend: Import: Fractional Filtered Mix
       #@TestID              Fractional Filtered Mix
       #@TestPurpose         Verify an import of a LDIF file specifying a mix of fractional and filtered.
       #@TestPreamble
@@ -793,7 +793,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Fractional Filtered Mix'">
+      <testcase name="'Backend: Import: Fractional Filtered Mix'">
 
         <sequence>
 
@@ -824,7 +824,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Append
+      #@TestName            Backend: Import: Append
       #@TestID              Append
       #@TestPurpose         Verify an import of a LDIF file specifying that the import process should append to the existing database.
       #@TestPreamble
@@ -833,7 +833,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Append'">
+      <testcase name="'Backend: Import: Append'">
 
         <sequence>
 
@@ -865,7 +865,7 @@
 
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Append Replace Existing
+      #@TestName            Backend: Import: Append Replace Existing
       #@TestID              Append Replace Existing
       #@TestPurpose         Verify an import of a LDIF file specifying that an existing entry should be replaced when appending to an existing database.
       #@TestPreamble
@@ -874,7 +874,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Append Replace Existing'">
+      <testcase name="'Backend: Import: Append Replace Existing'">
 
         <sequence>
 
@@ -906,7 +906,7 @@
 
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Compressed
+      #@TestName            Backend: Import: Compressed
       #@TestID              Compressed
       #@TestPurpose         Verify an import of a LDIF file specifying the data to import is compressed.
       #@TestPreamble
@@ -915,7 +915,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Compressed'">
+      <testcase name="'Backend: Import: Compressed'">
 
         <sequence>
 
@@ -947,7 +947,7 @@
 
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Encrypted
+      #@TestName            Backend: Import: Encrypted
       #@TestID              Encrypted
       #@TestPurpose         Verify an import of a LDIF file specifying the data to import is encrypted.
       #@TestPreamble
@@ -956,7 +956,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Encrypted'">
+      <testcase name="'Backend: Import: Encrypted'">
 
         <sequence>
 
@@ -994,7 +994,7 @@
 
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Hashed Signed
+      #@TestName            Backend: Import: Hashed Signed
       #@TestID              Hashed Signed
       #@TestPurpose         Verify an import of a LDIF file specifying the data to import is hashed/signed.
       #@TestPreamble
@@ -1007,7 +1007,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Rejects File
+      #@TestName            Backend: Import: Rejects File
       #@TestID              Rejects File
       #@TestPurpose         Verify an import of a LDIF file specifying the a path to a file into which rejected entries may be written if they are not accepted during the import process, when the rejects file is not overwritten.
       #@TestPreamble
@@ -1016,7 +1016,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Rejects File'">
+      <testcase name="'Backend: Import: Rejects File'">
 
         <sequence>
 
@@ -1048,7 +1048,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Rejects File Overwrite
+      #@TestName            Backend: Import: Rejects File Overwrite
       #@TestID              Rejects File Overwrite
       #@TestPurpose         Verify an import of a LDIF file specifying the a path to a file into which rejected entries may be written if they are not accepted during the import process, when the rejects file is overwritten.
       #@TestPreamble
@@ -1057,7 +1057,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Rejects File Overwrite'">
+      <testcase name="'Backend: Import: Rejects File Overwrite'">
 
         <sequence>
 
@@ -1089,7 +1089,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Skip Schema Validation Accept
+      #@TestName            Backend: Import: Skip Schema Validation Accept
       #@TestID              Skip Schema Validation Accept
       #@TestPurpose         Verify an import of a LDIF file containing invalided schema is accepted when skip schema validation is specified
       #@TestPreamble
@@ -1098,7 +1098,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Skip Schema Validation Accept'">
+      <testcase name="'Backend: Import: Skip Schema Validation Accept'">
 
         <sequence>
 
@@ -1130,7 +1130,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Skip Schema Validation Reject
+      #@TestName            Backend: Import: Skip Schema Validation Reject
       #@TestID              skip schema validation reject
       #@TestPurpose         Verify an import of a LDIF file containing invalided schema is rejected when skip schema validation is not specified
       #@TestPreamble
@@ -1139,7 +1139,7 @@
       #@TestResult
       -->
 
-      <testcase name="'Import: Skip Schema Validation Reject'">
+      <testcase name="'Backend: Import: Skip Schema Validation Reject'">
 
         <sequence>
 
@@ -1169,7 +1169,7 @@
       
       <!--- Test Case information
       #@TestMarker          Backend Import Tests
-      #@TestName            Import: Error Codes
+      #@TestName            Backend: Import: Error Codes
       #@TestID              Error Codes
       #@TestPurpose         Verify an import fails with an error code.
       #@TestPreamble
diff --git a/opends/tests/functional-tests/testcases/core/core_entry_cache.xml b/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
index 92178ca..8a24556 100644
--- a/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
+++ b/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -39,8 +39,8 @@
             'noOfMilliSeconds' : 2000 }
         </call>
 
-        <!--- Test Case : Entry Cache 1 -->
-        <testcase name="'Core: Entry Cache 1'">
+        <!--- Test Case : Entry Cache: Default Search -->
+        <testcase name="'Core: Entry Cache: Default Search'">
           <sequence>
             <message>
                'Check the response of OpenDS when an ldap search request is conducted with a single pipe character ("|") for an existing entry'
@@ -64,8 +64,8 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Entry Cache 2 -->
-        <testcase name="'Core: Entry Cache 2'">
+        <!--- Test Case : Entry Cache: Enable Default -->
+        <testcase name="'Core: Entry Cache: Enable Default'">
           <sequence>
             <message>
                'Enable the default entry cache'
@@ -86,8 +86,8 @@
           </sequence>
         </testcase>
         
-                <!--- Test Case : Entry Cache 3 -->
-        <testcase name="'Core: Entry Cache 3'">
+        <!--- Test Case : Entry Cache: Add Attributes -->
+        <testcase name="'Core: Entry Cache: Add Attributes'">
           <sequence>
             <message>
                'Add three attributes to cn=Entry Cache,cn=config'
@@ -108,8 +108,8 @@
           </sequence>
         </testcase>
         
-                       <!--- Test Case : Entry Cache 4 -->
-        <testcase name="'Core: Entry Cache 4'">
+        <!--- Test Case : Entry Cache: Attribute Already Exists -->
+        <testcase name="'Core: Entry Cache: Attribute Already Exists'">
           <sequence>
             <message>
                'Add one attribute that is not allowed under cn=Entry Cache,cn=config'
@@ -129,9 +129,10 @@
                   'expected'   : 65 }
             </call>
           </sequence>
-        </testcase> 
-                               <!--- Test Case : Entry Cache 5 -->
-        <testcase name="'Core: Entry Cache 5'">
+        </testcase>
+         
+        <!--- Test Case : Entry Cache: FIFO Cache-->
+        <testcase name="'Core: Entry Cache: FIFO Cache'">
           <sequence>
             <message>
                'Add second entry cache which is an object of the ds-cfg-fifo-entry-cache class'
@@ -151,8 +152,9 @@
             </call>
           </sequence>
         </testcase>
-                                       <!--- Test Case : Entry Cache 6 -->
-        <testcase name="'Core: Entry Cache 6'">
+        
+        <!--- Test Case : Entry Cache: Search -->
+        <testcase name="'Core: Entry Cache: Cache Search'">
           <sequence>
             <message>
                'Check the response of OpenDS when an ldap search request is conducted'
diff --git a/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
index 5260e16..f3b3a6e 100644
--- a/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -39,8 +39,8 @@
             'noOfMilliSeconds' : 2000 }
         </call>
 
-        <!--- Test Case : Search Size Limit 1 -->
-        <testcase name="'Core: Search Size Limit 1'">
+        <!--- Test Case : Search Size Limit: Size Limit Exceeded -->
+        <testcase name="'Core: Search Size Limit: Size Limit Exceeded'">
           <sequence>
             <message>
                'Core SSzL1: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is exceeed '
@@ -52,7 +52,7 @@
                 'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                 'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                 'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '-z 150' }
                 
             </call>
@@ -65,8 +65,8 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Search Size Limit 2 -->
-        <testcase name="'Core: Search Size Limit 2'">
+        <!--- Test Case : Search Size Limit: Size Limit Not Exceeded -->
+        <testcase name="'Core: Search Size Limit: Size Limit Not Exceeded'">
           <sequence>
             <message>
                'Core SSzL2: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is not exceeed'
@@ -78,7 +78,7 @@
                 'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                 'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                 'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '-z 151' }
                 
             </call>
@@ -90,8 +90,8 @@
           </sequence>
         </testcase>
         
-         <!--- Test Case : Search Size Limit 3 -->
-        <testcase name="'Core: Search Size Limit 3'">
+         <!--- Test Case : Search Size Limit: Server Wide Size Limit 5 -->
+        <testcase name="'Core: Search Size Limit: Server Wide Size Limit 5'">
           <sequence>
             <message>
                'Core SSzL3: Change the server-wide search size limit to 5'
@@ -112,8 +112,8 @@
           </sequence>
         </testcase> 
       
-                <!--- Test Case : Search Size Limit 4 -->
-        <testcase name="'Core: Search Size Limit 4'">
+        <!--- Test Case : Search Size Limit: Server Wide Size Limit Exceeded  -->
+        <testcase name="'Core: Search Size Limit: Server Wide Size Limit Exceeded'">
           <sequence>
             <message>
                'Core SSzL4: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is exceeded'
@@ -123,7 +123,7 @@
               { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                 'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                 'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
@@ -136,8 +136,8 @@
           </sequence>
         </testcase>
         
-                 <!--- Test Case : Search Size Limit 5 -->
-        <testcase name="'Core: Search Size Limit 5'">
+        <!--- Test Case : Search Size Limit: Server Wide Size Limit 1000-->
+        <testcase name="'Core: Search Size Limit: Server Wide Size Limit 1000'">
           <sequence>
             <message>
                'Core SSzL5: Change the server-wide search size limit to 1000'
@@ -158,8 +158,8 @@
           </sequence>
         </testcase>
         
-                <!--- Test Case : Search Size Limit 6 -->
-        <testcase name="'Core: Search Size Limit 6'">
+        <!--- Test Case : Search Size Limit: Server Wide Size Limit Not Exceeded -->
+        <testcase name="'Core: Search Size Limit: Server Wide Size Limit Not Exceeded '">
           <sequence>
             <message>
                'Core SSzL6: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is not exceeded'
@@ -169,7 +169,7 @@
               { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                 'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                 'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
@@ -181,8 +181,8 @@
           </sequence>
         </testcase>
         
-                         <!--- Test Case : Search Size Limit 7 -->
-        <testcase name="'Core: Search Size Limit 7'">
+        <!--- Test Case : Search Size Limit: Directory Manager Size Limit 5 -->
+        <testcase name="'Core: Search Size Limit: Directory Manager Size Limit 5'">
           <sequence>
             <message>
                'Core SSzL7: Change the search size limit for cn=Directory Manager to 5'
@@ -203,8 +203,8 @@
           </sequence>
         </testcase>
         
-                        <!--- Test Case : Search Size Limit 8 -->
-        <testcase name="'Core: Search Size Limit 8'">
+        <!--- Test Case : Search Size Limit: User Specific Size Limit Exceeded -->
+        <testcase name="'Core: Search Size Limit: User Specific Size Limit Exceeded'">
           <sequence>
             <message>
                'Core SSzL8: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search size limit is exceeded'
@@ -216,7 +216,7 @@
                 'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                 'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                 'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
@@ -229,8 +229,8 @@
           </sequence>
         </testcase>
         
-                                <!--- Test Case : Search Size Limit 9 -->
-        <testcase name="'Core: Search Size Limit 9'">
+        <!--- Test Case : Search Size Limit: Size Limit Not Applicable  -->
+        <testcase name="'Core: Search Size Limit: Size Limit Not Applicable'">
           <sequence>
             <message>
                'Core SSzL9: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search is conducted as a bind to a different user'
@@ -240,7 +240,7 @@
               { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                 'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                 'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
@@ -252,8 +252,8 @@
           </sequence>
         </testcase>
         
-                                 <!--- Test Case : Search Size Limit 10 -->
-        <testcase name="'Core: Search Size Limit 10'">
+        <!--- Test Case : Search Size Limit: Modify Directory Manager Limit -1 -->
+        <testcase name="'Core: Search Size Limit: Modify Directory Manager Limit -1'">
           <sequence>
             <message>
                'Core SSzL10: Change the search size limit for cn=Directory Manager to -1'
@@ -274,8 +274,8 @@
           </sequence>
         </testcase>
         
-                                        <!--- Test Case : Search Size Limit 11 -->
-        <testcase name="'Core: Search Size Limit 11'">
+        <!--- Test Case : Search Size Limit: No Size Limit -->
+        <testcase name="'Core: Search Size Limit: No Size Limit'">
           <sequence>
             <message>
                'Core SSzL11: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined as "unlimited" by the user-specific parameter, ds-rlim-size-limit, equal to -1 and the search is against 1150 entries'
@@ -287,7 +287,7 @@
                 'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                 'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                 'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
diff --git a/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml b/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
index 5c4622f..298afb8 100644
--- a/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -39,8 +39,8 @@
             'noOfMilliSeconds' : 2000 }
         </call>
 
-        <!--- Test Case : Search Time Limit 1 -->
-        <testcase name="'Core: Search Time Limit 1'">
+        <!--- Test Case : Search Time Limit: Time Limit Exceeded -->
+        <testcase name="'Core: Search Time Limit: Time Limit Exceeded'">
           <sequence>
             <message>
                'Core STmL1: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is exceeeded'
@@ -52,7 +52,7 @@
                 'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                 'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                 'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '-l 1' }
                 
             </call>
@@ -65,8 +65,8 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Search Time Limit 2 -->
-        <testcase name="'Core: Search Time Limit 2'">
+        <!--- Test Case : Search Time Limit: Time Limit Not Exceeded -->
+        <testcase name="'Core: Search Time Limit: Time Limit Not Exceeded'">
           <sequence>
             <message>
                'Core STmL2: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is not exceeed'
@@ -78,7 +78,7 @@
                 'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                 'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                 'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '-l 100' }
                 
             </call>
@@ -90,8 +90,8 @@
           </sequence>
         </testcase>
         
-         <!--- Test Case : Search Time Limit 3 -->
-        <testcase name="'Core: Search Time Limit 3'">
+         <!--- Test Case : Search Time Limit: Server Wide Time Limit 1 -->
+        <testcase name="'Core: Search Time Limit: Server Wide Time Limit 1'">
           <sequence>
             <message>
                'Core STmL3: Change the server-wide search time limit to 1'
@@ -112,8 +112,8 @@
           </sequence>
         </testcase> 
       
-                <!--- Test Case : Search Time Limit 4 -->
-        <testcase name="'Core: Search Time Limit 4'">
+        <!--- Test Case : Search Time Limit: Server Wide Time Limit Exceeded -->
+        <testcase name="'Core: Search Time Limit: Server Wide Time Limit Exceeded'">
           <sequence>
             <message>
                'Core STmL4: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is exceeded'
@@ -123,7 +123,7 @@
               { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                 'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                 'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
@@ -136,8 +136,8 @@
           </sequence>
         </testcase>
         
-                 <!--- Test Case : Search Time Limit 5 -->
-        <testcase name="'Core: Search Time Limit 5'">
+        <!--- Test Case : Search Time Limit: Server Wide Time Limit 60 -->
+        <testcase name="'Core: Search Time Limit: Server Wide Time Limit 60'">
           <sequence>
             <message>
                'Core STmL5: Change the server-wide search time limit to 60'
@@ -158,8 +158,8 @@
           </sequence>
         </testcase>
         
-                <!--- Test Case : Search Time Limit 6 -->
-        <testcase name="'Core: Search Time Limit 6'">
+        <!--- Test Case : Search Time Limit: Server Wide Time Limit Not Exceeded -->
+        <testcase name="'Core: Search Time Limit: Server Wide Time Limit Not Exceeded'">
           <sequence>
             <message>
                'Core STmL6: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is not exceeded'
@@ -169,7 +169,7 @@
               { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                 'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                 'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
@@ -181,8 +181,8 @@
           </sequence>
         </testcase>
         
-                         <!--- Test Case : Search Time Limit 7 -->
-        <testcase name="'Core: Search Time Limit 7'">
+        <!--- Test Case : Search Time Limit: Directory Manager Time Limit 1 -->
+        <testcase name="'Core: Search Time Limit: Directory Manager Time Limit 1'">
           <sequence>
             <message>
                'Core STmL7: Change the search time limit for cn=Directory Manager to 1'
@@ -203,8 +203,8 @@
           </sequence>
         </testcase>
         
-                        <!--- Test Case : Search Time Limit 8 -->
-        <testcase name="'Core: Search Time Limit 8'">
+        <!--- Test Case : Search Time Limit: User Specific Time Limit Exceeded -->
+        <testcase name="'Core: Search Time Limit: User Specific Time Limit Exceeded'">
           <sequence>
             <message>
                'Core STmL8: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter, ds-rlim-time-limit, and the search time limit is exceeded'
@@ -216,7 +216,7 @@
                 'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                 'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                 'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
@@ -229,8 +229,8 @@
           </sequence>
         </testcase>
         
-                                <!--- Test Case : Search Time Limit 9 -->
-        <testcase name="'Core: Search Time Limit 9'">
+        <!--- Test Case : Search Time Limit: Time Limit Not Applicable -->
+        <testcase name="'Core: Search Time Limit: Time Limit Not Applicable'">
           <sequence>
             <message>
                'Core STmL9: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter, ds-rlim-time-limit, and the search is conducted as a bind to a different user'
@@ -240,7 +240,7 @@
               { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                 'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                 'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
@@ -252,8 +252,8 @@
           </sequence>
         </testcase>
         
-                                 <!--- Test Case : Search Time Limit 10 -->
-        <testcase name="'Core: Search Time Limit 10'">
+        <!--- Test Case : Search Time Limit: Directory Manager Time Limit 60 -->
+        <testcase name="'Core: Search Time Limit: Directory Manager Time Limit 60'">
           <sequence>
             <message>
                'Core STmL10: Change the search time limit for cn=Directory Manager to 60'
@@ -274,8 +274,8 @@
           </sequence>
         </testcase>
         
-                                        <!--- Test Case : Search Time Limit 11 -->
-        <testcase name="'Core: Search Time Limit 11'">
+        <!--- Test Case : Search Time Limit: No Time Limit -->
+        <testcase name="'Core: Search Time Limit: No Time Limit'">
           <sequence>
             <message>
                'Core STmL11: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter ds-rlim-time-limit, equal to 60 and the search is conducted against 1150 entries'
@@ -287,7 +287,7 @@
                 'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                 'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                 'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-		'dsFilter'         : 'objectclass=*' ,
+                'dsFilter'         : 'objectclass=*' ,
                 'extraParams'	   : '' }
                 
             </call>
diff --git a/opends/tests/functional-tests/testcases/core/core_setup.xml b/opends/tests/functional-tests/testcases/core/core_setup.xml
index 1a2e36b..e28848f 100644
--- a/opends/tests/functional-tests/testcases/core/core_setup.xml
+++ b/opends/tests/functional-tests/testcases/core/core_setup.xml
@@ -39,8 +39,8 @@
             'noOfMilliSeconds' : 2000 }
         </call>
 
-          <!--- Test Case : Add required entries -->
-        <testcase name="'Core: Add required entries'">
+        <!--- Test Case : Setup: Add required entries -->
+        <testcase name="'Core: Setup: Add Core Entries'">
           <sequence>
             <message>
                'Add entries that are required for the Core Tests'
@@ -61,8 +61,8 @@
           </sequence>
         </testcase>
         
-           <!--- Test Case : To add 1000 extra entries that are required for some of the Core Tests -->
-        <testcase name="'Core: Add 1000 extra entries'">
+        <!--- Test Case : To add 1000 extra entries that are required for some of the Core Tests -->
+        <testcase name="'Core: Setup: Add 1000 Core Entries'">
           <sequence>
             <message>
                'Add 1000 extra entries that are required for some of the Core Tests'
diff --git a/opends/tests/functional-tests/testcases/core/core_tf_filters.xml b/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
index a1b647d..6174747 100644
--- a/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
+++ b/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
@@ -39,8 +39,8 @@
             'noOfMilliSeconds' : 2000 }
         </call>
 
-        <!--- Test Case : True False Filters 1 -->
-        <testcase name="'Core: True False Filters 1'">
+        <!--- Test Case : True False Filters: And Filter -->
+        <testcase name="'Core: True False Filters: And Filter'">
           <sequence>
             <message>
                'Core TFF1: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character '
@@ -63,8 +63,8 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : True False Filters 2 -->
-        <testcase name="'Core: True False Filters 2'">
+        <!--- Test Case : True False Filters: Or Filter -->
+        <testcase name="'Core: True False Filters: Or Filter'">
           <sequence>
             <message>
                'Core TFF2: Check the response of OpenDS when an ldap search request is conducted with a single pipe character'
@@ -86,8 +86,8 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : True False Filters 3 -->
-        <testcase name="'Core: True False Filters 3'">
+        <!--- Test Case : True False Filters: And Filter Entry Not Exists -->
+        <testcase name="'Core: True False Filters: And Filter Entry Not Exists'">
           <sequence>
             <message>
                'Core TFF3: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character for a non-existent entry'
@@ -110,8 +110,8 @@
            </sequence>
         </testcase>
  
-        <!--- Test Case : True False Filters 4 -->
-        <testcase name="'Core: True False Filters 4'">
+        <!--- Test Case : True False Filters: Or Filter Entry Not Exists -->
+        <testcase name="'Core: True False Filters: Or Filter Entry Not Exists'">
           <sequence>
             <message>
                'Core TFF4: Check the response of OpenDS when an ldap search request is conducted with a single pipe character for a non-existent entry'
diff --git a/opends/tests/functional-tests/testcases/core/core_version_report.xml b/opends/tests/functional-tests/testcases/core/core_version_report.xml
index 21c3e34..227dd1d 100644
--- a/opends/tests/functional-tests/testcases/core/core_version_report.xml
+++ b/opends/tests/functional-tests/testcases/core/core_version_report.xml
@@ -40,7 +40,7 @@
         </call>
 
         <!--- Test Case : Version Report 1 -->
-        <testcase name="'Core: Version Report 1'">
+        <testcase name="'Core: Version Report: Search Version'">
           <sequence>
             <message>
                'Core VR1:  Check the response of OpenDS when an ldap search request is conducted for the current version of OpenDS '
diff --git a/opends/tests/functional-tests/testcases/quickstart/quickstart.xml b/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
index 3dc6c7f..7e47cce 100755
--- a/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -67,7 +67,7 @@
         </call>
 
         <!--- Test Case : Add Quickstart Entries -->
-        <testcase name="'Quickstart:AddQuickstartEntries'">
+        <testcase name="'Quickstart: Add : Quick Start Entries'">
           <sequence>
             <message>
                'Quickstart: Adding quickstart entries'
diff --git a/opends/tests/functional-tests/testcases/runTestJob.xml b/opends/tests/functional-tests/testcases/runTestJob.xml
index f452fd5..4fb7b81 100644
--- a/opends/tests/functional-tests/testcases/runTestJob.xml
+++ b/opends/tests/functional-tests/testcases/runTestJob.xml
@@ -141,7 +141,7 @@
             else:
               errorfh.write('No match element %s.\n' % element)
 
-          if level == 'Stop':
+          elif level == 'Stop':
 
             tcpattern=re.compile("(Testcase): (.*), ElapsedTime: (.*)")
             tcmatch = tcpattern.search(message)
@@ -164,7 +164,7 @@
             else:
               errorfh.write('No match element %s.\n' % element)
 
-          if level == 'Status':
+          elif level == 'Status':
 
             tcpattern=re.compile("(Testcase): (.*), Pass: (.*), Fail: (.*), ElapsedTime: (.*), NumStarts: (.*)")
             tcmatch = tcpattern.search(message)
@@ -189,6 +189,9 @@
 
             else:
               errorfh.write('No match element %s.\n' % element)
+          
+          else:
+            errorfh.write('Bad element %s.\n' % element)
 
         </script>
       </iterate>
@@ -217,6 +220,10 @@
 
           if testDict.has_key(tcname):
 
+            tcnamesplit=tcname.split(":")
+            testgroup=tcnamesplit[0]
+            testsuite=tcnamesplit[1]
+            
             if testDict[tcname].has_key('pass'):
               tcpass=testDict[tcname]['pass']
             else:
@@ -252,7 +259,11 @@
           else:
             tcresult='fail'
 
-          xmlfh.write('      &lt;testcase name="%s" result="%s" start="%s" stop="%s" duration="%s"/&gt;\n' % (tcname,tcresult,tcstart,tcstop,tcduration))
+          xmlfh.write('      &lt;testgroup name="%s"&gt;\n' % testgroup)
+          xmlfh.write('        &lt;testsuite name="%s"&gt;\n' % testsuite)
+          xmlfh.write('          &lt;testcase name="%s" result="%s" start="%s" stop="%s" duration="%s"/&gt;\n' % (tcname,tcresult,tcstart,tcstop,tcduration))
+          xmlfh.write('        &lt;/testsuite&gt;\n')
+          xmlfh.write('      &lt;/testgroup&gt;\n')
       </script> 
  
       <!-- XML Report Post -->
@@ -296,7 +307,7 @@
   
         source = StreamSource(FileInputStream("%s" % xmlfile))
         result = StreamResult(FileOutputStream("%s" % htmlfile))
-  
+        
         transformer.transform(source, result)      
       </script>
 
diff --git a/opends/tests/functional-tests/testcases/schema/schema.xml b/opends/tests/functional-tests/testcases/schema/schema.xml
index 379004e..6fea117 100644
--- a/opends/tests/functional-tests/testcases/schema/schema.xml
+++ b/opends/tests/functional-tests/testcases/schema/schema.xml
@@ -27,81 +27,78 @@
  ! -->
 <stax>
 
-  <defaultcall function="main_schema"/>
+  <defaultcall function="main_schema" />
 
   <function name="main_schema">
 
-      <sequence>
-
-<parallel>
-    <block name="'Block DS Process Active'">
-
-    <!--- Start DS -->
     <sequence>
-      <message>
-         'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
-      </message>
-    
-      <!--- Start DS -->
-      <call function="'startDS'">
-        { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
-      </call>
-    
-      <call function="'checkRC'">
-          { 'returncode' : RC ,
-            'result'     : STAXResult }
-      </call>
-    
+
+      <parallel>
+        <block name="'Block DS Process Active'">
+
+          <!--- Start DS -->
+          <sequence>
+            <message>
+              'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+            </message>
+
+            <!--- Start DS -->
+            <call function="'startDS'">
+              { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
+            </call>
+
+            <call function="'checkRC'">
+              { 'returncode' : RC , 'result' : STAXResult }
+            </call>
+
+          </sequence>
+
+          <!--- End Block DS Process Active -->
+        </block>
+
+        <block name="'Block Clients'">
+
+          <sequence>
+
+            <!--- Check that DS started -->
+            <call function="'isAlive'">
+              { 'noOfLoops' : 5 , 'noOfMilliSeconds' : 2000 }
+            </call>
+
+            <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+              file="'%s/testcases/schema/schema_setup.xml' % (TESTS_DIR)" />
+            <call function="'schema_setup'" />
+
+            <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+              file="'%s/testcases/schema/schema_rfc_tests.xml' % (TESTS_DIR)" />
+            <call function="'schema_rfc_tests'" />
+
+            <!--- Stop DS -->
+            <sequence>
+              <message>
+                'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+              </message>
+
+              <call function="'stopDS'">
+                { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+              </call>
+
+              <call function="'checkRC'">
+                { 'returncode' : RC , 'result' : STAXResult }
+              </call>
+            </sequence>
+
+            <return>RC</return>
+
+          </sequence>
+
+          <!--- End Block Clients -->
+        </block>
+
+      </parallel>
+
     </sequence>
 
-     <!--- End Block DS Process Active -->
-     </block>
-
-     <block name="'Block Clients'">
-
-      <sequence>
-
-        <!--- Check that DS started -->
-        <call function="'isAlive'">
-          { 'noOfLoops'        : 5 ,
-            'noOfMilliSeconds' : 2000 }
-        </call>
-        
-        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
-          file="'%s/testcases/schema/schema_setup.xml' % (TESTS_DIR)"/>
-        <call function="'schema_setup'" />
-        
-      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
-          file="'%s/testcases/schema/schema_rfc_tests.xml' % (TESTS_DIR)"/>
-        <call function="'schema_rfc_tests'" />
-                 
-        <!--- Stop DS -->
-        <sequence>
-          <message>
-             'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
-          </message>
-
-          <call function="'stopDS'">
-            { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
-          </call>
-
-          <call function="'checkRC'">
-              { 'returncode' : RC ,
-                'result'     : STAXResult }
-          </call>
-        </sequence>
-
-        <return>RC</return>
-
-      </sequence>
-
-       <!--- End Block Clients -->
-       </block>
-
-</parallel>
-
-     </sequence>
-
   </function>
 
 </stax>
diff --git a/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml b/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
index e8f68ff..5381ede 100644
--- a/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
+++ b/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
@@ -39,11 +39,11 @@
             'noOfMilliSeconds' : 2000 }
         </call>
        
-        <!--- Test Case : Schema RFC Test 1 -->
-        <testcase name="'Schema: RFC Test 1'">
+        <!--- Test Case : Schema RFC Test 2079 -->
+        <testcase name="'Core: Schema: RFC 2079'">
           <sequence>
             <message>
-               'Schema RFC1: Add an entry that is covered by rfc 2079'
+               'Schema: Add an entry that is covered by rfc 2079'
             </message>
 
             <call function="'addEntry'">
@@ -61,11 +61,11 @@
           </sequence>
         </testcase> 
       
-        <!--- Test Case : Schema RFC Test 2 -->
-        <testcase name="'Schema: RFC Test 2'">
+        <!--- Test Case : Schema RFC Test 2247 -->
+        <testcase name="'Core: Schema: RFC 2247 1'">
           <sequence>
             <message>
-               'Schema RFC2: Add an entry that is covered by rfc 2247'
+               'Schema: Add an entry that is covered by rfc 2247'
             </message>
 
             <call function="'addEntry'">
@@ -83,11 +83,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 3 -->
-        <testcase name="'Schema: RFC Test 3'">
+        <!--- Test Case : Schema RFC Test 2247 -->
+        <testcase name="'Core: Schema: RFC 2247 2'">
           <sequence>
             <message>
-               'Schema RFC3: Add an entry that is covered by rfc 2247'
+               'Schema: Add an entry that is covered by rfc 2247'
             </message>
 
             <call function="'addEntry'">
@@ -105,11 +105,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 4 -->
-        <testcase name="'Schema: RFC Test 4'">
+        <!--- Test Case : Schema RFC Test 2247 -->
+        <testcase name="'Core: Schema: RFC 2247 3'">
           <sequence>
             <message>
-               'Schema RFC4: Add an entry that is covered by rfc 2247'
+               'Schema: Add an entry that is covered by rfc 2247'
             </message>
 
             <call function="'addEntry'">
@@ -128,11 +128,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 5 -->
-        <testcase name="'Schema: RFC Test 5'">
+        <!--- Test Case : Schema RFC 2247 -->
+        <testcase name="'Core: Schema: RFC 2247 4'">
           <sequence>
             <message>
-               'Schema RFC5: Add an entry that is covered by rfc 2247'
+               'Schema: Add an entry that is covered by rfc 2247'
             </message>
 
             <call function="'addEntry'">
@@ -151,11 +151,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 6 -->
-        <testcase name="'Schema: RFC Test 6'">
+        <!--- Test Case : Schema RFC 2247 -->
+        <testcase name="'Core: Schema: RFC 2247 5'">
           <sequence>
             <message>
-               'Schema RFC6: Add an entry that is covered by rfc 2247'
+               'Schema: Add an entry that is covered by rfc 2247'
             </message>
 
             <call function="'addEntry'">
@@ -174,11 +174,11 @@
           </sequence>
         </testcase>   
  
-        <!--- Test Case : Schema RFC Test 7 -->
-        <testcase name="'Schema: RFC Test 7'">
+        <!--- Test Case : Schema RFC Test 2377 -->
+        <testcase name="'Core: Schema: RFC 2377'">
           <sequence>
             <message>
-               'Schema RFC7: Add an entry that is covered by rfc 2377'
+               'Schema: Add an entry that is covered by rfc 2377'
             </message>
 
             <call function="'addEntry'">
@@ -196,11 +196,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 8 -->
-        <testcase name="'Schema: RFC Test 8'">
+        <!--- Test Case : Schema RFC Test 2798 -->
+        <testcase name="'Core: Schema: RFC 2798'">
           <sequence>
             <message>
-               'Schema RFC8: Add an entry that is covered by rfc 2798'
+               'Schema: Add an entry that is covered by rfc 2798'
             </message>
 
             <call function="'addEntry'">
@@ -218,11 +218,11 @@
           </sequence>
         </testcase> 
         
-        <!--- Test Case : Schema RFC Test 9 -->
-        <testcase name="'Schema: RFC Test 9'">
+        <!--- Test Case : Schema RFC 3045 -->
+        <testcase name="'Core: Schema: RFC 3045 1'">
           <sequence>
             <message>
-               'Schema RFC9: Modify an entry that is covered by rfc 3045'
+               'Schema: Modify an entry that is covered by rfc 3045'
             </message>
             
             <call function="'modifyEntry'">
@@ -241,11 +241,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 10 -->
-        <testcase name="'Schema: RFC Test 10'">
+        <!--- Test Case : Schema RFC 3045 -->
+        <testcase name="'Core: Schema: RFC 3045 2'">
           <sequence>
             <message>
-               'Schema RFC10: Modify an entry that is covered by rfc 3045'
+               'Schema: Modify an entry that is covered by rfc 3045'
             </message>
             
             <call function="'modifyEntry'">
@@ -264,11 +264,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 11 -->
-        <testcase name="'Schema: RFC Test 11'">
+        <!--- Test Case : Schema RFC 4403 -->
+        <testcase name="'Core: Schema: RFC 4403 1'">
           <sequence>
             <message>
-               'Schema RFC11: Add an entry that is covered by rfc 4403'
+               'Schema: Add an entry that is covered by rfc 4403'
             </message>
 
             <call function="'addEntry'">
@@ -286,11 +286,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 12 -->
-        <testcase name="'Schema: RFC Test 12'">
+        <!--- Test Case : Schema RFC 4403 -->
+        <testcase name="'Core: Schema: RFC 4403 2'">
           <sequence>
             <message>
-               'Schema RFC12: Add an entry that is covered by rfc 4403'
+               'Schema: Add an entry that is covered by rfc 4403'
             </message>
 
             <call function="'addEntry'">
@@ -308,11 +308,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 13 -->
-        <testcase name="'Schema: RFC Test 13'">
+        <!--- Test Case : Schema RFC Test 4403 -->
+        <testcase name="'Core: Schema: RFC 4403 3'">
           <sequence>
             <message>
-               'Schema RFC13: Add an entry that is covered by rfc 4403'
+               'Schema: Add an entry that is covered by rfc 4403'
             </message>
 
             <call function="'addEntry'">
@@ -331,11 +331,11 @@
           </sequence>
         </testcase>  
  
-        <!--- Test Case : Schema RFC Test 14 -->
-        <testcase name="'Schema: RFC Test 14'">
+        <!--- Test Case : Schema RFC Test 4403 -->
+        <testcase name="'Core: Schema: RFC 4403 4'">
           <sequence>
             <message>
-               'Schema RFC14: Add an entry that is covered by rfc 4403'
+               'Schema: Add an entry that is covered by rfc 4403'
             </message>
 
             <call function="'addEntry'">
@@ -353,11 +353,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 15 -->
-        <testcase name="'Schema: RFC Test 15'">
+        <!--- Test Case : Schema RFC Test 4403 -->
+        <testcase name="'Core: Schema: RFC 4403 5'">
           <sequence>
             <message>
-               'Schema RFC15: Add an entry that is covered by rfc 4403'
+               'Schema: Add an entry that is covered by rfc 4403'
             </message>
 
             <call function="'addEntry'">
@@ -376,11 +376,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 16 -->
-        <testcase name="'Schema: RFC Test 16'">
+        <!--- Test Case : Schema RFC Test 2307 -->
+        <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
           <sequence>
             <message>
-               'Schema RFC16: Add an entry that is covered by draft-howard-rfc2307bis'
+               'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
             </message>
 
             <call function="'addEntry'">
@@ -398,11 +398,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 17 -->
-        <testcase name="'Schema: RFC Test 17'">
+        <!--- Test Case : Schema RFC 2307 -->
+        <testcase name="'Core: Schema: Draft Howard RFC 2307bis 2'">
           <sequence>
             <message>
-               'Schema RFC17: Add an entry that is covered by draft-howard-rfc2307bis'
+               'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
             </message>
 
             <call function="'addEntry'">
@@ -421,11 +421,11 @@
           </sequence>
         </testcase>  
     
-        <!--- Test Case : Schema RFC Test 18 -->
-        <testcase name="'Schema: RFC Test 18'">
+        <!--- Test Case : Schema RFC 2307 -->
+        <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
           <sequence>
             <message>
-               'Schema RFC18: Add an entry that is covered by draft-howard-rfc2307bis'
+               'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
             </message>
 
             <call function="'addEntry'">
@@ -443,11 +443,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 19 -->
-        <testcase name="'Schema: RFC Test 19'">
+        <!--- Test Case : Schema RFC Test 2307 -->
+        <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
           <sequence>
             <message>
-               'Schema RFC19: Add an entry that is covered by draft-howard-rfc2307bis'
+               'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
             </message>
 
             <call function="'addEntry'">
@@ -466,11 +466,11 @@
           </sequence>
         </testcase>  
    
-        <!--- Test Case : Schema RFC Test 20 -->
-        <testcase name="'Schema: RFC Test 20'">
+        <!--- Test Case : Schema RFC draft-furseth-ldap-untypedobject -->
+        <testcase name="'Core: Schema: Draft Furseth LDAP Untypedobject'">
           <sequence>
             <message>
-               'Schema RFC20: Add an entry that is covered by draft-furseth-ldap-untypedobject'
+               'Schema: Add an entry that is covered by draft-furseth-ldap-untypedobject'
             </message>
 
             <call function="'addEntry'">
@@ -488,11 +488,11 @@
           </sequence>
         </testcase> 
        
-        <!--- Test Case : Schema RFC Test 21 -->
-        <testcase name="'Schema: RFC Test 21'">
+        <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
+        <testcase name="'Core: Schema: Draft Good LDAP Changelog 1'">
           <sequence>
             <message>
-               'Schema RFC21: Add an entry that is covered by draft-good-ldap-changelog'
+               'Schema: Add an entry that is covered by draft-good-ldap-changelog'
             </message>
 
             <call function="'addEntry'">
@@ -510,11 +510,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 22 -->
-        <testcase name="'Schema: RFC Test 22'">
+        <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
+        <testcase name="'Core: Schema: Draft Good LDAP Changelog 2'">
           <sequence>
             <message>
-               'Schema RFC22: Add an entry that is covered by draft-good-ldap-changelog'
+               'Schema: Add an entry that is covered by draft-good-ldap-changelog'
             </message>
 
             <call function="'addEntry'">
@@ -532,11 +532,11 @@
           </sequence>
         </testcase>  
     
-        <!--- Test Case : Schema RFC Test 23 -->
-        <testcase name="'Schema: RFC Test 23'">
+        <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
+        <testcase name="'Core: Schema: Draft Good LDAP Changelog 2'">
           <sequence>
             <message>
-               'Schema RFC23: Add an entry that is covered by draft-good-ldap-changelog'
+               'Schema: Add an entry that is covered by draft-good-ldap-changelog'
             </message>
 
             <call function="'addEntry'">
@@ -554,11 +554,11 @@
           </sequence>
         </testcase> 
   
-        <!--- Test Case : Schema RFC Test 24 -->
-        <testcase name="'Schema: RFC Test 24'">
+        <!--- Test Case : Schema RFC Test draft-howard-namedobject -->
+        <testcase name="'Core: Schema: Draft Howard NamedObject 1'">
           <sequence>
             <message>
-               'Schema RFC24: Add an entry that is covered by draft-howard-namedobject'
+               'Schema: Add an entry that is covered by draft-howard-namedobject'
             </message>
 
             <call function="'addEntry'">
@@ -576,11 +576,11 @@
           </sequence>
         </testcase>  
       
-        <!--- Test Case : Schema RFC Test 25 -->
-        <testcase name="'Schema: RFC Test 25'">
+        <!--- Test Case : Schema RFC Test draft-howard-namedobject -->
+        <testcase name="'Core: Schema: Draft Howard NamedObject 2'">
           <sequence>
             <message>
-               'Schema RFC25: Add an entry that is covered by draft-howard-namedobject'
+               'Schema: Add an entry that is covered by draft-howard-namedobject'
             </message>
 
             <call function="'addEntry'">
@@ -598,11 +598,11 @@
           </sequence>
         </testcase>  
     
-        <!--- Test Case : Schema RFC Test 26 -->
-        <testcase name="'Schema: RFC Test 26'">
+        <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
+        <testcase name="'Core: Schema: Draft IETF LDUP Subentry 1'">
           <sequence>
             <message>
-               'Schema RFC26: Add an entry that is covered by draft-ietf-ldup-subentry'
+               'Schema: Add an entry that is covered by draft-ietf-ldup-subentry'
             </message>
 
             <call function="'addEntry'">
@@ -620,11 +620,11 @@
           </sequence>
         </testcase> 
         
-        <!--- Test Case : Schema RFC Test 27 -->
-        <testcase name="'Schema: RFC Test 27'">
+        <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
+        <testcase name="'Core: Schema: Draft IETF LDUP Subentry 2'">
           <sequence>
             <message>
-               'Schema RFC27: Add an entry that is covered by draft-ietf-ldup-subentry'
+               'Schema: Add an entry that is covered by draft-ietf-ldup-subentry'
             </message>
 
             <call function="'addEntry'">
@@ -642,11 +642,11 @@
           </sequence>
         </testcase>
    
-        <!--- Test Case : Schema RFC Test 28 -->
-        <testcase name="'Schema: RFC Test 28'">
+        <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
+        <testcase name="'Core: Schema: Draft IETF LDUP Subentry 3'">
           <sequence>
             <message>
-               'Schema RFC28: Add an entry that is covered by draft-ietf-ldup-subentry'
+               'Schema: Add an entry that is covered by draft-ietf-ldup-subentry'
             </message>
 
             <call function="'addEntry'">
@@ -665,11 +665,11 @@
           </sequence>
         </testcase>  
    
-        <!--- Test Case : Schema RFC Test 29 -->
-        <testcase name="'Schema: RFC Test 29'">
+        <!--- Test Case : Schema Disable Schema Checking -->
+        <testcase name="'Core: Schema: Disable Schema Checking'">
           <sequence>
             <message>
-               'Schema RFC29: Disable schema checking'
+               'Schema: Disable schema checking'
             </message>
             
             <call function="'modifyEntry'">
@@ -687,11 +687,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 30 -->
-        <testcase name="'Schema: RFC Test 30'">
+        <!--- Test Case : Schema: Enable Schema Checking' -->
+        <testcase name="'Core: Schema: Enable Schema Checking'">
           <sequence>
             <message>
-               'Schema RFC30: Enable schema checking'
+               'Schema: Enable Schema Checking'
             </message>
             
             <call function="'modifyEntry'">
@@ -709,11 +709,11 @@
           </sequence>
         </testcase>
                 
-        <!--- Test Case : Schema RFC Test 31 -->
-        <testcase name="'Schema: RFC Test 31'">
+        <!--- Test Case : Schema: Disable Syntax Checking -->
+        <testcase name="'Core: Schema: Disable Syntax Checking'">
           <sequence>
             <message>
-               'Schema RFC31: Disable schema checking'
+               'Schema: Disable syntax checking'
             </message>
             
             <call function="'modifyEntry'">
@@ -731,11 +731,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 32 -->
-        <testcase name="'Schema: RFC Test 32'">
+        <!--- Test Case : Schema: Disable Syntax Checking -->
+        <testcase name="'Core: Schema: Disable Syntax Checking'">
           <sequence>
             <message>
-               'Schema RFC32:  Enable schema checking'
+               'Schema:  Enable syntax checking'
             </message>
             
             <call function="'modifyEntry'">
@@ -753,11 +753,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 33 -->
-        <testcase name="'Schema: RFC Test 33'">
+        <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
+        <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 1'">
           <sequence>
             <message>
-               'Schema RFC33: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
+               'Schema: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
             </message>
 
             <call function="'addEntry'">
@@ -775,11 +775,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 34 -->
-        <testcase name="'Schema: RFC Test 34'">
+        <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
+        <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 2'">
           <sequence>
             <message>
-               'Schema RFC34: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
+               'Schema: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
             </message>
 
             <call function="'addEntry'">
@@ -797,11 +797,11 @@
           </sequence>
         </testcase>
         
-        <!--- Test Case : Schema RFC Test 35 -->
-        <testcase name="'Schema: RFC Test 35'">
+        <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
+        <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 3'">
           <sequence>
             <message>
-               'Schema RFC35: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
+               'Schema: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
             </message>
 
             <call function="'addEntry'">
@@ -820,10 +820,10 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Schema: RFC 2739 Add1 Test 36'">
+        <testcase name="'Core: Schema: RFC 2739'">
           <sequence>
             <message>
-               'Schema RFC36: Add an entry that is covered by rfc 2739'
+               'Schema: Add an entry that is covered by rfc 2739'
             </message>
 
             <call function="'addEntry'">
@@ -860,10 +860,10 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Schema: RFC 2714 Add1 Test 37'">
+        <testcase name="'Core: Schema: RFC 2714 1'">
           <sequence>
             <message>
-               'Schema RFC37: Add an entry that is covered by rfc 2714'
+               'Schema: Add an entry that is covered by rfc 2714'
             </message>
 
             <call function="'addEntry'">
@@ -882,10 +882,10 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Schema: RFC 2714 Add2 Test 38'">
+        <testcase name="'Core: Schema: RFC 2714 2'">
           <sequence>
             <message>
-               'Schema RFC38: Add an entry that is covered by rfc 2714'
+               'Schema: Add an entry that is covered by rfc 2714'
             </message>
 
             <call function="'addEntry'">
@@ -921,10 +921,10 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Schema: RFC 2713 Add1 Test 39'">
+        <testcase name="'Core: Schema: RFC 2713'">
           <sequence>
             <message>
-               'Schema RFC39: Add an entry that is covered by rfc 2713'
+               'Schema: Add an entry that is covered by rfc 2713'
             </message>
 
             <call function="'addEntry'">
diff --git a/opends/tests/functional-tests/testcases/schema/schema_setup.xml b/opends/tests/functional-tests/testcases/schema/schema_setup.xml
index 6b4771f..a8001f7 100644
--- a/opends/tests/functional-tests/testcases/schema/schema_setup.xml
+++ b/opends/tests/functional-tests/testcases/schema/schema_setup.xml
@@ -40,7 +40,7 @@
         </call>
 
           <!--- Test Case : Add required entries -->
-        <testcase name="'Schema: Add required entries'">
+        <testcase name="'Core: Schema: Add required entries'">
           <sequence>
             <message>
                'Add entries that are required for the Schema Tests'

--
Gitblit v1.10.0