From 8b57c2d37e726fb94ffbd3eadd2eaf528d495fca Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Fri, 02 Mar 2007 15:39:22 +0000
Subject: [PATCH] Issue 1305 aci tests should plug into test log framework
---
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml | 12 +++++++++++-
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml | 14 ++++++++++++--
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml | 8 ++++++--
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
index 8b4e66f..f95627c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
@@ -33,7 +33,11 @@
<sequence>
- <call function="'testSuite_Preamble'"/>
+ <script>
+ CurrentTestPath['group']='aci'
+ </script>
+
+ <call function="'testGroup_Preamble'"/>
<parallel>
@@ -105,7 +109,7 @@
</parallel>
- <call function="'testSuite_Postamble'"/>
+ <call function="'testGroup_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml
index 8f3dd73..e87ab51 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml
@@ -30,6 +30,15 @@
<defaultcall function="aci_setup"/>
<function name="aci_setup">
+
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='aci-setup'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
<!---
Place group-specific test information here.
#@TestGroupName ACI
@@ -41,7 +50,6 @@
#@TestSuiteGroup ACI Setup Tests
#@TestScript aci_setup.xml
-->
- <sequence>
<!--- Test Case : Add Entries for ACI Tests -->
<!---
@@ -97,6 +105,8 @@
</sequence>
</testcase>
+ <call function="'testSuite_Postamble'"/>
+
</sequence>
</function>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
index 9fed154..cbd4c93 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -30,6 +30,15 @@
<defaultcall function="aci_target"/>
<function name="aci_target">
+
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='aci-target'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
<!---
Place suite-specific test information here.
#@TestSuiteName ACI Target Tests
@@ -37,7 +46,6 @@
#@TestSuiteGroup Basic ACI Target Tests
#@TestScript aci_target.xml
-->
- <sequence>
<!---
Place test-specific test information here.
@@ -1418,8 +1426,10 @@
</sequence>
</testcase>
+ <call function="'testSuite_Postamble'"/>
+
</sequence>
-
+
</function>
</stax>
--
Gitblit v1.10.0