sblim-commit

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

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

Modified Files:
	WBEMConfigurationTest.java 
Log Message:
3514685 - TCK: getProperty must return default values

Index: WBEMConfigurationTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util/WBEMConfigurationTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- WBEMConfigurationTest.java	14 Mar 2012 13:12:19 -0000	1.15
+++ WBEMConfigurationTest.java	19 Apr 2012 11:11:25 -0000	1.16
@@ -22,6 +22,7 @@
  * 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
+ * 3514685    2012-04-03  blaschke-oss TCK: getProperty must return default values
  */
 
 package org.sblim.cimclient.unittest.util;
@@ -241,32 +242,44 @@
 		String pathRelativeLong2 = dirRelativeLong + File.separator + file2;
 		String invalidProperty = "javax.wbem.client.log.name";
 
+		System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_LEVEL);
+		System.getProperties().remove(WBEMConfigurationProperties.LOG_DEBUG);
+		System.getProperties().remove(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL);
+		System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT);
+		System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_LOCATION);
+		System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_COUNT);
+		System.getProperties().remove(WBEMConfigurationProperties.HTTP_TIMEOUT);
+		System.getProperties().remove(WBEMConfigurationProperties.HTTP_USE_CHUNKING);
+		System.getProperties().remove(WBEMConfigurationProperties.KEYSTORE_PATH);
+		System.getProperties().remove(WBEMConfigurationProperties.KEYSTORE_PASSWORD);
+		System.getProperties().remove(WBEMConfigurationProperties.TRUSTSTORE_PATH);
+
 		WBEMClientSBLIM client = (WBEMClientSBLIM) WBEMClientFactory
 				.getClient(WBEMClientConstants.PROTOCOL_CIMXML);
 		client.initialize(new CIMObjectPath("https", "127.0.0.1", "5989", "root", null, null),
 				new Subject(), null);
 
-		// All JSR48 properties should be null with new client
+		// All JSR48 properties should be defaults with new client
 		verify("Uninit enab con", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), null);
+				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "0");
 		verify("Uninit enab dbg", EQUAL, client.getProperty(WBEMClientConstants.PROP_ENABLE_DEBUG),
-				null);
+				"0");
 		verify("Uninit enab file", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), null);
+				.getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "0");
 		verify("Uninit byte limit", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT), null);
+				.getProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT), "5242880");
 		verify("Uninit log dir", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_DIR), null);
 		verify("Uninit log file", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_FILENAME),
-				null);
+				WBEMConfigurationDefaults.LOG_FILE_LOCATION);
 		verify("Uninit num files", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_LOG_NUM_FILES), null);
-		verify("Uninit timeout", EQUAL, client.getProperty(WBEMClientConstants.PROP_TIMEOUT), null);
+				.getProperty(WBEMClientConstants.PROP_LOG_NUM_FILES), "3");
+		verify("Uninit timeout", EQUAL, client.getProperty(WBEMClientConstants.PROP_TIMEOUT), "0");
 		verify("Uninit chunking", EQUAL, client
-				.getProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING), null);
+				.getProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING), "1");
 		verify("Uninit keystore", EQUAL, client
 				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE), null);
 		verify("Uninit keystore passwd", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD), null);
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD), "");
 		verify("Uninit truststore", EQUAL, client
 				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), null);