[android] - espresso tests reworkupstream/tvn-espresso-test

2 files changed, 6 insertions, 16 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
index f702f8dafa..78be095005 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
@@ -11,15 +11,14 @@ import com.mapbox.mapboxsdk.offline.OfflineManager
 import com.mapbox.mapboxsdk.offline.OfflineRegion
 import com.mapbox.mapboxsdk.storage.FileSource
 import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke
-import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity
+import com.mapbox.mapboxsdk.testapp.activity.EspressoTest
 import com.mapbox.mapboxsdk.testapp.utils.FileUtils
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.io.IOException
 
 @RunWith(AndroidJUnit4::class)
-class OfflineManagerTest : BaseActivityTest() {
+class OfflineManagerTest : EspressoTest() {
 
   companion object {
     private const val TEST_DB_FILE_NAME = "offline.db"
@@ -29,10 +28,6 @@ class OfflineManagerTest : BaseActivityTest() {
 
   private lateinit var offlineIdlingResource: CountingIdlingResource
 
-  override fun getActivityClass(): Class<*> {
-    return EspressoTestActivity::class.java
-  }
-
   override fun beforeTest() {
     super.beforeTest()
     offlineIdlingResource = CountingIdlingResource("idling_resource")
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java
index 84f84fdb90..40fba08c25 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineUtilsTest.java
@@ -1,10 +1,9 @@
 package com.mapbox.mapboxsdk.testapp.offline;
 
-import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
+import android.support.test.runner.AndroidJUnit4;
 import com.mapbox.mapboxsdk.testapp.utils.OfflineUtils;
-
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
@@ -13,16 +12,12 @@ import static com.mapbox.mapboxsdk.testapp.activity.offline.OfflineActivity.JSON
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.TestCase.assertTrue;
 
-public class OfflineUtilsTest extends BaseActivityTest {
+@RunWith(AndroidJUnit4.class)
+public class OfflineUtilsTest {
 
   private static final String REGION_NAME = "hello world";
   private static final String CONVERTED_REGION_NAME = "{\"FIELD_REGION_NAME\":\"hello world\"}";
 
-  @Override
-  protected Class getActivityClass() {
-    return EspressoTestActivity.class;
-  }
-
   @Test
   public void testOfflineUtilsConvertToBytes() throws UnsupportedEncodingException {
     byte[] expected = CONVERTED_REGION_NAME.getBytes(JSON_CHARSET);