1 files changed, 125 insertions, 76 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
index 11843ce28f..bf31a935f8 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
@@ -22,6 +22,7 @@ import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 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 CircleLayer
  */
 @RunWith(AndroidJUnit4.class)
-public class CircleLayerTest extends BaseStyleTest {
-
-  @Rule
-  public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
+public class CircleLayerTest extends BaseActivityTest {
 
   private CircleLayer 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 CircleLayer("my-layer", "composite");
@@ -71,7 +66,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testSetVisibility() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("Visibility");
     assertNotNull(layer);
 
@@ -85,8 +81,9 @@ public class CircleLayerTest 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 CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleRadiusTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-radiusTransitionOptions");
     assertNotNull(layer);
 
@@ -112,7 +110,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleRadiusAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-radius");
     assertNotNull(layer);
 
@@ -123,7 +122,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleRadiusAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-radius");
     assertNotNull(layer);
 
@@ -149,7 +149,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleRadiusAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-radius");
     assertNotNull(layer);
 
@@ -168,7 +169,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleRadiusAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-radius");
     assertNotNull(layer);
 
@@ -194,7 +196,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleRadiusAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-radius");
     assertNotNull(layer);
 
@@ -223,7 +226,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleRadiusAsCompositeFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-radius");
     assertNotNull(layer);
 
@@ -257,7 +261,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleColorTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-colorTransitionOptions");
     assertNotNull(layer);
 
@@ -269,7 +274,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleColorAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-color");
     assertNotNull(layer);
 
@@ -280,7 +286,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleColorAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-color");
     assertNotNull(layer);
 
@@ -306,7 +313,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleColorAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-color");
     assertNotNull(layer);
 
@@ -325,7 +333,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleColorAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-color");
     assertNotNull(layer);
 
@@ -351,7 +360,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleColorAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-color");
     assertNotNull(layer);
 
@@ -380,7 +390,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleColorAsIntConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-color");
     assertNotNull(layer);
 
@@ -391,7 +402,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleBlurTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-blurTransitionOptions");
     assertNotNull(layer);
 
@@ -403,7 +415,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleBlurAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-blur");
     assertNotNull(layer);
 
@@ -414,7 +427,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleBlurAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-blur");
     assertNotNull(layer);
 
@@ -440,7 +454,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleBlurAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-blur");
     assertNotNull(layer);
 
@@ -459,7 +474,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleBlurAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-blur");
     assertNotNull(layer);
 
@@ -485,7 +501,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleBlurAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-blur");
     assertNotNull(layer);
 
@@ -514,7 +531,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleBlurAsCompositeFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-blur");
     assertNotNull(layer);
 
@@ -548,7 +566,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleOpacityTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-opacityTransitionOptions");
     assertNotNull(layer);
 
@@ -560,7 +579,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleOpacityAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-opacity");
     assertNotNull(layer);
 
@@ -571,7 +591,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleOpacityAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-opacity");
     assertNotNull(layer);
 
@@ -597,7 +618,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleOpacityAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-opacity");
     assertNotNull(layer);
 
@@ -616,7 +638,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleOpacityAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-opacity");
     assertNotNull(layer);
 
@@ -642,7 +665,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleOpacityAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-opacity");
     assertNotNull(layer);
 
@@ -671,7 +695,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleOpacityAsCompositeFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-opacity");
     assertNotNull(layer);
 
@@ -705,7 +730,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleTranslateTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-translateTransitionOptions");
     assertNotNull(layer);
 
@@ -717,7 +743,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleTranslateAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-translate");
     assertNotNull(layer);
 
@@ -728,7 +755,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleTranslateAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-translate");
     assertNotNull(layer);
 
@@ -754,7 +782,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleTranslateAnchorAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-translate-anchor");
     assertNotNull(layer);
 
@@ -765,7 +794,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleTranslateAnchorAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-translate-anchor");
     assertNotNull(layer);
 
@@ -790,7 +820,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCirclePitchScaleAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-pitch-scale");
     assertNotNull(layer);
 
@@ -801,7 +832,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCirclePitchScaleAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-pitch-scale");
     assertNotNull(layer);
 
@@ -826,7 +858,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeWidthTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-widthTransitionOptions");
     assertNotNull(layer);
 
@@ -838,7 +871,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeWidthAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-width");
     assertNotNull(layer);
 
@@ -849,7 +883,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeWidthAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-width");
     assertNotNull(layer);
 
@@ -875,7 +910,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeWidthAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-width");
     assertNotNull(layer);
 
@@ -894,7 +930,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeWidthAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-width");
     assertNotNull(layer);
 
@@ -920,7 +957,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeWidthAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-width");
     assertNotNull(layer);
 
@@ -949,7 +987,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeWidthAsCompositeFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-width");
     assertNotNull(layer);
 
@@ -983,7 +1022,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeColorTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-colorTransitionOptions");
     assertNotNull(layer);
 
@@ -995,7 +1035,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeColorAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-color");
     assertNotNull(layer);
 
@@ -1006,7 +1047,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeColorAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-color");
     assertNotNull(layer);
 
@@ -1032,7 +1074,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeColorAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-color");
     assertNotNull(layer);
 
@@ -1051,7 +1094,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeColorAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-color");
     assertNotNull(layer);
 
@@ -1077,7 +1121,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeColorAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-color");
     assertNotNull(layer);
 
@@ -1106,7 +1151,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeColorAsIntConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-color");
     assertNotNull(layer);
 
@@ -1117,7 +1163,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeOpacityTransition() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-opacityTransitionOptions");
     assertNotNull(layer);
 
@@ -1129,7 +1176,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeOpacityAsConstant() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-opacity");
     assertNotNull(layer);
 
@@ -1140,7 +1188,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeOpacityAsCameraFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-opacity");
     assertNotNull(layer);
 
@@ -1166,7 +1215,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeOpacityAsIdentitySourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-opacity");
     assertNotNull(layer);
 
@@ -1185,7 +1235,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeOpacityAsExponentialSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-opacity");
     assertNotNull(layer);
 
@@ -1211,7 +1262,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeOpacityAsCategoricalSourceFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-opacity");
     assertNotNull(layer);
 
@@ -1240,7 +1292,8 @@ public class CircleLayerTest extends BaseStyleTest {
 
   @Test
   public void testCircleStrokeOpacityAsCompositeFunction() {
-    checkViewIsDisplayed(R.id.mapView);
+    validateTestSetup();
+    setupLayer();
     Timber.i("circle-stroke-opacity");
     assertNotNull(layer);
 
@@ -1272,8 +1325,4 @@ public class CircleLayerTest extends BaseStyleTest {
     assertEquals(0.9f, stop.out, 0.001f);
   }
 
-  @After
-  public void unregisterIntentServiceIdlingResource() {
-    Espresso.unregisterIdlingResources(idlingResource);
-  }
 }