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, 147 insertions, 156 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java
index af1a146ca2..c16c8f05bb 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java
@@ -2,27 +2,21 @@ package com.mapbox.mapboxsdk.testapp.camera;
 
 import android.graphics.PointF;
 import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
 
-import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
 
-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;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 
 public class CameraAnimateTest extends BaseActivityTest {
@@ -36,202 +30,199 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToCameraPositionTarget() {
     validateTestSetup();
-
-    /*TODO remove zoom #6474*/
-    float zoom = 1.0f;
-    LatLng moveTarget = new LatLng(1, 1);
-
-    CameraPosition initialPosition = new CameraPosition.Builder().target(
-      new LatLng()).zoom(zoom).bearing(0).tilt(0).build();
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Default camera position should match default", cameraPosition, initialPosition);
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.newLatLng(moveTarget)));
-    cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        LatLng moveTarget = new LatLng(1, 1);
+        CameraPosition initialPosition = new CameraPosition.Builder().target(
+          new LatLng()).zoom(zoom).bearing(0).tilt(0).build();
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Default camera position should match default", cameraPosition, initialPosition);
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLng(moveTarget));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToCameraPositionTargetZoom() {
     validateTestSetup();
-
-    final float moveZoom = 15.5f;
-    final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngZoom(moveTarget, moveZoom)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final float moveZoom = 15.5f;
+        final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(moveTarget, moveZoom));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToCameraPosition() {
     validateTestSetup();
-
-    final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
-    final float moveZoom = 15.5f;
-    final float moveTilt = 45.5f;
-    final float moveBearing = 12.5f;
-
-    onView(withId(R.id.mapView)).perform(
-      new AnimateCameraAction(mapboxMap, CameraUpdateFactory.newCameraPosition(
-        new CameraPosition.Builder()
-          .target(moveTarget)
-          .zoom(moveZoom)
-          .tilt(moveTilt)
-          .bearing(moveBearing)
-          .build()))
-    );
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.tilt, moveTilt, TestConstants.TILT_DELTA);
-    assertEquals("Moved bearing should match", cameraPosition.bearing, moveBearing, TestConstants.BEARING_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
+        final float moveZoom = 15.5f;
+        final float moveTilt = 45.5f;
+        final float moveBearing = 12.5f;
+
+        mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(
+          new CameraPosition.Builder()
+            .target(moveTarget)
+            .zoom(moveZoom)
+            .tilt(moveTilt)
+            .bearing(moveBearing)
+            .build())
+        );
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.tilt, moveTilt, TestConstants.TILT_DELTA);
+        assertEquals("Moved bearing should match", cameraPosition.bearing, moveBearing, TestConstants.BEARING_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToBounds() {
     validateTestSetup();
-
-    final LatLng centerBounds = new LatLng(1, 1);
-    LatLng cornerOne = new LatLng();
-    LatLng cornerTwo = new LatLng(2, 2);
-
-    final LatLngBounds.Builder builder = new LatLngBounds.Builder();
-    builder.include(cornerOne);
-    builder.include(cornerTwo);
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngBounds(builder.build(), 0)));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match center bounds",
-      cameraPosition.target.getLatitude(),
-      centerBounds.getLatitude(),
-      TestConstants.LAT_LNG_DELTA);
-
-    assertEquals("Moved camera position longitude should match center bounds",
-      cameraPosition.target.getLongitude(),
-      centerBounds.getLongitude(),
-      TestConstants.LAT_LNG_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final LatLng centerBounds = new LatLng(1, 1);
+        LatLng cornerOne = new LatLng();
+        LatLng cornerTwo = new LatLng(2, 2);
+        final LatLngBounds.Builder builder = new LatLngBounds.Builder();
+        builder.include(cornerOne);
+        builder.include(cornerTwo);
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 0));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match center bounds",
+          cameraPosition.target.getLatitude(),
+          centerBounds.getLatitude(),
+          TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match center bounds",
+          cameraPosition.target.getLongitude(),
+          centerBounds.getLongitude(),
+          TestConstants.LAT_LNG_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToMoveBy() {
     validateTestSetup();
-
-    final PointF centerPoint = mapboxMap.getProjection().toScreenLocation(mapboxMap.getCameraPosition().target);
-    final LatLng moveTarget = new LatLng(2, 2);
-    final PointF moveTargetPoint = mapboxMap.getProjection().toScreenLocation(moveTarget);
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.scrollBy(
-      moveTargetPoint.x - centerPoint.x, moveTargetPoint.y - centerPoint.y)));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA_LARGE);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final PointF centerPoint = mapboxMap.getProjection().toScreenLocation(mapboxMap.getCameraPosition().target);
+        final LatLng moveTarget = new LatLng(2, 2);
+        final PointF moveTargetPoint = mapboxMap.getProjection().toScreenLocation(moveTarget);
+        mapboxMap.animateCamera(CameraUpdateFactory.scrollBy(
+          moveTargetPoint.x - centerPoint.x, moveTargetPoint.y - centerPoint.y));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToZoomIn() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 1.0f;
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.zoomIn()));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + 1,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomIn());
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + 1,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToZoomOut() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 10.0f;
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngZoom(new LatLng(), zoom)));
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.zoomOut()));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom - 1,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 10.0f;
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(), zoom));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomOut());
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom - 1,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToZoomBy() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 1.0f;
-    final float zoomBy = 2.45f;
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.zoomBy(zoomBy)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + zoomBy,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        final float zoomBy = 2.45f;
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomBy(zoomBy));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + zoomBy,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToZoomTo() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    final float zoomTo = 2.45f;
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.zoomTo(zoomTo)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoomTo,
-      TestConstants.ZOOM_DELTA);
-  }
-
-  private class AnimateCameraAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private CameraUpdate cameraUpdate;
-
-    AnimateCameraAction(MapboxMap map, CameraUpdate update) {
-      mapboxMap = map;
-      cameraUpdate = update;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.animateCamera(cameraUpdate);
-      uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
-    }
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final float zoomTo = 2.45f;
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomTo(zoomTo));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoomTo,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 }