From 0737e43e6f6544d74d67d5573a7cde178980ac96 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 06 Jul 2007 15:31:17 +0000
Subject: [PATCH] WS modification
---
opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml | 27 ++++---------
opends/tests/functional-tests/testcases/core/core_entry_cache.xml | 10 +---
opends/tests/functional-tests/testcases/core/core_tf_filters.xml | 18 +++------
opends/tests/functional-tests/testcases/core/core_search_timelimit.xml | 36 ++++++------------
4 files changed, 30 insertions(+), 61 deletions(-)
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 ac549b1..6a96b33 100644
--- a/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
+++ b/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -153,13 +153,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/core/ldifs/mod_entrycache4.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
+ 'entryToBeModified' : '%s/core/ldifs/mod_entrycache4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 65
+ }
</call>
<call function="'testCase_Postamble'"/>
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 1919856..4077c02 100644
--- a/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -67,15 +67,12 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-z 150' }
+ 'extraParams' : '-z 150' ,
+ 'expectedRC' : 4
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 4 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -143,15 +140,12 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 4
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 4 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -242,15 +236,12 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'ou=People,o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 4
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 4 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
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 6e747d5..ef02a00 100644
--- a/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -85,15 +85,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-l 1' }
-
+ 'extraParams' : '-l 1' ,
+ 'expectedRC' : 3
+ }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 3 }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -161,15 +157,11 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
-
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 3
+ }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 3 }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -260,15 +252,11 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'o=core tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
-
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 3
+ }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 3 }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
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 513baf4..67c5d98 100644
--- a/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
+++ b/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
@@ -115,14 +115,11 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'cn=bad,cn=monitor' ,
- 'dsFilter' : '&' }
+ 'dsFilter' : '&' ,
+ 'expectedRC' : 32
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 32 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -141,14 +138,11 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'cn=bad,cn=monitor' ,
- 'dsFilter' : '|' }
+ 'dsFilter' : '|' ,
+ 'expectedRC' : 32
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 32 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
--
Gitblit v1.10.0