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

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

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

Modified Files:
	WBEMConfigurationTest.java 
Log Message:
3521157 - JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1

Index: WBEMConfigurationTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util/WBEMConfigurationTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- WBEMConfigurationTest.java	9 May 2012 14:18:44 -0000	1.18
+++ WBEMConfigurationTest.java	25 May 2012 11:21:00 -0000	1.19
@@ -25,6 +25,7 @@
  * 3514685    2012-04-03  blaschke-oss TCK: getProperty must return default values
  * 3515180    2012-04-05  blaschke-oss JSR48 log dir/file should handle UNIX/Win separators
  * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3521157    2012-05-10  blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
  */
 
 package org.sblim.cimclient.unittest.util;
@@ -244,9 +245,8 @@
 		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_LEVEL);
 		System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT);
 		System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_LOCATION);
 		System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_COUNT);
@@ -263,11 +263,9 @@
 
 		// All JSR48 properties should be defaults with new client
 		verify("Uninit enab con", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "0");
-		verify("Uninit enab dbg", EQUAL, client.getProperty(WBEMClientConstants.PROP_ENABLE_DEBUG),
-				"0");
+				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "OFF");
 		verify("Uninit enab file", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "0");
+				.getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "OFF");
 		verify("Uninit byte limit", EQUAL, client
 				.getProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT), "5242880");
 		verify("Uninit log dir", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_DIR), "%t");
@@ -286,9 +284,8 @@
 				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), null);
 
 		// Setting corresponding SBLIM properties affect JSR48 properties
+		client.setProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, "WARNING");
 		client.setProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL, "ALL");
-		client.setProperty(WBEMConfigurationProperties.LOG_DEBUG, "true");
-		client.setProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, "OFF");
 		client.setProperty(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT, "1048576");
 		client.setProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION, pathAbsoluteLong1);
 		client.setProperty(WBEMConfigurationProperties.LOG_FILE_COUNT, "50");
@@ -299,11 +296,9 @@
 		client.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pathAbsoluteLong2);
 
 		verify("SBLIM init enab con", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "0");
-		verify("SBLIM init enab dbg", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_DEBUG), "1");
+				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "WARNING");
 		verify("SBLIM init enab file", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "1");
+				.getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "ALL");
 		verify("SBLIM init byte limit", EQUAL, client
 				.getProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT), "1048576");
 		verify("SBLIM init log dir", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_DIR),
@@ -324,9 +319,8 @@
 				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), pathAbsoluteLong2);
 
 		// Set JSR48 properties directly
-		client.setProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING, "1");
-		client.setProperty(WBEMClientConstants.PROP_ENABLE_DEBUG, "0");
-		client.setProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING, "0");
+		client.setProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING, "FINER");
+		client.setProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING, "CONFIG");
 		client.setProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT, "8192");
 		client.setProperty(WBEMClientConstants.PROP_LOG_DIR, dirAbsolute);
 		client.setProperty(WBEMClientConstants.PROP_LOG_FILENAME, file2);
@@ -338,11 +332,9 @@
 		client.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pathRelativeLong2);
 
 		verify("JSR48 init enab con", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "1");
-		verify("JSR48 init enab dbg", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_DEBUG), "0");
+				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "FINER");
 		verify("JSR48 init enab file", EQUAL, client
-				.getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "0");
+				.getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "CONFIG");
 		verify("JSR48 init byte limit", EQUAL, client
 				.getProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT), "8192");
 		verify("JSR48 init log dir", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_DIR),
@@ -363,12 +355,10 @@
 				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), pathRelativeLong2);
 
 		// Setting corresponding JSR48 properties affect SBLIM properties
-		verify("JSR48 init enab file from SBLIM", EQUAL, client
-				.getProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL), "OFF");
-		verify("JSR48 init enab dbg from SBLIM", EQUAL, client
-				.getProperty(WBEMConfigurationProperties.LOG_DEBUG), "false");
 		verify("JSR48 init enab con from SBLIM", EQUAL, client
-				.getProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL), "ALL");
+				.getProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL), "FINER");
+		verify("JSR48 init enab file from SBLIM", EQUAL, client
+				.getProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL), "CONFIG");
 		verify("JSR48 init byte limit from SBLIM", EQUAL, client
 				.getProperty(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT), "8192");
 		verify("JSR48 init file loc from SBLIM", EQUAL, client