From 024236ce15ba35489aae4214e3c72a06dd9e82df Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Thu, 08 Feb 2007 15:17:22 +0000
Subject: [PATCH] quality task issue 1140 Design some test preamble and postambles
---
opends/tests/functional-tests/testcases/backends/export-tasks.xml | 4
opends/tests/functional-tests/testcases/backends/import-tasks.xml | 104 ++++++------
opends/tests/functional-tests/testcases/backends/backup.xml | 20 +-
opends/tests/functional-tests/testcases/backends/backendsetup.xml | 4
opends/tests/functional-tests/testcases/backends/import.xml | 108 ++++++------
opends/tests/functional-tests/shared/functions/utils.xml | 154 +++++++++++++++---
opends/tests/functional-tests/testcases/backends/restore-tasks.xml | 4
opends/tests/functional-tests/testcases/backends/export.xml | 60 +++---
opends/tests/functional-tests/testcases/backends/restore.xml | 8
opends/tests/functional-tests/testcases/backends/backup-tasks.xml | 4
10 files changed, 281 insertions(+), 189 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/utils.xml b/opends/tests/functional-tests/shared/functions/utils.xml
index d793441..c2041f8 100755
--- a/opends/tests/functional-tests/shared/functions/utils.xml
+++ b/opends/tests/functional-tests/shared/functions/utils.xml
@@ -27,7 +27,7 @@
! -->
<stax>
- <function name="checkRC">
+ <function name="checkRC">
<function-prolog>
This function checks a return code against an expected return code
@@ -224,13 +224,13 @@
<sequence>
<call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=config' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s "base"' }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'cn=config' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s "base"' }
</call>
<script>
@@ -280,10 +280,6 @@
</function>
- <!--- XXX TODO XXX
- I am not sure this is best way, we could try directly
- calling python modules os sys
- -->
<function name="setOSvariables">
<function-prolog>
@@ -315,40 +311,136 @@
</function>
- <function name="testCaseStartBanner">
-
+ <function name="testCase_StartBanner">
+
<function-prolog>
- Pretty prints a banner at the start of a test.
+ Pretty prints a banner at the start of a test.
</function-prolog>
-
- <function-no-args/>
-
+
+ <function-no-args />
+
<sequence>
-
+
<message>
'### Starting test case %s. ###' % STAXCurrentTestcase
</message>
-
+
</sequence>
-
+
</function>
-
- <function name="testCaseEndBanner">
-
+
+ <function name="testCase_EndBanner">
+
<function-prolog>
Pretty prints a banner at the end of a test.
</function-prolog>
-
- <function-no-args/>
-
- <sequence>
-
+
+ <function-no-args />
+
+ <sequence>
+
<message>
'### Ending test case %s. ###' % STAXCurrentTestcase
</message>
-
+
</sequence>
-
+
+ </function>
+
+ <function name="testCase_Preamble">
+
+ <function-prolog>
+ Performs all the preoperations for a test case
+ </function-prolog>
+
+ <function-no-args />
+
+ <sequence>
+
+ <call function="'testCase_StartBanner'" />
+
+ </sequence>
+
+ </function>
+
+ <function name="testCase_Postamble">
+
+ <function-prolog>
+ Performs all the post operations for a test suite
+ </function-prolog>
+
+ <function-no-args />
+
+ <sequence>
+
+ <call function="'testCase_EndBanner'" />
+
+ </sequence>
+
+ </function>
+
+ <function name="testSuite_Preamble">
+
+ <function-prolog>
+ Performs all the pre operations for a test suite
+ </function-prolog>
+
+ <function-no-args />
+
+ <sequence>
+
+ <message>'Enter test suite preamble'</message>
+
+ </sequence>
+
+ </function>
+
+ <function name="testSuite_Postamble">
+
+ <function-prolog>
+ Performs all the post operations for a test suite
+ </function-prolog>
+
+ <function-no-args />
+
+ <sequence>
+
+ <message>'Enter test suite postamble'</message>
+
+ </sequence>
+
+ </function>
+
+ <function name="testGroup_Preamble">
+
+ <function-prolog>
+ Performs all the pre operations for a test group
+ </function-prolog>
+
+ <function-no-args />
+
+ <sequence>
+
+ <message>'Enter test group postamble'</message>
+
+ </sequence>
+
+ </function>
+
+ <function name="testGroup_Postamble">
+
+ <function-prolog>
+ Performs all the post operations for a test group
+ </function-prolog>
+
+ <function-no-args />
+
+ <sequence>
+
+ <message>'Enter test group postamble'</message>
+
+ </sequence>
+
</function>
</stax>
diff --git a/opends/tests/functional-tests/testcases/backends/backendsetup.xml b/opends/tests/functional-tests/testcases/backends/backendsetup.xml
index dbba201..7860ee8 100644
--- a/opends/tests/functional-tests/testcases/backends/backendsetup.xml
+++ b/opends/tests/functional-tests/testcases/backends/backendsetup.xml
@@ -59,7 +59,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend: Backend Setup for Export, Backup, and Restore Tests'
@@ -74,7 +74,7 @@
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/backends/backup-tasks.xml b/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
index c867c30..6bcfba4 100755
--- a/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
@@ -62,7 +62,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend ExportTasks1: Backup the data in OpenDS by scheduling a task'
</message>
@@ -81,7 +81,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/backends/backup.xml b/opends/tests/functional-tests/testcases/backends/backup.xml
index 8135c60..44755f0 100644
--- a/opends/tests/functional-tests/testcases/backends/backup.xml
+++ b/opends/tests/functional-tests/testcases/backends/backup.xml
@@ -61,7 +61,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Backup1: Create a backup of the data in OpenDS'
</message>
@@ -76,7 +76,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -98,7 +98,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Backup2: Create an incremental backup of the data in OpenDS'
</message>
@@ -114,7 +114,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -136,7 +136,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Backup3: Create a backup of the data in OpenDS with a backup id'
</message>
@@ -152,7 +152,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -174,7 +174,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Backup4: Create an incremental backup of the data in OpenDS with a backup id'
</message>
@@ -190,7 +190,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -212,7 +212,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Backup5: Create a compressed backup of the data in OpenDS'
</message>
@@ -228,7 +228,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/backends/export-tasks.xml b/opends/tests/functional-tests/testcases/backends/export-tasks.xml
index e2bc4fa..e3b4f27 100644
--- a/opends/tests/functional-tests/testcases/backends/export-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/export-tasks.xml
@@ -88,7 +88,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend ExportTasks1: Export the data in OpenDS by scheduling a task'
</message>
@@ -107,7 +107,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/backends/export.xml b/opends/tests/functional-tests/testcases/backends/export.xml
index e92ef19..bd793bb 100644
--- a/opends/tests/functional-tests/testcases/backends/export.xml
+++ b/opends/tests/functional-tests/testcases/backends/export.xml
@@ -61,7 +61,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export1: Export the data in OpenDS'
</message>
@@ -76,7 +76,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -98,7 +98,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export2: Export the data in OpenDS by appending to an ldif file'
</message>
@@ -114,7 +114,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -136,7 +136,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export3: Export the data in OpenDSwith one includeAttribute parameter '
</message>
@@ -152,7 +152,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -174,7 +174,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export4: Export the data in OpenDS with three includeAttribute parameters'
</message>
@@ -190,7 +190,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -212,7 +212,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export5: Export the data in OpenDS with one excludeAttribute parameter'
</message>
@@ -228,7 +228,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -250,7 +250,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export6: Export the data in OpenDS with three excludeAttribute parameters'
</message>
@@ -266,7 +266,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -288,7 +288,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export7: Export the data in OpenDS with one includeFilter parameter'
</message>
@@ -304,7 +304,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -326,7 +326,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export8: Export the data in OpenDS with three includeFilter parameters'
</message>
@@ -342,7 +342,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -364,7 +364,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export9: Export the data in OpenDS with one excludeFilter parameter'
</message>
@@ -380,7 +380,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -402,7 +402,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export10: Export the data in OpenDS with three excludeFilter parameters'
</message>
@@ -418,7 +418,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -440,7 +440,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export11: Export the data in OpenDS with one includeBranch parameter'
</message>
@@ -456,7 +456,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -478,7 +478,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export12: Export the data in OpenDS with one excludeBranch parameter'
</message>
@@ -494,7 +494,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -516,7 +516,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export13: Export the data in OpenDS with one includeAttribute, excludeFilter, and includeBranch parameters'
</message>
@@ -532,7 +532,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -554,7 +554,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export14: Export the data in OpenDS with one excludeAttribute, includeFilter, and excludeBranch parameters'
</message>
@@ -570,7 +570,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -592,7 +592,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Export15: Export the data in OpenDS in compressed format'
</message>
@@ -608,7 +608,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/backends/import-tasks.xml b/opends/tests/functional-tests/testcases/backends/import-tasks.xml
index 706b5f8..0f4ebbf 100644
--- a/opends/tests/functional-tests/testcases/backends/import-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -95,7 +95,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -120,7 +120,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -152,7 +152,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -178,7 +178,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -199,7 +199,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -225,7 +225,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -246,7 +246,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -274,7 +274,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -295,7 +295,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -325,7 +325,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -346,7 +346,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -375,7 +375,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -396,7 +396,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -421,7 +421,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -442,7 +442,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -468,7 +468,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -489,7 +489,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -514,7 +514,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -535,7 +535,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -560,7 +560,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -581,7 +581,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -611,7 +611,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -632,7 +632,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -658,7 +658,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -679,7 +679,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -707,7 +707,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -728,7 +728,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -756,7 +756,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -777,7 +777,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -802,7 +802,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -823,7 +823,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -849,7 +849,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -870,7 +870,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -895,7 +895,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -916,7 +916,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -943,7 +943,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -964,7 +964,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -990,7 +990,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1011,7 +1011,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -1038,7 +1038,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1059,7 +1059,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -1085,7 +1085,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1106,7 +1106,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -1138,7 +1138,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1172,7 +1172,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -1200,7 +1200,7 @@
<!-- Should check there is a rejects file and the contents are correct -->
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1221,7 +1221,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -1250,7 +1250,7 @@
<!-- Should check there is a rejects file and the contents are correct -->
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1271,7 +1271,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -1297,7 +1297,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1318,7 +1318,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdifTask'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
@@ -1344,7 +1344,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/backends/import.xml b/opends/tests/functional-tests/testcases/backends/import.xml
index 76cefc1..b1cb93a 100644
--- a/opends/tests/functional-tests/testcases/backends/import.xml
+++ b/opends/tests/functional-tests/testcases/backends/import.xml
@@ -59,7 +59,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR }
@@ -76,7 +76,7 @@
'uid=rhunt, ou=People, dc=example,dc=com'] }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -98,7 +98,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
@@ -114,7 +114,7 @@
{ 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com','uid=dmiller, ou=People, dc=example,dc=com','uid=rhunt, ou=People, dc=example,dc=com'] }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -136,7 +136,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
@@ -155,7 +155,7 @@
'uid=rhunt, ou=People, dc=example,dc=com'] }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -176,7 +176,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
@@ -195,7 +195,7 @@
'uid=rhunt, ou=People, dc=example,dc=com'] }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -216,7 +216,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
@@ -238,7 +238,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -259,7 +259,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
@@ -281,7 +281,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -302,7 +302,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
@@ -324,7 +324,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -345,7 +345,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
@@ -364,7 +364,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -385,7 +385,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
@@ -405,7 +405,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -426,7 +426,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
@@ -445,7 +445,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -466,7 +466,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
@@ -485,7 +485,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -506,7 +506,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
@@ -528,7 +528,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -549,7 +549,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
@@ -569,7 +569,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -590,7 +590,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
@@ -612,7 +612,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -633,7 +633,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
@@ -655,7 +655,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -676,7 +676,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
@@ -695,7 +695,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -716,7 +716,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
@@ -736,7 +736,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -757,7 +757,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
@@ -776,7 +776,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -797,7 +797,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
@@ -816,7 +816,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -837,7 +837,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Append.ldif' % STAGED_DATA_DIR,
@@ -857,7 +857,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -878,7 +878,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Append.ldif' % STAGED_DATA_DIR,
@@ -898,7 +898,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -919,7 +919,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Example.ldif.gz' % STAGED_DATA_DIR,
@@ -939,7 +939,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -960,7 +960,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
@@ -986,7 +986,7 @@
'Error: Known bug. Issue 839: Encrypted LDIF export is not implemented'
</message>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1020,7 +1020,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
@@ -1040,7 +1040,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1061,7 +1061,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
@@ -1081,7 +1081,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1102,7 +1102,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Schema.ldif' % STAGED_DATA_DIR,
@@ -1122,7 +1122,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -1143,7 +1143,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Schema.ldif' % STAGED_DATA_DIR }
@@ -1161,7 +1161,7 @@
}
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/backends/restore-tasks.xml b/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
index ba4d928..312e1dd 100755
--- a/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
@@ -63,7 +63,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend RestoreTasks1: Restore the data in OpenDS by scheduling a task'
</message>
@@ -82,7 +82,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/backends/restore.xml b/opends/tests/functional-tests/testcases/backends/restore.xml
index 6201bb3..4a2379e 100755
--- a/opends/tests/functional-tests/testcases/backends/restore.xml
+++ b/opends/tests/functional-tests/testcases/backends/restore.xml
@@ -60,7 +60,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Restore1: Restore data to OpenDS'
</message>
@@ -77,7 +77,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
@@ -100,7 +100,7 @@
<sequence>
- <call function="'testCaseStartBanner'"/>
+ <call function="'testCase_StartBanner'"/>
<message>
'Backend Restore2: Restore compressed data to OpenDS'
</message>
@@ -115,7 +115,7 @@
'result' : STAXResult }
</call>
- <call function="'testCaseEndBanner'"/>
+ <call function="'testCase_EndBanner'"/>
</sequence>
--
Gitblit v1.10.0