1 files changed, 75 insertions, 51 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
index edbfcb1106..b6b6578839 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
@@ -22,6 +22,7 @@ import com.mapbox.mapboxsdk.style.layers.FillLayer;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
 import org.junit.After;
 import org.junit.Before;
@@ -37,28 +38,22 @@ import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
 
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 /**
  * Basic smoke tests for FillLayer
  */
 @RunWith(AndroidJUnit4.class)
-public class FillLayerTest extends BaseStyleTest {
-
-  @Rule
-  public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
+public class FillLayerTest extends BaseActivityTest {
 
   private FillLayer layer;
 
-  private OnMapReadyIdlingResource idlingResource;
-
-  private MapboxMap mapboxMap;
-
-  @Before
-  public void setup() {
-    idlingResource = new OnMapReadyIdlingResource(rule.getActivity());
-    Espresso.registerIdlingResources(idlingResource);
-    mapboxMap = rule.getActivity().getMapboxMap();
+  @Override
+  protected Class getActivityClass() {
+    return EspressoTestActivity.class;
+  }
 
+  private void setupLayer(){
     if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
       Timber.i("Adding layer");
       layer = new FillLayer("my-layer", "composite");
@@ -71,7 +66,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testSetVisibility() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("Visibility");
     assertNotNull(layer);
 
@@ -85,8 +81,9 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testSourceLayer() {
-    checkViewIsDisplayed(R.id.mapView);
-    Timber.i("Visibility");
+    validateTestSetup();
+    setupLayer();
+    Timber.i("SourceLayer");
     assertNotNull(layer);
 
     // Get initial
@@ -100,7 +97,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillAntialiasAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-antialias");
     assertNotNull(layer);
 
@@ -111,7 +109,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillAntialiasAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-antialias");
     assertNotNull(layer);
 
@@ -136,7 +135,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOpacityTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-opacityTransitionOptions");
     assertNotNull(layer);
 
@@ -148,7 +148,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOpacityAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-opacity");
     assertNotNull(layer);
 
@@ -159,7 +160,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOpacityAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-opacity");
     assertNotNull(layer);
 
@@ -185,7 +187,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOpacityAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-opacity");
     assertNotNull(layer);
 
@@ -204,7 +207,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOpacityAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-opacity");
     assertNotNull(layer);
 
@@ -230,7 +234,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOpacityAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-opacity");
     assertNotNull(layer);
 
@@ -259,7 +264,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOpacityAsCompositeFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-opacity");
     assertNotNull(layer);
 
@@ -293,7 +299,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillColorTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-colorTransitionOptions");
     assertNotNull(layer);
 
@@ -305,7 +312,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillColorAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-color");
     assertNotNull(layer);
 
@@ -316,7 +324,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillColorAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-color");
     assertNotNull(layer);
 
@@ -342,7 +351,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillColorAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-color");
     assertNotNull(layer);
 
@@ -361,7 +371,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillColorAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-color");
     assertNotNull(layer);
 
@@ -387,7 +398,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillColorAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-color");
     assertNotNull(layer);
 
@@ -416,7 +428,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillColorAsIntConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-color");
     assertNotNull(layer);
 
@@ -427,7 +440,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOutlineColorTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-outline-colorTransitionOptions");
     assertNotNull(layer);
 
@@ -439,7 +453,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOutlineColorAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-outline-color");
     assertNotNull(layer);
 
@@ -450,7 +465,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOutlineColorAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-outline-color");
     assertNotNull(layer);
 
@@ -476,7 +492,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOutlineColorAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-outline-color");
     assertNotNull(layer);
 
@@ -495,7 +512,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOutlineColorAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-outline-color");
     assertNotNull(layer);
 
@@ -521,7 +539,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOutlineColorAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-outline-color");
     assertNotNull(layer);
 
@@ -550,7 +569,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillOutlineColorAsIntConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-outline-color");
     assertNotNull(layer);
 
@@ -561,7 +581,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillTranslateTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-translateTransitionOptions");
     assertNotNull(layer);
 
@@ -573,7 +594,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillTranslateAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-translate");
     assertNotNull(layer);
 
@@ -584,7 +606,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillTranslateAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-translate");
     assertNotNull(layer);
 
@@ -610,7 +633,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillTranslateAnchorAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-translate-anchor");
     assertNotNull(layer);
 
@@ -621,7 +645,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillTranslateAnchorAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-translate-anchor");
     assertNotNull(layer);
 
@@ -646,7 +671,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillPatternTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-patternTransitionOptions");
     assertNotNull(layer);
 
@@ -658,7 +684,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillPatternAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-pattern");
     assertNotNull(layer);
 
@@ -669,7 +696,8 @@ public class FillLayerTest extends BaseStyleTest {
 
   @Test
   public void testFillPatternAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("fill-pattern");
     assertNotNull(layer);
 
@@ -692,8 +720,4 @@ public class FillLayerTest extends BaseStyleTest {
     assertEquals(1, ((IntervalStops) layer.getFillPattern().getFunction().getStops()).size());
   }
 
-  @After
-  public void unregisterIntentServiceIdlingResource() {
-    Espresso.unregisterIdlingResources(idlingResource);
-  }
 }