1 files changed, 5 insertions, 44 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/feature/QueryRenderedFeaturesHighlightTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/feature/QueryRenderedFeaturesHighlightTest.java
index 0333aba191..307700e847 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/feature/QueryRenderedFeaturesHighlightTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/feature/QueryRenderedFeaturesHighlightTest.java
@@ -1,22 +1,10 @@
 package com.mapbox.mapboxsdk.testapp.feature;
 
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.action.CoordinatesProvider;
-import android.support.test.espresso.action.GeneralClickAction;
-import android.support.test.espresso.action.Press;
-import android.support.test.espresso.action.Tap;
-import android.support.test.rule.ActivityTestRule;
-import android.view.View;
-
 import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.feature.QueryRenderedFeaturesBoxHighlightActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
 
-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;
@@ -32,18 +20,11 @@ import static org.hamcrest.Matchers.not;
 /**
  * Instrumentation test to validate if clicking box on screen highlights features.
  */
-public class QueryRenderedFeaturesHighlightTest {
-
-  @Rule
-  public final ActivityTestRule<QueryRenderedFeaturesBoxHighlightActivity> rule =
-    new ActivityTestRule<>(QueryRenderedFeaturesBoxHighlightActivity.class);
-
-  private OnMapReadyIdlingResource idlingResource;
+public class QueryRenderedFeaturesHighlightTest extends BaseActivityTest {
 
-  @Before
-  public void registerIdlingResource() {
-    idlingResource = new OnMapReadyIdlingResource(rule.getActivity());
-    Espresso.registerIdlingResources(idlingResource);
+  @Override
+  protected Class getActivityClass() {
+    return QueryRenderedFeaturesBoxHighlightActivity.class;
   }
 
   @Test
@@ -58,24 +39,4 @@ public class QueryRenderedFeaturesHighlightTest {
       .check(matches(isDisplayed()));
   }
 
-  @After
-  public void unregisterIdlingResource() {
-    Espresso.unregisterIdlingResources(idlingResource);
-  }
-
-  private static ViewAction clickXY(final float x, final float y) {
-    return new GeneralClickAction(
-      Tap.SINGLE,
-      new CoordinatesProvider() {
-        @Override
-        public float[] calculateCoordinates(View view) {
-          final int[] screenPos = new int[2];
-          view.getLocationOnScreen(screenPos);
-          final float screenX = screenPos[0] + x;
-          final float screenY = screenPos[1] + y;
-          return new float[] {screenX, screenY};
-        }
-      },
-      Press.FINGER);
-  }
 }