diff options
author | Osana Babayan <32496536+osana@users.noreply.github.com> | 2017-10-30 16:48:56 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-30 16:48:56 -0700 |
commit | 8c716fde96054256eb2156f0590738e2bc38566d (patch) | |
tree | d305befbf2511cc87eefb8c4e4520ca9dfbc1735 | |
parent | 375f9f94b6a5348ced58fa0621a8618d1c5ed075 (diff) | |
download | qtlocation-mapboxgl-8c716fde96054256eb2156f0590738e2bc38566d.tar.gz |
[android] MapboxMap.animate() and Mapbox.easeCamera() should throw IllegalArgument (#10321)
if non-positive duration is passed in
2 files changed, 54 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index c417b3fc26..f25e05429e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -834,6 +834,10 @@ public final class MapboxMap { */ public final void easeCamera(final CameraUpdate update, final int durationMs, final boolean easingInterpolator, final MapboxMap.CancelableCallback callback, final boolean isDismissable) { + + if (durationMs <= 0) { + throw new IllegalArgumentException("Null duration passed into easeCamera"); + } new Handler().post(new Runnable() { @Override public void run() { @@ -906,6 +910,9 @@ public final class MapboxMap { */ public final void animateCamera(final CameraUpdate update, final int durationMs, final MapboxMap.CancelableCallback callback) { + if (durationMs <= 0) { + throw new IllegalArgumentException("Null duration passed into animageCamera"); + } new Handler().post(new Runnable() { @Override public void run() { diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java new file mode 100644 index 0000000000..5e9f94db28 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java @@ -0,0 +1,47 @@ +package com.mapbox.mapboxsdk.maps; + +import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; +import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.mockito.Mockito.mock; + +public class MapboxMapTest { + + private MapboxMap mapboxMap; + + @Before + public void beforeTest() { + + mapboxMap = new MapboxMap(mock(NativeMapView.class), + mock(Transform.class), + mock(UiSettings.class), + mock(TrackingSettings.class), + mock(MyLocationViewSettings.class), + mock(Projection.class), + mock(MapboxMap.OnRegisterTouchListener.class), + mock(AnnotationManager.class), + mock(CameraChangeDispatcher.class)); + } + + @Test(expected = IllegalArgumentException.class) + public void testAnimateCameraChecksDurationPositive() { + mapboxMap.animateCamera(CameraUpdateFactory.newLatLng(new LatLng(30.0, 30.0)), + 0, null); + } + + @Test(expected = IllegalArgumentException.class) + public void testEaseCameraChecksDurationPositive() { + mapboxMap.easeCamera(CameraUpdateFactory.newLatLng(new LatLng(30.0, 30.0)), + 0, null); + } + + @After + public void afterTest() { + mapboxMap = null; + } +} |