Merge branch 'release-ios-v3.6.0-android-v5.1.0'

# Conflicts:
#	.travis.yml
#	circle.yml
#	cmake/core-files.cmake
#	include/mbgl/style/function/composite_function.hpp
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
#	platform/android/dependencies.gradle
#	platform/android/src/native_map_view.cpp
#	platform/darwin/scripts/generate-style-code.js
#	platform/darwin/src/MGLGeometry_Private.h
#	platform/darwin/src/MGLLight.h
#	platform/darwin/src/MGLLight.mm
#	platform/darwin/src/MGLSource.h
#	platform/darwin/src/MGLStyle.h
#	platform/darwin/src/MGLStyle.mm
#	platform/darwin/test/MGLLightTest.mm
#	platform/default/default_file_source.cpp
#	platform/ios/CHANGELOG.md
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf
#	platform/macos/CHANGELOG.md
#	scripts/generate-shaders.js
#	src/mbgl/layout/symbol_layout.cpp
#	src/mbgl/programs/program.hpp
#	src/mbgl/programs/symbol_program.hpp
#	src/mbgl/programs/uniforms.hpp
#	src/mbgl/renderer/frame_history.cpp
#	src/mbgl/renderer/paint_property_binder.hpp
#	src/mbgl/shaders/line.cpp
#	src/mbgl/shaders/line_pattern.cpp
#	src/mbgl/shaders/line_sdf.cpp
#	src/mbgl/sprite/sprite_atlas.hpp
#	src/mbgl/style/layers/line_layer_properties.hpp
#	src/mbgl/style/sources/geojson_source.cpp
#	src/mbgl/style/style.cpp
#	src/mbgl/text/glyph_atlas.hpp
#	src/mbgl/tile/geometry_tile.cpp
#	src/mbgl/tile/geometry_tile.hpp
#	test/style/style.test.cpp

1 files changed, 354 insertions, 242 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
index 2a0d3401fb..020effe331 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
@@ -3,9 +3,9 @@
 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.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
+
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,20 +19,16 @@ 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.RasterLayer;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
-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 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.*;
@@ -53,15 +49,21 @@ public class RasterLayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new RasterLayer("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, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+          Timber.i("Adding layer");
+          layer = new RasterLayer("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 +71,19 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
-
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
-
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Get initial
+        assertEquals(layer.getVisibility().getValue(), VISIBLE);
+
+        // Set
+        layer.setProperties(visibility(NONE));
+        assertEquals(layer.getVisibility().getValue(), NONE);
+      }
+    });
   }
 
   @Test
@@ -84,12 +91,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacityTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterOpacityTransition(options);
-    assertEquals(layer.getRasterOpacityTransition(), options);
+    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.setRasterOpacityTransition(options);
+        assertEquals(layer.getRasterOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -97,11 +109,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacity");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterOpacity(0.3f));
-    assertEquals((Float) layer.getRasterOpacity().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterOpacity(0.3f));
+        assertEquals((Float) layer.getRasterOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -109,26 +126,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterOpacity(
-        zoom(
-          exponential(
-            stop(2, rasterOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterOpacity());
-    assertNotNull(layer.getRasterOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterOpacity(
+            zoom(
+              exponential(
+                stop(2, rasterOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterOpacity());
+        assertNotNull(layer.getRasterOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -136,12 +158,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotateTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterHueRotateTransition(options);
-    assertEquals(layer.getRasterHueRotateTransition(), options);
+    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.setRasterHueRotateTransition(options);
+        assertEquals(layer.getRasterHueRotateTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -149,11 +176,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotate");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterHueRotate(0.3f));
-    assertEquals((Float) layer.getRasterHueRotate().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterHueRotate(0.3f));
+        assertEquals((Float) layer.getRasterHueRotate().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -161,26 +193,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterHueRotate(
-        zoom(
-          exponential(
-            stop(2, rasterHueRotate(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterHueRotate());
-    assertNotNull(layer.getRasterHueRotate().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterHueRotate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterHueRotate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterHueRotate(
+            zoom(
+              exponential(
+                stop(2, rasterHueRotate(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterHueRotate());
+        assertNotNull(layer.getRasterHueRotate().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterHueRotate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterHueRotate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -188,12 +225,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-minTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterBrightnessMinTransition(options);
-    assertEquals(layer.getRasterBrightnessMinTransition(), options);
+    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.setRasterBrightnessMinTransition(options);
+        assertEquals(layer.getRasterBrightnessMinTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -201,11 +243,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-min");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterBrightnessMin(0.3f));
-    assertEquals((Float) layer.getRasterBrightnessMin().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterBrightnessMin(0.3f));
+        assertEquals((Float) layer.getRasterBrightnessMin().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -213,26 +260,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-min");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterBrightnessMin(
-        zoom(
-          exponential(
-            stop(2, rasterBrightnessMin(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterBrightnessMin());
-    assertNotNull(layer.getRasterBrightnessMin().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterBrightnessMin().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterBrightnessMin().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterBrightnessMin(
+            zoom(
+              exponential(
+                stop(2, rasterBrightnessMin(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterBrightnessMin());
+        assertNotNull(layer.getRasterBrightnessMin().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterBrightnessMin().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterBrightnessMin().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -240,12 +292,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-maxTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterBrightnessMaxTransition(options);
-    assertEquals(layer.getRasterBrightnessMaxTransition(), options);
+    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.setRasterBrightnessMaxTransition(options);
+        assertEquals(layer.getRasterBrightnessMaxTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -253,11 +310,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-max");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterBrightnessMax(0.3f));
-    assertEquals((Float) layer.getRasterBrightnessMax().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterBrightnessMax(0.3f));
+        assertEquals((Float) layer.getRasterBrightnessMax().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -265,26 +327,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-max");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterBrightnessMax(
-        zoom(
-          exponential(
-            stop(2, rasterBrightnessMax(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterBrightnessMax());
-    assertNotNull(layer.getRasterBrightnessMax().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterBrightnessMax().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterBrightnessMax().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterBrightnessMax(
+            zoom(
+              exponential(
+                stop(2, rasterBrightnessMax(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterBrightnessMax());
+        assertNotNull(layer.getRasterBrightnessMax().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterBrightnessMax().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterBrightnessMax().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -292,12 +359,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturationTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterSaturationTransition(options);
-    assertEquals(layer.getRasterSaturationTransition(), options);
+    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.setRasterSaturationTransition(options);
+        assertEquals(layer.getRasterSaturationTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -305,11 +377,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturation");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterSaturation(0.3f));
-    assertEquals((Float) layer.getRasterSaturation().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterSaturation(0.3f));
+        assertEquals((Float) layer.getRasterSaturation().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -317,26 +394,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturation");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterSaturation(
-        zoom(
-          exponential(
-            stop(2, rasterSaturation(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterSaturation());
-    assertNotNull(layer.getRasterSaturation().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterSaturation().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterSaturation().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterSaturation(
+            zoom(
+              exponential(
+                stop(2, rasterSaturation(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterSaturation());
+        assertNotNull(layer.getRasterSaturation().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterSaturation().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterSaturation().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -344,12 +426,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrastTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterContrastTransition(options);
-    assertEquals(layer.getRasterContrastTransition(), options);
+    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.setRasterContrastTransition(options);
+        assertEquals(layer.getRasterContrastTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -357,11 +444,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrast");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterContrast(0.3f));
-    assertEquals((Float) layer.getRasterContrast().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterContrast(0.3f));
+        assertEquals((Float) layer.getRasterContrast().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -369,26 +461,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrast");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterContrast(
-        zoom(
-          exponential(
-            stop(2, rasterContrast(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterContrast());
-    assertNotNull(layer.getRasterContrast().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterContrast().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterContrast().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterContrast(
+            zoom(
+              exponential(
+                stop(2, rasterContrast(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterContrast());
+        assertNotNull(layer.getRasterContrast().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterContrast().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterContrast().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -396,12 +493,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-durationTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterFadeDurationTransition(options);
-    assertEquals(layer.getRasterFadeDurationTransition(), options);
+    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.setRasterFadeDurationTransition(options);
+        assertEquals(layer.getRasterFadeDurationTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -409,11 +511,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-duration");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterFadeDuration(0.3f));
-    assertEquals((Float) layer.getRasterFadeDuration().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterFadeDuration(0.3f));
+        assertEquals((Float) layer.getRasterFadeDuration().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -421,26 +528,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-duration");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterFadeDuration(
-        zoom(
-          exponential(
-            stop(2, rasterFadeDuration(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterFadeDuration());
-    assertNotNull(layer.getRasterFadeDuration().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterFadeDuration().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterFadeDuration().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterFadeDuration(
+            zoom(
+              exponential(
+                stop(2, rasterFadeDuration(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterFadeDuration());
+        assertNotNull(layer.getRasterFadeDuration().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterFadeDuration().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterFadeDuration().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).size());
+      }
+    });
   }
 
 }