[android] expose camera padding option

This removes the cached insets on the Android side, making the core TransformState the source of truth. This still leaves an option to lazily set the padding which is going to be applied only when the next camera animation is started.

1 files changed, 4 insertions, 286 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
index ae81dc1302..be3b18ef8b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
@@ -1,294 +1,12 @@
 package com.mapbox.mapboxsdk.testapp.camera;
 
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.IdlingRegistry;
-import android.support.test.espresso.idling.CountingIdlingResource;
-
-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.camera.CameraUpdate;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.activity.BaseTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.DeviceIndependentTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
-
-import org.junit.Test;
-
-import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
-import static org.junit.Assert.assertEquals;
-
-public class CameraEaseTest extends BaseTest {
 
-  private final CountingIdlingResource animationIdlingResource =
-    new CountingIdlingResource("animation_idling_resource");
-
-  @Override
-  protected Class getActivityClass() {
-    return DeviceIndependentTestActivity.class;
-  }
+public class CameraEaseTest extends CameraTest {
 
   @Override
-  public void beforeTest() {
-    super.beforeTest();
-    IdlingRegistry.getInstance().register(animationIdlingResource);
-  }
-
-  @Test
-  public void testEaseToCameraPositionTarget() {
-    validateTestSetup();
-    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);
-
-      animationIdlingResource.increment();
-      mapboxMap.easeCamera(CameraUpdateFactory.newLatLng(moveTarget), new MapboxMap.CancelableCallback() {
-        @Override
-        public void onCancel() {
-          verifyCameraPosition(mapboxMap, moveTarget, zoom, 0, 0);
-          animationIdlingResource.decrement();
-        }
-
-        @Override
-        public void onFinish() {
-          verifyCameraPosition(mapboxMap, moveTarget, zoom, 0, 0);
-          animationIdlingResource.decrement();
-        }
-      });
-    });
-
-    Espresso.onIdle();
-  }
-
-  @Test
-  public void testEaseToCameraPositionTargetZoom() {
-    validateTestSetup();
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      final float moveZoom = 15.5f;
-      final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
-
-      animationIdlingResource.increment();
-      mapboxMap.easeCamera(CameraUpdateFactory.newLatLngZoom(moveTarget, moveZoom), new MapboxMap.CancelableCallback() {
-        @Override
-        public void onCancel() {
-          verifyCameraPosition(mapboxMap, moveTarget, moveZoom, 0, 0);
-          animationIdlingResource.decrement();
-        }
-
-        @Override
-        public void onFinish() {
-          verifyCameraPosition(mapboxMap, moveTarget, moveZoom, 0, 0);
-          animationIdlingResource.decrement();
-        }
-      });
-    });
-
-    Espresso.onIdle();
-  }
-
-  @Test
-  public void testEaseToCameraPosition() {
-    validateTestSetup();
-    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;
-
-      animationIdlingResource.increment();
-      mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(
-        new CameraPosition.Builder()
-          .target(moveTarget)
-          .zoom(moveZoom)
-          .tilt(moveTilt)
-          .bearing(moveBearing)
-          .build()),
-        new MapboxMap.CancelableCallback() {
-          @Override
-          public void onCancel() {
-            verifyCameraPosition(mapboxMap, moveTarget, moveZoom, moveBearing, moveTilt);
-            animationIdlingResource.decrement();
-          }
-
-          @Override
-          public void onFinish() {
-            verifyCameraPosition(mapboxMap, moveTarget, moveZoom, moveBearing, moveTilt);
-            animationIdlingResource.decrement();
-          }
-        }
-      );
-    });
-
-    Espresso.onIdle();
-  }
-
-  @Test
-  public void testEaseToBounds() {
-    validateTestSetup();
-    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);
-
-      animationIdlingResource.increment();
-      mapboxMap.easeCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 0),
-        new MapboxMap.CancelableCallback() {
-          @Override
-          public void onCancel() {
-            verifyCameraPosition(mapboxMap, centerBounds, mapboxMap.getCameraPosition().zoom, 0, 0);
-            animationIdlingResource.decrement();
-          }
-
-          @Override
-          public void onFinish() {
-            verifyCameraPosition(mapboxMap, centerBounds, mapboxMap.getCameraPosition().zoom, 0, 0);
-            animationIdlingResource.decrement();
-          }
-        });
-    });
-
-    Espresso.onIdle();
-  }
-
-  @Test
-  public void testEaseToZoomIn() {
-    validateTestSetup();
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      float zoom = 1.0f;
-
-      animationIdlingResource.increment();
-      mapboxMap.easeCamera(CameraUpdateFactory.zoomIn(), new MapboxMap.CancelableCallback() {
-        @Override
-        public void onCancel() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoom + 1, 0, 0);
-          animationIdlingResource.decrement();
-        }
-
-        @Override
-        public void onFinish() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoom + 1, 0, 0);
-          animationIdlingResource.decrement();
-        }
-      });
-    });
-
-    Espresso.onIdle();
-  }
-
-  @Test
-  public void testEaseToZoomOut() {
-    float zoom = 10.0f;
-    validateTestSetup();
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      animationIdlingResource.increment();
-      mapboxMap.easeCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(), zoom), new MapboxMap.CancelableCallback() {
-        @Override
-        public void onCancel() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoom, 0, 0);
-          animationIdlingResource.decrement();
-        }
-
-        @Override
-        public void onFinish() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoom, 0, 0);
-          animationIdlingResource.decrement();
-        }
-      });
-    });
-
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      animationIdlingResource.increment();
-      mapboxMap.easeCamera(CameraUpdateFactory.zoomOut(), new MapboxMap.CancelableCallback() {
-        @Override
-        public void onCancel() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoom - 1, 0, 0);
-          animationIdlingResource.decrement();
-        }
-
-        @Override
-        public void onFinish() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoom - 1, 0, 0);
-          animationIdlingResource.decrement();
-        }
-      });
-    });
-
-    Espresso.onIdle();
-  }
-
-  @Test
-  public void testEaseToZoomBy() {
-    validateTestSetup();
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      float zoom = 1.0f;
-      final float zoomBy = 2.45f;
-
-      animationIdlingResource.increment();
-      mapboxMap.easeCamera(CameraUpdateFactory.zoomBy(zoomBy), new MapboxMap.CancelableCallback() {
-        @Override
-        public void onCancel() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoom + zoomBy, 0, 0);
-          animationIdlingResource.decrement();
-        }
-
-        @Override
-        public void onFinish() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoom + zoomBy, 0, 0);
-          animationIdlingResource.decrement();
-        }
-      });
-    });
-
-    Espresso.onIdle();
-  }
-
-  @Test
-  public void testEaseToZoomTo() {
-    validateTestSetup();
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      final float zoomTo = 2.45f;
-
-      animationIdlingResource.increment();
-      mapboxMap.easeCamera(CameraUpdateFactory.zoomTo(zoomTo), new MapboxMap.CancelableCallback() {
-        @Override
-        public void onCancel() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoomTo, 0, 0);
-          animationIdlingResource.decrement();
-        }
-
-        @Override
-        public void onFinish() {
-          verifyCameraPosition(mapboxMap, mapboxMap.getCameraPosition().target, zoomTo, 0, 0);
-          animationIdlingResource.decrement();
-        }
-      });
-    });
-
-    Espresso.onIdle();
-  }
-
-  @Override
-  public void afterTest() {
-    super.afterTest();
-    IdlingRegistry.getInstance().unregister(animationIdlingResource);
-  }
-
-  private void verifyCameraPosition(MapboxMap mapboxMap, LatLng moveTarget, double moveZoom, double moveBearing,
-                                    double moveTilt) {
-    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);
+  void executeCameraMovement(CameraUpdate cameraUpdate, MapboxMap.CancelableCallback callback) {
+    mapboxMap.easeCamera(cameraUpdate, callback);
   }
 }
\ No newline at end of file