Update unit tests to handle compile with 28

34 files changed, 110 insertions, 89 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/AndroidTestCase2.java b/sdl_android/src/androidTest/java/com/smartdevicelink/AndroidTestCase2.java
new file mode 100644
index 000000000..f953b9522
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/AndroidTestCase2.java
@@ -0,0 +1,39 @@
+package com.smartdevicelink;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.test.InstrumentationRegistry;
+
+import junit.framework.TestCase;
+
+
+public class AndroidTestCase2 extends TestCase {
+
+    public Context mContext;
+
+    public AndroidTestCase2(){
+        mContext = InstrumentationRegistry.getTargetContext();
+        try {
+            setUp();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public Context getContext(){
+        return mContext;
+    }
+
+    public void setContext(Context context){}
+
+
+    public void assertActivityRequiresPermission(String packageName, String className, String permission){}
+    public void assertReadingContentUriRequiresPermission(Uri uri, String permission){}
+    public void assertWritingContentUriRequiresPermission(Uri uri, String permission){}
+
+
+    protected void	scrubClass(Class<?> testCaseClass){}
+    protected void setUp() throws Exception{}
+    protected void tearDown() throws Exception{}
+
+}
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java
index 0b8e37ea0..776da6ccc 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java
@@ -1,7 +1,6 @@
 package com.smartdevicelink.SdlConnection;
 
-import android.test.AndroidTestCase;
-
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.test.SdlUnitTestContants;
 import com.smartdevicelink.test.util.DeviceUtil;
 import com.smartdevicelink.transport.BTTransportConfig;
@@ -11,7 +10,7 @@ import com.smartdevicelink.transport.RouterServiceValidator;
 import com.smartdevicelink.transport.USBTransportConfig;
 import com.smartdevicelink.transport.enums.TransportType;
 
-public class SdlConnectionTest extends AndroidTestCase {
+public class SdlConnectionTest extends AndroidTestCase2 {
 	
 	private static final String TAG = "SdlConnection Tests";
 	
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
index ff8ab3c1d..61626251b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
@@ -1,8 +1,8 @@
 package com.smartdevicelink.managers;
 
 import android.content.Context;
-import android.test.AndroidTestCase;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.managers.lockscreen.LockScreenConfig;
 import com.smartdevicelink.protocol.enums.FunctionID;
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock;
  * This is a unit test class for the SmartDeviceLink library manager class :
  * {@link com.smartdevicelink.managers.SdlManager}
  */
-public class SdlManagerTests extends AndroidTestCase {
+public class SdlManagerTests extends AndroidTestCase2 {
 
 	public static BaseTransportConfig transport = null;
 	private Context mTestContext;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
index 9b903771f..35c57a4c3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
@@ -462,7 +462,9 @@ public class AudioStreamManagerTest extends TestCase {
         final int sampleRate = 16000;

 

         final File outputFile = new File(mContext.getCacheDir(), "test_audio_file.wav");

+        assertNotNull((outputFile));

         final FileOutputStream fileOutputStream = new FileOutputStream(outputFile);

+        assertNotNull(fileOutputStream);

         writeWaveHeader(fileOutputStream, sampleRate, sampleType << 3);

 

         IAudioStreamListener audioStreamListener = new IAudioStreamListener() {

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
index 5e8826261..05838d727 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
@@ -2,8 +2,8 @@ package com.smartdevicelink.managers.file;
 
 import android.content.Context;
 import android.net.Uri;
-import android.test.AndroidTestCase;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock;
  * This is a unit test class for the SmartDeviceLink library manager class :
  * {@link FileManager}
  */
-public class FileManagerTests extends AndroidTestCase {
+public class FileManagerTests extends AndroidTestCase2 {
 	public static final String TAG = "FileManagerTests";
 	private FileManager fileManager;
 	private Context mTestContext;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
index 5ced0432a..c2d4066ce 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
@@ -1,7 +1,6 @@
 package com.smartdevicelink.managers.lockscreen;
 
-import android.test.AndroidTestCase;
-
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.test.Test;
 
 
@@ -11,7 +10,7 @@ import com.smartdevicelink.test.Test;
  *
  * We currently do not need to test null values, as each currently is a primitive
  */
-public class LockScreenConfigTests extends AndroidTestCase {
+public class LockScreenConfigTests extends AndroidTestCase2 {
 
 	private LockScreenConfig lockScreenConfig;
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
index e4b610d53..69e0aa898 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
@@ -1,9 +1,8 @@
 package com.smartdevicelink.managers.lockscreen;
 
 import android.content.Context;
-import android.test.AndroidTestCase;
-import android.test.mock.MockContext;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;
 import com.smartdevicelink.test.Test;
@@ -14,7 +13,7 @@ import static org.mockito.Mockito.mock;
  * This is a unit test class for the SmartDeviceLink library manager class :
  * {@link com.smartdevicelink.managers.lockscreen.LockScreenManager}
  */
-public class LockScreenManagerTests extends AndroidTestCase {
+public class LockScreenManagerTests extends AndroidTestCase2 {
 
 	private LockScreenManager lockScreenManager;
 
@@ -24,7 +23,7 @@ public class LockScreenManagerTests extends AndroidTestCase {
 
 		ISdl internalInterface = mock(ISdl.class);
 
-		Context context = new MockContext();
+		Context context =  getContext();
 		// create config
 		LockScreenConfig lockScreenConfig = new LockScreenConfig();
 		lockScreenConfig.setCustomView(Test.GENERAL_INT);
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java
index 6e0e070da..6a66a3092 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java
@@ -1,12 +1,8 @@
 package com.smartdevicelink.managers.permission;
 
 import android.support.annotation.NonNull;
-import android.test.AndroidTestCase;
 
-import com.smartdevicelink.managers.permission.OnPermissionChangeListener;
-import com.smartdevicelink.managers.permission.PermissionElement;
-import com.smartdevicelink.managers.permission.PermissionManager;
-import com.smartdevicelink.managers.permission.PermissionStatus;
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.HMIPermissions;
@@ -32,7 +28,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 
-public class PermissionManagerTests extends AndroidTestCase {
+public class PermissionManagerTests extends AndroidTestCase2 {
 
     private OnRPCNotificationListener onHMIStatusListener, onPermissionsChangeListener;
     private PermissionManager permissionManager;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
index a6f03847b..8c0c1e9c0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
@@ -1,5 +1,6 @@
 package com.smartdevicelink.managers.screen;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
@@ -7,7 +8,6 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.MetadataType;
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
-import com.smartdevicelink.test.utl.AndroidToolsTests;
 
 import java.util.Arrays;
 import java.util.List;
@@ -18,7 +18,7 @@ import static org.mockito.Mockito.mock;
  * This is a unit test class for the SmartDeviceLink library manager class :
  * {@link ScreenManager}
  */
-public class ScreenManagerTests extends AndroidToolsTests{
+public class ScreenManagerTests extends AndroidTestCase2 {
 	private ScreenManager screenManager;
 	private SdlArtwork testArtwork;
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
index 9445d24b9..3198bc116 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
@@ -1,7 +1,7 @@
 package com.smartdevicelink.managers.screen;
 
-import android.test.AndroidTestCase;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.MultipleFileCompletionListener;
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock;
  * This is a unit test class for the SmartDeviceLink library manager class :
  * {@link SoftButtonManager}
  */
-public class SoftButtonManagerTests extends AndroidTestCase {
+public class SoftButtonManagerTests extends AndroidTestCase2 {
 
     private SoftButtonManager softButtonManager;
     private boolean fileManagerUploadArtworksGotCalled;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
index 2a6d8f028..aaad2df24 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
@@ -3,6 +3,7 @@ package com.smartdevicelink.managers.screen;
 import android.content.Context;
 import android.net.Uri;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
@@ -16,7 +17,6 @@ import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 import com.smartdevicelink.proxy.rpc.enums.MetadataType;
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
 import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
-import com.smartdevicelink.test.utl.AndroidToolsTests;
 
 import org.json.JSONException;
 
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.mock;
  * This is a unit test class for the SmartDeviceLink library manager class :
  * {@link com.smartdevicelink.managers.screen.TextAndGraphicManager}
  */
-public class TextAndGraphicManagerTests extends AndroidToolsTests{
+public class TextAndGraphicManagerTests extends AndroidTestCase2 {
 
 	// SETUP / HELPERS
 	private TextAndGraphicManager textAndGraphicManager;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
index 960d5c660..e0febdb51 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
@@ -3,11 +3,11 @@ package com.smartdevicelink.managers.video;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.test.AndroidTestCase;
 import android.view.Display;
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.when;
  * This is a unit test class for the SmartDeviceLink video streaming manager class :
  * {@link VideoStreamManager}
  */
-public class VideoStreamManagerTests extends AndroidTestCase {
+public class VideoStreamManagerTests extends AndroidTestCase2 {
 	public static final String TAG = "VideoStreamManagerTests";
 	private Context mTestContext;
 	private static boolean touchEventOccured = false;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java
index c3e39ce5a..a9bc03bb0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java
@@ -1,14 +1,13 @@
 package com.smartdevicelink.protocol;
 
-import android.test.AndroidTestCase;
-
 import com.livio.BSON.BsonEncoder;
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.protocol.enums.ControlFrameTags;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class SdlPacketTests extends AndroidTestCase {
+public class SdlPacketTests extends AndroidTestCase2 {
 	//TODO: Add tests to cover other parts of SdlPacket class
 
 	// Test variables
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
index accd50f40..675ecb4f2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
@@ -1,8 +1,8 @@
 package com.smartdevicelink.protocol;
 
-import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.SdlConnection.SdlConnection;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.protocol.SdlProtocol.MessageFrameAssembler;
@@ -22,7 +22,7 @@ import java.util.List;
 
 import static org.mockito.Mockito.mock;
 
-public class SdlProtocolTests  extends AndroidTestCase {
+public class SdlProtocolTests  extends AndroidTestCase2 {
 
     int max_int = 2147483647;
     byte[] payload;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
index 0cc371f5b..bec4a6d92 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
@@ -1,9 +1,9 @@
 package com.smartdevicelink.protocol;
 
 import android.os.Bundle;
-import android.test.AndroidTestCase;
 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;
@@ -26,7 +26,7 @@ import java.util.Map;
  * This is a unit test class for the SmartDeviceLink library project class : 
  * {@link com.smartdevicelink.protocol.BinaryFrameHeader}
  */
-public class WiProProtocolTests extends AndroidTestCase {
+public class WiProProtocolTests extends AndroidTestCase2 {
 	
 	int max_int = 2147483647;
 	byte[] payload;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
index c30f26a7f..8b9d5f3f7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
@@ -6,13 +6,12 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.test.AndroidTestCase;
-
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.RPCResponse;
 
-public abstract class BaseRpcTests extends AndroidTestCase {
+public abstract class BaseRpcTests extends AndroidTestCase2 {
 
     public static final int  SDL_VERSION_UNDER_TEST = Config.SDL_VERSION_UNDER_TEST;
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
index 60a97a35c..a1b108fea 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
@@ -2,14 +2,12 @@ package com.smartdevicelink.test.protocol;
 
 import junit.framework.Assert;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.protocol.BinaryFrameHeader;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.test.SampleRpc;
 
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-public class BinaryFrameHeaderTests extends AndroidTestCase {
+public class BinaryFrameHeaderTests extends AndroidTestCase2 {
 	
 	public static final byte RPC_TYPE_REQUEST 		= 0x00;
 	public static final byte RPC_TYPE_RESPONSE 		= 0x01;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
index 5c1b9436d..eea733631 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
@@ -1,22 +1,15 @@
 package com.smartdevicelink.test.proxy;
 
-import android.test.AndroidTestCase;
 
-import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.RPCMessage;
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.proxy.RPCResponse;
 import com.smartdevicelink.proxy.rpc.GetSystemCapability;
 import com.smartdevicelink.test.Config;
-import com.smartdevicelink.test.JsonUtils;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import junit.framework.TestCase;
 
-import java.util.Iterator;
 
-public class RPCRequestTest extends AndroidTestCase {
+public class RPCRequestTest extends AndroidTestCase2 {
 
     public static final int  SDL_VERSION_UNDER_TEST = Config.SDL_VERSION_UNDER_TEST;
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
index f05c9d98c..aecbb44f0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
@@ -2,9 +2,9 @@ package com.smartdevicelink.test.proxy;
 
 import android.content.Context;
 import android.telephony.TelephonyManager;
-import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.exception.SdlExceptionCause;
 import com.smartdevicelink.proxy.RPCRequest;
@@ -97,7 +97,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class SdlProxyBaseTests extends AndroidTestCase{
+public class SdlProxyBaseTests extends AndroidTestCase2 {
     public static final String TAG = "SdlProxyBaseTests";
 
     @Override
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
index 45c0f691a..91bd19d34 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
@@ -1,7 +1,6 @@
 package com.smartdevicelink.test.proxy;
 
-import android.test.AndroidTestCase;
-
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.RPCRequest;
@@ -38,7 +37,7 @@ import com.smartdevicelink.util.Version;
 
 import java.util.List;
 
-public class SystemCapabilityManagerTests extends AndroidTestCase {
+public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 	public static final String TAG = "SystemCapabilityManagerTests";
 	public static SystemCapabilityManager systemCapabilityManager;
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java
index 028f5dd30..6233a1d58 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java
@@ -1,6 +1,7 @@
 package com.smartdevicelink.test.rpc;
 
-import android.test.AndroidTestCase;
+
+import com.smartdevicelink.AndroidTestCase2;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -23,7 +24,7 @@ import java.util.Map;
  * It makes sure that for each RPC, all mandatory parameters are set in a constructor
  */
 
-public class RPCConstructorsTests extends AndroidTestCase {
+public class RPCConstructorsTests extends AndroidTestCase2 {
 
     private final String XML_FILE_NAME = "xml/MOBILE_API_4.5.0.xml";
     private final String RPC_PACKAGE_PREFIX = "com.smartdevicelink.proxy.rpc.";
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
index 7cef45d4a..e91903e21 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
@@ -4,8 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import android.test.AndroidTestCase;
-
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.SdlConnection.ISdlConnectionListener;
 import com.smartdevicelink.SdlConnection.SdlSession;
 import com.smartdevicelink.protocol.ProtocolMessage;
@@ -17,7 +16,7 @@ import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 import com.smartdevicelink.transport.enums.TransportType;
 
-public class SdlSecurityBaseTest extends AndroidTestCase {
+public class SdlSecurityBaseTest extends AndroidTestCase2 {
 		
 	@Override
 	protected void setUp() throws Exception {
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
index 96e6e29cb..e3b113cd3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
@@ -4,11 +4,11 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Looper;
-import android.test.AndroidTestCase;
 import android.view.Display;
 import android.view.MotionEvent;
 import android.widget.RelativeLayout;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.R;
 import com.smartdevicelink.encoder.VirtualDisplayEncoder;
 import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
@@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
 import java.util.concurrent.FutureTask;
 
 
-public class SdlRemoteDisplayTest extends AndroidTestCase {
+public class SdlRemoteDisplayTest extends AndroidTestCase2 {
 
     MockRemoteDisplayCallback rdCallback = new MockRemoteDisplayCallback();
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
index c4bfad6cc..cb3de5670 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
@@ -1,10 +1,10 @@
 package com.smartdevicelink.test.transport;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 
-import android.test.AndroidTestCase;
 
-public class MultiplexTransportConfigTests extends AndroidTestCase {
+public class MultiplexTransportConfigTests extends AndroidTestCase2 {
 
 	
 	public void testDefaultSecurity(){
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
index 116e846d7..027de8b2c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
@@ -38,8 +38,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
-import android.test.AndroidTestCase;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.R;
 import com.smartdevicelink.util.SdlAppInfo;
 
@@ -51,7 +51,7 @@ import java.util.List;
  * Created by Joey Grover on 2/20/18.
  */
 
-public class SdlAppInfoTests extends AndroidTestCase {
+public class SdlAppInfoTests extends AndroidTestCase2 {
 
     Context context;
     ResolveInfo defaultResolveInfo;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
index a3c0faed4..4798de56b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
@@ -1,10 +1,9 @@
 package com.smartdevicelink.test.util;
 
-import android.test.AndroidTestCase;
-
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.util.Version;
 
-public class VersionTest extends AndroidTestCase {
+public class VersionTest extends AndroidTestCase2 {
 
     private static final String TEST_VERSION = "1.2.3";
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
index e15c95098..c715bb62c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
@@ -2,11 +2,11 @@ package com.smartdevicelink.test.utl;
 
 import junit.framework.Assert;
 import android.content.ComponentName;
-import android.test.AndroidTestCase;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.util.AndroidTools;
 
-public class AndroidToolsTests extends AndroidTestCase{
+public class AndroidToolsTests extends AndroidTestCase2 {
 	
 	
 	public void testIsServiceExportedNormal(){
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
index c918ffa12..10aa25d75 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
@@ -3,9 +3,10 @@ package com.smartdevicelink.transport;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Parcel;
-import android.test.AndroidTestCase;
 
-public class LocalRouterServiceTests extends AndroidTestCase {
+import com.smartdevicelink.AndroidTestCase2;
+
+public class LocalRouterServiceTests extends AndroidTestCase2 {
 
 	private static final int TEST_WITH_CONSTRUCTOR 	= 0;
 	private static final int TEST_WITH_CREATOR 		= 1;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
index 901a756a3..9551a5a6f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
@@ -1,14 +1,13 @@
 package com.smartdevicelink.transport;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.protocol.SdlPacket;
 import com.smartdevicelink.test.SdlUnitTestContants;
 import com.smartdevicelink.transport.enums.TransportType;
 
-import android.test.AndroidTestCase;
-
 import junit.framework.Assert;
 
-public class MultiplexTransportTest extends AndroidTestCase {
+public class MultiplexTransportTest extends AndroidTestCase2 {
 
 	private static final int TIMEOUT = 2000;
 	
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
index e40049afd..b19a0c6ce 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
@@ -5,9 +5,9 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.transport.RouterServiceValidator.TrustedAppStore;
 import com.smartdevicelink.util.HttpRequestTask.HttpRequestTaskCallback;
 
@@ -21,7 +21,7 @@ import java.lang.reflect.Method;
 import java.util.List;
 import java.util.concurrent.Semaphore;
 
-public class RSVTestCase extends AndroidTestCase {
+public class RSVTestCase extends AndroidTestCase2 {
 	private static final String TAG = "RSVTestCase";
 	
 	private static final long REFRESH_TRUSTED_APP_LIST_TIME_DAY 	= 3600000 * 24; // A day in ms
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
index 4208c1479..89dbae3ab 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
@@ -1,16 +1,16 @@
 package com.smartdevicelink.transport;
 
-import android.os.Handler;
 import android.os.Looper;
 import android.os.Messenger;
-import android.test.AndroidTestCase;
+
+import com.smartdevicelink.AndroidTestCase2;
 
 
 /**
  * Created by brettywhite on 4/4/17.
  */
 
-public class RegisteredAppTests extends AndroidTestCase {
+public class RegisteredAppTests extends AndroidTestCase2 {
 
     private static final String APP_ID = "123451123";
     private static final Messenger messenger = null;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
index c87a7d85f..1a0bc2458 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
@@ -5,11 +5,11 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.test.AndroidTestCase;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.marshal.JsonRPCMarshaller;
 import com.smartdevicelink.protocol.BinaryFrameHeader;
 import com.smartdevicelink.protocol.ProtocolMessage;
@@ -29,7 +29,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 
-public class SdlRouterServiceTests extends AndroidTestCase {
+public class SdlRouterServiceTests extends AndroidTestCase2 {
 
     public static final String TAG = "SdlRouterServiceTests";
     private final int SAMPLE_RPC_CORRELATION_ID = 630;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
index 5725b6974..ac97857ad 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
@@ -5,12 +5,12 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
-import android.test.AndroidTestCase;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.test.SdlUnitTestContants;
 import com.smartdevicelink.test.util.DeviceUtil;
 
-public class TransportBrokerTest extends AndroidTestCase {
+public class TransportBrokerTest extends AndroidTestCase2 {
 	RouterServiceValidator rsvp;
 	//		public TransportBrokerThread(Context context, String appId, ComponentName service){
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
index 176a2b290..bdb628e05 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
@@ -5,8 +5,8 @@ import android.os.Bundle;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Parcelable;
-import android.test.AndroidTestCase;
 
+import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.protocol.SdlPacket;
 import com.smartdevicelink.protocol.SdlPacketFactory;
 import com.smartdevicelink.protocol.enums.SessionType;
@@ -18,7 +18,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class TransportManagerTests extends AndroidTestCase {
+public class TransportManagerTests extends AndroidTestCase2 {
 
     MultiplexTransportConfig config;
     final TransportRecord defaultBtRecord = new TransportRecord(TransportType.BLUETOOTH, "12:34:56:78:90");