From ae02a5b7fd1b0b057bb975f1a04d6a3c502fa960 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Mon, 16 Jul 2007 21:07:43 +0000
Subject: [PATCH] This commit fixes the pkcs12 functional test suite.
---
opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml | 89 +++++++++-----------------------------------
1 files changed, 18 insertions(+), 71 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
index 7542b7e..dd5160a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
@@ -69,97 +69,45 @@
'Security: PKCS12: Preamble Step 1. Generating Server PKCS12 Certicate'
</message>
- <call function="'genCertificate'">
+ <call function="'genCertificate'">
{ 'certAlias' : 'server-cert' ,
'dname' : "cn=client,O=Sun Microsystems,C=US",
'keystore' : 'keystore',
'storepass' : 'servercert',
'keypass' : 'servercert',
- 'storetype' : 'PKCS12' }
- </call>
-
+ 'storetype' : 'PKCS12' }
+ </call>
<!--- Self-Sign Server Cert -->
<message>
'Security: PKCS12: Preamble Step 2. Self-Signing Server PKCS12 Certicate'
</message>
+
<call function="'SelfSignCertificate'">
{ 'certAlias' : 'server-cert' ,
- 'storepass' : 'servercert',
- 'keypass' : 'servercert',
- 'keystore' : 'keystore',
- 'storetype' : 'PKCS12' }
+ 'storepass' : 'servercert',
+ 'keypass' : 'servercert',
+ 'keystore' : 'keystore',
+ 'storetype' : 'PKCS12' }
</call>
-
<!--- Configure PKCS12 Keystore -->
<message>
'Security: PKCS12: Preamble Step 3. Configuring PKCS12 Keystore'
</message>
- <!-- Configure SSL-->
-
- <message>
- '---- Configure SSL ----'
- </message>
-
- <!--- Enable Key Manager Provider -->
- <message>
- 'Enabling Key Manager Provider'
- </message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ <call function="'configureSSL'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/setup/enable_key_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'keystoreType' : '%s' % 'pkcs12' }
+ </call>
-
- <!--- Enable Trust Manager Provider -->
- <message>
- 'Enabling Trust 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/pkcs12/setup/enable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
-
- <!--- Enable LDAPS Connection Handler -->
- <message>
- 'Enabling LDAPS Connection Handler - Port number'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/ldaps_port.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
- <!-- Enabling LDAPS Connection Handler - Keystore type -->
- <message>
- 'Enabling LDAPS Connection Handler - Keystore type'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/setup/enable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
- 'expectedRC' : 0 }
- </call>
-
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<!--- Initial Search With SSL -->
<message>
@@ -171,12 +119,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-Z -X' }
</call>
-
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
--
Gitblit v1.10.0