1 files changed, 507 insertions, 602 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 66c6093537..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.UiController;
 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,22 +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.action.MapboxMapAction;
+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.Test;
 import org.junit.runner.RunWith;
 
-import static com.mapbox.mapboxsdk.style.functions.Function.*;
+import timber.log.Timber;
+
+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.*;
+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.*;
-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;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * Basic smoke tests for FillExtrusionLayer
@@ -51,17 +61,14 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap 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");
-        }
+    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");
       }
     });
   }
@@ -71,18 +78,15 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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);
     });
   }
 
@@ -91,19 +95,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Get initial
-        assertEquals(layer.getSourceLayer(), "composite");
-
-        // Set
-        final String sourceLayer = "test";
-        layer.setSourceLayer(sourceLayer);
-        assertEquals(layer.getSourceLayer(), sourceLayer);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Get initial
+      assertEquals(layer.getSourceLayer(), "composite");
+
+      // Set
+      final String sourceLayer = "test";
+      layer.setSourceLayer(sourceLayer);
+      assertEquals(layer.getSourceLayer(), sourceLayer);
     });
   }
 
@@ -112,16 +113,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacityTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setFillExtrusionOpacityTransition(options);
-        assertEquals(layer.getFillExtrusionOpacityTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionOpacityTransition(options);
+      assertEquals(layer.getFillExtrusionOpacityTransition(), options);
     });
   }
 
@@ -130,15 +128,12 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacity");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(fillExtrusionOpacity(0.3f));
-        assertEquals((Float) layer.getFillExtrusionOpacity().getValue(), (Float) 0.3f);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      layer.setProperties(fillExtrusionOpacity(0.3f));
+      assertEquals((Float) layer.getFillExtrusionOpacity().getValue(), (Float) 0.3f);
     });
   }
 
@@ -147,30 +142,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacity");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -179,16 +171,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-colorTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setFillExtrusionColorTransition(options);
-        assertEquals(layer.getFillExtrusionColorTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionColorTransition(options);
+      assertEquals(layer.getFillExtrusionColorTransition(), options);
     });
   }
 
@@ -197,15 +186,12 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap 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)");
-      }
+    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)");
     });
   }
 
@@ -214,30 +200,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -246,23 +229,20 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // 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());
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // 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());
     });
   }
 
@@ -271,30 +251,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -303,33 +280,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap 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());
-      }
+    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());
     });
 
   }
@@ -339,15 +313,12 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(fillExtrusionColor(Color.RED));
-        assertEquals(layer.getFillExtrusionColorAsInt(), Color.RED);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      layer.setProperties(fillExtrusionColor(Color.RED));
+      assertEquals(layer.getFillExtrusionColorAsInt(), Color.RED);
     });
   }
 
@@ -356,16 +327,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translateTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setFillExtrusionTranslateTransition(options);
-        assertEquals(layer.getFillExtrusionTranslateTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionTranslateTransition(options);
+      assertEquals(layer.getFillExtrusionTranslateTransition(), options);
     });
   }
 
@@ -374,15 +342,12 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(fillExtrusionTranslate(new Float[] {0f, 0f}));
-        assertEquals((Float[]) layer.getFillExtrusionTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
-      }
+    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});
     });
   }
 
@@ -391,30 +356,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -423,15 +385,12 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate-anchor");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap 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);
-      }
+    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);
     });
   }
 
@@ -440,29 +399,26 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate-anchor");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -471,16 +427,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-patternTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setFillExtrusionPatternTransition(options);
-        assertEquals(layer.getFillExtrusionPatternTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionPatternTransition(options);
+      assertEquals(layer.getFillExtrusionPatternTransition(), options);
     });
   }
 
@@ -489,15 +442,12 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-pattern");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(fillExtrusionPattern("pedestrian-polygon"));
-        assertEquals((String) layer.getFillExtrusionPattern().getValue(), (String) "pedestrian-polygon");
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      layer.setProperties(fillExtrusionPattern("pedestrian-polygon"));
+      assertEquals((String) layer.getFillExtrusionPattern().getValue(), (String) "pedestrian-polygon");
     });
   }
 
@@ -506,29 +456,26 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-pattern");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -537,16 +484,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-heightTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setFillExtrusionHeightTransition(options);
-        assertEquals(layer.getFillExtrusionHeightTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionHeightTransition(options);
+      assertEquals(layer.getFillExtrusionHeightTransition(), options);
     });
   }
 
@@ -555,15 +499,12 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(fillExtrusionHeight(0.3f));
-        assertEquals((Float) layer.getFillExtrusionHeight().getValue(), (Float) 0.3f);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      layer.setProperties(fillExtrusionHeight(0.3f));
+      assertEquals((Float) layer.getFillExtrusionHeight().getValue(), (Float) 0.3f);
     });
   }
 
@@ -572,30 +513,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -604,23 +542,20 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // 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());
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // 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());
     });
   }
 
@@ -629,30 +564,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -661,33 +593,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap 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());
-      }
+    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());
     });
 
   }
@@ -697,38 +626,35 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap 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);
-      }
+    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);
     });
   }
 
@@ -737,16 +663,13 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-baseTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setFillExtrusionBaseTransition(options);
-        assertEquals(layer.getFillExtrusionBaseTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setFillExtrusionBaseTransition(options);
+      assertEquals(layer.getFillExtrusionBaseTransition(), options);
     });
   }
 
@@ -755,15 +678,12 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(fillExtrusionBase(0.3f));
-        assertEquals((Float) layer.getFillExtrusionBase().getValue(), (Float) 0.3f);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      layer.setProperties(fillExtrusionBase(0.3f));
+      assertEquals((Float) layer.getFillExtrusionBase().getValue(), (Float) 0.3f);
     });
   }
 
@@ -772,30 +692,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -804,23 +721,20 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // 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());
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // 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());
     });
   }
 
@@ -829,30 +743,27 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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());
     });
   }
 
@@ -861,33 +772,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap 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());
-      }
+    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());
     });
 
   }
@@ -897,38 +805,35 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap 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);
-      }
+    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);
     });
   }