From 55927d1f49e61d4175ebafb5cea560f2b58a1244 Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Fri, 06 Jul 2007 16:18:44 +0000
Subject: [PATCH] WS modifications to use checktestRC
---
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml | 51 +++++++------------------
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml | 35 +++++------------
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml | 7 +--
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml | 7 +--
4 files changed, 28 insertions(+), 72 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index f305993..db0ecc0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -48,13 +48,10 @@
'dsInstancePswd' : 'inflict' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -72,13 +69,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_expire_account.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/account_activation/admin_expire_account.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -98,14 +92,10 @@
'dsInstancePswd' : 'inflict' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -122,13 +112,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_expire_account_future.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/account_activation/admin_expire_account_future.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -148,13 +135,10 @@
'dsInstancePswd' : 'inflict' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -172,13 +156,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_unexpire_account.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/account_activation/admin_unexpire_account.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Account Expiration Postamble Step 2. Checking User Bind After Removing Expiration'
</message>
@@ -190,12 +171,8 @@
'dsInstancePswd' : 'inflict' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
index 74cc23e..0c2cecb 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
@@ -46,13 +46,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/account_activation/account_activation_startup.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/account_activation/account_activation_startup.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
index 51007c0..b65d7b6 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
@@ -48,13 +48,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'o=Account Activation Tests,dc=example,dc=com' ,
- 'extraParams' : '-x'}
+ 'extraParams' : '-x',
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
index 6fbda6e..c2890a9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
@@ -48,13 +48,10 @@
'dsInstancePswd' : 'sprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -72,13 +69,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_deactivate_account.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/account_activation/admin_deactivate_account.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -98,14 +92,10 @@
'dsInstancePswd' : 'sprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -123,12 +113,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/account_activation/admin_reactivate_account.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/account_activation/admin_reactivate_account.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Account Activation: Postamble Step 2. Checking User Bind After Reactivation'
@@ -141,13 +129,10 @@
'dsInstancePswd' : 'sprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
--
Gitblit v1.10.0