From cddf7c47847bd8c2ef0d00700b616abcae431de0 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Fri, 23 Feb 2007 10:28:22 +0000
Subject: [PATCH] Issue 1076 store test logs per testcase
---
opends/tests/functional-tests/testcases/core/core_setup.xml | 116
opends/tests/functional-tests/testcases/backends/import-tasks.xml | 6
opends/tests/functional-tests/testcases/backends/backup.xml | 4
opends/tests/functional-tests/testcases/core/core_entry_cache.xml | 348 +-
opends/tests/functional-tests/testcases/backends/import.xml | 4
opends/tests/functional-tests/testcases/security/jks/security_jks.xml | 150
opends/tests/functional-tests/testcases/backends/export.xml | 4
opends/tests/functional-tests/testcases/core/core_search_timelimit.xml | 552 ++--
opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml | 1993 +++++++++---------
opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml | 145
opends/tests/functional-tests/testcases/schema/schema_setup.xml | 74
opends/tests/functional-tests/testcases/backends/backends.xml | 4
opends/tests/functional-tests/testcases/schema/schema.xml | 6
opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml | 4
opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml | 130
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml | 4
opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml | 131
opends/tests/functional-tests/testcases/backends/restore-tasks.xml | 6
opends/tests/functional-tests/testcases/core/core_tf_filters.xml | 216 +
opends/tests/functional-tests/testcases/backends/restore.xml | 6
opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml | 171
opends/tests/functional-tests/testcases/backends/backup-tasks.xml | 6
opends/tests/functional-tests/testcases/security/security.xml | 6
opends/tests/functional-tests/shared/python/common.py | 48
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml | 228 +-
opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml | 226 +-
opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml | 592 ++--
opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml | 2
opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml | 173
opends/tests/functional-tests/shared/functions/utils.xml | 187 +
opends/tests/functional-tests/testcases/setup/setup.xml | 2
opends/tests/functional-tests/testcases/core/core_version_report.xml | 70
opends/tests/functional-tests/testcases/runFuncTests.xml | 31
opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml | 157
opends/tests/functional-tests/testcases/backends/export-tasks.xml | 6
opends/tests/functional-tests/testcases/backends/backendsetup.xml | 6
opends/tests/functional-tests/testcases/core/core.xml | 6
opends/tests/functional-tests/shared/python/security.py | 30
opends/tests/functional-tests/testcases/quickstart/quickstart.xml | 49
opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml | 137
opends/tests/functional-tests/shared/functions/stafcmd.xml | 90
opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml | 290 +-
42 files changed, 3,452 insertions(+), 2,964 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/stafcmd.xml b/opends/tests/functional-tests/shared/functions/stafcmd.xml
index afa54d1..a49f5e5 100755
--- a/opends/tests/functional-tests/shared/functions/stafcmd.xml
+++ b/opends/tests/functional-tests/shared/functions/stafcmd.xml
@@ -263,7 +263,9 @@
name of target host
</function-required-arg>
</function-map-args>
+
<sequence>
+
<stafcmd name="'STAF Command: Get Folder Attributes'">
<location>'%s' % (hostname)</location>
<service>'fs'</service>
@@ -297,11 +299,91 @@
cmdRC=RC
cmdResult=STAFResult
</script>
+
<call function="'checkRC'">
- { 'returncode' : cmdRC ,
- 'result' : cmdResult }
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
</call>
+
<return>cmdRC</return>
- </sequence>
- </function>
+
+ </sequence>
+
+ </function>
+
+ <function name="CreateFolder">
+
+ <function-prolog>
+ This function creates a folder
+ </function-prolog>
+
+ <function-map-args>
+ <function-required-arg name="hostname">
+ name of target host
+ </function-required-arg>
+ <function-required-arg name="foldername">
+ name of folder to be deleted
+ </function-required-arg>
+ </function-map-args>
+
+ <sequence>
+
+ <stafcmd name="'STAF Command: Create Folder'">
+ <location>'%s' % (hostname)</location>
+ <service>'fs'</service>
+ <request>
+ 'CREATE DIRECTORY %s FULLPATH' % foldername
+ </request>
+ </stafcmd>
+
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+
+ <call function="'checkRC'">
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
+ </call>
+
+ <return>cmdRC</return>
+
+ </sequence>
+
+ </function>
+
+
+ <function name="queryLogs">
+
+ <function-prolog>
+ Queries the staf logs from startfrom point
+ </function-prolog>
+
+ <function-map-args>
+ <function-required-arg name="hostname">
+ name of target host
+ </function-required-arg>
+ <function-required-arg name="logname">
+ name of log to query
+ </function-required-arg>
+ <function-required-arg name="startfrom">
+ timestamp to start logging
+ </function-required-arg>
+ <function-required-arg name="endat">
+ timestamp to end logging
+ </function-required-arg>
+ </function-map-args>
+
+ <sequence>
+
+ <stafcmd name="'STAF Command: Log Query for Test Case Log.'">
+ <location>'%s' % (hostname)</location>
+ <service>'log'</service>
+ <request>'QUERY ALL MACHINE %s LOGNAME %s FROM %s TO %s' % (hostname,logname,startfrom,endat)</request>
+ </stafcmd>
+
+ </sequence>
+
+ </function>
+
</stax>
diff --git a/opends/tests/functional-tests/shared/functions/utils.xml b/opends/tests/functional-tests/shared/functions/utils.xml
index 86e948e..0ad8392 100755
--- a/opends/tests/functional-tests/shared/functions/utils.xml
+++ b/opends/tests/functional-tests/shared/functions/utils.xml
@@ -295,8 +295,8 @@
Performs all the preoperations for a test case
</function-prolog>
<function-no-args />
- <sequence>
- <call function="'testCase_StartBanner'" />
+ <sequence>
+ <call function="'testCase_StartBanner'" />
</sequence>
</function>
@@ -316,7 +316,28 @@
</function-prolog>
<function-no-args />
<sequence>
- <message>'Enter test suite preamble'</message>
+
+ <!-- Take the values from the current test path -->
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='unknown-group'
+
+ if not CurrentTestPath.has_key('suite'):
+ CurrentTestPath['suite']='unknown-suite'
+
+ ThisGroupName=CurrentTestPath['group']
+ ThisSuiteName=CurrentTestPath['suite']
+ </script>
+
+ <!-- Start time of test suite -->
+ <script>
+ TestSuiteStartTime=strftime("%Y%m%d@%H:%M:%S",localtime())
+ </script>
+
+ <message>
+ '### %s/%s suite preamble ###' % (ThisGroupName,ThisSuiteName)
+ </message>
+
</sequence>
</function>
@@ -326,7 +347,50 @@
</function-prolog>
<function-no-args />
<sequence>
- <message>'Enter test suite postamble'</message>
+
+ <!-- Take the values from the current test path -->
+ <script>
+ if CurrentTestPath.has_key('suite'):
+ ThisSuiteName=CurrentTestPath['suite']
+ else:
+ ThisSuiteName='unknown-suite'
+
+ if CurrentTestPath.has_key('group'):
+ ThisGroupName=CurrentTestPath['group']
+ else:
+ ThisGroupName='unknown-group'
+ </script>
+
+ <message>
+ '### %s/%s suite postamble ###' % (ThisGroupName,ThisSuiteName)
+ </message>
+
+ <!-- Start time of test suite -->
+ <script>
+ TestSuiteEndTime=strftime("%Y%m%d@%H:%M:%S",localtime())
+ </script>
+
+ <!-- Format the test group and suite names to create folder -->
+ <script>
+ FormattedTestcase=format_testcase()
+ FormattedTestgroup=FormattedTestcase.group(ThisGroupName)
+ FormattedTestsuite=FormattedTestcase.suite(ThisSuiteName)
+
+ TestLogDir= '%s/%s' % (LogDir,FormattedTestgroup)
+ TestLogFile='%s/%s' % (TestLogDir,FormattedTestsuite)
+ </script>
+
+ <call function="'WriteLogsForTestCase'">
+ { 'starttime' : TestSuiteStartTime,
+ 'endtime' : TestSuiteEndTime,
+ 'tofile' : TestLogFile }
+ </call>
+
+ <script>
+ if CurrentTestPath.has_key('suite'):
+ del CurrentTestPath['suite']
+ </script>
+
</sequence>
</function>
@@ -336,7 +400,17 @@
</function-prolog>
<function-no-args />
<sequence>
- <message>'Enter test group postamble'</message>
+
+ <!-- Take the values from the current test path -->
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='unknown-group'
+
+ ThisGroupName=CurrentTestPath['group']
+ </script>
+
+ <message>'### %s group preamble ###' % ThisGroupName</message>
+
</sequence>
</function>
@@ -346,7 +420,108 @@
</function-prolog>
<function-no-args />
<sequence>
- <message>'Enter test group postamble'</message>
+
+ <script>
+ if CurrentTestPath.has_key('group'):
+ ThisGroupName=CurrentTestPath['group']
+ else:
+ ThisGroupName='unknown-group'
+ </script>
+
+ <message>'### %s group postamble ###' % ThisGroupName</message>
+
+ <script>
+ if CurrentTestPath.has_key('group'):
+ del CurrentTestPath['group']
+ </script>
+
</sequence>
</function>
+
+ <function name="WriteLogsForTestCase">
+
+ <function-prolog>
+ Queries the staf logs for the test case and write to file as text
+ </function-prolog>
+
+ <function-map-args>
+ <function-required-arg name="starttime">
+ timestamp to start logging from
+ </function-required-arg>
+ <function-required-arg name="endtime">
+ timestamp to start logging from
+ </function-required-arg>
+ <function-required-arg name="tofile">
+ timestamp to start logging from
+ </function-required-arg>
+ </function-map-args>
+
+ <sequence>
+
+ <call function="'queryLogs'">
+ { 'hostname' : STAXServiceMachine,
+ 'logname' : 'STAX_Job_%s_User' % STAXJobID,
+ 'startfrom' : starttime,
+ 'endat' : endtime }
+ </call>
+
+ <call function="'WriteLogs'">
+ { 'queryresult' : STAFResult,
+ 'logfile' : tofile }
+ </call>
+
+ </sequence>
+
+ </function>
+
+ <function name="WriteLogs">
+
+ <function-prolog>
+ Process staf log query results and write them to a file
+ </function-prolog>
+
+ <function-map-args>
+ <function-required-arg name="queryresult">
+ result of the staf log query
+ </function-required-arg>
+ <function-required-arg name="logfile">
+ name of the log file to where results are written
+ </function-required-arg>
+ </function-map-args>
+
+ <sequence>
+
+ <message>'Creating test log %s' % logfile</message>
+
+ <script>
+ NewLogDir=posixpath.dirname(logfile)
+ </script>
+
+ <call function="'CreateFolder'">
+ { 'hostname' : STAXServiceMachine,
+ 'foldername' : NewLogDir }
+ </call>
+
+ <script>
+ testlogfh=open(logfile,'w')
+ </script>
+
+ <message>'Writing query result'</message>
+ <iterate var="element" in="queryresult">
+ <script>
+ level=element['level']
+ message=element['message']
+ timestamp=element['timestamp']
+
+ testlogfh.write('%s %s %s\n' % (timestamp,level,message))
+ </script>
+
+ </iterate>
+
+ <script>testlogfh.close()</script>
+
+ </sequence>
+
+ </function>
+
</stax>
diff --git a/opends/tests/functional-tests/shared/python/common.py b/opends/tests/functional-tests/shared/python/common.py
new file mode 100644
index 0000000..389ea6e
--- /dev/null
+++ b/opends/tests/functional-tests/shared/python/common.py
@@ -0,0 +1,48 @@
+#!/usr/bin/python
+
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Portions Copyright 2007 Sun Microsystems, Inc.
+
+__version__ = "$Revision$"
+# $Source$
+
+# public symbols
+__all__ = [ "format_testcase" ]
+
+class format_testcase:
+ "Format the Test name objects"
+ def group(self,string):
+ self.group=string.lower()
+ self.group=self.group.strip()
+ return '%s' % self.group
+ def suite(self,string):
+ self.suite=string.lower()
+ self.suite=self.suite.strip()
+ self.suite=self.suite.replace(' ','-')
+ return '%s' % self.suite
+ def name(self,string):
+ self.name=string.strip()
+ self.name=self.name.replace(' ','-')
+ return '%s' % self.name
diff --git a/opends/tests/functional-tests/shared/python/security.py b/opends/tests/functional-tests/shared/python/security.py
index 3bd10e4..b940650 100644
--- a/opends/tests/functional-tests/shared/python/security.py
+++ b/opends/tests/functional-tests/shared/python/security.py
@@ -1,4 +1,34 @@
#!/usr/bin/python
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Portions Copyright 2006-2007 Sun Microsystems, Inc.
+
+__version__ = "$Revision$"
+# $Source$
+
+# public symbols
+__all__ = [ "write_ldaps_ldif_file" ]
def write_ldaps_ldif_file(path, port):
ldif_file = open(path + "/ldaps_port.ldif","w")
diff --git a/opends/tests/functional-tests/testcases/backends/backends.xml b/opends/tests/functional-tests/testcases/backends/backends.xml
index 62d6514..45cdab1 100644
--- a/opends/tests/functional-tests/testcases/backends/backends.xml
+++ b/opends/tests/functional-tests/testcases/backends/backends.xml
@@ -33,6 +33,10 @@
<sequence>
+ <script>
+ CurrentTestPath['group']='backends'
+ </script>
+
<call function="'testGroup_Preamble'"/>
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
diff --git a/opends/tests/functional-tests/testcases/backends/backendsetup.xml b/opends/tests/functional-tests/testcases/backends/backendsetup.xml
index a02bcee..86aab83 100644
--- a/opends/tests/functional-tests/testcases/backends/backendsetup.xml
+++ b/opends/tests/functional-tests/testcases/backends/backendsetup.xml
@@ -33,7 +33,11 @@
<function name="main_backend-setup">
<sequence>
-
+
+ <script>
+ CurrentTestPath['suite']='setup'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<!--- Test Suite information
diff --git a/opends/tests/functional-tests/testcases/backends/backup-tasks.xml b/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
index f812ddf..f2e9675 100755
--- a/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
@@ -33,7 +33,11 @@
<function name="main_backup-tasks">
<sequence>
-
+
+ <script>
+ CurrentTestPath['suite']='backup-tasks'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<!--- Start DS -->
diff --git a/opends/tests/functional-tests/testcases/backends/backup.xml b/opends/tests/functional-tests/testcases/backends/backup.xml
index 4f84466..c5e4a95 100644
--- a/opends/tests/functional-tests/testcases/backends/backup.xml
+++ b/opends/tests/functional-tests/testcases/backends/backup.xml
@@ -34,6 +34,10 @@
<sequence>
+ <script>
+ CurrentTestPath['suite']='backup'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<!--- Test Suite information
diff --git a/opends/tests/functional-tests/testcases/backends/export-tasks.xml b/opends/tests/functional-tests/testcases/backends/export-tasks.xml
index 8c9c164..8099293 100644
--- a/opends/tests/functional-tests/testcases/backends/export-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/export-tasks.xml
@@ -33,7 +33,11 @@
<function name="main_export-tasks">
<sequence>
-
+
+ <script>
+ CurrentTestPath['suite']='export-tasks'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<!--- Start DS -->
diff --git a/opends/tests/functional-tests/testcases/backends/export.xml b/opends/tests/functional-tests/testcases/backends/export.xml
index cabccd1..921dcce 100644
--- a/opends/tests/functional-tests/testcases/backends/export.xml
+++ b/opends/tests/functional-tests/testcases/backends/export.xml
@@ -34,6 +34,10 @@
<sequence>
+ <script>
+ CurrentTestPath['suite']='export'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<!--- Test Suite information
diff --git a/opends/tests/functional-tests/testcases/backends/import-tasks.xml b/opends/tests/functional-tests/testcases/backends/import-tasks.xml
index c4affb3..174a468 100644
--- a/opends/tests/functional-tests/testcases/backends/import-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -33,7 +33,11 @@
<function name="main_import-tasks">
<sequence>
-
+
+ <script>
+ CurrentTestPath['suite']='import-tasks'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<parallel>
diff --git a/opends/tests/functional-tests/testcases/backends/import.xml b/opends/tests/functional-tests/testcases/backends/import.xml
index 16dc093..4e22a6b 100644
--- a/opends/tests/functional-tests/testcases/backends/import.xml
+++ b/opends/tests/functional-tests/testcases/backends/import.xml
@@ -34,6 +34,10 @@
<sequence>
+ <script>
+ CurrentTestPath['suite']='import'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<!--- Test Suite information
diff --git a/opends/tests/functional-tests/testcases/backends/restore-tasks.xml b/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
index 969092f..bb6192f 100755
--- a/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
@@ -33,7 +33,11 @@
<function name="main_restore-tasks">
<sequence>
-
+
+ <script>
+ CurrentTestPath['suite']='restore-tasks'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<!--- Test Suite information
diff --git a/opends/tests/functional-tests/testcases/backends/restore.xml b/opends/tests/functional-tests/testcases/backends/restore.xml
index d90cfc5..f96813a 100755
--- a/opends/tests/functional-tests/testcases/backends/restore.xml
+++ b/opends/tests/functional-tests/testcases/backends/restore.xml
@@ -33,7 +33,11 @@
<function name="main_restore">
<sequence>
-
+
+ <script>
+ CurrentTestPath['suite']='restore'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<!--- Test Suite information
diff --git a/opends/tests/functional-tests/testcases/core/core.xml b/opends/tests/functional-tests/testcases/core/core.xml
index d09c7f3..8808554 100644
--- a/opends/tests/functional-tests/testcases/core/core.xml
+++ b/opends/tests/functional-tests/testcases/core/core.xml
@@ -32,7 +32,11 @@
<function name="main_core">
<sequence>
-
+
+ <script>
+ CurrentTestPath['group']='core'
+ </script>
+
<call function="'testGroup_Preamble'"/>
<parallel>
diff --git a/opends/tests/functional-tests/testcases/core/core_entry_cache.xml b/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
index a3883ff..b53d65d 100644
--- a/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
+++ b/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -31,194 +31,198 @@
<function name="core_entry_cache">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='entry-cache'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <!--- Test Case : Entry Cache: Default Search -->
+ <testcase name="'Core: Entry Cache: Default Search'">
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <message>
+ 'Check the response of OpenDS when an ldap search request is conducted with a single pipe character ("|") for an existing entry'
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'cn=version,cn=monitor' ,
+ 'dsFilter' : '|' ,
+ 'extraParams' : '' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
- <call function="'testSuite_Preamble'"/>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <!--- Test Case : Entry Cache: Default Search -->
- <testcase name="'Core: Entry Cache: Default Search'">
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <message>
- 'Check the response of OpenDS when an ldap search request is conducted with a single pipe character ("|") for an existing entry'
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=version,cn=monitor' ,
- 'dsFilter' : '|' ,
- 'extraParams' : '' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
+ <!--- Test Case : Entry Cache: Enable Default -->
+ <testcase name="'Core: Entry Cache: Enable Default'">
+ <sequence>
- <!--- Test Case : Entry Cache: Enable Default -->
- <testcase name="'Core: Entry Cache: Enable Default'">
- <sequence>
+ <call function="'testCase_Preamble'"/>
- <call function="'testCase_Preamble'"/>
-
- <message>
- 'Enable the default entry cache'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/core/ldifs/mod_entrycache2.ldif' % STAGED_DATA_DIR }
- </call>
+ <message>
+ 'Enable the default entry cache'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/core/ldifs/mod_entrycache2.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Entry Cache: Add Attributes -->
+ <testcase name="'Core: Entry Cache: Add Attributes'">
+ <sequence>
- <!--- Test Case : Entry Cache: Add Attributes -->
- <testcase name="'Core: Entry Cache: Add Attributes'">
- <sequence>
+ <call function="'testCase_Preamble'"/>
- <call function="'testCase_Preamble'"/>
-
- <message>
- 'Add three attributes to cn=Entry Cache,cn=config'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/core/ldifs/mod_entrycache3.ldif' % STAGED_DATA_DIR }
- </call>
+ <message>
+ 'Add three attributes to cn=Entry Cache,cn=config'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/core/ldifs/mod_entrycache3.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Entry Cache: Attribute Already Exists -->
+ <testcase name="'Core: Entry Cache: Attribute Already Exists'">
+ <sequence>
- <!--- Test Case : Entry Cache: Attribute Already Exists -->
- <testcase name="'Core: Entry Cache: Attribute Already Exists'">
- <sequence>
+ <call function="'testCase_Preamble'"/>
- <call function="'testCase_Preamble'"/>
-
- <message>
- 'Add one attribute that is not allowed under cn=Entry Cache,cn=config'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/core/ldifs/mod_entrycache4.ldif' % STAGED_DATA_DIR }
- </call>
+ <message>
+ 'Add one attribute that is not allowed under cn=Entry Cache,cn=config'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/core/ldifs/mod_entrycache4.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
-
- <!--- Test Case : Entry Cache: FIFO Cache-->
- <testcase name="'Core: Entry Cache: FIFO Cache'">
- <sequence>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
- <call function="'testCase_Preamble'"/>
-
- <message>
- 'Add second entry cache which is an object of the ds-cfg-fifo-entry-cache class'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_entrycache5.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Entry Cache: FIFO Cache-->
+ <testcase name="'Core: Entry Cache: FIFO Cache'">
+ <sequence>
- <!--- Test Case : Entry Cache: Search -->
- <testcase name="'Core: Entry Cache: Cache Search'">
- <sequence>
+ <call function="'testCase_Preamble'"/>
- <call function="'testCase_Preamble'"/>
-
- <message>
- 'Check the response of OpenDS when an ldap search request is conducted'
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
+ <message>
+ 'Add second entry cache which is an object of the ds-cfg-fifo-entry-cache class'
+ </message>
- </testcase>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/mod_entrycache5.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Entry Cache: Search -->
+ <testcase name="'Core: Entry Cache: Cache Search'">
+ <sequence>
- <call function="'testSuite_Postamble'"/>
+ <call function="'testCase_Preamble'"/>
+
+ <message>
+ 'Check the response of OpenDS when an ldap search request is conducted'
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+ </call>
- </sequence>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <call function="'testSuite_Postamble'"/>
+
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
index e4c5237..fdf6a08 100644
--- a/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -31,303 +31,307 @@
<function name="core_search_sizelimit">
- <sequence>
-
- <call function="'testSuite_Preamble'"/>
+ <sequence>
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <!--- Test Case : Search Size Limit: Size Limit Exceeded -->
- <testcase name="'Core: Search Size Limit: Size Limit Exceeded'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL1: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is exceeed '
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-z 150' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 4 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: Size Limit Not Exceeded -->
- <testcase name="'Core: Search Size Limit: Size Limit Not Exceeded'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL2: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is not exceeed'
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-z 151' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: Server Wide Size Limit 5 -->
- <testcase name="'Core: Search Size Limit: Server Wide Size Limit 5'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL3: Change the server-wide search size limit to 5'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: Server Wide Size Limit Exceeded -->
- <testcase name="'Core: Search Size Limit: Server Wide Size Limit Exceeded'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL4: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is exceeded'
- </message>
-
- <call function="'AnonSearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 4 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: Server Wide Size Limit 1000-->
- <testcase name="'Core: Search Size Limit: Server Wide Size Limit 1000'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL5: Change the server-wide search size limit to 1000'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit2.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: Server Wide Size Limit Not Exceeded -->
- <testcase name="'Core: Search Size Limit: Server Wide Size Limit Not Exceeded '">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL6: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is not exceeded'
- </message>
-
- <call function="'AnonSearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: Directory Manager Size Limit 5 -->
- <testcase name="'Core: Search Size Limit: Directory Manager Size Limit 5'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL7: Change the search size limit for cn=Directory Manager to 5'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit3.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: User Specific Size Limit Exceeded -->
- <testcase name="'Core: Search Size Limit: User Specific Size Limit Exceeded'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL8: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search size limit is exceeded'
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 4 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: Size Limit Not Applicable -->
- <testcase name="'Core: Search Size Limit: Size Limit Not Applicable'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL9: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search is conducted as a bind to a different user'
- </message>
-
- <call function="'AnonSearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: Modify Directory Manager Limit -1 -->
- <testcase name="'Core: Search Size Limit: Modify Directory Manager Limit -1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL10: Change the search size limit for cn=Directory Manager to -1'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit4.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Size Limit: No Size Limit -->
- <testcase name="'Core: Search Size Limit: No Size Limit'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core SSzL11: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined as "unlimited" by the user-specific parameter, ds-rlim-size-limit, equal to -1 and the search is against 1150 entries'
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+ <script>
+ CurrentTestPath['suite']='search-sizelimit'
+ </script>
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
+ <call function="'testSuite_Preamble'"/>
- </sequence>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <!--- Test Case : Search Size Limit: Size Limit Exceeded -->
+ <testcase name="'Core: Search Size Limit: Size Limit Exceeded'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL1: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is exceeed '
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-z 150' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 4 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: Size Limit Not Exceeded -->
+ <testcase name="'Core: Search Size Limit: Size Limit Not Exceeded'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL2: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is not exceeed'
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-z 151' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: Server Wide Size Limit 5 -->
+ <testcase name="'Core: Search Size Limit: Server Wide Size Limit 5'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL3: Change the server-wide search size limit to 5'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: Server Wide Size Limit Exceeded -->
+ <testcase name="'Core: Search Size Limit: Server Wide Size Limit Exceeded'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL4: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is exceeded'
+ </message>
+
+ <call function="'AnonSearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 4 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: Server Wide Size Limit 1000-->
+ <testcase name="'Core: Search Size Limit: Server Wide Size Limit 1000'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL5: Change the server-wide search size limit to 1000'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: Server Wide Size Limit Not Exceeded -->
+ <testcase name="'Core: Search Size Limit: Server Wide Size Limit Not Exceeded '">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL6: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is not exceeded'
+ </message>
+
+ <call function="'AnonSearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: Directory Manager Size Limit 5 -->
+ <testcase name="'Core: Search Size Limit: Directory Manager Size Limit 5'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL7: Change the search size limit for cn=Directory Manager to 5'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit3.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: User Specific Size Limit Exceeded -->
+ <testcase name="'Core: Search Size Limit: User Specific Size Limit Exceeded'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL8: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search size limit is exceeded'
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 4 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: Size Limit Not Applicable -->
+ <testcase name="'Core: Search Size Limit: Size Limit Not Applicable'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL9: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search is conducted as a bind to a different user'
+ </message>
+
+ <call function="'AnonSearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: Modify Directory Manager Limit -1 -->
+ <testcase name="'Core: Search Size Limit: Modify Directory Manager Limit -1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL10: Change the search size limit for cn=Directory Manager to -1'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit4.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Size Limit: No Size Limit -->
+ <testcase name="'Core: Search Size Limit: No Size Limit'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core SSzL11: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined as "unlimited" by the user-specific parameter, ds-rlim-size-limit, equal to -1 and the search is against 1150 entries'
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
+
+ <call function="'testSuite_Postamble'"/>
+
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml b/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
index 7277908..111d565 100644
--- a/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -31,301 +31,305 @@
<function name="core_search_timelimit">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='search-timelimit'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <!--- Test Case : Search Time Limit: Time Limit Exceeded -->
+ <testcase name="'Core: Search Time Limit: Time Limit Exceeded'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL1: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is exceeeded'
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-l 1' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 3 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'testSuite_Preamble'"/>
+ <!--- Test Case : Search Time Limit: Time Limit Not Exceeded -->
+ <testcase name="'Core: Search Time Limit: Time Limit Not Exceeded'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL2: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is not exceeed'
+ </message>
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-l 100' }
+
+ </call>
- <!--- Test Case : Search Time Limit: Time Limit Exceeded -->
- <testcase name="'Core: Search Time Limit: Time Limit Exceeded'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL1: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is exceeeded'
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-l 1' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 3 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Time Limit: Time Limit Not Exceeded -->
- <testcase name="'Core: Search Time Limit: Time Limit Not Exceeded'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL2: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is not exceeed'
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-l 100' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Time Limit: Server Wide Time Limit 1 -->
- <testcase name="'Core: Search Time Limit: Server Wide Time Limit 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL3: Change the server-wide search time limit to 1'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <!--- Test Case : Search Time Limit: Server Wide Time Limit Exceeded -->
- <testcase name="'Core: Search Time Limit: Server Wide Time Limit Exceeded'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL4: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is exceeded'
- </message>
+ <!--- Test Case : Search Time Limit: Server Wide Time Limit 1 -->
+ <testcase name="'Core: Search Time Limit: Server Wide Time Limit 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL3: Change the server-wide search time limit to 1'
+ </message>
- <call function="'AnonSearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 3 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Time Limit: Server Wide Time Limit 60 -->
- <testcase name="'Core: Search Time Limit: Server Wide Time Limit 60'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL5: Change the server-wide search time limit to 60'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Time Limit: Server Wide Time Limit Exceeded -->
+ <testcase name="'Core: Search Time Limit: Server Wide Time Limit Exceeded'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL4: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is exceeded'
+ </message>
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit2.ldif' % STAGED_DATA_DIR }
- </call>
+ <call function="'AnonSearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Time Limit: Server Wide Time Limit Not Exceeded -->
- <testcase name="'Core: Search Time Limit: Server Wide Time Limit Not Exceeded'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL6: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is not exceeded'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 3 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Time Limit: Server Wide Time Limit 60 -->
+ <testcase name="'Core: Search Time Limit: Server Wide Time Limit 60'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL5: Change the server-wide search time limit to 60'
+ </message>
- <call function="'AnonSearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit2.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Time Limit: Directory Manager Time Limit 1 -->
- <testcase name="'Core: Search Time Limit: Directory Manager Time Limit 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL7: Change the search time limit for cn=Directory Manager to 1'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Time Limit: Server Wide Time Limit Not Exceeded -->
+ <testcase name="'Core: Search Time Limit: Server Wide Time Limit Not Exceeded'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL6: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is not exceeded'
+ </message>
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit3.ldif' % STAGED_DATA_DIR }
- </call>
+ <call function="'AnonSearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Time Limit: User Specific Time Limit Exceeded -->
- <testcase name="'Core: Search Time Limit: User Specific Time Limit Exceeded'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL8: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter, ds-rlim-time-limit, and the search time limit is exceeded'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Time Limit: Directory Manager Time Limit 1 -->
+ <testcase name="'Core: Search Time Limit: Directory Manager Time Limit 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL7: Change the search time limit for cn=Directory Manager to 1'
+ </message>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit3.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 3 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Time Limit: Time Limit Not Applicable -->
- <testcase name="'Core: Search Time Limit: Time Limit Not Applicable'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL9: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter, ds-rlim-time-limit, and the search is conducted as a bind to a different user'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Time Limit: User Specific Time Limit Exceeded -->
+ <testcase name="'Core: Search Time Limit: User Specific Time Limit Exceeded'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL8: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter, ds-rlim-time-limit, and the search time limit is exceeded'
+ </message>
- <call function="'AnonSearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Time Limit: Directory Manager Time Limit 60 -->
- <testcase name="'Core: Search Time Limit: Directory Manager Time Limit 60'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL10: Change the search time limit for cn=Directory Manager to 60'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 3 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Time Limit: Time Limit Not Applicable -->
+ <testcase name="'Core: Search Time Limit: Time Limit Not Applicable'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL9: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter, ds-rlim-time-limit, and the search is conducted as a bind to a different user'
+ </message>
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit4.ldif' % STAGED_DATA_DIR }
- </call>
+ <call function="'AnonSearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Search Time Limit: No Time Limit -->
- <testcase name="'Core: Search Time Limit: No Time Limit'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core STmL11: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter ds-rlim-time-limit, equal to 60 and the search is conducted against 1150 entries'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Time Limit: Directory Manager Time Limit 60 -->
+ <testcase name="'Core: Search Time Limit: Directory Manager Time Limit 60'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL10: Change the search time limit for cn=Directory Manager to 60'
+ </message>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '' }
-
- </call>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit4.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Search Time Limit: No Time Limit -->
+ <testcase name="'Core: Search Time Limit: No Time Limit'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core STmL11: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter ds-rlim-time-limit, equal to 60 and the search is conducted against 1150 entries'
+ </message>
- </sequence>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '' }
+
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <call function="'testSuite_Postamble'"/>
+
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/core/core_setup.xml b/opends/tests/functional-tests/testcases/core/core_setup.xml
index 5f73152..81978d2 100644
--- a/opends/tests/functional-tests/testcases/core/core_setup.xml
+++ b/opends/tests/functional-tests/testcases/core/core_setup.xml
@@ -31,67 +31,71 @@
<function name="core_setup">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='setup'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <!--- Test Case : Setup: Add required entries -->
+ <testcase name="'Core: Setup: Add Core Entries'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Add entries that are required for the Core Tests'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/core_start.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'testSuite_Preamble'"/>
+ <!--- Test Case : To add 1000 extra entries that are required for some of the Core Tests -->
+ <testcase name="'Core: Setup: Add 1000 Core Entries'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Add 1000 extra entries that are required for some of the Core Tests'
+ </message>
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/core/ldifs/core_test_1K.ldif' % STAGED_DATA_DIR }
+ </call>
- <!--- Test Case : Setup: Add required entries -->
- <testcase name="'Core: Setup: Add Core Entries'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Add entries that are required for the Core Tests'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/core_start.ldif' % STAGED_DATA_DIR }
- </call>
+ <call function="'testSuite_Postamble'"/>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : To add 1000 extra entries that are required for some of the Core Tests -->
- <testcase name="'Core: Setup: Add 1000 Core Entries'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Add 1000 extra entries that are required for some of the Core Tests'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/core_test_1K.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
-
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/core/core_tf_filters.xml b/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
index 4baf45f..9bd73ac 100644
--- a/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
+++ b/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
@@ -31,122 +31,126 @@
<function name="core_tf_filters">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='filters'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <!--- Test Case : True False Filters: And Filter -->
+ <testcase name="'Core: True False Filters: And Filter'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core TFF1: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character '
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'cn=version,cn=monitor' ,
+ 'dsFilter' : '&' }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'testSuite_Preamble'"/>
+ <!--- Test Case : True False Filters: Or Filter -->
+ <testcase name="'Core: True False Filters: Or Filter'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core TFF2: Check the response of OpenDS when an ldap search request is conducted with a single pipe character'
+ </message>
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'cn=version,cn=monitor' ,
+ 'dsFilter' : '|' }
+ </call>
- <!--- Test Case : True False Filters: And Filter -->
- <testcase name="'Core: True False Filters: And Filter'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core TFF1: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character '
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : True False Filters: And Filter Entry Not Exists -->
+ <testcase name="'Core: True False Filters: And Filter Entry Not Exists'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core TFF3: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character for a non-existent entry'
+ </message>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=version,cn=monitor' ,
- 'dsFilter' : '&' }
- </call>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'cn=bad,cn=monitor' ,
+ 'dsFilter' : '&' }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : True False Filters: Or Filter -->
- <testcase name="'Core: True False Filters: Or Filter'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core TFF2: Check the response of OpenDS when an ldap search request is conducted with a single pipe character'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 32 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=version,cn=monitor' ,
- 'dsFilter' : '|' }
- </call>
+ <!--- Test Case : True False Filters: Or Filter Entry Not Exists -->
+ <testcase name="'Core: True False Filters: Or Filter Entry Not Exists'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core TFF4: Check the response of OpenDS when an ldap search request is conducted with a single pipe character for a non-existent entry'
+ </message>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : True False Filters: And Filter Entry Not Exists -->
- <testcase name="'Core: True False Filters: And Filter Entry Not Exists'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core TFF3: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character for a non-existent entry'
- </message>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'cn=bad,cn=monitor' ,
+ 'dsFilter' : '|' }
+ </call>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=bad,cn=monitor' ,
- 'dsFilter' : '&' }
- </call>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 32 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 32 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : True False Filters: Or Filter Entry Not Exists -->
- <testcase name="'Core: True False Filters: Or Filter Entry Not Exists'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core TFF4: Check the response of OpenDS when an ldap search request is conducted with a single pipe character for a non-existent entry'
- </message>
+ </testcase>
+
+ <call function="'testSuite_Postamble'"/>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=bad,cn=monitor' ,
- 'dsFilter' : '|' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 32 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
-
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
-
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/core/core_version_report.xml b/opends/tests/functional-tests/testcases/core/core_version_report.xml
index 2125e46..0d51881 100644
--- a/opends/tests/functional-tests/testcases/core/core_version_report.xml
+++ b/opends/tests/functional-tests/testcases/core/core_version_report.xml
@@ -31,44 +31,48 @@
<function name="core_version_report">
- <sequence>
-
- <call function="'testSuite_Preamble'"/>
+ <sequence>
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
+ <script>
+ CurrentTestPath['suite']='version-report'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
- <!--- Test Case : Version Report 1 -->
- <testcase name="'Core: Version Report: Search Version'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Core VR1: Check the response of OpenDS when an ldap search request is conducted for the current version of OpenDS '
- </message>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=version,cn=monitor' ,
- 'dsFilter' : 'objectclass=*' }
- </call>
+ <!--- Test Case : Version Report 1 -->
+ <testcase name="'Core: Version Report: Search Version'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Core VR1: Check the response of OpenDS when an ldap search request is conducted for the current version of OpenDS '
+ </message>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'cn=version,cn=monitor' ,
+ 'dsFilter' : 'objectclass=*' }
+ </call>
- </sequence>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <call function="'testSuite_Postamble'"/>
+
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/quickstart/quickstart.xml b/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
index 04bd98e..0a4cdb8 100755
--- a/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -32,8 +32,6 @@
<function name="main_quickstart">
<sequence>
-
- <call function="'testGroup_Preamble'"/>
<parallel>
@@ -62,38 +60,29 @@
<block name="'Block Clients'">
<sequence>
-
- <call function="'testSuite_Preamble'"/>
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
'noOfMilliSeconds' : 2000 }
</call>
-
- <!--- Test Case : Add Quickstart Entries -->
- <testcase name="'Quickstart: Add : Quick Start Entries'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Quickstart: Adding quickstart entries'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/quickstart/quickstart.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
+
+ <message>
+ 'Quickstart: Adding quickstart entries'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/quickstart/quickstart.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<!--- Stop DS -->
<sequence>
@@ -111,16 +100,12 @@
</call>
</sequence>
- <call function="'testSuite_Postamble'"/>
-
</sequence>
<!--- End Block Clients -->
</block>
</parallel>
-
- <call function="'testGroup_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/runFuncTests.xml b/opends/tests/functional-tests/testcases/runFuncTests.xml
index 27aed7a..822401e 100755
--- a/opends/tests/functional-tests/testcases/runFuncTests.xml
+++ b/opends/tests/functional-tests/testcases/runFuncTests.xml
@@ -33,9 +33,7 @@
<sequence>
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
+ <!--- Import all the shared xml libraries -->
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)" />
@@ -51,13 +49,27 @@
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/security.xml' % (TESTS_FUNCTIONS_DIR)" />
+ <!-- Load in any standard python libraries -->
+ <script>
+ import re
+ import posixpath
+ import sys
+ </script>
+
+ <!-- Load in any standard python functions -->
+ <script>
+ from time import localtime,strftime
+ </script>
+
+ <!-- Resolve any OS related variables -->
<call function="'setOSvariables'">
{ 'hostname' : STAF_REMOTE_HOSTNAME }
</call>
+ <!-- XXXX this needs some cleanup XXXX -->
<script>
- import re
STAXLogMessage = 1
+ LogDir='%s' % TMPDIR
SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
@@ -69,7 +81,18 @@
else:
fileExt=''
</script>
+
+ <!-- Load in the local shared python objects from libraries -->
+ <script>
+ sys.path.append("%s/python" % TESTS_SHARED_DIR )
+ from common import *
+ </script>
+ <!-- Initialize any global variables -->
+ <script>
+ CurrentTestPath={}
+ </script>
+
<!--- The Functional Tests -->
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/testcases/setup/setup.xml' % (TESTS_DIR)" />
diff --git a/opends/tests/functional-tests/testcases/schema/schema.xml b/opends/tests/functional-tests/testcases/schema/schema.xml
index 954893c..040882f 100644
--- a/opends/tests/functional-tests/testcases/schema/schema.xml
+++ b/opends/tests/functional-tests/testcases/schema/schema.xml
@@ -32,7 +32,11 @@
<function name="main_schema">
<sequence>
-
+
+ <script>
+ CurrentTestPath['group']='schema'
+ </script>
+
<call function="'testGroup_Preamble'"/>
<parallel>
diff --git a/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml b/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
index 3c1b8de..03a140a 100644
--- a/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
+++ b/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
@@ -31,1019 +31,1026 @@
<function name="schema_rfc_tests">
- <sequence>
-
- <call function="'testSuite_Preamble'"/>
+ <sequence>
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <!--- Test Case : Schema RFC Test 2079 -->
- <testcase name="'Core: Schema: RFC 2079'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2079'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2079.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 2247 -->
- <testcase name="'Core: Schema: RFC 2247 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2247'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_1.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 2247 -->
- <testcase name="'Core: Schema: RFC 2247 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2247'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_2.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 2247 -->
- <testcase name="'Core: Schema: RFC 2247 3'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2247'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_3.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC 2247 -->
- <testcase name="'Core: Schema: RFC 2247 4'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2247'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_4.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC 2247 -->
- <testcase name="'Core: Schema: RFC 2247 5'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2247'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_5.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 2377 -->
- <testcase name="'Core: Schema: RFC 2377'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2377'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2377.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 2798 -->
- <testcase name="'Core: Schema: RFC 2798'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2798'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2798.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC 3045 -->
- <testcase name="'Core: Schema: RFC 3045 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Modify an entry that is covered by rfc 3045'
- </message>
+ <script>
+ CurrentTestPath['suite']='rfc'
+ </script>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/rfc3045_1.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 53 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC 3045 -->
- <testcase name="'Core: Schema: RFC 3045 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Modify an entry that is covered by rfc 3045'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/rfc3045_2.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 53 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC 4403 -->
- <testcase name="'Core: Schema: RFC 4403 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 4403'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_1.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC 4403 -->
- <testcase name="'Core: Schema: RFC 4403 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 4403'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_2.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 4403 -->
- <testcase name="'Core: Schema: RFC 4403 3'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 4403'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_3.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 4403 -->
- <testcase name="'Core: Schema: RFC 4403 4'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 4403'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_4.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 4403 -->
- <testcase name="'Core: Schema: RFC 4403 5'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 4403'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_5.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 2307 -->
- <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_1.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC 2307 -->
- <testcase name="'Core: Schema: Draft Howard RFC 2307bis 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_2.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC 2307 -->
- <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_3.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test 2307 -->
- <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_4.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC draft-furseth-ldap-untypedobject -->
- <testcase name="'Core: Schema: Draft Furseth LDAP Untypedobject'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-furseth-ldap-untypedobject'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/untypedobject.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
- <testcase name="'Core: Schema: Draft Good LDAP Changelog 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-good-ldap-changelog'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/changelog_1.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
- <testcase name="'Core: Schema: Draft Good LDAP Changelog 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-good-ldap-changelog'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/changelog_2.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
- <testcase name="'Core: Schema: Draft Good LDAP Changelog 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-good-ldap-changelog'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/changelog_3.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
+ <call function="'testSuite_Preamble'"/>
- <!--- Test Case : Schema RFC Test draft-howard-namedobject -->
- <testcase name="'Core: Schema: Draft Howard NamedObject 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-howard-namedobject'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/namedobject_1.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test draft-howard-namedobject -->
- <testcase name="'Core: Schema: Draft Howard NamedObject 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-howard-namedobject'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/namedobject_2.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <!--- Test Case : Schema RFC Test 2079 -->
+ <testcase name="'Core: Schema: RFC 2079'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2079'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2079.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
- <testcase name="'Core: Schema: Draft IETF LDUP Subentry 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-ietf-ldup-subentry'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_1.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
+ <!--- Test Case : Schema RFC Test 2247 -->
+ <testcase name="'Core: Schema: RFC 2247 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2247'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_1.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test 2247 -->
+ <testcase name="'Core: Schema: RFC 2247 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2247'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test 2247 -->
+ <testcase name="'Core: Schema: RFC 2247 3'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2247'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_3.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC 2247 -->
+ <testcase name="'Core: Schema: RFC 2247 4'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2247'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_4.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC 2247 -->
+ <testcase name="'Core: Schema: RFC 2247 5'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2247'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_5.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test 2377 -->
+ <testcase name="'Core: Schema: RFC 2377'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2377'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2377.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test 2798 -->
+ <testcase name="'Core: Schema: RFC 2798'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2798'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2798.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC 3045 -->
+ <testcase name="'Core: Schema: RFC 3045 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Modify an entry that is covered by rfc 3045'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/schema/ldifs/rfc3045_1.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 53 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC 3045 -->
+ <testcase name="'Core: Schema: RFC 3045 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Modify an entry that is covered by rfc 3045'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/schema/ldifs/rfc3045_2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 53 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC 4403 -->
+ <testcase name="'Core: Schema: RFC 4403 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 4403'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_1.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC 4403 -->
+ <testcase name="'Core: Schema: RFC 4403 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 4403'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test 4403 -->
+ <testcase name="'Core: Schema: RFC 4403 3'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 4403'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_3.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test 4403 -->
+ <testcase name="'Core: Schema: RFC 4403 4'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 4403'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_4.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test 4403 -->
+ <testcase name="'Core: Schema: RFC 4403 5'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 4403'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_5.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test 2307 -->
+ <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_1.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC 2307 -->
+ <testcase name="'Core: Schema: Draft Howard RFC 2307bis 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
- <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
- <testcase name="'Core: Schema: Draft IETF LDUP Subentry 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-ietf-ldup-subentry'
- </message>
+ </sequence>
+
+ </testcase>
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_2.ldif' % STAGED_DATA_DIR }
- </call>
+ <!--- Test Case : Schema RFC 2307 -->
+ <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
+ </message>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_3.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test 2307 -->
+ <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-howard-rfc2307bis'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_4.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC draft-furseth-ldap-untypedobject -->
+ <testcase name="'Core: Schema: Draft Furseth LDAP Untypedobject'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-furseth-ldap-untypedobject'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/untypedobject.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
- <testcase name="'Core: Schema: Draft IETF LDUP Subentry 3'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-ietf-ldup-subentry'
- </message>
+ <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
+ <testcase name="'Core: Schema: Draft Good LDAP Changelog 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-good-ldap-changelog'
+ </message>
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_3.ldif' % STAGED_DATA_DIR }
- </call>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/changelog_1.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 53 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema Disable Schema Checking -->
- <testcase name="'Core: Schema: Disable Schema Checking'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Disable schema checking'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
+ <testcase name="'Core: Schema: Draft Good LDAP Changelog 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-good-ldap-changelog'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/changelog_2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
+ <testcase name="'Core: Schema: Draft Good LDAP Changelog 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-good-ldap-changelog'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/changelog_3.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test draft-howard-namedobject -->
+ <testcase name="'Core: Schema: Draft Howard NamedObject 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-howard-namedobject'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/namedobject_1.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test draft-howard-namedobject -->
+ <testcase name="'Core: Schema: Draft Howard NamedObject 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-howard-namedobject'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/namedobject_2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
+ <testcase name="'Core: Schema: Draft IETF LDUP Subentry 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-ietf-ldup-subentry'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_1.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
+ <testcase name="'Core: Schema: Draft IETF LDUP Subentry 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-ietf-ldup-subentry'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
+ <testcase name="'Core: Schema: Draft IETF LDUP Subentry 3'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-ietf-ldup-subentry'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_3.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 53 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema Disable Schema Checking -->
+ <testcase name="'Core: Schema: Disable Schema Checking'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Disable schema checking'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/schema/ldifs/disable_schema_checking.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema: Enable Schema Checking' -->
+ <testcase name="'Core: Schema: Enable Schema Checking'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Enable Schema Checking'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/schema/ldifs/enable_schema_checking.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/disable_schema_checking.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
+ <!--- Test Case : Schema: Disable Syntax Checking -->
+ <testcase name="'Core: Schema: Disable Syntax Checking'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Disable syntax checking'
+ </message>
- <!--- Test Case : Schema: Enable Schema Checking' -->
- <testcase name="'Core: Schema: Enable Schema Checking'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Enable Schema Checking'
- </message>
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/schema/ldifs/disable_syntax_checking.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema: Disable Syntax Checking -->
+ <testcase name="'Core: Schema: Disable Syntax Checking'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Enable syntax checking'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/schema/ldifs/enable_syntax_checking.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
+ <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_1.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
+ <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
+ <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 3'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_3.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <testcase name="'Core: Schema: RFC 2739'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2739'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2739.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'Search the entry just added and return calCalURI '
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'o=rfc tests,dc=example,dc=com' ,
+ 'dsFilter' : 'uid=tsmith' ,
+ 'attributes' : 'calCalURI' }
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/enable_schema_checking.ldif' % STAGED_DATA_DIR }
- </call>
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema: Disable Syntax Checking -->
- <testcase name="'Core: Schema: Disable Syntax Checking'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Disable syntax checking'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <testcase name="'Core: Schema: RFC 2714 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2714'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2714.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 65 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <testcase name="'Core: Schema: RFC 2714 2'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2714'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2714_2.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'Search the entry just added and return corbaRepositoryId '
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'o=rfc tests,dc=example,dc=com' ,
+ 'dsFilter' : 'cn=corba1' ,
+ 'attributes' : 'corbaRepositoryId' }
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/disable_syntax_checking.ldif' % STAGED_DATA_DIR }
- </call>
+ </call>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <testcase name="'Core: Schema: RFC 2713'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Schema: Add an entry that is covered by rfc 2713'
+ </message>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2713.ldif' % STAGED_DATA_DIR }
+ </call>
- <!--- Test Case : Schema: Disable Syntax Checking -->
- <testcase name="'Core: Schema: Disable Syntax Checking'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Enable syntax checking'
- </message>
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'Search the entry just added and return javaClassName '
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'ou=java object,o=rfc tests,dc=example,dc=com' ,
+ 'dsFilter' : 'cn=java1' ,
+ 'attributes' : 'javaClassName' }
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/enable_syntax_checking.ldif' % STAGED_DATA_DIR }
- </call>
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
- <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
- </message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <call function="'testSuite_Postamble'"/>
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_1.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
- <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_2.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
- <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 3'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_3.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <testcase name="'Core: Schema: RFC 2739'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2739'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2739.ldif' % STAGED_DATA_DIR }
- </call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
- 'Search the entry just added and return calCalURI '
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'o=rfc tests,dc=example,dc=com' ,
- 'dsFilter' : 'uid=tsmith' ,
- 'attributes' : 'calCalURI' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <testcase name="'Core: Schema: RFC 2714 1'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2714'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2714.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <testcase name="'Core: Schema: RFC 2714 2'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2714'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2714_2.ldif' % STAGED_DATA_DIR }
- </call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
- 'Search the entry just added and return corbaRepositoryId '
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'o=rfc tests,dc=example,dc=com' ,
- 'dsFilter' : 'cn=corba1' ,
- 'attributes' : 'corbaRepositoryId' }
-
- </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <testcase name="'Core: Schema: RFC 2713'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Schema: Add an entry that is covered by rfc 2713'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2713.ldif' % STAGED_DATA_DIR }
- </call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
- 'Search the entry just added and return javaClassName '
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'ou=java object,o=rfc tests,dc=example,dc=com' ,
- 'dsFilter' : 'cn=java1' ,
- 'attributes' : 'javaClassName' }
-
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
-
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/schema/schema_setup.xml b/opends/tests/functional-tests/testcases/schema/schema_setup.xml
index a4979b9..efcd007 100644
--- a/opends/tests/functional-tests/testcases/schema/schema_setup.xml
+++ b/opends/tests/functional-tests/testcases/schema/schema_setup.xml
@@ -31,43 +31,47 @@
<function name="schema_setup">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='setup'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <!--- Test Case : Add required entries -->
+ <testcase name="'Core: Schema: Add required entries'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Add entries that are required for the Schema Tests'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/schema/ldifs/schema_start.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'testSuite_Preamble'"/>
+ <call function="'testSuite_Postamble'"/>
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <!--- Test Case : Add required entries -->
- <testcase name="'Core: Schema: Add required entries'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Add entries that are required for the Schema Tests'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/schema_start.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
-
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml b/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
index 4ee9c02..ebb9c2c 100755
--- a/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
+++ b/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
@@ -32,6 +32,10 @@
<function name="security_account_activation">
<sequence>
+
+ <script>
+ CurrentTestPath['suite']='account-activation'
+ </script>
<call function="'testSuite_Preamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index f3c22d5..e4e6cf7 100755
--- a/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -31,166 +31,180 @@
<function name="account_expiration">
- <sequence>
+ <sequence>
+
+ <!--- Test case: User Bind Before Deactivation -->
+ <testcase name="'Security: Acct Exp: Preamble'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Security: Account Expiration: Preamble - Checking User Bind Before Expiration'
+ </message>
- <!--- Test case: User Bind Before Deactivation -->
- <testcase name="'Security: Acct Exp: Preamble'">
- <sequence>
- <message>
- 'Security: Account Expiration: Preamble - Checking User Bind Before Expiration'
- </message>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'inflict' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base' }
+ </call>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'inflict' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <!--- Test Case : Admin Expire User-->
+ <testcase name="'Security: Acct Exp: Admin Expire User'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Security: Account Expiration Admin Expiring User'
+ </message>
- <!--- Test Case : Admin Expire User-->
- <testcase name="'Security: Acct Exp: Admin Expire User'">
- <sequence>
- <message>
- 'Security: Account Expiration Admin Expiring User'
- </message>
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/account_activation/admin_expire_account.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_expire_account.ldif' % STAGED_DATA_DIR }
- </call>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <!--- Test Case : User Bind After Expiration-->
+ <testcase name="'Security: Acct Exp: User Bind After Expiration'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Security: Acct Exp: User Binding After Expiration'
+ </message>
- <!--- Test Case : User Bind After Expiration-->
- <testcase name="'Security: Acct Exp: User Bind After Expiration'">
- <sequence>
- <message>
- 'Security: Acct Exp: User Binding After Expiration'
- </message>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'inflict' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base' }
+ </call>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'inflict' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 1 }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 1 }
- </call>
- </sequence>
- </testcase>
+ <testcase name="'Security: Acct Exp: Admin Expire User in Future'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Security: Account Expiration Admin Expiring User in Future'
+ </message>
- <testcase name="'Security: Acct Exp: Admin Expire User in Future'">
- <sequence>
- <message>
- 'Security: Account Expiration Admin Expiring User in Future'
- </message>
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/account_activation/admin_expire_account_future.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_expire_account_future.ldif' % STAGED_DATA_DIR }
- </call>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <!--- Test Case : User Bind After Expiration-->
+ <testcase name="'Security: Acct Exp: User Bind With Future Expiration'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Security: Acct Exp: User Binding With Future Expiration'
+ </message>
- <!--- Test Case : User Bind After Expiration-->
- <testcase name="'Security: Acct Exp: User Bind With Future Expiration'">
- <sequence>
- <message>
- 'Security: Acct Exp: User Binding With Future Expiration'
- </message>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'inflict' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base' }
+ </call>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'inflict' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- </testcase>
+ <!--- Test case: Admin Reactivate User -->
+ <testcase name="'Security: Acct Exp: Postamble'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Security: Account Expiration: Postamble Step 1. Admin Removing User Expiration'
+ </message>
- <!--- Test case: Admin Reactivate User -->
- <testcase name="'Security: Acct Exp: Postamble'">
- <sequence>
- <message>
- 'Security: Account Expiration: Postamble Step 1. Admin Removing User Expiration'
- </message>
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/account_activation/admin_unexpire_account.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_unexpire_account.ldif' % STAGED_DATA_DIR }
- </call>
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
+ <message>
+ 'Security: Account Expiration Postamble Step 2. Checking User Bind After Removing Expiration'
+ </message>
- <message>
- 'Security: Account Expiration Postamble Step 2. Checking User Bind After Removing Expiration'
- </message>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'inflict' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base' }
+ </call>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=abergin,ou=people,ou=activation tests,o=Account Activation Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'inflict' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+ </sequence>
+
+ </testcase>
- </sequence>
- </testcase>
-
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
index 8740b6b..3308072 100755
--- a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
+++ b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
@@ -33,6 +33,10 @@
<sequence>
+ <script>
+ CurrentTestPath['suite']='auth-pwd-syntax'
+ </script>
+
<call function="'testSuite_Preamble'"/>
<parallel>
diff --git a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
index 07f4bb1..3bb89cc 100755
--- a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
+++ b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
@@ -31,82 +31,85 @@
<function name="security_bind_no_pwd">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='bind-no-pwd'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <parallel>
- <call function="'testSuite_Preamble'"/>
-
-<parallel>
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml' % (TESTS_DIR)"/>
- <call function="'setup_bind_no_pwd'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/bind_no_pwd/security_pwd_null.xml' % (TESTS_DIR)"/>
- <call function="'pwd_null'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml' % (TESTS_DIR)"/>
- <call function="'teardown_bind_no_pwd'" />
-
- <!--- Stop DS -->
+ <block name="'Block DS Process Active'">
+
+ <!--- Start DS -->
<sequence>
<message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
</message>
-
- <call function="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+
+ <!--- Start DS -->
+ <call function="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
</call>
-
+
<call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
+
</sequence>
+
+ <!--- End Block DS Process Active -->
+ </block>
+
+ <block name="'Block Clients'">
+
+ <sequence>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml' % (TESTS_DIR)"/>
+ <call function="'setup_bind_no_pwd'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/bind_no_pwd/security_pwd_null.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_null'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_bind_no_pwd'" />
+
+ <!--- Stop DS -->
+ <sequence>
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+
+ </sequence>
+
+ <!--- End Block Clients -->
+ </block>
- <return>RC</return>
+ </parallel>
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
-</parallel>
-
- <call function="'testSuite_Postamble'"/>
+ <call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
index 552e74d..b809964 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
@@ -31,84 +31,88 @@
<function name="security_jks">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='jks'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <parallel>
- <call function="'testSuite_Preamble'"/>
+ <block name="'Block DS Process Active'">
+
+ <!--- Start DS -->
+ <sequence>
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+
+ <!--- End Block DS Process Active -->
+ </block>
+
+ <block name="'Block Clients'">
+
+ <sequence>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/jks/security_setup_jks.xml' % (TESTS_DIR)"/>
+ <call function="'setup_jks'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/jks/security_bob_jks.xml' % (TESTS_DIR)"/>
+ <call function="'bob_jks'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/jks/security_teardown_jks.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_jks'" />
+
+ <!--- Stop DS -->
+ <sequence>
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+
+ </sequence>
+
+ <!--- End Block Clients -->
+ </block>
-<parallel>
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_setup_jks.xml' % (TESTS_DIR)"/>
- <call function="'setup_jks'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_bob_jks.xml' % (TESTS_DIR)"/>
- <call function="'bob_jks'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_teardown_jks.xml' % (TESTS_DIR)"/>
- <call function="'teardown_jks'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- <return>RC</return>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
-</parallel>
+ </parallel>
<call function="'testSuite_Postamble'"/>
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
index c552244..c25a5b1 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
@@ -31,82 +31,87 @@
<function name="security_pkcs12">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='pkcs12'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <parallel>
- <call function="'testSuite_Preamble'"/>
-
-<parallel>
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pkcs12/security_setup_pkcs12.xml' % (TESTS_DIR)"/>
- <call function="'setup_pkcs12'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pkcs12/security_bob_pkcs12.xml' % (TESTS_DIR)"/>
- <call function="'bob_pkcs12'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pkcs12/security_teardown_pkcs12.xml' % (TESTS_DIR)"/>
- <call function="'teardown_pkcs12'" />
-
- <!--- Stop DS -->
+ <block name="'Block DS Process Active'">
+
+ <!--- Start DS -->
+ <sequence>
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+
+ <!--- End Block DS Process Active -->
+ </block>
+
+ <block name="'Block Clients'">
+
<sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
</call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pkcs12/security_setup_pkcs12.xml' % (TESTS_DIR)"/>
+ <call function="'setup_pkcs12'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pkcs12/security_bob_pkcs12.xml' % (TESTS_DIR)"/>
+ <call function="'bob_pkcs12'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pkcs12/security_teardown_pkcs12.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_pkcs12'" />
+
+ <!--- Stop DS -->
+ <sequence>
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+
+ <call function="'testSuite_Postamble'"/>
+
</sequence>
+
+ <!--- End Block Clients -->
+ </block>
- <call function="'testSuite_Postamble'"/>
+ </parallel>
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
-</parallel>
-
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
index 2848bda..50e6d2f 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
@@ -31,123 +31,127 @@
<function name="security_pwd_policy">
- <sequence>
+ <sequence>
- <call function="'testSuite_Preamble'"/>
+ <script>
+ CurrentTestPath['suite']='pwd-policy'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
-<parallel>
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_setup_pwd_policy.xml' % (TESTS_DIR)"/>
- <call function="'setup_pwd_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_user_pwd_policy.xml' % (TESTS_DIR)"/>
- <call function="'user_pwd_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_force_pwd_change.xml' % (TESTS_DIR)"/>
- <call function="'force_pwd_change'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml' % (TESTS_DIR)"/>
- <call function="'force_pwd_change_all_users'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_enable_max_pwd_age.xml' % (TESTS_DIR)"/>
- <call function="'enable_max_pwd_age'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_disable_max_pwd_age.xml' % (TESTS_DIR)"/>
- <call function="'disable_max_pwd_age'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_min_pwd_age.xml' % (TESTS_DIR)"/>
- <call function="'min_pwd_age'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_lockout_fail_cnt.xml' % (TESTS_DIR)"/>
- <call function="'lockout_fail_cnt'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_mult_pwd_policies.xml' % (TESTS_DIR)"/>
- <call function="'mult_pwd_policies'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_preencoded_pwds.xml' % (TESTS_DIR)"/>
- <call function="'preencoded_pwds'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_lockout_duration.xml' % (TESTS_DIR)"/>
- <call function="'lockout_duration'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_last_login.xml' % (TESTS_DIR)"/>
- <call function="'last_login'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_teardown_pwd_policy.xml' % (TESTS_DIR)"/>
- <call function="'teardown_pwd_policy'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- <return>RC</return>
-
- </sequence>
-
+ <parallel>
+
+ <block name="'Block DS Process Active'">
+
+ <!--- Start DS -->
+ <sequence>
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+
+ <!--- End Block DS Process Active -->
+ </block>
+
+ <block name="'Block Clients'">
+
+ <sequence>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_setup_pwd_policy.xml' % (TESTS_DIR)"/>
+ <call function="'setup_pwd_policy'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_user_pwd_policy.xml' % (TESTS_DIR)"/>
+ <call function="'user_pwd_policy'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_force_pwd_change.xml' % (TESTS_DIR)"/>
+ <call function="'force_pwd_change'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml' % (TESTS_DIR)"/>
+ <call function="'force_pwd_change_all_users'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_enable_max_pwd_age.xml' % (TESTS_DIR)"/>
+ <call function="'enable_max_pwd_age'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_disable_max_pwd_age.xml' % (TESTS_DIR)"/>
+ <call function="'disable_max_pwd_age'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_min_pwd_age.xml' % (TESTS_DIR)"/>
+ <call function="'min_pwd_age'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_lockout_fail_cnt.xml' % (TESTS_DIR)"/>
+ <call function="'lockout_fail_cnt'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_mult_pwd_policies.xml' % (TESTS_DIR)"/>
+ <call function="'mult_pwd_policies'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_preencoded_pwds.xml' % (TESTS_DIR)"/>
+ <call function="'preencoded_pwds'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_lockout_duration.xml' % (TESTS_DIR)"/>
+ <call function="'lockout_duration'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_last_login.xml' % (TESTS_DIR)"/>
+ <call function="'last_login'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_teardown_pwd_policy.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_pwd_policy'" />
+
+ <!--- Stop DS -->
+ <sequence>
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+
+ </sequence>
+
<!--- End Block Clients -->
</block>
-</parallel>
+ </parallel>
- <call function="'testSuite_Postamble'"/>
- </sequence>
+ <call function="'testSuite_Postamble'"/>
+
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
index 3a8c10f..a2aab70 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
@@ -51,7 +51,7 @@
'extraParams' : '-x'}
</call>
- <call function="'checkRC'">
+ <call function="'checktestRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml b/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
index 58e919b..6f55084 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
@@ -33,73 +33,77 @@
<sequence>
+ <script>
+ CurrentTestPath['suite']='pwd-policy-root'
+ </script>
+
<call function="'testSuite_Preamble'"/>
-<parallel>
- <block name="'Block DS Process Active'">
+
+ <parallel>
+
+ <block name="'Block DS Process Active'">
+
+ <!--- Start DS -->
+ <sequence>
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+
+ <!--- End Block DS Process Active -->
+ </block>
+
+ <block name="'Block Clients'">
+
+ <sequence>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy_root/security_root_user_tests.xml' % (TESTS_DIR)"/>
+ <call function="'root_user_tests'" />
+
+ <!--- Stop DS -->
+ <sequence>
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+
+ </sequence>
+
+ <!--- End Block Clients -->
+ </block>
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
+ </parallel>
- <!--- Start DS -->
- <call function="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </call>
+ <call function="'testSuite_Postamble'"/>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy_root/security_root_user_tests.xml' % (TESTS_DIR)"/>
- <call function="'root_user_tests'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- <return>RC</return>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
-</parallel>
-
- <call function="'testSuite_Postamble'"/>
-
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml b/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
index afadf09..de199b1 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
@@ -31,101 +31,102 @@
<function name="root_user_tests">
- <sequence>
+ <sequence>
- <!--- Check Existence of ds-cfg-default-password-storage-scheme Attr -->
- <testcase name="'Security: Pwd Policy Root: Default Pwd Scheme'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Security: Pwd Policy Root: Checking default value ds-cfg-default-password-storage-scheme'
- </message>
+ <!--- Check Existence of ds-cfg-default-password-storage-scheme Attr -->
+ <testcase name="'Security: Pwd Policy Root: Default Pwd Scheme'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Security: Pwd Policy Root: Checking default value ds-cfg-default-password-storage-scheme'
+ </message>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=Root Password Policy,cn=Password Policies,cn=config' ,
- 'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'ds-cfg-default-password-storage-scheme' }
- </call>
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'cn=Root Password Policy,cn=Password Policies,cn=config' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'attributes' : 'ds-cfg-default-password-storage-scheme' }
+ </call>
- <script>
- returnString = STAXResult[0][1]
- </script>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
- <call function="'checktestString'">
- { 'returnString' : returnString ,
- 'expectedString' : 'SSHA' }
- </call>
-
- <call function="'testCase_Postamble'"/>
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'SSHA' }
+ </call>
- </sequence>
- </testcase>
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
- <!--- Check Existence of ds-cfg-password-generator-dn Attr -->
- <testcase name="'Security: Pwd Policy Root: No Default Pwd Generator'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Security: Pwd Policy Root: Checking for ds-cfg-password-generator-dn'
- </message>
+ <!--- Check Existence of ds-cfg-password-generator-dn Attr -->
+ <testcase name="'Security: Pwd Policy Root: No Default Pwd Generator'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Security: Pwd Policy Root: Checking for ds-cfg-password-generator-dn'
+ </message>
- <call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-password-generator-dn:cn=anything',
- 'entryToBeCompared' : 'cn=Root Password Policy,cn=Password Policies,cn=config' }
- </call>
+ <call function="'compareEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'ds-cfg-password-generator-dn:cn=anything',
+ 'entryToBeCompared' : 'cn=Root Password Policy,cn=Password Policies,cn=config' }
+ </call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 16 }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
-
- <!--- Check Existence of ds-cfg-password-change-requires-current-password Attr -->
- <testcase name="'Security: Pwd Policy Root: Default Pwd Change Setting'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Security: Pwd Policy Root: Checking default value ds-cfg-password-change-requires-current-password'
- </message>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=Root Password Policy,cn=Password Policies,cn=config' ,
- 'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'ds-cfg-password-change-requires-current-password' }
- </call>
-
- <script>
- returnString = STAXResult[0][1]
- </script>
-
- <call function="'checktestString'">
- { 'returnString' : returnString ,
- 'expectedString' : 'true' }
- </call>
-
- <call function="'testCase_Postamble'"/>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult ,
+ 'expected' : 16 }
+ </call>
- </sequence>
- </testcase>
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+ </testcase>
- </sequence>
+ <!--- Check Existence of ds-cfg-password-change-requires-current-password Attr -->
+ <testcase name="'Security: Pwd Policy Root: Default Pwd Change Setting'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Security: Pwd Policy Root: Checking default value ds-cfg-password-change-requires-current-password'
+ </message>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'cn=Root Password Policy,cn=Password Policies,cn=config' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'attributes' : 'ds-cfg-password-change-requires-current-password' }
+ </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'checktestString'">
+ { 'returnString' : returnString ,
+ 'expectedString' : 'true' }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
index 62e65bd..d64f9d5 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
@@ -31,122 +31,126 @@
<function name="security_pwd_storage">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='pwd-storage'
+ </script>
- <call function="'testSuite_Preamble'"/>
-
-<parallel>
- <block name="'Block DS Process Active'">
+ <call function="'testSuite_Preamble'"/>
+
+ <parallel>
+
+ <block name="'Block DS Process Active'">
+
+ <!--- Start DS -->
+ <sequence>
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+
+ <!--- End Block DS Process Active -->
+ </block>
+
+ <block name="'Block Clients'">
+
+ <sequence>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_setup_pwd_storage.xml' % (TESTS_DIR)"/>
+ <call function="'setup_pwd_storage'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SSHA.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SSHA'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SHA.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SHA'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SSHA256.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SSHA256'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SSHA384.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SSHA384'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SSHA512.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SSHA512'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_MD5.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_MD5'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SMD5.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SMD5'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_BASE64.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_BASE64'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_CLEAR.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_CLEAR'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_multiple_schemes.xml' % (TESTS_DIR)"/>
+ <call function="'multiple_schemes'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_deprecated_schemes.xml' % (TESTS_DIR)"/>
+ <call function="'deprecated_schemes'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_teardown_pwd_storage.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_pwd_storage'" />
+
+ <!--- Stop DS -->
+ <sequence>
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+
+ </sequence>
+
+ <!--- End Block Clients -->
+ </block>
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_setup_pwd_storage.xml' % (TESTS_DIR)"/>
- <call function="'setup_pwd_storage'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SSHA.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SSHA'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SHA.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SHA'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SSHA256.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SSHA256'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SSHA384.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SSHA384'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SSHA512.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SSHA512'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_MD5.xml' % (TESTS_DIR)"/>
- <call function="'pwd_MD5'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SMD5.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SMD5'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_BASE64.xml' % (TESTS_DIR)"/>
- <call function="'pwd_BASE64'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_CLEAR.xml' % (TESTS_DIR)"/>
- <call function="'pwd_CLEAR'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_multiple_schemes.xml' % (TESTS_DIR)"/>
- <call function="'multiple_schemes'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_deprecated_schemes.xml' % (TESTS_DIR)"/>
- <call function="'deprecated_schemes'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_teardown_pwd_storage.xml' % (TESTS_DIR)"/>
- <call function="'teardown_pwd_storage'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- <return>RC</return>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
-</parallel>
+ </parallel>
<call function="'testSuite_Postamble'"/>
+
</sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml b/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
index 33a1678..f4494e5 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
@@ -31,86 +31,91 @@
<function name="security_pwd_validator">
- <sequence>
+ <sequence>
- <call function="'testSuite_Preamble'"/>
-
-<parallel>
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
+ <script>
+ CurrentTestPath['suite']='pwd-validator'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <parallel>
+
+ <block name="'Block DS Process Active'">
+
<!--- Start DS -->
- <call function="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_validator/security_setup_pwd_validator.xml' % (TESTS_DIR)"/>
- <call function="'setup_pwd_validator'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_validator/security_pwd_length.xml' % (TESTS_DIR)"/>
- <call function="'pwd_length'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_validator/security_skip_val_for_admins.xml' % (TESTS_DIR)"/>
- <call function="'skip_val_for_admins'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_validator/security_teardown_pwd_validator.xml' % (TESTS_DIR)"/>
- <call function="'teardown_pwd_validator'" />
-
- <!--- Stop DS -->
<sequence>
<message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
</message>
-
- <call function="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+
+ <!--- Start DS -->
+ <call function="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
</call>
-
+
<call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
+
</sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
+
+ <!--- End Block DS Process Active -->
</block>
+
+ <block name="'Block Clients'">
+
+ <sequence>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_validator/security_setup_pwd_validator.xml' % (TESTS_DIR)"/>
+ <call function="'setup_pwd_validator'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_validator/security_pwd_length.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_length'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_validator/security_skip_val_for_admins.xml' % (TESTS_DIR)"/>
+ <call function="'skip_val_for_admins'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_validator/security_teardown_pwd_validator.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_pwd_validator'" />
+
+ <!--- Stop DS -->
+ <sequence>
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+
+ </sequence>
+
+ <!--- End Block Clients -->
+ </block>
-</parallel>
+ </parallel>
- <call function="'testSuite_Postamble'"/>
-
- </sequence>
+ <call function="'testSuite_Postamble'"/>
+
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml b/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
index 064f030..cddfa78 100755
--- a/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
+++ b/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
@@ -31,96 +31,99 @@
<function name="security_sasl">
- <sequence>
+ <sequence>
- <call function="'testSuite_Preamble'"/>
+ <script>
+ CurrentTestPath['suite']='sasl'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
-<parallel>
- <block name="'Block DS Process Active'">
+ <parallel>
+
+ <block name="'Block DS Process Active'">
+
+ <!--- Start DS -->
+ <sequence>
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+
+ <!--- End Block DS Process Active -->
+ </block>
+
+ <block name="'Block Clients'">
+
+ <sequence>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/sasl/security_setup_sasl.xml' % (TESTS_DIR)"/>
+ <call function="'setup_sasl'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/sasl/security_sasl_anon.xml' % (TESTS_DIR)"/>
+ <call function="'sasl_anon'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/sasl/security_sasl_plain.xml' % (TESTS_DIR)"/>
+ <call function="'sasl_plain'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/sasl/security_sasl_cram-md5.xml' % (TESTS_DIR)"/>
+ <call function="'sasl_cram-md5'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/sasl/security_sasl_digest-md5.xml' % (TESTS_DIR)"/>
+ <call function="'sasl_digest-md5'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/sasl/security_teardown_sasl.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_sasl'" />
+
+ <!--- Stop DS -->
+ <sequence>
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+
+ </sequence>
+
+ <!--- End Block Clients -->
+ </block>
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
+ </parallel>
- <!--- Start DS -->
- <call function="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_setup_sasl.xml' % (TESTS_DIR)"/>
- <call function="'setup_sasl'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_sasl_anon.xml' % (TESTS_DIR)"/>
- <call function="'sasl_anon'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_sasl_plain.xml' % (TESTS_DIR)"/>
- <call function="'sasl_plain'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_sasl_cram-md5.xml' % (TESTS_DIR)"/>
- <call function="'sasl_cram-md5'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_sasl_digest-md5.xml' % (TESTS_DIR)"/>
- <call function="'sasl_digest-md5'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_teardown_sasl.xml' % (TESTS_DIR)"/>
- <call function="'teardown_sasl'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- <return>RC</return>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
-</parallel>
-
- <call function="'testSuite_Postamble'"/>
+ <call function="'testSuite_Postamble'"/>
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/security/security.xml b/opends/tests/functional-tests/testcases/security/security.xml
index 3b70d9f..ca57e87 100755
--- a/opends/tests/functional-tests/testcases/security/security.xml
+++ b/opends/tests/functional-tests/testcases/security/security.xml
@@ -33,8 +33,12 @@
<sequence>
+ <script>
+ CurrentTestPath['group']='security'
+ </script>
+
<call function="'testGroup_Preamble'"/>
-
+
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/testcases/security/jks/security_jks.xml' % (TESTS_DIR)"/>
<call function="'security_jks'" />
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
index fbf2e07..641c27f 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
@@ -31,88 +31,91 @@
<function name="security_startTLS">
- <sequence>
+ <sequence>
- <call function="'testSuite_Preamble'"/>
+ <script>
+ CurrentTestPath['suite']='startTLS'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
-<parallel>
- <block name="'Block DS Process Active'">
+ <parallel>
+
+ <block name="'Block DS Process Active'">
+
+ <!--- Start DS -->
+ <sequence>
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+
+ <!--- End Block DS Process Active -->
+ </block>
+
+ <block name="'Block Clients'">
+
+ <sequence>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/startTLS/security_setup_startTLS.xml' % (TESTS_DIR)"/>
+ <call function="'setup_startTLS'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/startTLS/security_bob_startTLS.xml' % (TESTS_DIR)"/>
+ <call function="'bob_startTLS'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/startTLS/security_force_pwd_change_startTLS.xml' % (TESTS_DIR)"/>
+ <call function="'force_pwd_change_startTLS'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/startTLS/security_teardown_startTLS.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_startTLS'" />
+
+ <!--- Stop DS -->
+ <sequence>
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+
+ </sequence>
+
+ <!--- End Block Clients -->
+ </block>
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
+ </parallel>
- <!--- Start DS -->
- <call function="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/startTLS/security_setup_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'setup_startTLS'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/startTLS/security_bob_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'bob_startTLS'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/startTLS/security_force_pwd_change_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'force_pwd_change_startTLS'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/startTLS/security_teardown_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'teardown_startTLS'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- <return>RC</return>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
-</parallel>
-
- <call function="'testSuite_Postamble'"/>
+ <call function="'testSuite_Postamble'"/>
- </sequence>
+ </sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/setup/setup.xml b/opends/tests/functional-tests/testcases/setup/setup.xml
index 232b411..fd5f99a 100755
--- a/opends/tests/functional-tests/testcases/setup/setup.xml
+++ b/opends/tests/functional-tests/testcases/setup/setup.xml
@@ -32,7 +32,7 @@
<function name="main_setup">
<sequence>
-
+
<!-- Delete any existing files -->
<message>'Delete temporary staging area'</message>
<call function="'deletefolder'">
--
Gitblit v1.10.0