From 839e0a0abe97ae9e4b8b7b78b2b9f64c9b8c52e8 Mon Sep 17 00:00:00 2001 From: tobrun Date: Mon, 6 Nov 2017 14:36:13 +0100 Subject: [android] - update android unit tests, update test make target to SDK --- Makefile | 6 +++--- .../java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java | 9 --------- .../java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java | 11 +++++++++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 87bd899400..d54dcc4fd6 100644 --- a/Makefile +++ b/Makefile @@ -595,9 +595,9 @@ run-android-ui-test-%: run-android-ui-test-arm-v7-% # Run Java Unit tests on the JVM of the development machine executing this .PHONY: run-android-unit-test run-android-unit-test: platform/android/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:testDebugUnitTest + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:testDebugUnitTest run-android-unit-test-%: platform/android/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:testDebugUnitTest --tests "$*" + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:testDebugUnitTest --tests "$*" # Run Instrumentation tests on AWS device farm, requires additional authentication through gradle.properties .PHONY: run-android-ui-test-aws @@ -654,7 +654,7 @@ android-lint-test-app: platform/android/configuration.gradle android-javadoc: platform/android/configuration.gradle cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:javadocrelease -# Symbolicate ndk stack traces for the arm-v7 abi +# Symbolicate ndk stack traces for the arm-v7 abi .PHONY: android-ndk-stack android-ndk-stack: android-ndk-stack-arm-v7 diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java index 8d9a360714..bb96c9939d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java @@ -73,15 +73,6 @@ public class LatLngBoundsTest { assertEquals("Center should match", new LatLng(1, 1), center); } - @Test - public void emptySpan() { - latLngBounds = new LatLngBounds.Builder() - .include(LAT_LNG_NOT_NULL_ISLAND) - .include(LAT_LNG_NOT_NULL_ISLAND) - .build(); - assertTrue("Should be empty", latLngBounds.isEmptySpan()); - } - @Test public void notEmptySpan() { latLngBounds = new LatLngBounds.Builder() diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java index 0d592f9bb3..239ad7392b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AnnotationManagerTest.java @@ -10,6 +10,7 @@ import com.mapbox.mapboxsdk.annotations.MarkerViewManager; import com.mapbox.mapboxsdk.geometry.LatLng; import org.junit.Test; +import org.mockito.ArgumentMatchers; import java.util.ArrayList; import java.util.List; @@ -32,8 +33,9 @@ public class AnnotationManagerTest { Markers markers = new MarkerContainer(aNativeMapView, aMapView, annotationsArray, aIconManager, aMarkerViewManager); Polygons polygons = new PolygonContainer(aNativeMapView, annotationsArray); Polylines polylines = new PolylineContainer(aNativeMapView, annotationsArray); + ShapeAnnotations shapeAnnotations = new ShapeAnnotationContainer(aNativeMapView, annotationsArray); AnnotationManager annotationManager = new AnnotationManager(aNativeMapView, aMapView, annotationsArray, - aMarkerViewManager, aIconManager, annotations, markers, polygons, polylines); + aMarkerViewManager, aIconManager, annotations, markers, polygons, polylines, shapeAnnotations); Marker aMarker = mock(Marker.class); long aId = 5L; when(aNativeMapView.addMarker(aMarker)).thenReturn(aId); @@ -58,18 +60,23 @@ public class AnnotationManagerTest { Markers markers = new MarkerContainer(aNativeMapView, aMapView, annotationsArray, aIconManager, aMarkerViewManager); Polygons polygons = new PolygonContainer(aNativeMapView, annotationsArray); Polylines polylines = new PolylineContainer(aNativeMapView, annotationsArray); + ShapeAnnotations shapeAnnotations = new ShapeAnnotationContainer(aNativeMapView, annotationsArray); AnnotationManager annotationManager = new AnnotationManager(aNativeMapView, aMapView, annotationsArray, - aMarkerViewManager, aIconManager, annotations, markers, polygons, polylines); + aMarkerViewManager, aIconManager, annotations, markers, polygons, polylines, shapeAnnotations); long firstId = 1L; long secondId = 2L; List markerList = new ArrayList<>(); MarkerOptions firstMarkerOption = new MarkerOptions().position(new LatLng()).title("first"); MarkerOptions secondMarkerOption = new MarkerOptions().position(new LatLng()).title("second"); + markerList.add(firstMarkerOption); markerList.add(secondMarkerOption); MapboxMap aMapboxMap = mock(MapboxMap.class); when(aNativeMapView.addMarker(any(Marker.class))).thenReturn(firstId, secondId); + when(aNativeMapView.addMarkers(ArgumentMatchers.anyList())) + .thenReturn(new long[]{firstId, secondId}); + annotationManager.addMarkers(markerList, aMapboxMap); assertEquals(2, annotationManager.getAnnotations().size()); -- cgit v1.2.1