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/restore-tasks.xml | 69 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/backends/restore-tasks.xml b/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
index 297797c..b2f554c 100755
--- a/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
@@ -34,36 +34,39 @@
<sequence>
- <script>
- CurrentTestPath['suite']='restore-tasks'
- </script>
-
- <call function="'testSuite_Preamble'"/>
-
- <!--- Test Suite information
- #@TestSuiteName Backend Restore Tasks Tests
- #@TestSuitePurpose Verify that the basic restore task functionality is working in the Directory Server.
- #@TestSuiteID Restore Tasks Tests
- #@TestSuiteGroup Restore Tasks
- #@TestGroup Backend
- #@TestScript restore-tasks.xml
- #@TestHTMLLink http://opends.dev.java.net/
- -->
-
- <!--- Test Case information
- #@TestMarker Backend Restore Tasks Tests
- #@TestName Restore Tasks: Restore Tasks 1
- #@TestID RestoreTasks1
- #@TestPurpose Verify an restore task of a LDIF file on the default backend.
- #@TestPreamble
- #@TestSteps An ldif file is created that describes the restore task to be
- scheduled. The task is scheduled by adding the ldif file
- with the static ldapmodify.
- #@TestPostamble
- #@TestResult Success if OpenDS returns 0
- -->
+ <block name="'restore-tasks'">
-
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']=STAXCurrentBlock
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <!--- Test Suite information
+ #@TestSuiteName Backend Restore Tasks Tests
+ #@TestSuitePurpose Verify that the basic restore task functionality is working in the Directory Server.
+ #@TestSuiteID Restore Tasks Tests
+ #@TestSuiteGroup Restore Tasks
+ #@TestGroup Backend
+ #@TestScript restore-tasks.xml
+ #@TestHTMLLink http://opends.dev.java.net/
+ -->
+
+ <!--- Test Case information
+ #@TestMarker Backend Restore Tasks Tests
+ #@TestName Restore Tasks: Restore Tasks 1
+ #@TestID RestoreTasks1
+ #@TestPurpose Verify an restore task of a LDIF file on the default backend.
+ #@TestPreamble
+ #@TestSteps An ldif file is created that describes the restore task to be
+ scheduled. The task is scheduled by adding the ldif file
+ with the static ldapmodify.
+ #@TestPostamble
+ #@TestResult Success if OpenDS returns 0
+ -->
+
<testcase name="'Backend: Restore Tasks 1'">
@@ -79,7 +82,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : '4',
- 'backupDir' : '%s/backends/' % STAGED_DATA_DIR
+ 'backupDir' : '%s/backends/' % STAGED_DATA_DIR
}
</call>
@@ -94,8 +97,12 @@
</testcase>
- <call function="'testSuite_Postamble'"/>
+ <call function="'testSuite_Postamble'"/>
+ </sequence>
+
+ </block>
+
</sequence>
</function>
--
Gitblit v1.10.0