diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox')
2 files changed, 9 insertions, 50 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt index 77fb272bd2..4c67049b39 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt @@ -29,8 +29,7 @@ class MapboxMapTest { nativeMapView = mockk() mapboxMap = MapboxMap(nativeMapView, Transform(mapView, nativeMapView, cameraChangeDispatcher), null, null, null, cameraChangeDispatcher) every { nativeMapView.styleUrl = any() } answers {} - every { nativeMapView.transitionDuration = any() } answers {} - every { nativeMapView.transitionDelay = any() } answers {} + every { nativeMapView.transitionOptions = any() } answers {} every { nativeMapView.isDestroyed } returns false every { nativeMapView.cameraPosition } returns CameraPosition.DEFAULT every { nativeMapView.cancelTransitions() } answers {} @@ -38,7 +37,7 @@ class MapboxMapTest { every { nativeMapView.minZoom = any() } answers {} every { nativeMapView.maxZoom = any() } answers {} every { nativeMapView.setOnFpsChangedListener(any()) } answers {} - every { nativeMapView.prefetchesTiles = any() } answers {} + every { nativeMapView.prefetchTiles = any() } answers {} every { nativeMapView.setLatLngBounds(any()) } answers {} mapboxMap.injectLocationComponent(spyk()) mapboxMap.setStyle(Style.MAPBOX_STREETS) @@ -49,8 +48,7 @@ class MapboxMapTest { fun testTransitionOptions() { val expected = TransitionOptions(100, 200) mapboxMap.style?.transition = expected - verify { nativeMapView.transitionDelay = 200 } - verify { nativeMapView.transitionDuration = 100 } + verify { nativeMapView.transitionOptions = expected } } @Test @@ -60,7 +58,7 @@ class MapboxMapTest { val target = LatLng(1.0, 2.0) val expected = CameraPosition.Builder().target(target).build() mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(expected), callback) - verify { nativeMapView.jumpTo(-1.0, target, -1.0, -1.0) } + verify { nativeMapView.jumpTo(target, -1.0, -1.0, -1.0) } verify { callback.onFinish() } } @@ -86,7 +84,7 @@ class MapboxMapTest { @Test fun testTilePrefetch() { mapboxMap.prefetchesTiles = true - verify { nativeMapView.prefetchesTiles = true } + verify { nativeMapView.prefetchTiles = true } } @Test diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt index 56223dadef..83769914ef 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt @@ -33,9 +33,8 @@ class StyleTest { every { nativeMapView.addLayerAbove(any(), any()) } answers {} every { nativeMapView.addLayerAt(any(), any()) } answers {} every { nativeMapView.addSource(any()) } answers {} - every { nativeMapView.addImage(any(), any(), any()) } answers {} - every { nativeMapView.transitionDuration = any() } answers {} - every { nativeMapView.transitionDelay = any() } answers {} + every { nativeMapView.addImages(any()) } answers {} + every { nativeMapView.transitionOptions = any() } answers {} every { nativeMapView.isDestroyed } returns false mapboxMap.injectLocationComponent(spyk()) } @@ -104,24 +103,7 @@ class StyleTest { val transitionOptions = TransitionOptions(100, 200) val builder = Style.Builder().withTransition(transitionOptions) mapboxMap.setStyle(builder) - verify(exactly = 1) { nativeMapView.transitionDuration = 100 } - verify(exactly = 1) { nativeMapView.transitionDelay = 200 } - } - - @Test - fun testWithImage() { - val image = mockk<Bitmap>() - val builder = Style.Builder().withImage("id", image) - mapboxMap.setStyle(builder) - verify(exactly = 1) { nativeMapView.addImage("id", image, false) } - } - - @Test - fun testWithImageSdf() { - val image = mockk<Bitmap>() - val builder = Style.Builder().withImage("id", image, true) - mapboxMap.setStyle(builder) - verify(exactly = 1) { nativeMapView.addImage("id", image, true) } + verify(exactly = 1) { nativeMapView.transitionOptions = transitionOptions } } @Test @@ -186,28 +168,7 @@ class StyleTest { mapboxMap.setStyle(builder) verify(exactly = 1) { nativeMapView.styleUrl = Style.MAPBOX_STREETS } mapboxMap.notifyStyleLoaded() - verify(exactly = 1) { nativeMapView.transitionDuration = 100 } - verify(exactly = 1) { nativeMapView.transitionDelay = 200 } - } - - @Test - fun testWithFromImage() { - val bitmap = mockk<Bitmap>() - val builder = Style.Builder().fromUrl(Style.MAPBOX_STREETS).withImage("id", bitmap) - mapboxMap.setStyle(builder) - verify(exactly = 1) { nativeMapView.styleUrl = Style.MAPBOX_STREETS } - mapboxMap.notifyStyleLoaded() - verify(exactly = 1) { nativeMapView.addImage("id", bitmap, false) } - } - - @Test - fun testWithFromImageSdf() { - val bitmap = mockk<Bitmap>() - val builder = Style.Builder().fromUrl(Style.MAPBOX_STREETS).withImage("id", bitmap, true) - mapboxMap.setStyle(builder) - verify(exactly = 1) { nativeMapView.styleUrl = Style.MAPBOX_STREETS } - mapboxMap.notifyStyleLoaded() - verify(exactly = 1) { nativeMapView.addImage("id", bitmap, true) } + verify(exactly = 1) { nativeMapView.transitionOptions = transitionOptions } } @Test |