1 files changed, 226 insertions, 333 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 23479b2893..bf8b8ef2b2 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
@@ -3,558 +3,451 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
+import android.support.test.annotation.UiThreadTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import com.mapbox.mapboxsdk.maps.BaseLayerTest;
+import org.junit.Before;
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
-import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.mapbox.mapboxsdk.style.expressions.Expression.*;
-import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 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 BaseActivityTest {
+public class CircleLayerTest extends BaseLayerTest {
 
   private CircleLayer layer;
 
-  @Override
-  protected Class getActivityClass() {
-    return EspressoTestActivity.class;
-  }
-
-  private void setupLayer() {
-    Timber.i("Retrieving layer");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      if ((layer = mapboxMap.getStyle().getLayerAs("my-layer")) == null) {
-        Timber.i("Adding layer");
-        layer = new CircleLayer("my-layer", "composite");
-        layer.setSourceLayer("composite");
-        mapboxMap.getStyle().addLayer(layer);
-        // Layer reference is now stale, get new reference
-        layer = mapboxMap.getStyle().getLayerAs("my-layer");
-      }
-    });
+  @Before
+  @UiThreadTest
+  public void beforeTest(){
+    super.before();
+    layer = new CircleLayer("my-layer", "composite");
+    layer.setSourceLayer("composite");
+    setupLayer(layer);
   }
 
   @Test
+  @UiThreadTest
   public void testSourceId() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("SourceId");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      // Get source id
-      assertEquals(layer.getSourceId(), "composite");
-    });
+    assertNotNull(layer);
+    assertEquals(layer.getSourceId(), "composite");
   }
 
   @Test
+  @UiThreadTest
   public void testSetVisibility() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Get initial
-      assertEquals(layer.getVisibility().getValue(), VISIBLE);
+    // Get initial
+    assertEquals(layer.getVisibility().getValue(), VISIBLE);
 
-      // Set
-      layer.setProperties(visibility(NONE));
-      assertEquals(layer.getVisibility().getValue(), NONE);
-    });
+    // Set
+    layer.setProperties(visibility(NONE));
+    assertEquals(layer.getVisibility().getValue(), NONE);
   }
 
   @Test
+  @UiThreadTest
   public void testSourceLayer() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("SourceLayer");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Get initial
-      assertEquals(layer.getSourceLayer(), "composite");
+    // Get initial
+    assertEquals(layer.getSourceLayer(), "composite");
 
-      // Set
-      final String sourceLayer = "test";
-      layer.setSourceLayer(sourceLayer);
-      assertEquals(layer.getSourceLayer(), sourceLayer);
-    });
+    // Set
+    final String sourceLayer = "test";
+    layer.setSourceLayer(sourceLayer);
+    assertEquals(layer.getSourceLayer(), sourceLayer);
   }
 
   @Test
+  @UiThreadTest
   public void testFilter() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("Filter");
-    invoke(mapboxMap, (uiController, mapboxMap1) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Get initial
-      assertEquals(layer.getFilter(), null);
+    // Get initial
+    assertEquals(layer.getFilter(), null);
 
-      // Set
-      Expression filter = eq(get("undefined"), literal(1.0));
-      layer.setFilter(filter);
-      assertEquals(layer.getFilter().toString(), filter.toString());
+    // Set
+    Expression filter = eq(get("undefined"), literal(1.0));
+    layer.setFilter(filter);
+    assertEquals(layer.getFilter().toString(), filter.toString());
 
-      // Set constant
-      filter = literal(true);
-      layer.setFilter(filter);
-      assertEquals(layer.getFilter().toString(), filter.toString());
-    });
+    // Set constant
+    filter = literal(true);
+    layer.setFilter(filter);
+    assertEquals(layer.getFilter().toString(), filter.toString());
   }
 
 
 
   @Test
+  @UiThreadTest
   public void testCircleRadiusTransition() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-radiusTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setCircleRadiusTransition(options);
-      assertEquals(layer.getCircleRadiusTransition(), options);
-    });
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setCircleRadiusTransition(options);
+    assertEquals(layer.getCircleRadiusTransition(), options);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleRadiusAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-radius");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleRadius().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCircleRadius().getValue());
 
-      // Set and Get
-      Float propertyValue = 0.3f;
-      layer.setProperties(circleRadius(propertyValue));
-      assertEquals(layer.getCircleRadius().getValue(), propertyValue);
-    });
+    // Set and Get
+    Float propertyValue = 0.3f;
+    layer.setProperties(circleRadius(propertyValue));
+    assertEquals(layer.getCircleRadius().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleRadiusAsExpression() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-radius-expression");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleRadius().getExpression());
+    assertNotNull(layer);
+    assertNull(layer.getCircleRadius().getExpression());
 
-      // Set and Get
-      Expression expression = number(Expression.get("undefined"));
-      layer.setProperties(circleRadius(expression));
-      assertEquals(layer.getCircleRadius().getExpression(), expression);
-    });
+    // Set and Get
+    Expression expression = number(Expression.get("undefined"));
+    layer.setProperties(circleRadius(expression));
+    assertEquals(layer.getCircleRadius().getExpression(), expression);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleColorTransition() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setCircleColorTransition(options);
-      assertEquals(layer.getCircleColorTransition(), options);
-    });
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setCircleColorTransition(options);
+    assertEquals(layer.getCircleColorTransition(), options);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleColorAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleColor().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCircleColor().getValue());
 
-      // Set and Get
-      String propertyValue = "rgba(0, 0, 0, 1)";
-      layer.setProperties(circleColor(propertyValue));
-      assertEquals(layer.getCircleColor().getValue(), propertyValue);
-    });
+    // Set and Get
+    String propertyValue = "rgba(0, 0, 0, 1)";
+    layer.setProperties(circleColor(propertyValue));
+    assertEquals(layer.getCircleColor().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleColorAsExpression() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-color-expression");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleColor().getExpression());
+    assertNotNull(layer);
+    assertNull(layer.getCircleColor().getExpression());
 
-      // Set and Get
-      Expression expression = toColor(Expression.get("undefined"));
-      layer.setProperties(circleColor(expression));
-      assertEquals(layer.getCircleColor().getExpression(), expression);
-    });
+    // Set and Get
+    Expression expression = toColor(Expression.get("undefined"));
+    layer.setProperties(circleColor(expression));
+    assertEquals(layer.getCircleColor().getExpression(), expression);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleColorAsIntConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      layer.setProperties(circleColor(Color.RED));
-      assertEquals(layer.getCircleColorAsInt(), Color.RED);
-    });
+    // Set and Get
+    layer.setProperties(circleColor(Color.RED));
+    assertEquals(layer.getCircleColorAsInt(), Color.RED);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleBlurTransition() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-blurTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setCircleBlurTransition(options);
-      assertEquals(layer.getCircleBlurTransition(), options);
-    });
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setCircleBlurTransition(options);
+    assertEquals(layer.getCircleBlurTransition(), options);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleBlurAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleBlur().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCircleBlur().getValue());
 
-      // Set and Get
-      Float propertyValue = 0.3f;
-      layer.setProperties(circleBlur(propertyValue));
-      assertEquals(layer.getCircleBlur().getValue(), propertyValue);
-    });
+    // Set and Get
+    Float propertyValue = 0.3f;
+    layer.setProperties(circleBlur(propertyValue));
+    assertEquals(layer.getCircleBlur().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleBlurAsExpression() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-blur-expression");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleBlur().getExpression());
+    assertNotNull(layer);
+    assertNull(layer.getCircleBlur().getExpression());
 
-      // Set and Get
-      Expression expression = number(Expression.get("undefined"));
-      layer.setProperties(circleBlur(expression));
-      assertEquals(layer.getCircleBlur().getExpression(), expression);
-    });
+    // Set and Get
+    Expression expression = number(Expression.get("undefined"));
+    layer.setProperties(circleBlur(expression));
+    assertEquals(layer.getCircleBlur().getExpression(), expression);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleOpacityTransition() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setCircleOpacityTransition(options);
-      assertEquals(layer.getCircleOpacityTransition(), options);
-    });
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setCircleOpacityTransition(options);
+    assertEquals(layer.getCircleOpacityTransition(), options);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleOpacityAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleOpacity().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCircleOpacity().getValue());
 
-      // Set and Get
-      Float propertyValue = 0.3f;
-      layer.setProperties(circleOpacity(propertyValue));
-      assertEquals(layer.getCircleOpacity().getValue(), propertyValue);
-    });
+    // Set and Get
+    Float propertyValue = 0.3f;
+    layer.setProperties(circleOpacity(propertyValue));
+    assertEquals(layer.getCircleOpacity().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleOpacityAsExpression() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-opacity-expression");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleOpacity().getExpression());
+    assertNotNull(layer);
+    assertNull(layer.getCircleOpacity().getExpression());
 
-      // Set and Get
-      Expression expression = number(Expression.get("undefined"));
-      layer.setProperties(circleOpacity(expression));
-      assertEquals(layer.getCircleOpacity().getExpression(), expression);
-    });
+    // Set and Get
+    Expression expression = number(Expression.get("undefined"));
+    layer.setProperties(circleOpacity(expression));
+    assertEquals(layer.getCircleOpacity().getExpression(), expression);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleTranslateTransition() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-translateTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setCircleTranslateTransition(options);
-      assertEquals(layer.getCircleTranslateTransition(), options);
-    });
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setCircleTranslateTransition(options);
+    assertEquals(layer.getCircleTranslateTransition(), options);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleTranslateAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleTranslate().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCircleTranslate().getValue());
 
-      // Set and Get
-      Float[] propertyValue = new Float[] {0f, 0f};
-      layer.setProperties(circleTranslate(propertyValue));
-      assertEquals(layer.getCircleTranslate().getValue(), propertyValue);
-    });
+    // Set and Get
+    Float[] propertyValue = new Float[] {0f, 0f};
+    layer.setProperties(circleTranslate(propertyValue));
+    assertEquals(layer.getCircleTranslate().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleTranslateAnchorAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleTranslateAnchor().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCircleTranslateAnchor().getValue());
 
-      // Set and Get
-      String propertyValue = CIRCLE_TRANSLATE_ANCHOR_MAP;
-      layer.setProperties(circleTranslateAnchor(propertyValue));
-      assertEquals(layer.getCircleTranslateAnchor().getValue(), propertyValue);
-    });
+    // Set and Get
+    String propertyValue = CIRCLE_TRANSLATE_ANCHOR_MAP;
+    layer.setProperties(circleTranslateAnchor(propertyValue));
+    assertEquals(layer.getCircleTranslateAnchor().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCirclePitchScaleAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-pitch-scale");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCirclePitchScale().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCirclePitchScale().getValue());
 
-      // Set and Get
-      String propertyValue = CIRCLE_PITCH_SCALE_MAP;
-      layer.setProperties(circlePitchScale(propertyValue));
-      assertEquals(layer.getCirclePitchScale().getValue(), propertyValue);
-    });
+    // Set and Get
+    String propertyValue = CIRCLE_PITCH_SCALE_MAP;
+    layer.setProperties(circlePitchScale(propertyValue));
+    assertEquals(layer.getCirclePitchScale().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCirclePitchAlignmentAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-pitch-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCirclePitchAlignment().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCirclePitchAlignment().getValue());
 
-      // Set and Get
-      String propertyValue = CIRCLE_PITCH_ALIGNMENT_MAP;
-      layer.setProperties(circlePitchAlignment(propertyValue));
-      assertEquals(layer.getCirclePitchAlignment().getValue(), propertyValue);
-    });
+    // Set and Get
+    String propertyValue = CIRCLE_PITCH_ALIGNMENT_MAP;
+    layer.setProperties(circlePitchAlignment(propertyValue));
+    assertEquals(layer.getCirclePitchAlignment().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeWidthTransition() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-widthTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setCircleStrokeWidthTransition(options);
-      assertEquals(layer.getCircleStrokeWidthTransition(), options);
-    });
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setCircleStrokeWidthTransition(options);
+    assertEquals(layer.getCircleStrokeWidthTransition(), options);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeWidthAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleStrokeWidth().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCircleStrokeWidth().getValue());
 
-      // Set and Get
-      Float propertyValue = 0.3f;
-      layer.setProperties(circleStrokeWidth(propertyValue));
-      assertEquals(layer.getCircleStrokeWidth().getValue(), propertyValue);
-    });
+    // Set and Get
+    Float propertyValue = 0.3f;
+    layer.setProperties(circleStrokeWidth(propertyValue));
+    assertEquals(layer.getCircleStrokeWidth().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeWidthAsExpression() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-width-expression");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleStrokeWidth().getExpression());
+    assertNotNull(layer);
+    assertNull(layer.getCircleStrokeWidth().getExpression());
 
-      // Set and Get
-      Expression expression = number(Expression.get("undefined"));
-      layer.setProperties(circleStrokeWidth(expression));
-      assertEquals(layer.getCircleStrokeWidth().getExpression(), expression);
-    });
+    // Set and Get
+    Expression expression = number(Expression.get("undefined"));
+    layer.setProperties(circleStrokeWidth(expression));
+    assertEquals(layer.getCircleStrokeWidth().getExpression(), expression);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeColorTransition() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setCircleStrokeColorTransition(options);
-      assertEquals(layer.getCircleStrokeColorTransition(), options);
-    });
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setCircleStrokeColorTransition(options);
+    assertEquals(layer.getCircleStrokeColorTransition(), options);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeColorAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleStrokeColor().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCircleStrokeColor().getValue());
 
-      // Set and Get
-      String propertyValue = "rgba(0, 0, 0, 1)";
-      layer.setProperties(circleStrokeColor(propertyValue));
-      assertEquals(layer.getCircleStrokeColor().getValue(), propertyValue);
-    });
+    // Set and Get
+    String propertyValue = "rgba(0, 0, 0, 1)";
+    layer.setProperties(circleStrokeColor(propertyValue));
+    assertEquals(layer.getCircleStrokeColor().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeColorAsExpression() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-color-expression");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleStrokeColor().getExpression());
+    assertNotNull(layer);
+    assertNull(layer.getCircleStrokeColor().getExpression());
 
-      // Set and Get
-      Expression expression = toColor(Expression.get("undefined"));
-      layer.setProperties(circleStrokeColor(expression));
-      assertEquals(layer.getCircleStrokeColor().getExpression(), expression);
-    });
+    // Set and Get
+    Expression expression = toColor(Expression.get("undefined"));
+    layer.setProperties(circleStrokeColor(expression));
+    assertEquals(layer.getCircleStrokeColor().getExpression(), expression);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeColorAsIntConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      layer.setProperties(circleStrokeColor(Color.RED));
-      assertEquals(layer.getCircleStrokeColorAsInt(), Color.RED);
-    });
+    // Set and Get
+    layer.setProperties(circleStrokeColor(Color.RED));
+    assertEquals(layer.getCircleStrokeColorAsInt(), Color.RED);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeOpacityTransition() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
+    assertNotNull(layer);
 
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setCircleStrokeOpacityTransition(options);
-      assertEquals(layer.getCircleStrokeOpacityTransition(), options);
-    });
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setCircleStrokeOpacityTransition(options);
+    assertEquals(layer.getCircleStrokeOpacityTransition(), options);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeOpacityAsConstant() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleStrokeOpacity().getValue());
+    assertNotNull(layer);
+    assertNull(layer.getCircleStrokeOpacity().getValue());
 
-      // Set and Get
-      Float propertyValue = 0.3f;
-      layer.setProperties(circleStrokeOpacity(propertyValue));
-      assertEquals(layer.getCircleStrokeOpacity().getValue(), propertyValue);
-    });
+    // Set and Get
+    Float propertyValue = 0.3f;
+    layer.setProperties(circleStrokeOpacity(propertyValue));
+    assertEquals(layer.getCircleStrokeOpacity().getValue(), propertyValue);
   }
 
   @Test
+  @UiThreadTest
   public void testCircleStrokeOpacityAsExpression() {
-    validateTestSetup();
-    setupLayer();
     Timber.i("circle-stroke-opacity-expression");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.getCircleStrokeOpacity().getExpression());
-
-      // Set and Get
-      Expression expression = number(Expression.get("undefined"));
-      layer.setProperties(circleStrokeOpacity(expression));
-      assertEquals(layer.getCircleStrokeOpacity().getExpression(), expression);
-    });
+    assertNotNull(layer);
+    assertNull(layer.getCircleStrokeOpacity().getExpression());
+
+    // Set and Get
+    Expression expression = number(Expression.get("undefined"));
+    layer.setProperties(circleStrokeOpacity(expression));
+    assertEquals(layer.getCircleStrokeOpacity().getExpression(), expression);
   }
 }