1 files changed, 58 insertions, 48 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
index 36833fb4ee..21026527c5 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
@@ -6,22 +6,22 @@ import android.support.test.espresso.ViewAction;
 import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 
-import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.functions.Function;
 import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops;
 import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.light.Position;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.style.FillExtrusionStyleTestActivity;
 
-import timber.log.Timber;
-
 import org.hamcrest.Matcher;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import timber.log.Timber;
+
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
@@ -31,7 +31,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionBas
 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.testapp.action.MapboxMapAction.invoke;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 
@@ -43,89 +43,99 @@ public class LightTest extends BaseActivityTest {
   @Test
   public void testAnchor() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("anchor");
-    assertNotNull(light);
-    // Set and Get
-    light.setAnchor(ANCHOR_MAP);
-    assertEquals("Anchor should match", ANCHOR_MAP, light.getAnchor());
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(light);
+      // Set and Get
+      light.setAnchor(ANCHOR_MAP);
+      assertEquals("Anchor should match", ANCHOR_MAP, light.getAnchor());
+    });
   }
 
   @Test
   public void testPositionTransition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("positionTransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.setPositionTransition(options);
-    assertEquals("Transition options should match", options, light.getPositionTransition());
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(light);
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      light.setPositionTransition(options);
+      assertEquals("Transition options should match", options, light.getPositionTransition());
+    });
   }
 
   @Test
   public void testPosition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("position");
-    assertNotNull(light);
-
-    // Set and Get
-    Position position = new Position(1,2,3);
-    light.setPosition(position);
-    assertEquals("Position should match", position, light.getPosition());
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(light);
+      // Set and Get
+      Position position = new Position(1, 2, 3);
+      light.setPosition(position);
+      assertEquals("Position should match", position, light.getPosition());
+    });
   }
 
   @Test
   public void testColorTransition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("colorTransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.setColorTransition(options);
-    assertEquals("Transition options should match", options, light.getColorTransition());
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(light);
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      light.setColorTransition(options);
+      assertEquals("Transition options should match", options, light.getColorTransition());
+    });
   }
 
   @Test
   public void testColor() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("color");
-    assertNotNull(light);
-    // Set and Get
-    light.setColor("rgba(0, 0, 0, 1)");
-    assertEquals("Color should match", "rgba(0, 0, 0, 1)".replaceAll("\\s+",""), light.getColor());
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(light);
+      // Set and Get
+      light.setColor("rgba(0, 0, 0, 1)");
+      assertEquals("Color should match", "rgba(0, 0, 0, 1)".replaceAll("\\s+", ""), light.getColor());
+    });
   }
 
   @Test
   public void testIntensityTransition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("intensityTransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.setIntensityTransition(options);
-    assertEquals("Transition options should match", options, light.getIntensityTransition());
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(light);
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      light.setIntensityTransition(options);
+      assertEquals("Transition options should match", options, light.getIntensityTransition());
+    });
   }
 
   @Test
   public void testIntensity() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("intensity");
-    assertNotNull(light);
-    // Set and Get
-    light.setIntensity(0.3f);
-    assertEquals("Intensity should match", 0.3f, light.getIntensity());
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(light);
+      // Set and Get
+      light.setIntensity(0.3f);
+      assertEquals("Intensity should match", 0.3f, light.getIntensity());
+    });
   }
 
-  private void setupLayer() {
+  private void setupLight() {
     onView(withId(R.id.mapView)).perform(new ViewAction() {
       @Override
       public Matcher<View> getConstraints() {