From 036d84b6e8e7d8dd1aa25005b9ca426902b8292b Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 15 Oct 2008 16:31:28 +0000
Subject: [PATCH] Issue 3521 - backend name and suffix hardcode in some tests
---
opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml | 110 ++++++++++++++++--------------------------------------
1 files changed, 33 insertions(+), 77 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
index 0fb3c77..6b156c1 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
@@ -50,83 +50,39 @@
</script>
<call function="'testGroup_Preamble'"/>
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/global_acis.xml' % (TESTS_DIR)"/>
- <call function="'global_acis'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_target.xml' % (TESTS_DIR)"/>
- <call function="'aci_target'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targetattr.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetattr'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targetfilter.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetfilter'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targattrfilter.xml' % (TESTS_DIR)"/>
- <call function="'aci_targattrfilter'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targetscope.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetscope'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targetcontrol.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetcontrol'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_delete_entry.xml' % (TESTS_DIR)"/>
- <call function="'aci_delete_entry'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_add_entry.xml' % (TESTS_DIR)"/>
- <call function="'aci_add_entry'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_modify_entry.xml' % (TESTS_DIR)"/>
- <call function="'aci_modify_entry'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_modify_filter_tests.xml' % (TESTS_DIR)"/>
- <call function="'aci_modify_filter_tests'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_compare_tests.xml' % (TESTS_DIR)"/>
- <call function="'aci_compare_tests'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/multiple_aci_tests.xml' % (TESTS_DIR)"/>
- <call function="'multiple_aci_tests'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_modify_rdn.xml' % (TESTS_DIR)"/>
- <call function="'aci_modify_rdn'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_rdn_wildcards.xml' % (TESTS_DIR)"/>
- <call function="'aci_rdn_wildcards'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_bindtypes.xml' % (TESTS_DIR)"/>
- <call function="'aci_bindtypes'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_proxy_auth.xml' % (TESTS_DIR)"/>
- <call function="'aci_proxy_auth'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_effective_rights.xml' % (TESTS_DIR)"/>
- <call function="'aci_effective_rights'" />
- <!--
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_import.xml' % (TESTS_DIR)"/>
- <call function="'aci_import'" />
- -->
+
+ <!-- List of ACI test suites to run -->
+ <script>
+ suiteList=[]
+ suiteList.append('global_acis')
+ suiteList.append('aci_target')
+ suiteList.append('aci_targetattr')
+ suiteList.append('aci_targetfilter')
+ suiteList.append('aci_targattrfilter')
+ suiteList.append('aci_targetscope')
+ suiteList.append('aci_targetcontrol')
+ suiteList.append('aci_delete_entry')
+ suiteList.append('aci_add_entry')
+ suiteList.append('aci_modify_entry')
+ suiteList.append('aci_modify_filter_tests')
+ suiteList.append('aci_compare_tests')
+ suiteList.append('multiple_aci_tests')
+ suiteList.append('aci_modify_rdn')
+ suiteList.append('aci_rdn_wildcards')
+ suiteList.append('aci_bindtypes')
+ suiteList.append('aci_proxy_auth')
+ suiteList.append('aci_effective_rights')
+#OOS suiteList.append('aci_import')
+ </script>
+
+ <iterate var="_suite" in="suiteList">
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/aci/%s.xml' % (TESTS_DIR,_suite)"/>
+ <call function="'%s' % _suite" />
+ </sequence>
+ </iterate>
+
<call function="'testGroup_Postamble'"/>
</sequence>
</block>
--
Gitblit v1.10.0