Updated and documented unit tests for the existing trace package classes. Also, small fix to failed unit test in BTTransportConfig test class.

4 files changed, 192 insertions, 126 deletions

diff --git a/sdl_android_tests/src/com/smartdevicelink/test/trace/DiagLevelTests.java b/sdl_android_tests/src/com/smartdevicelink/test/trace/DiagLevelTests.java
index 42b1123d6..bc1aa6060 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/trace/DiagLevelTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/trace/DiagLevelTests.java
@@ -1,17 +1,29 @@
 package com.smartdevicelink.test.trace;
 
+import com.smartdevicelink.test.Test;
 import com.smartdevicelink.trace.DiagLevel;
 import com.smartdevicelink.trace.enums.DetailLevel;
 import com.smartdevicelink.trace.enums.Mod;
 
 import junit.framework.TestCase;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.trace.DiagLevel}
+ */
 public class DiagLevelTests extends TestCase {
 	
-	private final String MSG = "Value did not match expected value.";
-	
-	public void testMethods () {
+	/**
+	 * This is a unit test for the following methods : 
+	 * {@link com.smartdevicelink.trace.DiagLevel#setAllLevels(DetailLevel)}
+	 * {@link com.smartdevicelink.trace.DiagLevel#setLevel(Mod, DetailLevel)}
+	 * {@link com.smartdevicelink.trace.DiagLevel#getLevel(Mod)}
+	 * {@link com.smartdevicelink.trace.DiagLevel#isValidDetailLevel(String)}
+	 * {@link com.smartdevicelink.trace.DiagLevel#toDetailLevel(String)}
+	 */
+	public void testLevels () {
 		
+		// Test Values
 		Mod testMar   = Mod.mar;
 		Mod testRpc   = Mod.rpc;
 		Mod testApp   = Mod.app;
@@ -27,86 +39,93 @@ public class DiagLevelTests extends TestCase {
 		DetailLevel testOff     = DetailLevel.OFF;
 		DetailLevel testTerse   = DetailLevel.TERSE;
 		DetailLevel testVerbose = DetailLevel.VERBOSE;
-	
-		// Test -- setAllLevels (DetailLevel thisDetail) 
-		DiagLevel.setAllLevels(testVerbose);
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testProto));
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testProxy));
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testTran));
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testApp));
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testRpc));
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testMar));
 				
+		// Valid Tests
+		DiagLevel.setAllLevels(testVerbose);
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testProto));
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testProxy));
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testTran));
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testApp));
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testRpc));
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testMar));
+		
 		DiagLevel.setAllLevels(testTerse);
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testProto));
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testProxy));
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testTran));
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testApp));
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testRpc));
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testMar));
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testProto));
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testProxy));
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testTran));
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testApp));
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testRpc));
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testMar));
 		
 		DiagLevel.setAllLevels(testOff);
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testProto));
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testProxy));
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testTran));
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testApp));
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testRpc));
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testMar));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testProto));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testProxy));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testTran));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testApp));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testRpc));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testMar));
+		
 		
-		// Test -- setLevel (Mod thisMod, DetailLevel thisDetail)
 		DiagLevel.setLevel(testMar, testVerbose);
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testMar));		
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testMar));		
 		DiagLevel.setLevel(testMar, testTerse);
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testMar));		
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testMar));		
 		DiagLevel.setLevel(testMar, testOff);
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testMar));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testMar));
 		
 		DiagLevel.setLevel(testRpc, testVerbose);
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testRpc));	
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testRpc));	
 		DiagLevel.setLevel(testRpc, testTerse);
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testRpc));			
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testRpc));			
 		DiagLevel.setLevel(testRpc, testOff);
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testRpc));	
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testRpc));	
 		
 		DiagLevel.setLevel(testApp, testVerbose);
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testApp));
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testApp));
 		DiagLevel.setLevel(testApp, testTerse);
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testApp));
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testApp));
 		DiagLevel.setLevel(testApp, testOff);
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testApp));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testApp));
 		
 		DiagLevel.setLevel(testTran, testVerbose);
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testTran));	
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testTran));	
 		DiagLevel.setLevel(testTran, testTerse);
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testTran));		
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testTran));		
 		DiagLevel.setLevel(testTran, testOff);
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testTran));	
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testTran));	
 		
 		DiagLevel.setLevel(testProxy, testVerbose);
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testProxy));			
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testProxy));			
 		DiagLevel.setLevel(testProxy, testTerse);
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testProxy));		
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testProxy));		
 		DiagLevel.setLevel(testProxy, testOff);
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testProxy));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testProxy));
 		
 		DiagLevel.setLevel(testProto, testVerbose);
-		assertEquals(MSG, testVerbose, DiagLevel.getLevel(testProto));
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.getLevel(testProto));
 		DiagLevel.setLevel(testProto, testTerse);
-		assertEquals(MSG, testTerse, DiagLevel.getLevel(testProto));
+		assertEquals(Test.MATCH, testTerse, DiagLevel.getLevel(testProto));
 		DiagLevel.setLevel(testProto, testOff);
-		assertEquals(MSG, testOff, DiagLevel.getLevel(testProto));
+		assertEquals(Test.MATCH, testOff, DiagLevel.getLevel(testProto));
 		
-		// Test -- isValidDetailLevel (String dtString)		
-		assertTrue(MSG, DiagLevel.isValidDetailLevel(testVerboseS));		
-		assertTrue(MSG, DiagLevel.isValidDetailLevel(testTerseS));		
-		assertTrue(MSG, DiagLevel.isValidDetailLevel(testOffS));		
-		assertFalse(MSG, DiagLevel.isValidDetailLevel(testInvalidS));
-				
-		// Test -- toDetailLevel (String dtString)		
-		assertEquals(MSG, testVerbose, DiagLevel.toDetailLevel(testVerboseS));
-		assertEquals(MSG, testTerse, DiagLevel.toDetailLevel(testTerseS));
-		assertEquals(MSG, testOff, DiagLevel.toDetailLevel(testOffS));
-		assertEquals(MSG, testOff, DiagLevel.toDetailLevel(testInvalidS));
-		// Note : assumes 'off' as default for invalid data
+		assertTrue(Test.TRUE, DiagLevel.isValidDetailLevel(testVerboseS));		
+		assertTrue(Test.TRUE, DiagLevel.isValidDetailLevel(testTerseS));		
+		assertTrue(Test.TRUE, DiagLevel.isValidDetailLevel(testOffS));	
+		
+		assertEquals(Test.MATCH, testVerbose, DiagLevel.toDetailLevel(testVerboseS));
+		assertEquals(Test.MATCH, testTerse, DiagLevel.toDetailLevel(testTerseS));
+		assertEquals(Test.MATCH, testOff, DiagLevel.toDetailLevel(testOffS));
+		assertEquals(Test.MATCH, testOff, DiagLevel.toDetailLevel(testInvalidS));
+		
+		try {
+			// Invalid/Null Tests
+			assertFalse(Test.FALSE, DiagLevel.isValidDetailLevel(testInvalidS));
+			assertFalse(Test.FALSE, DiagLevel.isValidDetailLevel(null));
+			assertNull(Test.NULL, DiagLevel.getLevel(null));
+			DiagLevel.setLevel(null, null);		
+			DiagLevel.setAllLevels(null);
+		} catch (NullPointerException e) {
+			fail("NullPointerException was thrown when attempting to set null values.");
+		}
 	}
 }
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/trace/MimeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/trace/MimeTests.java
index 09fa1f434..a39e87393 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/trace/MimeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/trace/MimeTests.java
@@ -2,34 +2,53 @@ package com.smartdevicelink.test.trace;
 
 import java.io.UnsupportedEncodingException;
 
+import com.smartdevicelink.test.Test;
 import com.smartdevicelink.trace.Mime;
 
 import junit.framework.TestCase;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.trace.Mime}
+ */
 public class MimeTests extends TestCase {
 	
-	private final String MSG = "Value did not match expected value.";
-	String test = "test";
-	String testEncoded = "dGVzdA==";
-	
+	/**
+	 * This is a unit test for the following methods : 
+	 * {@link com.smartdevicelink.trace.Mime#base64Encode(byte[])}
+	 * {@link com.smartdevicelink.trace.Mime#base64Encode(String)}
+	 * {@link com.smartdevicelink.trace.Mime#base64Encode(byte[], int, int)}
+	 */
 	public void testEncoding () {
 		
-		try {			
-			byte[] testBytes = test.getBytes("US-ASCII");
-				
-			// Test -- base64Encode (String string)
-			assertEquals(MSG, testEncoded, Mime.base64Encode(test));
-		
-			// Test -- base64Encode(byte bytesToEncode[])
-			assertEquals(MSG, testEncoded, Mime.base64Encode(testBytes));
+		try {
+			// Test Values
+			String testString  = "test";
+			byte[] testBytes   = testString.getBytes("US-ASCII");
 			
-			// Test -- base64Encode(byte bytesToEncode[], int offset, int length)
-			assertEquals(MSG, testEncoded, Mime.base64Encode(testBytes, 0, testBytes.length));
+			// Comparison Values
+			String expectedEncodedString = "dGVzdA==";
+			String actualNullResult1    = Mime.base64Encode((byte[]) null);
+			String actualNullResult2    = Mime.base64Encode((String) null);	
+			String actualNullResult3    = Mime.base64Encode(null, 0, 0); 
+			String actualInvalidResult  = Mime.base64Encode(testBytes, 35, 2);
+			String actualEncodedString1 = Mime.base64Encode(testString);
+			String actualEncodedString2 = Mime.base64Encode(testBytes);
+			String actualEncodedString3 = Mime.base64Encode(testBytes, 0, testBytes.length);
 			
+			// Valid Tests
+			assertEquals(Test.MATCH, expectedEncodedString, actualEncodedString1);
+			assertEquals(Test.MATCH, expectedEncodedString, actualEncodedString2);
+			assertEquals(Test.MATCH, expectedEncodedString, actualEncodedString3);
+			
+			// Invalid/Null Tests
+			assertNull(Test.NULL, actualNullResult1);
+			assertNull(Test.NULL, actualNullResult2);
+			assertNull(Test.NULL, actualNullResult3);
+			assertNull(Test.NULL, actualInvalidResult);
+						
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
 	}
-	
-	// Cannot test base64Decode method because it is not public
 }
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/trace/SdlTraceTests.java b/sdl_android_tests/src/com/smartdevicelink/test/trace/SdlTraceTests.java
index 33b889e26..8cec7f332 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/trace/SdlTraceTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/trace/SdlTraceTests.java
@@ -2,95 +2,123 @@ package com.smartdevicelink.test.trace;
 
 import junit.framework.TestCase;
 
+import com.smartdevicelink.test.Test;
 import com.smartdevicelink.trace.DiagLevel;
 import com.smartdevicelink.trace.SdlTrace;
 import com.smartdevicelink.trace.enums.DetailLevel;
 import com.smartdevicelink.trace.enums.Mod;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.trace.SdlTrace}
+ */
 public class SdlTraceTests extends TestCase {
 	
-	private final String MSG = "Value did not match expected value.";
-	
-	public void testMethods () {
-		
-//		long testTimestamp = 1234567890;
-//		Mod testMod = Mod.app;
-//		InterfaceActivityDirection testIAD = InterfaceActivityDirection.None;
-//		String testStr = "test";
+	/**
+	 * This is a unit test for the following methods : 
+	 * {@link com.smartdevicelink.trace.SdlTrace#setAcceptAPITraceAdjustments(Boolean)}
+	 * {@link com.smartdevicelink.trace.SdlTrace#getAcceptAPITraceAdjustments()}
+	 */
+	public void testAdjustmentFlags () {
 		
-//		StringBuilder sb = new StringBuilder();
-//		sb.append("<msg><dms>1234567890</dms><pid>");
-//		sb.append(Process.myPid());
-//		sb.append("</pid><tid>");
-//		sb.append(Thread.currentThread().getId());
-//		sb.append("</tid><mod>app</mod>test</msg>");
+		SdlTrace.setAcceptAPITraceAdjustments(true);
+		assertTrue(Test.TRUE, SdlTrace.getAcceptAPITraceAdjustments());
 		
-		// Test -- set/get AcceptAPITraceAdjustments
 		SdlTrace.setAcceptAPITraceAdjustments(false);
-		assertFalse(MSG, SdlTrace.getAcceptAPITraceAdjustments());
+		assertFalse(Test.FALSE, SdlTrace.getAcceptAPITraceAdjustments());
+		
+		// This should not change the value from the previous setting.
 		SdlTrace.setAcceptAPITraceAdjustments(null);
-		assertFalse(MSG, SdlTrace.getAcceptAPITraceAdjustments());
+		assertFalse(Test.FALSE, SdlTrace.getAcceptAPITraceAdjustments());
+	}
+	
+	/**
+	 * This is a unit test for the following methods : 
+	 * {@link com.smartdevicelink.trace.SdlTrace#setAppTraceLevel(DetailLevel)}
+	 * {@link com.smartdevicelink.trace.SdlTrace#setProxyTraceLevel(DetailLevel)}
+	 * {@link com.smartdevicelink.trace.SdlTrace#setRpcTraceLevel(DetailLevel)}
+	 * {@link com.smartdevicelink.trace.SdlTrace#setMarshallingTraceLevel(DetailLevel)}
+	 * {@link com.smartdevicelink.trace.SdlTrace#setProtocolTraceLevel(DetailLevel)}
+	 * {@link com.smartdevicelink.trace.SdlTrace#setTransportTraceLevel(DetailLevel)}
+	 */
+	public void testTraceLevelFlags () {
+		
 		SdlTrace.setAcceptAPITraceAdjustments(true);
-		assertTrue(MSG, SdlTrace.getAcceptAPITraceAdjustments());
-				
-		// Cannot test values for setTracingEnable (Boolean enable)
 		
-		// Test -- DaigLevel methods
+		// App Trace Level - - - - - - - - - - - - - - - - - - - - - - - - - - -
 		SdlTrace.setAppTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(MSG, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.app));		
+		assertEquals(Test.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.app));		
 		SdlTrace.setAppTraceLevel(DetailLevel.TERSE);
-		assertEquals(MSG, DetailLevel.TERSE, DiagLevel.getLevel(Mod.app));
+		assertEquals(Test.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.app));
 		SdlTrace.setAppTraceLevel(DetailLevel.OFF);
-		assertEquals(MSG, DetailLevel.OFF, DiagLevel.getLevel(Mod.app));
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.app));
+		
+		// This should not change the value from the previous setting.
+		SdlTrace.setAppTraceLevel(null);
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.app));
 		
+		// Proxy Trace Level - - - - - - - - - - - - - - - - - - - - - - - - - -
 		SdlTrace.setProxyTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(MSG, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.proxy));
+		assertEquals(Test.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.proxy));
 		SdlTrace.setProxyTraceLevel(DetailLevel.TERSE);
-		assertEquals(MSG, DetailLevel.TERSE, DiagLevel.getLevel(Mod.proxy));
+		assertEquals(Test.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.proxy));
 		SdlTrace.setProxyTraceLevel(DetailLevel.OFF);
-		assertEquals(MSG, DetailLevel.OFF, DiagLevel.getLevel(Mod.proxy));
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proxy));
 		
+		// This should not change the value from the previous setting.
+		SdlTrace.setProxyTraceLevel(null);
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proxy));
+		
+		// Rpc Trace Level - - - - - - - - - - - - - - - - - - - - - - - - - - -
 		SdlTrace.setRpcTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(MSG, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.rpc));
+		assertEquals(Test.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.rpc));
 		SdlTrace.setRpcTraceLevel(DetailLevel.TERSE);
-		assertEquals(MSG, DetailLevel.TERSE, DiagLevel.getLevel(Mod.rpc));
+		assertEquals(Test.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.rpc));
 		SdlTrace.setRpcTraceLevel(DetailLevel.OFF);
-		assertEquals(MSG, DetailLevel.OFF, DiagLevel.getLevel(Mod.rpc));
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.rpc));
+		
+		// This should not change the value from the previous setting.
+		SdlTrace.setRpcTraceLevel(null);
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.rpc));
 		
+		// Marshalling Trace Level - - - - - - - - - - - - - - - - - - - - - - -
 		SdlTrace.setMarshallingTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(MSG, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.mar));
+		assertEquals(Test.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.mar));
 		SdlTrace.setMarshallingTraceLevel(DetailLevel.TERSE);
-		assertEquals(MSG, DetailLevel.TERSE, DiagLevel.getLevel(Mod.mar));
+		assertEquals(Test.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.mar));
 		SdlTrace.setMarshallingTraceLevel(DetailLevel.OFF);
-		assertEquals(MSG, DetailLevel.OFF, DiagLevel.getLevel(Mod.mar));
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.mar));
 		
+		// This should not change the value from the previous setting.
+		SdlTrace.setMarshallingTraceLevel(null);
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.mar));
+		
+		// Protocol Trace Level - - - - - - - - - - - - - - - - - - - - - - - -
 		SdlTrace.setProtocolTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(MSG, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.proto));
+		assertEquals(Test.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.proto));
 		SdlTrace.setProtocolTraceLevel(DetailLevel.TERSE);
-		assertEquals(MSG, DetailLevel.TERSE, DiagLevel.getLevel(Mod.proto));
+		assertEquals(Test.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.proto));
 		SdlTrace.setProtocolTraceLevel(DetailLevel.OFF);
-		assertEquals(MSG, DetailLevel.OFF, DiagLevel.getLevel(Mod.proto));
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proto));
+		
+		// This should not change the value from the previous setting.
+		SdlTrace.setProtocolTraceLevel(null);
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proto));
 		
+		// Transport Trace Level - - - - - - - - - - - - - - - - - - - - - - - -
 		SdlTrace.setTransportTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(MSG, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.tran));
+		assertEquals(Test.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.tran));
 		SdlTrace.setTransportTraceLevel(DetailLevel.TERSE);
-		assertEquals(MSG, DetailLevel.TERSE, DiagLevel.getLevel(Mod.tran));
+		assertEquals(Test.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.tran));
 		SdlTrace.setTransportTraceLevel(DetailLevel.OFF);
-		assertEquals(MSG, DetailLevel.OFF, DiagLevel.getLevel(Mod.tran));
-		
-		// Cannot use reflection - java test package issues?
-		// Test -- encodeTraceMessage (long timestamp, Mod module, InterfaceActivityDirection msgDirection, String msgBodyXml)
-		// This is using "reflection" to test the private method
-//		try {
-//			Method method = (SdlTrace.class).getDeclaredMethod("encodeTraceMessage", new Class[] { long.class, Mod.class, InterfaceActivityDirection.class, String.class });
-//			method.setAccessible(true);
-//			String actual = (String) method.invoke(new SdlTrace(), new Object[] { testTimestamp, testMod, testIAD, testStr });
-//			assertEquals(MSG, sb.toString(), actual);
-//		} catch (Exception e) {
-//			fail("Could not test private method \"encodeTraceMessage\".");
-//		}
-		
-		// Note: cannot test log info -- at least not beyond 'do not throw exception when run'
-		// Note: no need to test deprecated method		
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.tran));
+		
+		// This should not change the value from the previous setting.
+		SdlTrace.setTransportTraceLevel(null);
+		assertEquals(Test.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.tran));
 	}
+	
+	// NOTE : No testing can currently be done for the logging methods.
+		
+	// NOTE : Cannot test for Bluetooth connected information currently.
 }
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/transport/BTTransportConfigTests.java b/sdl_android_tests/src/com/smartdevicelink/test/transport/BTTransportConfigTests.java
index 524f2769f..c09eb1dc1 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/transport/BTTransportConfigTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/transport/BTTransportConfigTests.java
@@ -38,6 +38,6 @@ public class BtTransportConfigTests extends TestCase {
 		testConfig1.setKeepSocketActive(true);
 		assertTrue(Test.TRUE, testConfig1.getKeepSocketActive());
 		testConfig1.setKeepSocketActive(false);
-		assertFalse(Test.FALSE, testConfig2.getKeepSocketActive());
+		assertFalse(Test.FALSE, testConfig1.getKeepSocketActive());
 	}	
 }
\ No newline at end of file