Refactoring issue fixes and added documentation to DebugToolTests class.

2 files changed, 17 insertions, 61 deletions

diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
index 4eeece263..33c4ab53c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
@@ -15,8 +15,8 @@ import com.smartdevicelink.proxy.rpc.SendLocation;
 import com.smartdevicelink.proxy.rpc.enums.ImageType;
 import com.smartdevicelink.test.BaseRpcTests;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class SendLocationTests extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/util/DebugToolTests.java b/sdl_android_tests/src/com/smartdevicelink/test/util/DebugToolTests.java
index fbd60276d..d174c22ba 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/util/DebugToolTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/util/DebugToolTests.java
@@ -4,68 +4,24 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.util.DebugTool;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.util.DebugTool}
+ */
 public class DebugToolTests extends TestCase {
 	
-	// Cannot test logging methods
-	
-	public void testToolMethods () {
-		
-//		MockConsole mc1 = new MockConsole();
-//		MockConsole mc2 = new MockConsole();
-//		MockConsole mc3 = new MockConsole();
-		
-		// Test -- enableDebugTool()
+	/**
+	 * This is a unit test for the following methods : 
+	 * {@link com.smartdevicelink.util.DebugTool#enableDebugTool()}
+	 * {@link com.smartdevicelink.util.DebugTool#disableDebugTool()}
+	 * {@link com.smartdevicelink.util.DebugTool#isDebugEnabled()}
+	 */
+	public void testDebugEnableMethods () {		
 		DebugTool.enableDebugTool();
 		assertTrue("Value should be true.", DebugTool.isDebugEnabled());
-		
-		// Test -- disableDebugTool()
 		DebugTool.disableDebugTool();
-		assertFalse("Value should be false.", DebugTool.isDebugEnabled());
-		
-// Can't test protected static field --
-//		// -> Uses reflection <-
-//		try {
-//			
-//			// Test console methods
-//			DebugTool.addConsole(mc1);
-//			DebugTool.addConsole(mc2);
-//			DebugTool.addConsole(mc3);
-//			
-//			Vector<IConsole> testList = new Vector<IConsole>();
-//			testList.add(mc1);
-//			testList.add(mc2);
-//			testList.add(mc3);
-//			
-//			// >>>>> HERE
-//			Field field = (DebugTool.class).getDeclaredField("isTransportEnabled");
-//			// <<<<<
-//			
-//			assertEquals("Values should match.", testList, field);
-//			
-//			DebugTool.removeConsole(mc3);
-//			testList.removeElement(mc3);
-//			
-//			// Need to update field-get here?
-//			assertEquals("Values should match.", testList, field);
-//			
-//			DebugTool.clearConsoles();
-//			testList = new Vector<IConsole>();
-//			
-//			assertEquals("Values should match.", testList, field);
-//			
-//		} catch (NoSuchFieldException e) {
-//			fail("Could not test private field, doesn't exist?");
-//		}
+		assertFalse("Value should be false.", DebugTool.isDebugEnabled());		
 	}
-}
-
-//class MockConsole implements IConsole {
-//
-//	public MockConsole (String n) {}
-//	@Override public void logInfo(String msg) { }
-//	@Override public void logError(String msg) { }
-//	@Override public void logError(String msg, Throwable ex) { }
-//	@Override public void logRPCSend(String rpcMsg) { }
-//	@Override public void logRPCReceive(String rpcMsg) { }
-//	
-//}
\ No newline at end of file
+	
+	// NOTE : No testing can currently be done for the logging methods.
+}
\ No newline at end of file