From 30df460c52eb2742645230dc07bfaaafdfd8f3ee Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Fri, 06 Jul 2007 16:26:50 +0000
Subject: [PATCH] WS modification to use checktestRC
---
opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml | 183 ++++--------------------------------
opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml | 56 +++++++---
opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml | 20 ----
opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml | 36 +++---
4 files changed, 76 insertions(+), 219 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
index 8d442f3..d953a19 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
@@ -50,11 +50,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -77,11 +72,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -104,11 +94,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -131,11 +116,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
index ab40a09..8f3765d 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
@@ -51,10 +51,6 @@
'extraParams' : '-q -X' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: Preamble Step 2. Admin Enabling Force Password On Add'
</message>
@@ -68,11 +64,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -95,10 +86,6 @@
'extraParams' : '-q -X' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: User Searching With Password'
</message>
@@ -110,15 +97,10 @@
'dsInstancePswd' : 'pizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -q -X' }
+ 'extraParams' : '-s base -q -X' ,
+ 'expectedRC' : 19 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 19 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -141,10 +123,6 @@
'extraParams' : '-q -X' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: User Searching With Password'
</message>
@@ -159,11 +137,6 @@
'extraParams' : '-s base -q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -186,10 +159,6 @@
'extraParams' : '-q -X' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: Postamble Step 2. Adding Single New User'
</message>
@@ -203,10 +172,6 @@
'extraParams' : '-q -X' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: Postamble Step 3. User Searching With Password'
</message>
@@ -221,11 +186,6 @@
'extraParams' : '-s base -q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -248,10 +208,6 @@
'extraParams' : '-q -X' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: Preamble Step 2. Admin Enabling Force Password On Reset'
</message>
@@ -265,11 +221,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -292,11 +243,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -318,15 +264,10 @@
'dsInstancePswd' : 'pizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -q -X' }
+ 'extraParams' : '-s base -q -X' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -346,13 +287,10 @@
'dsInstanceDn' : 'uid=mdog,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_add_attr.ldif' % logsRemoteDataDir ,
- 'extraParams' : '-q -X' }
+ 'extraParams' : '-q -X' ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: Checking For Existence of User-added Attribute'
</message>
@@ -364,15 +302,9 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'attrToBeCompared' : 'pager:+1 999 555-1212',
'entryToBeCompared' : 'uid=mdog,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
- 'extraParams' : '-q -X' }
+ 'extraParams' : '-q -X' ,
+ 'expectedRC' : 16 }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 16 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -392,13 +324,10 @@
'dsInstanceDn' : 'uid=mdog,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_del_attr.ldif' % logsRemoteDataDir ,
- 'extraParams' : '-q -X' }
+ 'extraParams' : '-q -X' ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: Checking For Existence of User-deleted Attribute'
</message>
@@ -413,11 +342,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -438,13 +362,8 @@
'dsInstancePswd' : 'pizza' ,
'attrToBeCompared' : 'l:Sunnyvale',
'entryToBeCompared' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'extraParams' : '-q -X' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-q -X' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -467,13 +386,8 @@
'dsInstancePswd' : 'adminpizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -q -X' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 19 }
+ 'extraParams' : '-s base -q -X' ,
+ 'expectedRC' : 19 }
</call>
<call function="'testCase_Postamble'"/>
@@ -498,10 +412,6 @@
'extraParams' : '-q -X' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: User Searching With Assigned Password'
</message>
@@ -513,12 +423,10 @@
'dsInstancePswd' : 'adminpizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -q -X' }
+ 'extraParams' : '-s base -q -X' ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: TLS: User Searching With New Password'
@@ -534,11 +442,6 @@
'extraParams' : '-s base -q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -561,11 +464,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -588,11 +486,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -615,10 +508,6 @@
'extraParams' : '-q -X' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: User Searching With Password'
</message>
@@ -633,11 +522,6 @@
'extraParams' : '-s base -q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -660,11 +544,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -687,11 +566,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -719,13 +593,10 @@
'dsInstanceDn' : 'uid=mdog,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'adminshortpizza' ,
'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_change_pwd3.ldif' % logsRemoteDataDir ,
- 'extraParams' : '-q -X' }
+ 'extraParams' : '-q -X' ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: User Searching With Password'
</message>
@@ -737,13 +608,8 @@
'dsInstancePswd' : 'newshortpizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -q -X' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-s base -q -X' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -768,10 +634,6 @@
'extraParams' : '-q -X' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: TLS: Postamble Step 2. Admin Disabling Force Password On Reset'
</message>
@@ -785,11 +647,6 @@
'extraParams' : '-q -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
index 215ba7d..6af1e7f 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
@@ -42,26 +42,29 @@
'Security: TLS: Preamble Step 1. Generating Server Certicate'
</message>
- <call function="'genServerJKSCert'">
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+ <call function="'genCertificate'">
+ { 'certAlias' : 'server-cert' ,
+ 'dname' : "cn=client,O=Sun Microsystems,C=US",
+ 'keystore' : 'keystore',
+ 'storepass' : 'servercert',
+ 'keypass' : 'servercert',
+ 'storetype' : 'JKS' }
+ </call>
<!--- Self-Sign Server Cert -->
<message>
'Security: TLS: Preamble Step 2. Self-Signing Server Certicate'
</message>
- <call function="'selfSignServerJKSCert'">
- </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+ <call function="'SelfSignCertificate'">
+ { 'certAlias' : 'server-cert' ,
+ 'storepass' : 'servercert',
+ 'keypass' : 'servercert',
+ 'keystore' : 'keystore',
+ 'storetype' : 'JKS' }
+ </call>
+
<!--- Configure JKS Keystore -->
<message>
@@ -76,7 +79,7 @@
'keystoreType' : '%s' % 'startTLS' }
</call>
- <call function="'checkRC'">
+ <call function="'checktestRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -96,11 +99,6 @@
'extraParams' : '-q -X -s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
index 4431490..0091412 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
@@ -56,24 +56,51 @@
'result' : STAXResult }
</call>
- <!--- Unconfigure JKS Keystore -->
- <message>
- 'Security: TLS: Postamble Step 2. Unconfiguring JKS Keystore'
- </message>
+
+
+ <!--- Disable SSL Trust Manager Provider -->
+ <message> 'Disabling SSL Trust Manager Provider' </message>
- <call function="'unconfigureTLS'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'keystoreType' : '%s' % 'startTLS' }
- </call>
+ 'entryToBeModified' : '%s/security/startTLS/teardown/disable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
+ <!--- Disable Key Manager Provider -->
+ <message>
+ 'Disabling Key Manager Provider'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/startTLS/teardown/disable_key_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
+
+
+ <!--- Disable StartTLS -->
+ <message>
+ 'Disabling StartTLS'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/startTLS/teardown/disable_startTLS.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
+
<!--- Remove JKS Keystore -->
<message>
'Security: TLS: Postamble Step 3. Removing JKS Keystore'
@@ -103,11 +130,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
--
Gitblit v1.10.0