From 50f8a165bf3b68795f4f8d424286788c1abb2a13 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 13 Mar 2007 09:18:27 +0000
Subject: [PATCH] Issue 1354 use block element for test groups and suites
---
opends/tests/functional-tests/testcases/backends/backendsetup.xml | 108 +++++++++++++++++++++++++++++-------------------------
1 files changed, 58 insertions(+), 50 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/backends/backendsetup.xml b/opends/tests/functional-tests/testcases/backends/backendsetup.xml
index a0f9157..dad13a7 100644
--- a/opends/tests/functional-tests/testcases/backends/backendsetup.xml
+++ b/opends/tests/functional-tests/testcases/backends/backendsetup.xml
@@ -34,60 +34,68 @@
<sequence>
- <script>
- CurrentTestPath['suite']='setup'
- </script>
-
- <call function="'testSuite_Preamble'"/>
-
- <!--- Test Suite information
- #@TestSuiteName Backend Setup
- #@TestSuitePurpose Verify that the basic import functionality is working in the Directory Server.
- #@TestSuiteID Import Tests
- #@TestSuiteGroup Import
- #@TestGroup Backend
- #@TestScript import.xml
- #@TestHTMLLink http://opends.dev.java.net/
- -->
-
- <!--- Test Case information
- #@TestMarker Backend Export, Backup, and Restore Tests
- #@TestName Import: LDIF Default
- #@TestID LDIF Default
- #@TestPurpose Add entries that are required for these Backend Tests.
- #@TestPreamble
- #@TestSteps ./import-ldif.sh -l data/backends/backend_start.ldif -n "userRoot"
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Backend Setup'">
-
+ <block name="'setup'">
+
<sequence>
-
- <call function="'testCase_Preamble'"/>
+
+ <script>
+ CurrentTestPath['suite']=STAXCurrentBlock
+ </script>
- <message>
- 'Backend: Backend Setup for Export, Backup, and Restore Tests'
- </message>
- <call function="'importLdif'">
- { 'ldifFile' : '%s/backends/backend_start.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
+ <call function="'testSuite_Preamble'"/>
+
+ <!--- Test Suite information
+ #@TestSuiteName Backend Setup
+ #@TestSuitePurpose Verify that the basic import functionality is working in the Directory Server.
+ #@TestSuiteID Import Tests
+ #@TestSuiteGroup Import
+ #@TestGroup Backend
+ #@TestScript import.xml
+ #@TestHTMLLink http://opends.dev.java.net/
+ -->
+
+ <!--- Test Case information
+ #@TestMarker Backend Export, Backup, and Restore Tests
+ #@TestName Import: LDIF Default
+ #@TestID LDIF Default
+ #@TestPurpose Add entries that are required for these Backend Tests.
+ #@TestPreamble
+ #@TestSteps ./import-ldif.sh -l data/backends/backend_start.ldif -n "userRoot"
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Backend Setup'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <message>
+ 'Backend: Backend Setup for Export, Backup, and Restore Tests'
+ </message>
+ <call function="'importLdif'">
+ { 'ldifFile' : '%s/backends/backend_start.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
- <call function="'testCase_Postamble'"/>
-
+ <call function="'testSuite_Postamble'"/>
+
</sequence>
-
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
-
+
+ </block>
+
</sequence>
</function>
--
Gitblit v1.10.0