From ccb383c5308f88916e6946ef9479cedef8d98481 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 04 Aug 2009 10:14:21 +0000
Subject: [PATCH] refactoring to use different backend types
---
opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml | 115 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 46 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
index 90a2d50..d830e23 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
@@ -36,7 +36,9 @@
</function-list-args>
<sequence>
-
+
+ <try>
+
<block name="'clu'">
<sequence>
@@ -54,10 +56,11 @@
-->
<script>
CurrentTestPath['group'] = 'clu'
+ _group=CurrentTestPath['group']
</script>
<call function="'testGroup_Preamble'"/>
-
+
<!---
Links between tests:
- clu_ldapsearch_checkbehavior add a new suffix
@@ -68,51 +71,71 @@
clu_verify-index_checkbehavior and clu_dbtest_checkbehavior
-->
<script>
- testList = []
- testList.append(['.','clu_setup'])
- testList.append(['.','clu_ldapsearch_checkoptions'])
- testList.append(['.','clu_ldapsearch_checkbehavior'])
- testList.append(['.','clu_ldapmodify_checkoptions'])
- testList.append(['.','clu_ldapmodify_checkbehavior'])
- testList.append(['.','clu_ldapcompare_checkbehavior'])
- testList.append(['.','clu_ldapdelete_checkbehavior'])
- testList.append(['.','clu_base64_checkbehavior'])
- testList.append(['.','clu_status_checkbehavior'])
- testList.append(['.','clu_ldappasswordmodify_checkbehavior'])
- testList.append(['.','clu_ldifsearch_checkbehavior'])
- testList.append(['.','clu_verify-index_checkbehavior'])
- testList.append(['.','clu_rebuild-index_checkbehavior'])
- testList.append(['.','clu_encode-password_checkbehavior'])
- testList.append(['.','clu_make-ldif_checkbehavior'])
- testList.append(['.','clu_list-backends_checkbehavior'])
- testList.append(['.','clu_manage-tasks_checkbehavior'])
- testList.append(['.','clu_dbtest_checkbehavior'])
- testList.append(['.','clu_ldifmodify_checkbehavior'])
- testList.append(['.','clu_ldif-diff_checkbehavior'])
- testList.append(['.','clu_cleanup'])
+ suiteList = []
+ suiteList.append('clu_ldapsearch_checkoptions')
+ suiteList.append('clu_ldapsearch_checkbehavior')
+ suiteList.append('clu_ldapmodify_checkoptions')
+ suiteList.append('clu_ldapmodify_checkbehavior')
+ suiteList.append('clu_ldapcompare_checkbehavior')
+ suiteList.append('clu_ldapdelete_checkbehavior')
+ suiteList.append('clu_base64_checkbehavior')
+ suiteList.append('clu_status_checkbehavior')
+ suiteList.append('clu_ldappasswordmodify_checkbehavior')
+ suiteList.append('clu_ldifsearch_checkbehavior')
+ suiteList.append('clu_verify-index_checkbehavior')
+ suiteList.append('clu_rebuild-index_checkbehavior')
+ suiteList.append('clu_encode-password_checkbehavior')
+ suiteList.append('clu_make-ldif_checkbehavior')
+ suiteList.append('clu_list-backends_checkbehavior')
+ suiteList.append('clu_manage-tasks_checkbehavior')
+ suiteList.append('clu_dbtest_checkbehavior')
+ suiteList.append('clu_ldifmodify_checkbehavior')
+ suiteList.append('clu_ldif-diff_checkbehavior')
</script>
-
- <iterate var="_test" in="testList">
- <sequence>
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/clu/%s/%s.xml' %
- (TESTS_DIR,_test[0],_test[1])"/>
-
- <call function="'%s' % _test[1]" />
-
- </sequence>
-
- </iterate>
-
- <call function="'testGroup_Postamble'"/>
-
+
+ <!-- Data global to this test group -->
+
+ <!-- Run the test suites -->
+ <iterate var="_suite" in="suiteList">
+ <sequence>
+ <try>
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/%s/%s.xml' % (TESTS_DIR,_group,_suite)"/>
+ <call function="'%s' % _suite" />
+ </sequence>
+ <catch exception="'STAFException.TestSuite.SetupException'">
+ <sequence>
+ <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
+ </sequence>
+ </catch>
+ <catch exception="'STAFException.TestSuite.MainException'">
+ <sequence>
+ <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
+ </sequence>
+ </catch>
+ <catch exception="'STAFException.TestSuite.CleanupException'">
+ <sequence>
+ <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
+ </sequence>
+ </catch>
+ </try>
+ </sequence>
+ </iterate>
+
+ </sequence>
+ </block>
+ <catch exception="'STAXException.TestGroupException'">
+ <sequence>
+ <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
</sequence>
-
- </block>
-
+ </catch>
+ <finally>
+ <!-- Test Group postamble -->
+ <call function="'testGroup_Postamble'"/>
+ </finally>
+ </try>
+
</sequence>
-
</function>
-
</stax>
--
Gitblit v1.10.0