Refactor BaseRpcTest and all child classes

Author: RHenigan

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java

@@ -1,17 +1,27 @@
 package com.smartdevicelink.test;
 
-import com.smartdevicelink.AndroidTestCase2;
+import android.support.test.runner.AndroidJUnit4;
+
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.RPCResponse;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.Iterator;
 
-public abstract class BaseRpcTests extends AndroidTestCase2 {
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertTrue;
+
+@RunWith(AndroidJUnit4.class)
+public abstract class BaseRpcTests {
 
     public static final int  SDL_VERSION_UNDER_TEST = Config.SDL_VERSION_UNDER_TEST;
 
@@ -39,7 +49,7 @@ public abstract class BaseRpcTests extends AndroidTestCase2 {
 	 */
     protected abstract JSONObject getExpectedParameters(int sdlVersion);
 
-    @Override
+    @Before
     public void setUp(){
         this.msg = createMessage();
         if (msg instanceof RPCRequest) {
@@ -51,10 +61,12 @@ else if (msg instanceof RPCResponse) {
 
     }
 
+    @Test
     public void testCreation(){
         assertNotNull("Object creation failed.", msg);
     }
 
+    @Test
     public void testCorrelationId(){
     	int correlationId;
     	if (msg instanceof RPCRequest) {
@@ -68,13 +80,15 @@ else if (msg instanceof RPCResponse) {
 
     }
 
+    @Test
     public void testMessageType(){
         String messageType = msg.getMessageType();
 
         assertNotNull("Message type was null.", messageType);
         assertEquals("Message type was not REQUEST.", getMessageType(), messageType);
     }
 
+    @Test
     public void testCommandType(){
         String command = msg.getFunctionName();
 
@@ -83,13 +97,15 @@ public void testCommandType(){
     }
 
 
+    @Test
     public void testFunctionName(){
         String funcName = msg.getFunctionName();
 
         assertNotNull("Function name was null.", funcName);
         assertEquals("Function name did not match expected name.", getCommandType(), funcName);
     }
 
+    @Test
     public void testJson(){
         try{
             JSONObject reference = buildJsonStore();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java

@@ -9,6 +9,12 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.fail;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -51,6 +57,7 @@ protected JSONObject getExpectedParameters(int sdlVersion){
     /**
 	 * Tests the expected values of the RPC message.
 	 */
+    @Test
     public void testRpcValues () {       	
     	// Test Values
         AppInterfaceUnregisteredReason reason = ( (OnAppInterfaceUnregistered) msg ).getReason();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java

@@ -9,6 +9,13 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.fail;
+
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class :
@@ -51,6 +58,7 @@ protected JSONObject getExpectedParameters(int sdlVersion){
 	/**
 	 * Tests the expected values of the RPC message.
 	 */
+	@Test
 	public void testRpcValues () {
 		// Test Values
 		AppServiceData cmdId = ( (OnAppServiceData) msg ).getServiceData();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java

@@ -7,6 +7,9 @@
 import com.smartdevicelink.test.TestValues;
 
 import org.json.JSONObject;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertNotNull;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -37,6 +40,7 @@ protected JSONObject getExpectedParameters(int sdlVersion){
     /**
 	 * Tests the expected values of the RPC message.
 	 */
+    @Test
     public void testRpcValues () { 
     	// Invalid/Null Tests
         OnAudioPassThru msg = new OnAudioPassThru();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java

@@ -10,6 +10,12 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.fail;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -56,6 +62,7 @@ protected JSONObject getExpectedParameters(int sdlVersion){
     /**
 	 * Tests the expected values of the RPC message.
 	 */
+    @Test
     public void testRpcValues () { 
     	// Test Values
         int cmdId = ( (OnButtonEvent) msg ).getCustomButtonID();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java

@@ -10,6 +10,12 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.fail;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -56,6 +62,7 @@ protected JSONObject getExpectedParameters(int sdlVersion){
     /**
 	 * Tests the expected values of the RPC message.
 	 */
+    @Test
     public void testRpcValues () { 
     	// Test Values
         int customName = ( (OnButtonPress) msg ).getCustomButtonID();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java

@@ -9,6 +9,12 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.fail;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -53,6 +59,7 @@ protected JSONObject getExpectedParameters(int sdlVersion){
     /**
 	 * Tests the expected values of the RPC message.
 	 */
+    @Test
     public void testRpcValues () {       	
     	// Test Values
         int cmdId = ( (OnCommand) msg ).getCmdID();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java

@@ -9,6 +9,12 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.fail;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -53,6 +59,7 @@ protected JSONObject getExpectedParameters(int sdlVersion){
     /**
 	 * Tests the expected values of the RPC message.
 	 */
+    @Test
     public void testRpcValues () {       	
     	// Test Values
         DriverDistractionState cmdId = ( (OnDriverDistraction) msg ).getState();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java

@@ -6,6 +6,8 @@
 
 import junit.framework.TestCase;
 
+import org.junit.Test;
+
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
  * {@link com.smartdevicelink.proxy.callbacks.OnError}
@@ -17,6 +19,7 @@ public class OnErrorTests extends TestCase {
 	 * {@link com.smartdevicelink.proxy.callbacks.OnError#OnError()}
 	 * {@link com.smartdevicelink.proxy.callbacks.OnError#OnError(String, Exception)}
 	 */
+	@Test
 	public void testValues () {		
 		// Valid Tests
 		OnError testOnError = new OnError();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java

@@ -13,6 +13,12 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.fail;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -64,6 +70,7 @@ protected JSONObject getExpectedParameters(int sdlVersion){
     /**
 	 * Tests the expected values of the RPC message.
 	 */
+    @Test
     public void testRpcValues () {       	
     	// Test Values
         AudioStreamingState audioStreamingState = ( (OnHMIStatus) msg ).getAudioStreamingState();