Update Test Files for AndroidJUnit4

14 files changed, 257 insertions, 101 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
index a5556479f..21892632a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
@@ -1,8 +1,8 @@
 package com.smartdevicelink.protocol;
 
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
-import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.SdlConnection.SdlConnection;
 import com.smartdevicelink.protocol.WiProProtocol.MessageFrameAssembler;
 import com.smartdevicelink.protocol.enums.SessionType;
@@ -14,15 +14,27 @@ import com.smartdevicelink.transport.RouterServiceValidator;
 
 import junit.framework.Assert;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.ByteArrayOutputStream;
 import java.lang.reflect.Method;
 import java.util.List;
 
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static android.support.test.InstrumentationRegistry.getContext;
+import static junit.framework.TestCase.assertTrue;
+
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
  * {@link com.smartdevicelink.protocol.BinaryFrameHeader}
  */
-public class WiProProtocolTests extends AndroidTestCase2 {
+@RunWith(AndroidJUnit4.class)
+public class WiProProtocolTests {
 	
 	int max_int = 2147483647;
 	byte[] payload;
@@ -97,12 +109,14 @@ public class WiProProtocolTests extends AndroidTestCase2 {
 		public void onProtocolError(String info, Exception e) {}
 	};
 	DidReceiveListener onProtocolMessageReceivedListener = new DidReceiveListener();
-	
+
+	@Test
 	public void testBase(){
 		WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
 		
 	}
-	
+
+	@Test
 	public void testVersion(){
 		WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
 		
@@ -135,7 +149,8 @@ public class WiProProtocolTests extends AndroidTestCase2 {
 		wiProProtocol.setVersion((byte)0x00);
 		assertEquals((byte)0x01,wiProProtocol.getVersion());
 	}
-	
+
+	@Test
 	public void testMtu(){
 		WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
 		
@@ -169,7 +184,8 @@ public class WiProProtocolTests extends AndroidTestCase2 {
 		}
 
 	}
-	
+
+	@Test
 	public void testHandleFrame(){
 		SampleRpc sampleRpc = new SampleRpc(4);
 		WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
@@ -180,6 +196,8 @@ public class WiProProtocolTests extends AndroidTestCase2 {
 			Assert.fail("Exceptin during handleFrame - " + e.toString());
 		}
 	}
+
+	@Test
 	public void testHandleFrameCorrupt(){
 		SampleRpc sampleRpc = new SampleRpc(4);
 		BinaryFrameHeader header = sampleRpc.getBinaryFrameHeader(true);
@@ -193,7 +211,8 @@ public class WiProProtocolTests extends AndroidTestCase2 {
 			Assert.fail("Exceptin during handleFrame - " + e.toString());
 		}
 	}
-	
+
+	@Test
 	public void testHandleSingleFrameMessageFrame(){
 		SampleRpc sampleRpc = new SampleRpc(4);
 		WiProProtocol wiProProtocol = new WiProProtocol(defaultListener);
@@ -208,7 +227,8 @@ public class WiProProtocolTests extends AndroidTestCase2 {
 			Assert.fail("Exceptin during handleSingleFrameMessageFrame - " + e.toString());
 		}	
 	}
-	
+
+	@Test
 	public void testHandleSingleFrameMessageFrameCorruptBfh(){
 		SampleRpc sampleRpc = new SampleRpc(4);
 		
@@ -246,13 +266,14 @@ public class WiProProtocolTests extends AndroidTestCase2 {
 	}
 	
 
-	
+	@Before
 	public void setUp(){
-		config = new MultiplexTransportConfig(this.mContext,SdlUnitTestContants.TEST_APP_ID);
+		config = new MultiplexTransportConfig(getContext(),SdlUnitTestContants.TEST_APP_ID);
 		connection = new SdlConnectionTestClass(config, null);
 		protocol = new WiProProtocol(connection);
 	}
-	
+
+	@Test
 	public void testNormalCase(){
 		setUp();
 		payload = new byte[]{0x00,0x02,0x05,0x01,0x01,0x01,0x05,0x00};
@@ -296,7 +317,8 @@ public class WiProProtocolTests extends AndroidTestCase2 {
 		assertNull(np_exception);
 		assertNull(oom_error);
 	}
-	
+
+	@Test
 	public void testOverallocatingAccumulator(){
 		setUp();
 		ByteArrayOutputStream builder = new ByteArrayOutputStream();
@@ -364,7 +386,7 @@ public class WiProProtocolTests extends AndroidTestCase2 {
 		public void onTransportDisconnected(String info) {
 			connected = false;
 			//Grab a currently running router service
-			RouterServiceValidator rsvp2 = new RouterServiceValidator(mContext);
+			RouterServiceValidator rsvp2 = new RouterServiceValidator(getContext());
 			rsvp2.setFlags(RouterServiceValidator.FLAG_DEBUG_NONE);
 			assertTrue(rsvp2.validate());
 			assertNotNull(rsvp2.getService());
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
index 04c44e810..733192fdd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
@@ -1,13 +1,24 @@
 package com.smartdevicelink.test.protocol;
 
-import com.smartdevicelink.AndroidTestCase2;
+import android.support.test.runner.AndroidJUnit4;
+
 import com.smartdevicelink.protocol.BinaryFrameHeader;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.test.SampleRpc;
 
 import junit.framework.Assert;
 
-public class BinaryFrameHeaderTests extends AndroidTestCase2 {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertTrue;
+
+@RunWith(AndroidJUnit4.class)
+public class BinaryFrameHeaderTests {
 	
 	public static final byte RPC_TYPE_REQUEST 		= 0x00;
 	public static final byte RPC_TYPE_RESPONSE 		= 0x01;
@@ -32,7 +43,8 @@ public class BinaryFrameHeaderTests extends AndroidTestCase2 {
 			return null;
 		}
 	}
-	
+
+	@Test
 	public void testAssemblyAndParse(){
 		BinaryFrameHeader bfh = createDummyBfh();
 		
@@ -55,7 +67,8 @@ public class BinaryFrameHeaderTests extends AndroidTestCase2 {
 		assertTrue(bfh.getJsonSize() == parsedBfh.getJsonSize());
 		
 	}
-	
+
+	@Test
 	public void testCorruptHeader(){
 		BinaryFrameHeader bfh = createDummyBfh();
 		bfh.setJsonSize(5);
@@ -78,7 +91,8 @@ public class BinaryFrameHeaderTests extends AndroidTestCase2 {
 		BinaryFrameHeader head = BinaryFrameHeader.parseBinaryHeader(bfhBytes);
 		assertNull(head);
 	}
-	
+
+	@Test
 	public void testJsonSetException(){
 		try{
 			BinaryFrameHeader bfh = createDummyBfh();
@@ -88,7 +102,8 @@ public class BinaryFrameHeaderTests extends AndroidTestCase2 {
 			//Pass
 		}
 	}
-	
+
+	@Test
 	public void testAlteredDataInSampleRpc(){
 		SampleRpc sampleRpc = new SampleRpc(4);
 		//Create a corrupted header
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
index 8496a16d5..bcf319383 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
@@ -1,13 +1,21 @@
 package com.smartdevicelink.test.proxy;
 
 
-import com.smartdevicelink.AndroidTestCase2;
+import android.support.test.runner.AndroidJUnit4;
+
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.rpc.GetSystemCapability;
 import com.smartdevicelink.test.Config;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
 
-public class RPCRequestTest extends AndroidTestCase2 {
+@RunWith(AndroidJUnit4.class)
+public class RPCRequestTest {
 
     public static final int  SDL_VERSION_UNDER_TEST = Config.SDL_VERSION_UNDER_TEST;
 
@@ -15,19 +23,23 @@ public class RPCRequestTest extends AndroidTestCase2 {
 
     protected RPCRequest msg;
 
-    @Override
+    @Before
     public void setUp(){
         this.msg = new GetSystemCapability();
-        
+
     }
 
+    @Test
     public void testCreation(){
         assertNotNull("Object creation failed.", msg);
     }
 
+    @Test
     public void testGetCorrelationId(){
         assertNotNull(this.msg.getCorrelationID());
     }
+
+    @Test
     public void testSettingCorrelationId(){
         assertNotNull(this.msg.getCorrelationID());
         msg.setCorrelationID(CORR_ID);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
index 482a618ff..6e12c1bf1 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
@@ -1,10 +1,10 @@
 package com.smartdevicelink.test.proxy;
 
 import android.content.Context;
+import android.support.test.runner.AndroidJUnit4;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.exception.SdlExceptionCause;
 import com.smartdevicelink.proxy.RPCMessage;
@@ -28,6 +28,8 @@ import com.smartdevicelink.test.streaming.video.SdlRemoteDisplayTest;
 
 import junit.framework.Assert;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -36,31 +38,26 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static android.support.test.InstrumentationRegistry.getContext;
 
-
-public class SdlProxyBaseTests extends AndroidTestCase2 {
+@RunWith(AndroidJUnit4.class)
+public class SdlProxyBaseTests {
     public static final String TAG = "SdlProxyBaseTests";
 
     int onUpdateListenerCounter, onFinishedListenerCounter, onResponseListenerCounter, onErrorListenerCounter, remainingRequestsExpected;
 
-    @Override
-    protected void setUp() throws Exception{
-        super.setUp();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        //Nothing here for now
-    }
-
     /**
      * Test SdlProxyBase for handling null SdlProxyConfigurationResources
      */
+    @Test
     public void testNullSdlProxyConfigurationResources() {
         SdlProxyALM proxy = null;
         SdlProxyBuilder.Builder builder = new SdlProxyBuilder.Builder(mock(IProxyListenerALM.class), "appId", "appName", true, getContext());
@@ -127,6 +124,7 @@ public class SdlProxyBaseTests extends AndroidTestCase2 {
         }
     }
 
+    @Test
     public void testRemoteDisplayStreaming(){
         SdlProxyALM proxy = null;
         SdlProxyBuilder.Builder builder = new SdlProxyBuilder.Builder(mock(IProxyListenerALM.class), "appId", "appName", true, getContext());
@@ -144,18 +142,22 @@ public class SdlProxyBaseTests extends AndroidTestCase2 {
         }
     }
 
+    @Test
     public void testSendRPCsAllSucceed(){
         testSendMultipleRPCs(false, 1);
     }
 
+    @Test
     public void testSendRPCsSomeFail(){
         testSendMultipleRPCs(false, 2);
     }
 
+    @Test
     public void testSendSequentialRPCsAllSucceed(){
         testSendMultipleRPCs(true, 1);
     }
 
+    @Test
     public void testSendSequentialRPCsSomeFail(){
         testSendMultipleRPCs(true, 2);
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
index e28cd9a00..7b4aa2a62 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
@@ -1,8 +1,8 @@
 package com.smartdevicelink.test.proxy;
 
+import android.support.test.runner.AndroidJUnit4;
 import android.util.SparseArray;
 
-import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.managers.ManagerUtility;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
@@ -63,6 +63,8 @@ import com.smartdevicelink.test.utl.AppServiceFactory;
 import com.smartdevicelink.util.CorrelationIdGenerator;
 import com.smartdevicelink.util.Version;
 
+import org.junit.Before;
+import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -71,6 +73,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertFalse;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
@@ -79,15 +86,15 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class SystemCapabilityManagerTests extends AndroidTestCase2 {
+@RunWith(AndroidJUnit4.class)
+public class SystemCapabilityManagerTests {
 	public static final String TAG = "SystemCapabilityManagerTests";
 	public static SystemCapabilityManager systemCapabilityManager;
 	private SystemCapability systemCapability;
 	private VideoStreamingCapability videoStreamingCapability;
 
-	@Override
-	protected void setUp() throws Exception{
-		super.setUp();
+	@Before
+	public void setUp() throws Exception{
 
 		systemCapability = new SystemCapability(SystemCapabilityType.VIDEO_STREAMING);
 		videoStreamingCapability = new VideoStreamingCapability();
@@ -97,11 +104,6 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		systemCapability.setCapabilityForType(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
 	public SystemCapabilityManager createSampleManager(){
 		return createSampleManager(new InternalSDLInterface());
 	}
@@ -174,6 +176,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		return convertedCapabilities;
 	}
 
+	@org.junit.Test
 	public void testParseRAI() {
 		systemCapabilityManager = createSampleManager();
 
@@ -201,12 +204,14 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 
 	}
 
+	@org.junit.Test
 	public void testNullDisplayCapabilitiesEnablesAllTextAndImageFields() {
 		List<DisplayCapability> displayCapabilityList = createDisplayCapabilityList(null, Test.GENERAL_BUTTONCAPABILITIES_LIST, Test.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
 		assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getTextFields().size(), 29);
 		assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getImageFields().size(), 14);
 	}
 
+	@org.junit.Test
 	public void testGetVSCapability(){
 		VideoStreamingCapability vsCapability = new VideoStreamingCapability();
 		vsCapability.setMaxBitrate(Test.GENERAL_INT);
@@ -291,6 +296,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		return onSendGetSystemCapabilityAnswer;
 	}
 
+	@org.junit.Test
 	public void testGetCapability() {
 		ISdl internalInterface;
 		SystemCapabilityManager scm;
@@ -348,6 +354,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
 	}
 
+	@org.junit.Test
 	public void testGetCapabilityHmiNone() {
 		ISdl internalInterface = mock(ISdl.class);
 		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_NONE)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
@@ -362,6 +369,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		verify(onSystemCapabilityListener, times(1)).onError(any(String.class));
 	}
 
+	@org.junit.Test
 	public void testAddOnSystemCapabilityListenerWithSubscriptionsSupportedAndCapabilityCached() {
 		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(6, 0); // This version supports capability subscriptions
 		sdlMsgVersion.setPatchVersion(0);
@@ -408,6 +416,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
 	}
 
+	@org.junit.Test
 	public void testAddOnSystemCapabilityListenerWithSubscriptionsSupportedAndCapabilityNotCached() {
 		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(6, 0); // This version supports capability subscriptions
 		sdlMsgVersion.setPatchVersion(0);
@@ -454,6 +463,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
 	}
 
+	@org.junit.Test
 	public void testAddOnSystemCapabilityListenerWithSubscriptionsNotSupportedAndCapabilityCached() {
 		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(5, 0); // This version doesn't support capability subscriptions
 		sdlMsgVersion.setPatchVersion(0);
@@ -500,6 +510,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
 	}
 
+	@org.junit.Test
 	public void testAddOnSystemCapabilityListenerWithSubscriptionsNotSupportedAndCapabilityNotCached() {
 		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(5, 0); // This version doesn't support capability subscriptions
 		sdlMsgVersion.setPatchVersion(0);
@@ -546,6 +557,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
 	}
 
+	@org.junit.Test
 	public void testAddOnSystemCapabilityListenerThenGetCapabilityWhenSubscriptionsAreNotSupported() {
 		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(5, 0); // This version doesn't support capability subscriptions
 		sdlMsgVersion.setPatchVersion(0);
@@ -635,6 +647,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		verify(onSystemCapabilityListener3, times(4)).onCapabilityRetrieved(any(Object.class));
 	}
 
+	@org.junit.Test
 	public void testGetAndAddListenerForDisplaysCapability() {
 		ISdl internalInterface;
 		SystemCapabilityManager scm;
@@ -670,6 +683,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
 	}
 
+	@org.junit.Test
 	public void testListConversion(){
 		SystemCapabilityManager systemCapabilityManager = createSampleManager();
 		Object capability = systemCapabilityManager.getCapability(SystemCapabilityType.SOFTBUTTON);
@@ -678,12 +692,14 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		assertNotNull(list);
 	}
 
+	@org.junit.Test
 	public void testFalsePositive(){
 		SystemCapabilityManager systemCapabilityManager = createSampleManager();
 		systemCapabilityManager.setCapability(SystemCapabilityType.AUDIO_PASSTHROUGH, null);
 		assertFalse(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.AUDIO_PASSTHROUGH));
 	}
 
+	@org.junit.Test
 	public void testOnSystemCapabilityUpdateWithNoExistingCap(){
 		InternalSDLInterface iSDL = new InternalSDLInterface();
 		SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
@@ -709,6 +725,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES));
 	}
 
+	@org.junit.Test
 	public void testOnSystemCapabilityUpdatedForDISPLAYS() {
 		InternalSDLInterface iSDL = new InternalSDLInterface();
 		SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
@@ -739,6 +756,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		assertTrue(Validator.validateDisplayCapabilities(appliedConvertedCaps, testConvertedCaps));
 	}
 
+	@org.junit.Test
 	public void testOnSystemCapabilityUpdated(){
 		InternalSDLInterface iSDL = new InternalSDLInterface();
 		String baseName = "NavTest", baseID = "37F98053AE";
@@ -875,6 +893,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		assertEquals(phoneCapability, phoneCapabilityUpdated);
 	}
 
+	@org.junit.Test
 	public void testOnSetDisplayLayout() {
 		InternalSDLInterface iSDL = new InternalSDLInterface();
 		SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
@@ -907,6 +926,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		assertNull(systemCapabilityManager.getWindowCapability(42));
 	}
 
+	@org.junit.Test
 	public void testManagerBeforeDisplayUpdate() {
 		InternalSDLInterface iSDL = new InternalSDLInterface();
 		SystemCapabilityManager systemCapabilityManager = new SystemCapabilityManager(iSDL);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java
index 6b164eb16..d17582da4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java
@@ -1,8 +1,11 @@
 package com.smartdevicelink.test.rpc;
 
 
-import com.smartdevicelink.AndroidTestCase2;
+import android.support.test.runner.AndroidJUnit4;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
@@ -18,13 +21,16 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import static android.support.test.InstrumentationRegistry.getContext;
+import static junit.framework.TestCase.assertTrue;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project
  * It makes sure that for each RPC, all mandatory parameters are set in a constructor
  */
 
-public class RPCConstructorsTests extends AndroidTestCase2 {
+@RunWith(AndroidJUnit4.class)
+public class RPCConstructorsTests {
 
     private final String XML_FILE_NAME = "xml/MOBILE_API.xml";
     private final String RPC_PACKAGE_PREFIX = "com.smartdevicelink.proxy.rpc.";
@@ -42,13 +48,8 @@ public class RPCConstructorsTests extends AndroidTestCase2 {
         }
     }
 
-    @Override
+    @Before
     public void setUp(){
-        try {
-            super.setUp();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
         // Map that has keys correspond to the RPC names and values correspond to the
         // mandatory params for that RPC. All info are loaded from the RPC spec xml file
         rpcMandatoryParamsMapFromXml = getRPCMandatoryParamsMap(XML_FILE_NAME);
@@ -60,7 +61,7 @@ public class RPCConstructorsTests extends AndroidTestCase2 {
     private Map<String, List<Parameter>> getRPCMandatoryParamsMap(String fileName) {
         Map<String, List<Parameter>> rpcMandatoryParamsMap = new HashMap<>();
         try {
-            InputStream stream = this.mContext.getAssets().open(fileName);
+            InputStream stream = getContext().getAssets().open(fileName);
             XmlPullParserFactory xmlFactoryObject = XmlPullParserFactory.newInstance();
             XmlPullParser myParser = xmlFactoryObject.newPullParser();
             myParser.setInput(stream, null);
@@ -144,6 +145,7 @@ public class RPCConstructorsTests extends AndroidTestCase2 {
 
     // This method makes sure that for every RPC, there is a constructor that has all the mandatory params
     // It also checks if there are RPC in the XML file that don't exist in the code
+    @Test
     public void testMandatoryParamsMatch() {
         // List of RPC names that don't have a constructor that has all mandatory params
         List<String> rpcsWithInvalidConstructor = new ArrayList<>();
@@ -207,6 +209,7 @@ public class RPCConstructorsTests extends AndroidTestCase2 {
     }
 
     // This method makes sure that for every RPC, the constructor that has the mandatory params is setting the values correctly
+    @Test
     public void testMandatoryParamsValues() {
         // List of RPC names that have a constructor which is not settings the values for the mandatory params correctly
         List<String> rpcsWithInvalidConstructor = new ArrayList<>();
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
index e3aca14a4..730226472 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
@@ -1,6 +1,7 @@
 package com.smartdevicelink.test.security;
 
-import com.smartdevicelink.AndroidTestCase2;
+import android.support.test.runner.AndroidJUnit4;
+
 import com.smartdevicelink.SdlConnection.ISdlConnectionListener;
 import com.smartdevicelink.SdlConnection.SdlSession;
 import com.smartdevicelink.protocol.ProtocolMessage;
@@ -10,17 +11,17 @@ import com.smartdevicelink.test.Test;
 import com.smartdevicelink.transport.BTTransportConfig;
 import com.smartdevicelink.transport.BaseTransportConfig;
 
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
 import java.util.List;
 
-public class SdlSecurityBaseTest extends AndroidTestCase2 {
-		
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-	
-	}
-	
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+
+@RunWith(AndroidJUnit4.class)
+public class SdlSecurityBaseTest {
+
 	private class MockSdlSecurityBase extends SdlSecurityBase {
 
 		@Override
@@ -115,7 +116,8 @@ public class SdlSecurityBaseTest extends AndroidTestCase2 {
 		public void onAuthTokenReceived(String token, byte bytes){}
 
 	}
-	
+
+	@org.junit.Test
 	public void testMakeListSetAndGet(){
 		List<String> makeList = new ArrayList<String>();
 		MockSdlSecurityBase mockSdlSecurityBase = new MockSdlSecurityBase();
@@ -130,7 +132,8 @@ public class SdlSecurityBaseTest extends AndroidTestCase2 {
     	assertNotNull(Test.NOT_NULL, makeList);
     	assertEquals(Test.MATCH, makeList, mockSdlSecurityBase.getMakeList());
 	}
-	
+
+	@org.junit.Test
 	public void testHandleInitResult() {
 		byte testWiproVersion = (byte) 0x0B;
 		boolean testInitResult = true;
@@ -154,7 +157,8 @@ public class SdlSecurityBaseTest extends AndroidTestCase2 {
 		
 		assertEquals(Test.MATCH, testInitResult, mockSdlSecurityBase.getInitSuccess());
 	}
-	
+
+	@org.junit.Test
 	public void testStartServiceListSetAndGet() {
 		List<SessionType> startServiceList = new ArrayList<SessionType>();
 		MockSdlSecurityBase mockSdlSecurityBase = new MockSdlSecurityBase();
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java
index b894eca12..8aa8ac5e8 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java
@@ -1,26 +1,38 @@
 package com.smartdevicelink.test.streaming.video;
 
-import com.smartdevicelink.AndroidTestCase2;
+import android.support.test.runner.AndroidJUnit4;
+
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.VideoStreamingCapability;
 import com.smartdevicelink.proxy.rpc.VideoStreamingFormat;
 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingCodec;
 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingProtocol;
 import com.smartdevicelink.streaming.video.VideoStreamingParameters;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.Collections;
 
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNull;
 
-public class VideoStreamingParametersTest extends AndroidTestCase2 {
+@RunWith(AndroidJUnit4.class)
+public class VideoStreamingParametersTest {
 
     private VideoStreamingParameters params;
     private VideoStreamingCapability capability;
     private ImageResolution preferredResolution;
 
+    @Before
     public void setUp() {
         params = new VideoStreamingParameters();
         capability = new VideoStreamingCapability();
     }
 
+    @Test
     public void testUpdateNullScale() {
         preferredResolution = new ImageResolution(800, 354);
 
@@ -36,6 +48,7 @@ public class VideoStreamingParametersTest extends AndroidTestCase2 {
         assertEquals(354, height);
     }
 
+    @Test
     public void testUpdateScale_1_Resolution_800_354() {
         preferredResolution = new ImageResolution(800, 354);
 
@@ -51,6 +64,7 @@ public class VideoStreamingParametersTest extends AndroidTestCase2 {
         assertEquals(354, height);
     }
 
+    @Test
     public void testUpdateScale_1_25_Resolution_1280_569() {
         preferredResolution = new ImageResolution(1280, 569);
 
@@ -66,6 +80,7 @@ public class VideoStreamingParametersTest extends AndroidTestCase2 {
         assertEquals(456, height);
     }
 
+    @Test
     public void testUpdateScale_1_5_Resolution_1280_569() {
         preferredResolution = new ImageResolution(1280, 569);
 
@@ -81,6 +96,7 @@ public class VideoStreamingParametersTest extends AndroidTestCase2 {
         assertEquals(380, height);
     }
 
+    @Test
     public void testUpdateScale_1_0_Ford_Resolution_800_354() {
         preferredResolution = new ImageResolution(800, 354);
 
@@ -96,6 +112,7 @@ public class VideoStreamingParametersTest extends AndroidTestCase2 {
         assertEquals(354, height);
     }
 
+    @Test
     public void testUpdateScale_1_3_Lincoln_Resolution_600_900() {
         preferredResolution = new ImageResolution(600, 900);
 
@@ -111,6 +128,7 @@ public class VideoStreamingParametersTest extends AndroidTestCase2 {
         assertEquals(676, height);
     }
 
+    @Test
     public void testUpdateScale_1_3_Ford_Resolution_900_600() {
         preferredResolution = new ImageResolution(900, 600);
 
@@ -126,6 +144,7 @@ public class VideoStreamingParametersTest extends AndroidTestCase2 {
         assertEquals(450, height);
     }
 
+    @Test
     public void testUpdateScale_1_0_Toyota_Resolution_900_600() {
         preferredResolution = new ImageResolution(900, 600);
 
@@ -141,6 +160,7 @@ public class VideoStreamingParametersTest extends AndroidTestCase2 {
         assertEquals(600, height);
     }
 
+    @Test
     public void testUpdateCapabilityFormat(){
         VideoStreamingCapability capability = new VideoStreamingCapability();
         capability.setMaxBitrate(10000);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
index cb3de5670..021465d93 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
@@ -1,22 +1,30 @@
 package com.smartdevicelink.test.transport;
 
-import com.smartdevicelink.AndroidTestCase2;
+import android.support.test.runner.AndroidJUnit4;
+
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class MultiplexTransportConfigTests extends AndroidTestCase2 {
+import static android.support.test.InstrumentationRegistry.getContext;
+import static junit.framework.TestCase.assertEquals;
 
-	
+@RunWith(AndroidJUnit4.class)
+public class MultiplexTransportConfigTests {
+
+	@Test
 	public void testDefaultSecurity(){
-		MultiplexTransportConfig config = new MultiplexTransportConfig(this.mContext, "2341");
+		MultiplexTransportConfig config = new MultiplexTransportConfig(getContext(), "2341");
 		assertEquals(config.getSecurityLevel(), MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED);
 	}
-	
+
+	@Test
 	public void testSettingSecurity(){
-		MultiplexTransportConfig config = new MultiplexTransportConfig(this.mContext, "2341", MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+		MultiplexTransportConfig config = new MultiplexTransportConfig(getContext(), "2341", MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
 		assertEquals(config.getSecurityLevel(), MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
 		
-		config = new MultiplexTransportConfig(this.mContext, "2341");
+		config = new MultiplexTransportConfig(getContext(), "2341");
 		config.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
 		assertEquals(config.getSecurityLevel(), MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/CompareUtilsTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/CompareUtilsTest.java
index 5edd95ab5..8bb3b378b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/CompareUtilsTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/CompareUtilsTest.java
@@ -1,11 +1,19 @@
 package com.smartdevicelink.test.util;
 
-import com.smartdevicelink.AndroidTestCase2;
+import android.support.test.runner.AndroidJUnit4;
+
 import com.smartdevicelink.test.Test;
 import com.smartdevicelink.util.CompareUtils;
 
-public class CompareUtilsTest extends AndroidTestCase2 {
+import org.junit.runner.RunWith;
+
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+@RunWith(AndroidJUnit4.class)
+public class CompareUtilsTest {
 
+    @org.junit.Test
     public void testAreStringsEqual(){
 
         assertTrue(CompareUtils.areStringsEqual(Test.GENERAL_STRING, Test.GENERAL_STRING, true, true));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
index 027de8b2c..c1cf90e8c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
@@ -38,20 +38,29 @@ import android.content.pm.PackageInfo;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
+import android.support.test.runner.AndroidJUnit4;
 
-import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.R;
 import com.smartdevicelink.util.SdlAppInfo;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import static android.support.test.InstrumentationRegistry.getContext;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotNull;
 
 /**
  * Created by Joey Grover on 2/20/18.
  */
 
-public class SdlAppInfoTests extends AndroidTestCase2 {
+@RunWith(AndroidJUnit4.class)
+public class SdlAppInfoTests {
 
     Context context;
     ResolveInfo defaultResolveInfo;
@@ -59,9 +68,8 @@ public class SdlAppInfoTests extends AndroidTestCase2 {
     Bundle defaultBundle;
     PackageInfo defaultPackageInfo;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         context = getContext();
         defaultResolveInfo =  createResolveInfo(context.getResources().getInteger(R.integer.sdl_router_service_version_value), "com.smartdevicelink.test", "com.smartdevicelink.test.SdlRouterService",false);
         defaultServiceInfo = defaultResolveInfo.serviceInfo;
@@ -72,6 +80,7 @@ public class SdlAppInfoTests extends AndroidTestCase2 {
         defaultPackageInfo.firstInstallTime = System.currentTimeMillis() - 1000000;
     }
 
+    @Test
     public void testConstructorWithDefaultData(){
 
         SdlAppInfo info = new SdlAppInfo(defaultResolveInfo,defaultPackageInfo);
@@ -92,6 +101,7 @@ public class SdlAppInfoTests extends AndroidTestCase2 {
     /**
      * If an app is found to have a newer service the compare should put it at the top of the list
      */
+    @Test
     public void testCompareVersion(){
         SdlAppInfo defaultInfo = new SdlAppInfo(defaultResolveInfo,defaultPackageInfo);
 
@@ -112,6 +122,7 @@ public class SdlAppInfoTests extends AndroidTestCase2 {
     /**
      * Regardless of version, if the router service is custom it should be towards the end of the list
      */
+    @Test
     public void testCompareVersionAndCustom(){
         SdlAppInfo defaultInfo = new SdlAppInfo(defaultResolveInfo,defaultPackageInfo);
 
@@ -132,6 +143,7 @@ public class SdlAppInfoTests extends AndroidTestCase2 {
     /**
      * If two services have the same version and are not custom, we need to check which app has been updated the most recently
      */
+    @Test
     public void testCompareUpdatedTime(){
         SdlAppInfo defaultInfo = new SdlAppInfo(defaultResolveInfo,defaultPackageInfo);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
index f9d3b8e0a..9f462e3f4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
@@ -1,13 +1,21 @@
 package com.smartdevicelink.test.util;
 
-import com.smartdevicelink.AndroidTestCase2;
+import android.support.test.runner.AndroidJUnit4;
+
 import com.smartdevicelink.util.Version;
 
-public class VersionTest extends AndroidTestCase2 {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static junit.framework.TestCase.assertEquals;
+
+@RunWith(AndroidJUnit4.class)
+public class VersionTest {
 
     private static final String TEST_VERSION_STRING = "1.2.3";
     private static final Version TEST_VERSION = new Version(1,2,3);
 
+    @Test
     public void testConstructorCorrect(){
         Version version = new Version(TEST_VERSION_STRING);
         assertEquals(1, version.getMajor());
@@ -15,6 +23,7 @@ public class VersionTest extends AndroidTestCase2 {
         assertEquals(3, version.getPatch());
     }
 
+    @Test
     public void testConstructorIncorrect(){
         try{
             Version version = new Version("1.2");
@@ -24,11 +33,13 @@ public class VersionTest extends AndroidTestCase2 {
         assert false;
     }
 
+    @Test
     public void testToString(){
         Version version = new Version(TEST_VERSION_STRING);
         assertEquals(version.toString(), TEST_VERSION_STRING);
     }
 
+    @Test
     public void testisNewerThan(){
         Version version1 = new Version(5,0,0);
 
@@ -47,6 +58,7 @@ public class VersionTest extends AndroidTestCase2 {
 
     }
 
+    @Test
     public void testIsBetween(){
 
         assertEquals(TEST_VERSION.isBetween(new Version(1,0,0), new Version (2,0,0)), 1);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
index 8b93b41b7..95723696a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
@@ -1,28 +1,35 @@
 package com.smartdevicelink.test.utl;
 
 import android.content.ComponentName;
+import android.support.test.runner.AndroidJUnit4;
 
-import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.util.AndroidTools;
 
 import junit.framework.Assert;
 
-public class AndroidToolsTests extends AndroidTestCase2 {
-	
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.InstrumentationRegistry.getContext;
+
+@RunWith(AndroidJUnit4.class)
+public class AndroidToolsTests {
 	
+	@Test
 	public void testIsServiceExportedNormal(){
 		
 		try{
-			AndroidTools.isServiceExported(mContext, new ComponentName(mContext, "test"));
+			AndroidTools.isServiceExported(getContext(), new ComponentName(getContext(), "test"));
 		}catch(Exception e){
 			Assert.fail("Exception during normal test: " + e.getMessage());
 		}
 		
 	}
+	@Test
 	public void testIsServiceExportedNull(){
 		
 		try{
-			AndroidTools.isServiceExported(mContext, null);
+			AndroidTools.isServiceExported(getContext(), null);
 			Assert.fail("Proccessed null data");
 		}catch(Exception e){
 			
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
index 10aa25d75..e6b3d4341 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
@@ -3,22 +3,30 @@ package com.smartdevicelink.transport;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Parcel;
+import android.support.test.runner.AndroidJUnit4;
 
-import com.smartdevicelink.AndroidTestCase2;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class LocalRouterServiceTests extends AndroidTestCase2 {
+import static android.support.test.InstrumentationRegistry.getContext;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+
+@RunWith(AndroidJUnit4.class)
+public class LocalRouterServiceTests {
 
 	private static final int TEST_WITH_CONSTRUCTOR 	= 0;
 	private static final int TEST_WITH_CREATOR 		= 1;
 	
 	
-	
+	@Test
 	public void testLocalRouterServiceParcel(){
 		Parcel p =  Parcel.obtain();
 		p.writeInt(4);
 		p.writeLong(System.currentTimeMillis());
 		p.writeParcelable(new Intent(), 0);
-		p.writeParcelable(new ComponentName(mContext, "test"), 0);
+		p.writeParcelable(new ComponentName(getContext(), "test"), 0);
 		p.setDataPosition(0);
 		
 		SdlRouterService.LocalRouterService local = new SdlRouterService.LocalRouterService(p);
@@ -28,13 +36,14 @@ public class LocalRouterServiceTests extends AndroidTestCase2 {
 		p.recycle();
 		
 	}
-	
+
+	@Test
 	public void testLocalRouterServiceParcelCreator(){
 		Parcel p =  Parcel.obtain();
 		p.writeInt(4);
 		p.writeLong(System.currentTimeMillis());
 		p.writeParcelable(new Intent(), 0);
-		p.writeParcelable(new ComponentName(mContext, "test"), 0);
+		p.writeParcelable(new ComponentName(getContext(), "test"), 0);
 		p.setDataPosition(0);
 		
 		SdlRouterService.LocalRouterService local = SdlRouterService.LocalRouterService.CREATOR.createFromParcel(p);
@@ -57,7 +66,7 @@ public class LocalRouterServiceTests extends AndroidTestCase2 {
 		Parcel p =  Parcel.obtain();
 		p.writeInt(4);
 		p.writeLong(System.currentTimeMillis());
-		p.writeParcelable(new ComponentName(mContext, "test"), 0);
+		p.writeParcelable(new ComponentName(getContext(), "test"), 0);
 		p.writeParcelable(new Intent(), 0);
 		p.setDataPosition(0);
 		
@@ -108,7 +117,7 @@ public class LocalRouterServiceTests extends AndroidTestCase2 {
 		p.writeLong(System.currentTimeMillis());
 		int space = p.dataSize();
 		p.writeParcelable(new Intent(), 0);
-		p.writeParcelable(new ComponentName(mContext, "test"), 0);
+		p.writeParcelable(new ComponentName(getContext(), "test"), 0);
 		p.setDataPosition(0);
 		
 		byte[] raw = p.marshall();
@@ -130,11 +139,13 @@ public class LocalRouterServiceTests extends AndroidTestCase2 {
 		p.recycle();
 		
 	}
-	
+
+	@Test
 	public void testLocalRouterServiceCorruptParcel(){
 		corruptParcel(TEST_WITH_CONSTRUCTOR);
 	}
-	
+
+	@Test
 	public void testLocalRouterServiceCorruptParcelCreator(){
 		corruptParcel(TEST_WITH_CREATOR);
 	}