1 files changed, 9 insertions, 36 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java
index a8d1ee5911..be2fc9ab9c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java
@@ -2,29 +2,22 @@ package com.mapbox.mapboxsdk.testapp.style;
 
 import android.content.res.Resources;
 import android.support.annotation.RawRes;
-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.support.test.runner.AndroidJUnit4;
 import android.view.View;
 
-import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
-import com.mapbox.mapboxsdk.testapp.utils.ViewUtils;
 import com.mapbox.services.commons.geojson.Feature;
 import com.mapbox.services.commons.geojson.FeatureCollection;
 import com.mapbox.services.commons.geojson.Point;
 
 import org.hamcrest.Matcher;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -45,34 +38,20 @@ import static org.junit.Assert.fail;
  * Tests for {@link GeoJsonSource}
  */
 @RunWith(AndroidJUnit4.class)
-public class GeoJsonSourceTests {
+public class GeoJsonSourceTests extends BaseActivityTest {
 
-  @Rule
-  public final ActivityTestRule<RuntimeStyleTestActivity> rule =
-    new ActivityTestRule<>(RuntimeStyleTestActivity.class);
-
-  private OnMapReadyIdlingResource idlingResource;
-
-  @Before
-  public void registerIdlingResource() {
-    idlingResource = new OnMapReadyIdlingResource(rule.getActivity());
-    Espresso.registerIdlingResources(idlingResource);
-  }
-
-  @After
-  public void unregisterIntentServiceIdlingResource() {
-    Espresso.unregisterIdlingResources(idlingResource);
+  @Override
+  protected Class getActivityClass() {
+    return RuntimeStyleTestActivity.class;
   }
 
   @Test
   public void testFeatureCollection() {
-    ViewUtils.checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
     onView(withId(R.id.mapView)).perform(new BaseViewAction() {
 
       @Override
       public void perform(UiController uiController, View view) {
-        MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
-
         GeoJsonSource source = new GeoJsonSource("source", FeatureCollection
           .fromJson(readRawResource(rule.getActivity().getResources(), R.raw.test_feature_collection)));
         mapboxMap.addSource(source);
@@ -85,13 +64,11 @@ public class GeoJsonSourceTests {
 
   @Test
   public void testPointGeometry() {
-    ViewUtils.checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
     onView(withId(R.id.mapView)).perform(new BaseViewAction() {
 
       @Override
       public void perform(UiController uiController, View view) {
-        MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
-
         GeoJsonSource source = new GeoJsonSource("source", Point.fromCoordinates(new double[] {0d, 0d}));
         mapboxMap.addSource(source);
 
@@ -103,13 +80,11 @@ public class GeoJsonSourceTests {
 
   @Test
   public void testFeatureProperties() {
-    ViewUtils.checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
     onView(withId(R.id.mapView)).perform(new BaseViewAction() {
 
       @Override
       public void perform(UiController uiController, View view) {
-        MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
-
         GeoJsonSource source = new GeoJsonSource("source",
           readRawResource(rule.getActivity().getResources(), R.raw.test_feature_properties));
         mapboxMap.addSource(source);
@@ -156,13 +131,11 @@ public class GeoJsonSourceTests {
   }
 
   protected void testFeatureFromResource(final @RawRes int resource) {
-    ViewUtils.checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
     onView(withId(R.id.mapView)).perform(new BaseViewAction() {
 
       @Override
       public void perform(UiController uiController, View view) {
-        MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
-
         GeoJsonSource source = new GeoJsonSource("source");
         mapboxMap.addSource(source);
         Layer layer = new CircleLayer("layer", source.getId());