1 files changed, 109 insertions, 139 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 c16c8f05bb..94aec734a4 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
@@ -1,14 +1,11 @@
 package com.mapbox.mapboxsdk.testapp.camera;
 
 import android.graphics.PointF;
-import android.support.test.espresso.UiController;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 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.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
@@ -30,23 +27,20 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToCameraPositionTarget() {
     validateTestSetup();
-    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);
-      }
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 
@@ -54,20 +48,17 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToCameraPositionTargetZoom() {
     validateTestSetup();
-    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);
-      }
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 
@@ -75,32 +66,29 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToCameraPosition() {
     validateTestSetup();
-    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);
-      }
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 
@@ -108,27 +96,24 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToBounds() {
     validateTestSetup();
-    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);
-      }
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 
@@ -136,21 +121,18 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToMoveBy() {
     validateTestSetup();
-    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);
-      }
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 
@@ -158,16 +140,13 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToZoomIn() {
     validateTestSetup();
-    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);
-      }
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 
@@ -175,18 +154,15 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToZoomOut() {
     validateTestSetup();
-    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);
-      }
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 
@@ -194,17 +170,14 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToZoomBy() {
     validateTestSetup();
-    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);
-      }
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 
@@ -212,16 +185,13 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToZoomTo() {
     validateTestSetup();
-    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);
-      }
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 }