[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/util WBEMConfigurationTest.java, 1.3.2.10, 1.3.2.11

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util
In directory vz-cvs-3.sog:/tmp/cvs-serv16103/utst/org/sblim/cimclient/unittest/util

Modified Files:
      Tag: Experimental
	WBEMConfigurationTest.java 
Log Message:
3496355 - JSR48 1.0.0: add new WBEMClientConstants

Index: WBEMConfigurationTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util/WBEMConfigurationTest.java,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.11
diff -u -d -r1.3.2.10 -r1.3.2.11
--- WBEMConfigurationTest.java	13 Jan 2010 02:04:06 -0000	1.3.2.10
+++ WBEMConfigurationTest.java	2 Mar 2012 21:22:13 -0000	1.3.2.11
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2012
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -21,6 +21,7 @@
  * 2882448    2009-10-21  blaschke-oss Add WBEMClientConstants from JSR48
  * 2884718    2009-10-23  blaschke-oss Merge JSR48 and SBLIM client properties
  * 2930341    2010-01-12  blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0
+ * 3496355    2012-03-02  blaschke-oss JSR48 1.0.0: add new WBEMClientConstants
  */
 
 package org.sblim.cimclient.unittest.util;
@@ -262,6 +263,12 @@
 		verify("Uninit timeout", EQUAL, client.getProperty(WBEMClientConstants.PROP_TIMEOUT), null);
 		verify("Uninit chunking", EQUAL, client
 				.getProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING), null);
+		verify("Uninit keystore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE), null);
+		verify("Uninit keystore passwd", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD), null);
+		verify("Uninit truststore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), null);
 
 		// Setting corresponding SBLIM properties affect JSR48 properties
 		client.setProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL, "ALL");
@@ -272,6 +279,9 @@
 		client.setProperty(WBEMConfigurationProperties.LOG_FILE_COUNT, "50");
 		client.setProperty(WBEMConfigurationProperties.HTTP_TIMEOUT, "60000");
 		client.setProperty(WBEMConfigurationProperties.HTTP_USE_CHUNKING, "false");
+		client.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, pathAbsoluteLong1);
+		client.setProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD, "passw0rd");
+		client.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pathAbsoluteLong2);
 
 		verify("SBLIM init enab con", EQUAL, client
 				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "0");
@@ -291,6 +301,12 @@
 				"60000");
 		verify("SBLIM init chunking", EQUAL, client
 				.getProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING), "0");
+		verify("SBLIM init keystore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE), pathAbsoluteLong1);
+		verify("SBLIM init keystore passwd", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD), "passw0rd");
+		verify("SBLIM init truststore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), pathAbsoluteLong2);
 
 		// Set JSR48 properties directly
 		client.setProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING, "1");
@@ -302,6 +318,9 @@
 		client.setProperty(WBEMClientConstants.PROP_LOG_NUM_FILES, "4");
 		client.setProperty(WBEMClientConstants.PROP_TIMEOUT, "5000");
 		client.setProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING, "1");
+		client.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, pathRelativeLong1);
+		client.setProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD, "pa$$word");
+		client.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pathRelativeLong2);
 
 		verify("JSR48 init enab con", EQUAL, client
 				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "1");
@@ -321,6 +340,12 @@
 				"5000");
 		verify("JSR48 init chunking", EQUAL, client
 				.getProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING), "1");
+		verify("JSR48 init keystore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE), pathRelativeLong1);
+		verify("JSR48 init keystore passwd", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD), "pa$$word");
+		verify("JSR48 init truststore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), pathRelativeLong2);
 
 		// Setting corresponding JSR48 properties affect SBLIM properties
 		verify("JSR48 init enab file from SBLIM", EQUAL, client
@@ -339,6 +364,12 @@
 				.getProperty(WBEMConfigurationProperties.HTTP_TIMEOUT), "5000");
 		verify("JSR48 init chunking from SBLIM", EQUAL, client
 				.getProperty(WBEMConfigurationProperties.HTTP_USE_CHUNKING), "true");
+		verify("JSR48 init keystore from SBLIM", EQUAL, client
+				.getProperty(WBEMConfigurationProperties.KEYSTORE_PATH), pathRelativeLong1);
+		verify("JSR48 init keystore passwd from SBLIM", EQUAL, client
+				.getProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD), "pa$$word");
+		verify("JSR48 init truststore from SBLIM", EQUAL, client
+				.getProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH), pathRelativeLong2);
 
 		// Try various combinations of log dir and file
 		client.setProperty(WBEMClientConstants.PROP_LOG_DIR, null);