1 files changed, 514 insertions, 434 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
index fec9a6c119..3a1cba5cf2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
@@ -3,14 +3,10 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import timber.log.Timber;
 
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
 import com.mapbox.mapboxsdk.style.functions.CameraFunction;
+import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
 import com.mapbox.mapboxsdk.style.functions.SourceFunction;
 import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
@@ -19,26 +15,36 @@ import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
 import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
-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.style.layers.TransitionOptions;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static com.mapbox.mapboxsdk.style.functions.Function.*;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
-import static org.junit.Assert.*;
-import static com.mapbox.mapboxsdk.style.layers.Property.*;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
+import timber.log.Timber;
 
-import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
+import static com.mapbox.mapboxsdk.style.functions.Function.composite;
+import static com.mapbox.mapboxsdk.style.functions.Function.property;
+import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.categorical;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.exponential;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.interval;
+import static com.mapbox.mapboxsdk.style.layers.Property.FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP;
+import static com.mapbox.mapboxsdk.style.layers.Property.NONE;
+import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionBase;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionColor;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionHeight;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionOpacity;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionPattern;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionTranslate;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionTranslateAnchor;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * Basic smoke tests for FillExtrusionLayer
@@ -53,15 +59,18 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new FillExtrusionLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  private void setupLayer() {
+    Timber.i("Retrieving layer");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+        Timber.i("Adding layer");
+        layer = new FillExtrusionLayer("my-layer", "composite");
+        layer.setSourceLayer("composite");
+        mapboxMap.addLayer(layer);
+        // Layer reference is now stale, get new reference
+        layer = mapboxMap.getLayerAs("my-layer");
+      }
+    });
   }
 
   @Test
@@ -69,14 +78,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      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
@@ -84,15 +95,17 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      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
@@ -100,12 +113,14 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacityTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionOpacityTransition(options);
-    assertEquals(layer.getFillExtrusionOpacityTransition(), options);
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionOpacityTransition(options);
+      assertEquals(layer.getFillExtrusionOpacityTransition(), options);
+    });
   }
 
   @Test
@@ -113,11 +128,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacity");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionOpacity(0.3f));
-    assertEquals((Float) layer.getFillExtrusionOpacity().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(fillExtrusionOpacity(0.3f));
+      assertEquals((Float) layer.getFillExtrusionOpacity().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -125,26 +142,28 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionOpacity(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionOpacity(0.3f))
-          ).withBase(0.5f)
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionOpacity(
+          zoom(
+            exponential(
+              stop(2, fillExtrusionOpacity(0.3f))
+            ).withBase(0.5f)
+          )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionOpacity());
-    assertNotNull(layer.getFillExtrusionOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionOpacity().getFunction().getStops()).size());
+      // Verify
+      assertNotNull(layer.getFillExtrusionOpacity());
+      assertNotNull(layer.getFillExtrusionOpacity().getFunction());
+      assertEquals(CameraFunction.class, layer.getFillExtrusionOpacity().getFunction().getClass());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionOpacity().getFunction().getStops().getClass());
+      assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionOpacity().getFunction().getStops()).getBase(), 0.001);
+      assertEquals(1, ((ExponentialStops) layer.getFillExtrusionOpacity().getFunction().getStops()).size());
+    });
   }
 
   @Test
@@ -152,12 +171,14 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-colorTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionColorTransition(options);
-    assertEquals(layer.getFillExtrusionColorTransition(), options);
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionColorTransition(options);
+      assertEquals(layer.getFillExtrusionColorTransition(), options);
+    });
   }
 
   @Test
@@ -165,11 +186,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getFillExtrusionColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      // Set and Get
+      layer.setProperties(fillExtrusionColor("rgba(0, 0, 0, 1)"));
+      assertEquals((String) layer.getFillExtrusionColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+    });
   }
 
   @Test
@@ -177,26 +200,28 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionColor(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionColor(
+          zoom(
+            exponential(
+              stop(2, fillExtrusionColor("rgba(0, 0, 0, 1)"))
+            ).withBase(0.5f)
+          )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionColor());
-    assertNotNull(layer.getFillExtrusionColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionColor().getFunction().getStops()).size());
+      // Verify
+      assertNotNull(layer.getFillExtrusionColor());
+      assertNotNull(layer.getFillExtrusionColor().getFunction());
+      assertEquals(CameraFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+      assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionColor().getFunction().getStops()).getBase(), 0.001);
+      assertEquals(1, ((ExponentialStops) layer.getFillExtrusionColor().getFunction().getStops()).size());
+    });
   }
 
   @Test
@@ -204,19 +229,21 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      fillExtrusionColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+      // Set
+      layer.setProperties(
+        fillExtrusionColor(property("FeaturePropertyA", Stops.<String>identity()))
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionColor());
-    assertNotNull(layer.getFillExtrusionColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+      // Verify
+      assertNotNull(layer.getFillExtrusionColor());
+      assertNotNull(layer.getFillExtrusionColor().getFunction());
+      assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
+      assertEquals(IdentityStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+    });
   }
 
   @Test
@@ -224,26 +251,28 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, fillExtrusionColor(Color.RED))
-          ).withBase(0.5f)
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionColor(
+          property(
+            "FeaturePropertyA",
+            exponential(
+              stop(Color.RED, fillExtrusionColor(Color.RED))
+            ).withBase(0.5f)
+          )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionColor());
-    assertNotNull(layer.getFillExtrusionColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+      // Verify
+      assertNotNull(layer.getFillExtrusionColor());
+      assertNotNull(layer.getFillExtrusionColor().getFunction());
+      assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+    });
   }
 
   @Test
@@ -251,29 +280,32 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", fillExtrusionColor(Color.RED))
-          )
-        ).withDefaultValue(fillExtrusionColor(Color.GREEN))
-      )
-    );
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionColor(
+          property(
+            "FeaturePropertyA",
+            categorical(
+              stop("valueA", fillExtrusionColor(Color.RED))
+            )
+          ).withDefaultValue(fillExtrusionColor(Color.GREEN))
+        )
+      );
+
+      // Verify
+      assertNotNull(layer.getFillExtrusionColor());
+      assertNotNull(layer.getFillExtrusionColor().getFunction());
+      assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
+      assertEquals(CategoricalStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+      assertNotNull(((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue());
+      assertNotNull(((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue().getValue());
+      assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue().getColorInt());
+    });
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionColor());
-    assertNotNull(layer.getFillExtrusionColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue().getColorInt());
   }
 
   @Test
@@ -281,11 +313,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionColor(Color.RED));
-    assertEquals(layer.getFillExtrusionColorAsInt(), Color.RED);
+      // Set and Get
+      layer.setProperties(fillExtrusionColor(Color.RED));
+      assertEquals(layer.getFillExtrusionColorAsInt(), Color.RED);
+    });
   }
 
   @Test
@@ -293,12 +327,14 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translateTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionTranslateTransition(options);
-    assertEquals(layer.getFillExtrusionTranslateTransition(), options);
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionTranslateTransition(options);
+      assertEquals(layer.getFillExtrusionTranslateTransition(), options);
+    });
   }
 
   @Test
@@ -306,11 +342,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionTranslate(new Float[]{0f,0f}));
-    assertEquals((Float[]) layer.getFillExtrusionTranslate().getValue(), (Float[]) new Float[]{0f,0f});
+      // Set and Get
+      layer.setProperties(fillExtrusionTranslate(new Float[] {0f, 0f}));
+      assertEquals((Float[]) layer.getFillExtrusionTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+    });
   }
 
   @Test
@@ -318,26 +356,28 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionTranslate(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionTranslate(new Float[]{0f,0f}))
-          ).withBase(0.5f)
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionTranslate(
+          zoom(
+            exponential(
+              stop(2, fillExtrusionTranslate(new Float[] {0f, 0f}))
+            ).withBase(0.5f)
+          )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionTranslate());
-    assertNotNull(layer.getFillExtrusionTranslate().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionTranslate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionTranslate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionTranslate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionTranslate().getFunction().getStops()).size());
+      // Verify
+      assertNotNull(layer.getFillExtrusionTranslate());
+      assertNotNull(layer.getFillExtrusionTranslate().getFunction());
+      assertEquals(CameraFunction.class, layer.getFillExtrusionTranslate().getFunction().getClass());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionTranslate().getFunction().getStops().getClass());
+      assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionTranslate().getFunction().getStops()).getBase(), 0.001);
+      assertEquals(1, ((ExponentialStops) layer.getFillExtrusionTranslate().getFunction().getStops()).size());
+    });
   }
 
   @Test
@@ -345,11 +385,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate-anchor");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionTranslateAnchor(FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP));
-    assertEquals((String) layer.getFillExtrusionTranslateAnchor().getValue(), (String) FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP);
+      // Set and Get
+      layer.setProperties(fillExtrusionTranslateAnchor(FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP));
+      assertEquals((String) layer.getFillExtrusionTranslateAnchor().getValue(), (String) FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP);
+    });
   }
 
   @Test
@@ -357,25 +399,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate-anchor");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionTranslateAnchor(
-        zoom(
-          interval(
-            stop(2, fillExtrusionTranslateAnchor(FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP))
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionTranslateAnchor(
+          zoom(
+            interval(
+              stop(2, fillExtrusionTranslateAnchor(FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP))
+            )
           )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionTranslateAnchor());
-    assertNotNull(layer.getFillExtrusionTranslateAnchor().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionTranslateAnchor().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getFillExtrusionTranslateAnchor().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getFillExtrusionTranslateAnchor().getFunction().getStops()).size());
+      // Verify
+      assertNotNull(layer.getFillExtrusionTranslateAnchor());
+      assertNotNull(layer.getFillExtrusionTranslateAnchor().getFunction());
+      assertEquals(CameraFunction.class, layer.getFillExtrusionTranslateAnchor().getFunction().getClass());
+      assertEquals(IntervalStops.class, layer.getFillExtrusionTranslateAnchor().getFunction().getStops().getClass());
+      assertEquals(1, ((IntervalStops) layer.getFillExtrusionTranslateAnchor().getFunction().getStops()).size());
+    });
   }
 
   @Test
@@ -383,12 +427,14 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-patternTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionPatternTransition(options);
-    assertEquals(layer.getFillExtrusionPatternTransition(), options);
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionPatternTransition(options);
+      assertEquals(layer.getFillExtrusionPatternTransition(), options);
+    });
   }
 
   @Test
@@ -396,11 +442,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-pattern");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionPattern("pedestrian-polygon"));
-    assertEquals((String) layer.getFillExtrusionPattern().getValue(), (String) "pedestrian-polygon");
+      // Set and Get
+      layer.setProperties(fillExtrusionPattern("pedestrian-polygon"));
+      assertEquals((String) layer.getFillExtrusionPattern().getValue(), (String) "pedestrian-polygon");
+    });
   }
 
   @Test
@@ -408,25 +456,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-pattern");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionPattern(
-        zoom(
-          interval(
-            stop(2, fillExtrusionPattern("pedestrian-polygon"))
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionPattern(
+          zoom(
+            interval(
+              stop(2, fillExtrusionPattern("pedestrian-polygon"))
+            )
           )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionPattern());
-    assertNotNull(layer.getFillExtrusionPattern().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionPattern().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getFillExtrusionPattern().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getFillExtrusionPattern().getFunction().getStops()).size());
+      // Verify
+      assertNotNull(layer.getFillExtrusionPattern());
+      assertNotNull(layer.getFillExtrusionPattern().getFunction());
+      assertEquals(CameraFunction.class, layer.getFillExtrusionPattern().getFunction().getClass());
+      assertEquals(IntervalStops.class, layer.getFillExtrusionPattern().getFunction().getStops().getClass());
+      assertEquals(1, ((IntervalStops) layer.getFillExtrusionPattern().getFunction().getStops()).size());
+    });
   }
 
   @Test
@@ -434,12 +484,14 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-heightTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionHeightTransition(options);
-    assertEquals(layer.getFillExtrusionHeightTransition(), options);
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionHeightTransition(options);
+      assertEquals(layer.getFillExtrusionHeightTransition(), options);
+    });
   }
 
   @Test
@@ -447,11 +499,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionHeight(0.3f));
-    assertEquals((Float) layer.getFillExtrusionHeight().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(fillExtrusionHeight(0.3f));
+      assertEquals((Float) layer.getFillExtrusionHeight().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -459,26 +513,28 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionHeight(0.3f))
-          ).withBase(0.5f)
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionHeight(
+          zoom(
+            exponential(
+              stop(2, fillExtrusionHeight(0.3f))
+            ).withBase(0.5f)
+          )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).size());
+      // Verify
+      assertNotNull(layer.getFillExtrusionHeight());
+      assertNotNull(layer.getFillExtrusionHeight().getFunction());
+      assertEquals(CameraFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+      assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).getBase(), 0.001);
+      assertEquals(1, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).size());
+    });
   }
 
   @Test
@@ -486,19 +542,21 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+      // Set
+      layer.setProperties(
+        fillExtrusionHeight(property("FeaturePropertyA", Stops.<Float>identity()))
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+      // Verify
+      assertNotNull(layer.getFillExtrusionHeight());
+      assertNotNull(layer.getFillExtrusionHeight().getFunction());
+      assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
+      assertEquals(IdentityStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+    });
   }
 
   @Test
@@ -506,26 +564,28 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, fillExtrusionHeight(0.3f))
-          ).withBase(0.5f)
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionHeight(
+          property(
+            "FeaturePropertyA",
+            exponential(
+              stop(0.3f, fillExtrusionHeight(0.3f))
+            ).withBase(0.5f)
+          )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+      // Verify
+      assertNotNull(layer.getFillExtrusionHeight());
+      assertNotNull(layer.getFillExtrusionHeight().getFunction());
+      assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+    });
   }
 
   @Test
@@ -533,29 +593,32 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, fillExtrusionHeight(0.3f))
-          )
-        ).withDefaultValue(fillExtrusionHeight(0.3f))
-      )
-    );
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionHeight(
+          property(
+            "FeaturePropertyA",
+            categorical(
+              stop(1.0f, fillExtrusionHeight(0.3f))
+            )
+          ).withDefaultValue(fillExtrusionHeight(0.3f))
+        )
+      );
+
+      // Verify
+      assertNotNull(layer.getFillExtrusionHeight());
+      assertNotNull(layer.getFillExtrusionHeight().getFunction());
+      assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
+      assertEquals(CategoricalStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+      assertNotNull(((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue());
+      assertNotNull(((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue().getValue());
+      assertEquals(0.3f, ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue().getValue());
+    });
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -563,34 +626,36 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, fillExtrusionHeight(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(fillExtrusionHeight(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(CompositeFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillExtrusionHeight().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionHeight(
+          composite(
+            "FeaturePropertyA",
+            exponential(
+              stop(0, 0.3f, fillExtrusionHeight(0.9f))
+            ).withBase(0.5f)
+          ).withDefaultValue(fillExtrusionHeight(0.3f))
+        )
+      );
+
+      // Verify
+      assertNotNull(layer.getFillExtrusionHeight());
+      assertNotNull(layer.getFillExtrusionHeight().getFunction());
+      assertEquals(CompositeFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+      assertEquals(1, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).size());
+
+      ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+        (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillExtrusionHeight().getFunction().getStops();
+      Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+      assertEquals(0f, stop.in.zoom, 0.001);
+      assertEquals(0.3f, stop.in.value, 0.001f);
+      assertEquals(0.9f, stop.out, 0.001f);
+    });
   }
 
   @Test
@@ -598,12 +663,14 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-baseTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionBaseTransition(options);
-    assertEquals(layer.getFillExtrusionBaseTransition(), options);
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionBaseTransition(options);
+      assertEquals(layer.getFillExtrusionBaseTransition(), options);
+    });
   }
 
   @Test
@@ -611,11 +678,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionBase(0.3f));
-    assertEquals((Float) layer.getFillExtrusionBase().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(fillExtrusionBase(0.3f));
+      assertEquals((Float) layer.getFillExtrusionBase().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -623,26 +692,28 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionBase(0.3f))
-          ).withBase(0.5f)
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionBase(
+          zoom(
+            exponential(
+              stop(2, fillExtrusionBase(0.3f))
+            ).withBase(0.5f)
+          )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).size());
+      // Verify
+      assertNotNull(layer.getFillExtrusionBase());
+      assertNotNull(layer.getFillExtrusionBase().getFunction());
+      assertEquals(CameraFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+      assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).getBase(), 0.001);
+      assertEquals(1, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).size());
+    });
   }
 
   @Test
@@ -650,19 +721,21 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+      // Set
+      layer.setProperties(
+        fillExtrusionBase(property("FeaturePropertyA", Stops.<Float>identity()))
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+      // Verify
+      assertNotNull(layer.getFillExtrusionBase());
+      assertNotNull(layer.getFillExtrusionBase().getFunction());
+      assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
+      assertEquals(IdentityStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+    });
   }
 
   @Test
@@ -670,26 +743,28 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, fillExtrusionBase(0.3f))
-          ).withBase(0.5f)
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionBase(
+          property(
+            "FeaturePropertyA",
+            exponential(
+              stop(0.3f, fillExtrusionBase(0.3f))
+            ).withBase(0.5f)
+          )
         )
-      )
-    );
+      );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+      // Verify
+      assertNotNull(layer.getFillExtrusionBase());
+      assertNotNull(layer.getFillExtrusionBase().getFunction());
+      assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+    });
   }
 
   @Test
@@ -697,29 +772,32 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, fillExtrusionBase(0.3f))
-          )
-        ).withDefaultValue(fillExtrusionBase(0.3f))
-      )
-    );
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionBase(
+          property(
+            "FeaturePropertyA",
+            categorical(
+              stop(1.0f, fillExtrusionBase(0.3f))
+            )
+          ).withDefaultValue(fillExtrusionBase(0.3f))
+        )
+      );
+
+      // Verify
+      assertNotNull(layer.getFillExtrusionBase());
+      assertNotNull(layer.getFillExtrusionBase().getFunction());
+      assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
+      assertEquals(CategoricalStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+      assertNotNull(((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue());
+      assertNotNull(((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue().getValue());
+      assertEquals(0.3f, ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue().getValue());
+    });
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -727,34 +805,36 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, fillExtrusionBase(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(fillExtrusionBase(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(CompositeFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillExtrusionBase().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set
+      layer.setProperties(
+        fillExtrusionBase(
+          composite(
+            "FeaturePropertyA",
+            exponential(
+              stop(0, 0.3f, fillExtrusionBase(0.9f))
+            ).withBase(0.5f)
+          ).withDefaultValue(fillExtrusionBase(0.3f))
+        )
+      );
+
+      // Verify
+      assertNotNull(layer.getFillExtrusionBase());
+      assertNotNull(layer.getFillExtrusionBase().getFunction());
+      assertEquals(CompositeFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+      assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
+      assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+      assertEquals(1, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).size());
+
+      ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+        (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillExtrusionBase().getFunction().getStops();
+      Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+      assertEquals(0f, stop.in.zoom, 0.001);
+      assertEquals(0.3f, stop.in.value, 0.001f);
+      assertEquals(0.9f, stop.out, 0.001f);
+    });
   }
 
 }