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/aci/aci_setup.xml | 150 ++++++++++++++++++++++++++-----------------------
1 files changed, 79 insertions(+), 71 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci_setup.xml b/opends/tests/functional-tests/testcases/aci/aci_setup.xml
index e87ab51..e4a0bca 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_setup.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_setup.xml
@@ -32,80 +32,88 @@
<function name="aci_setup">
<sequence>
+
+ <block name="'setup'">
+
+ <sequence>
- <script>
- CurrentTestPath['suite']='aci-setup'
- </script>
+ <script>
+ CurrentTestPath['suite']=STAXCurrentBlock
+ </script>
- <call function="'testSuite_Preamble'"/>
-
- <!---
- Place group-specific test information here.
- #@TestGroupName ACI
- #@TestGroupPurpose To test the ACI functionality.
-
- Place suite-specific test information here.
- #@TestSuiteName ACI Setup Tests
- #@TestSuitePurpose Configure OpenDS to test ACI functionality.
- #@TestSuiteGroup ACI Setup Tests
- #@TestScript aci_setup.xml
- -->
-
- <!--- Test Case : Add Entries for ACI Tests -->
- <!---
- Place test-specific test information here.
- The tag, TestMarker, must be the same as the tag, TestSuiteName.
- #@TestMarker ACI Setup Tests
- #@TestName ACI Startup Test
- #@TestIssue none
- #@TestPurpose Add entries that are needed for the ACI tests.
- #@TestPreamble none
- #@TestStep Add entries with ldapmodify.
- #@TestPostamble none
- #@TestResult Success if OpenDS returns 0 for all operations
- -->
- <testcase name="'ACI: ACI Setup: Add Initial Entries'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'ACI: ACI Setup: Adding Initial Entries'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_startup.ldif' % STAGED_DATA_DIR }
- </call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
- 'ACI: ACI Setup: Enabling ACI'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/aci_handler.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
+ <call function="'testSuite_Preamble'"/>
+
+ <!---
+ Place group-specific test information here.
+ #@TestGroupName ACI
+ #@TestGroupPurpose To test the ACI functionality.
+
+ Place suite-specific test information here.
+ #@TestSuiteName ACI Setup Tests
+ #@TestSuitePurpose Configure OpenDS to test ACI functionality.
+ #@TestSuiteGroup ACI Setup Tests
+ #@TestScript aci_setup.xml
+ -->
+
+ <!--- Test Case : Add Entries for ACI Tests -->
+ <!---
+ Place test-specific test information here.
+ The tag, TestMarker, must be the same as the tag, TestSuiteName.
+ #@TestMarker ACI Setup Tests
+ #@TestName ACI Startup Test
+ #@TestIssue none
+ #@TestPurpose Add entries that are needed for the ACI tests.
+ #@TestPreamble none
+ #@TestStep Add entries with ldapmodify.
+ #@TestPostamble none
+ #@TestResult Success if OpenDS returns 0 for all operations
+ -->
+ <testcase name="'ACI: ACI Setup: Add Initial Entries'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'ACI: ACI Setup: Adding Initial Entries'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/aci/aci_startup.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: ACI Setup: Enabling ACI'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_target/aci_handler.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
+
+ <call function="'testSuite_Postamble'"/>
+
</sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
+
+ </block>
</sequence>
--
Gitblit v1.10.0