1 files changed, 7 insertions, 26 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/MyLocationViewTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/MyLocationViewTest.java
index c8a983351b..efd67db356 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/MyLocationViewTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/MyLocationViewTest.java
@@ -5,10 +5,8 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.test.espresso.Espresso;
 import android.support.test.espresso.UiController;
 import android.support.test.espresso.ViewAction;
-import android.support.test.rule.ActivityTestRule;
 import android.view.View;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
@@ -20,17 +18,13 @@ import com.mapbox.mapboxsdk.location.LocationSource;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.widgets.MyLocationView;
 import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
-import com.mapbox.mapboxsdk.testapp.utils.ViewUtils;
 
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 
 import static android.support.test.espresso.Espresso.onView;
@@ -49,24 +43,17 @@ import static org.hamcrest.Matchers.not;
  * {@link com.mapbox.mapboxsdk.maps.TrackingSettings#setMyBearingTrackingMode(int)}.
  * </p>
  */
-public class MyLocationViewTest {
+public class MyLocationViewTest extends BaseActivityTest {
 
-  @Rule
-  public final ActivityTestRule<EspressoTestActivity> rule = new ActivityTestRule<>(EspressoTestActivity.class);
-
-  private OnMapReadyIdlingResource idlingResource;
-
-  @Before
-  public void beforeTest() {
-    idlingResource = new OnMapReadyIdlingResource(rule.getActivity());
-    Espresso.registerIdlingResources(idlingResource);
+  @Override
+  protected Class getActivityClass() {
+    return EspressoTestActivity.class;
   }
 
   @Test
   @Ignore // requires runtime permissions, disabled for CI
   public void testEnabled() {
-    ViewUtils.checkViewIsDisplayed(R.id.mapView);
-    MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
+    validateTestSetup();
     onView(withId(R.id.userLocationView)).check(matches(not(isDisplayed())));
     onView(withId(R.id.mapView)).perform(new ToggleLocationAction(mapboxMap, true));
     onView(withId(R.id.userLocationView)).check(matches(isDisplayed()));
@@ -79,8 +66,7 @@ public class MyLocationViewTest {
   // requires runtime permissions, disabled for CI + issue with android.support.test.espresso.AppNotIdleException:
   // Looped for 5049 iterations over 60 SECONDS.
   public void testTracking() {
-    ViewUtils.checkViewIsDisplayed(R.id.mapView);
-    MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
+    validateTestSetup();
     onView(withId(R.id.userLocationView)).check(matches(not(isDisplayed())));
     onView(withId(R.id.mapView)).perform(new EnableLocationTrackingAction(mapboxMap));
     onView(withId(R.id.userLocationView)).check(matches(isDisplayed()));
@@ -91,11 +77,6 @@ public class MyLocationViewTest {
       R.drawable.mapbox_mylocation_icon_bearing, true)));
   }
 
-  @After
-  public void afterTest() {
-    Espresso.unregisterIdlingResources(idlingResource);
-  }
-
   private class ToggleLocationAction implements ViewAction {
 
     private MapboxMap mapboxMap;