1 files changed, 284 insertions, 244 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..11368767fe 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
@@ -2,43 +2,36 @@
 
 package com.mapbox.mapboxsdk.testapp.style;
 
-import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import timber.log.Timber;
 
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
 import com.mapbox.mapboxsdk.style.functions.CameraFunction;
-import com.mapbox.mapboxsdk.style.functions.SourceFunction;
-import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
-import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops;
-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.style.layers.TransitionOptions;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static com.mapbox.mapboxsdk.style.functions.Function.*;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
-import static org.junit.Assert.*;
-import static com.mapbox.mapboxsdk.style.layers.Property.*;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
+import timber.log.Timber;
 
-import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
+import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.exponential;
+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.rasterBrightnessMax;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterBrightnessMin;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterContrast;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterFadeDuration;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterHueRotate;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterOpacity;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterSaturation;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * Basic smoke tests for RasterLayer
@@ -53,15 +46,18 @@ 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, (uiController, 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 +65,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
+      // Get initial
+      assertEquals(layer.getVisibility().getValue(), VISIBLE);
 
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+      // Set
+      layer.setProperties(visibility(NONE));
+      assertEquals(layer.getVisibility().getValue(), NONE);
+    });
   }
 
   @Test
@@ -84,12 +82,14 @@ 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, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterOpacityTransition(options);
+      assertEquals(layer.getRasterOpacityTransition(), options);
+    });
   }
 
   @Test
@@ -97,11 +97,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacity");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(rasterOpacity(0.3f));
-    assertEquals((Float) layer.getRasterOpacity().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(rasterOpacity(0.3f));
+      assertEquals((Float) layer.getRasterOpacity().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -109,26 +111,28 @@ 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)
+    invoke(mapboxMap, (uiController, 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());
+      );
+
+      // 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 +140,14 @@ 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, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterHueRotateTransition(options);
+      assertEquals(layer.getRasterHueRotateTransition(), options);
+    });
   }
 
   @Test
@@ -149,11 +155,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotate");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(rasterHueRotate(0.3f));
-    assertEquals((Float) layer.getRasterHueRotate().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(rasterHueRotate(0.3f));
+      assertEquals((Float) layer.getRasterHueRotate().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -161,26 +169,28 @@ 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)
+    invoke(mapboxMap, (uiController, 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());
+      );
+
+      // 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 +198,14 @@ 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, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterBrightnessMinTransition(options);
+      assertEquals(layer.getRasterBrightnessMinTransition(), options);
+    });
   }
 
   @Test
@@ -201,11 +213,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-min");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(rasterBrightnessMin(0.3f));
-    assertEquals((Float) layer.getRasterBrightnessMin().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(rasterBrightnessMin(0.3f));
+      assertEquals((Float) layer.getRasterBrightnessMin().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -213,26 +227,28 @@ 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)
+    invoke(mapboxMap, (uiController, 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());
+      );
+
+      // 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 +256,14 @@ 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, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterBrightnessMaxTransition(options);
+      assertEquals(layer.getRasterBrightnessMaxTransition(), options);
+    });
   }
 
   @Test
@@ -253,11 +271,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-max");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(rasterBrightnessMax(0.3f));
-    assertEquals((Float) layer.getRasterBrightnessMax().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(rasterBrightnessMax(0.3f));
+      assertEquals((Float) layer.getRasterBrightnessMax().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -265,26 +285,28 @@ 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)
+    invoke(mapboxMap, (uiController, 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());
+      );
+
+      // 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 +314,14 @@ 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, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterSaturationTransition(options);
+      assertEquals(layer.getRasterSaturationTransition(), options);
+    });
   }
 
   @Test
@@ -305,11 +329,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturation");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(rasterSaturation(0.3f));
-    assertEquals((Float) layer.getRasterSaturation().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(rasterSaturation(0.3f));
+      assertEquals((Float) layer.getRasterSaturation().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -317,26 +343,28 @@ 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)
+    invoke(mapboxMap, (uiController, 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());
+      );
+
+      // 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 +372,14 @@ 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, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterContrastTransition(options);
+      assertEquals(layer.getRasterContrastTransition(), options);
+    });
   }
 
   @Test
@@ -357,11 +387,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrast");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(rasterContrast(0.3f));
-    assertEquals((Float) layer.getRasterContrast().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(rasterContrast(0.3f));
+      assertEquals((Float) layer.getRasterContrast().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -369,26 +401,28 @@ 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)
+    invoke(mapboxMap, (uiController, 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());
+      );
+
+      // 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 +430,14 @@ 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, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterFadeDurationTransition(options);
+      assertEquals(layer.getRasterFadeDurationTransition(), options);
+    });
   }
 
   @Test
@@ -409,11 +445,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-duration");
-    assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(rasterFadeDuration(0.3f));
-    assertEquals((Float) layer.getRasterFadeDuration().getValue(), (Float) 0.3f);
+      // Set and Get
+      layer.setProperties(rasterFadeDuration(0.3f));
+      assertEquals((Float) layer.getRasterFadeDuration().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
@@ -421,26 +459,28 @@ 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)
+    invoke(mapboxMap, (uiController, 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());
+      );
+
+      // 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());
+    });
   }
 
 }