1 files changed, 106 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
index 1dca34b95d..19402f0a0d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
@@ -4,7 +4,6 @@ import android.graphics.Color;
 import android.support.test.espresso.UiController;
 import android.support.test.espresso.ViewAction;
 import android.view.View;
-
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
@@ -12,6 +11,7 @@ import com.mapbox.mapboxsdk.annotations.Polygon;
 import com.mapbox.mapboxsdk.annotations.PolygonOptions;
 import com.mapbox.mapboxsdk.annotations.Polyline;
 import com.mapbox.mapboxsdk.annotations.PolylineOptions;
+import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.exceptions.InvalidMarkerPositionException;
@@ -22,16 +22,14 @@ import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
 import com.mapbox.mapboxsdk.testapp.utils.ViewUtils;
-
 import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
+import timber.log.Timber;
 
 import java.util.ArrayList;
 import java.util.List;
 
-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;
@@ -126,6 +124,108 @@ public class MapboxMapTest extends BaseActivityTest {
     }));
   }
 
+  @Test
+  public void testGetCameraForLatLngBounds() {
+    validateTestSetup();
+    onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
+      CameraPosition actualPosition = mapboxMap.getCameraForLatLngBounds(
+        LatLngBounds.from(10, 10, -10, -10));
+      CameraPosition expectedPosition = new CameraPosition.Builder()
+        .target(new LatLng()).zoom(3.66).tilt(0).bearing(0).build();
+      assertEquals("Latitude should match",
+        expectedPosition.target.getLatitude(), actualPosition.target.getLatitude(), 0.00001f);
+      assertEquals("Longitude should match",
+        expectedPosition.target.getLongitude(), actualPosition.target.getLongitude(), 0.00001f);
+      assertEquals("Bearing should match",
+        expectedPosition.zoom, actualPosition.zoom, 0.01f);
+      assertEquals("Tilt should match", expectedPosition.tilt, actualPosition.tilt, 0.01f);
+    }));
+  }
+
+  @Test
+  public void testGetCameraForLatLngBoundsPadding() {
+    validateTestSetup();
+    onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
+      CameraPosition actualPosition = mapboxMap.getCameraForLatLngBounds(
+        LatLngBounds.from(10, 10, -10, -10), new int[] {5, 5, 5, 5});
+      CameraPosition expectedPosition = new CameraPosition.Builder()
+        .target(new LatLng()).zoom(3.64).tilt(0).bearing(0).build();
+      assertEquals("Latitude should match",
+        expectedPosition.target.getLatitude(), actualPosition.target.getLatitude(), 0.00001f);
+      assertEquals("Longitude should match",
+        expectedPosition.target.getLongitude(), actualPosition.target.getLongitude(), 0.00001f);
+      assertEquals("Zoom should match",
+        expectedPosition.zoom, actualPosition.zoom, 0.01f);
+      assertEquals("Tilt should match",
+        expectedPosition.tilt, actualPosition.tilt, 0.01f);
+      assertEquals("Bearing should match",
+        expectedPosition.bearing, actualPosition.bearing, 0.01f);
+    }));
+  }
+
+  @Test
+  public void testGetCameraForLatLngBoundsBearing() {
+    validateTestSetup();
+    onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
+      CameraPosition actualPosition = mapboxMap.getCameraForLatLngBounds(
+        LatLngBounds.from(10, 10, -10, -10),45, 0);
+      CameraPosition expectedPosition = new CameraPosition.Builder()
+        .target(new LatLng()).zoom(3.15).tilt(0).bearing(45).build();
+      assertEquals("Latitude should match",
+        expectedPosition.target.getLatitude(), actualPosition.target.getLatitude(), 0.00001f);
+      assertEquals("Longitude should match",
+        expectedPosition.target.getLongitude(), actualPosition.target.getLongitude(), 0.00001f);
+      assertEquals("Zoom should match",
+        expectedPosition.zoom, actualPosition.zoom, 0.01f);
+      assertEquals("Tilt should match",
+        expectedPosition.tilt, actualPosition.tilt, 0.01f);
+      assertEquals("Bearing should match",
+        expectedPosition.bearing, actualPosition.bearing, 0.01f);
+    }));
+  }
+
+  @Test
+  public void testGetCameraForLatLngBoundsTilt() {
+    validateTestSetup();
+    onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
+      CameraPosition actualPosition = mapboxMap.getCameraForLatLngBounds(
+        LatLngBounds.from(10, 10, -10, -10), 0, 45);
+      CameraPosition expectedPosition = new CameraPosition.Builder()
+        .target(new LatLng(-0.2423318,0)).zoom(3.62).tilt(45).bearing(0).build();
+      assertEquals("Latitude should match",
+        expectedPosition.target.getLatitude(), actualPosition.target.getLatitude(), 0.00001f);
+      assertEquals("Longitude should match",
+        expectedPosition.target.getLongitude(), actualPosition.target.getLongitude(), 0.00001f);
+      assertEquals("Zoom should match",
+        expectedPosition.zoom, actualPosition.zoom, 0.01f);
+      assertEquals("Tilt should match",
+        expectedPosition.tilt, actualPosition.tilt, 0.01f);
+      assertEquals("Bearing should match",
+        expectedPosition.bearing, actualPosition.bearing, 0.01f);
+    }));
+  }
+
+  @Test
+  public void testGetCameraForLatLngBoundsAll() {
+    validateTestSetup();
+    onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
+      CameraPosition actualPosition = mapboxMap.getCameraForLatLngBounds(
+        LatLngBounds.from(10, 10, -10, -10), new int[]{5,5,5,5}, 45, 45);
+      CameraPosition expectedPosition = new CameraPosition.Builder()
+        .target(new LatLng(-0.3418347,-0.3400988)).zoom(3.13).tilt(45).bearing(45).build();
+      assertEquals("Latitude should match",
+        expectedPosition.target.getLatitude(), actualPosition.target.getLatitude(), 0.00001f);
+      assertEquals("Longitude should match",
+        expectedPosition.target.getLongitude(), actualPosition.target.getLongitude(), 0.00001f);
+      assertEquals("Zoom should match",
+        expectedPosition.zoom, actualPosition.zoom, 0.01f);
+      assertEquals("Tilt should match",
+        expectedPosition.tilt, actualPosition.tilt, 0.01f);
+      assertEquals("Bearing should match",
+        expectedPosition.bearing, actualPosition.bearing, 0.01f);
+    }));
+  }
+
   //
   // MinZoomLevel
   //
@@ -634,6 +734,8 @@ public class MapboxMapTest extends BaseActivityTest {
     }));
   }
 
+  //
+
   public class MapboxMapAction implements ViewAction {
 
     private InvokeViewAction invokeViewAction;