diff options
author | Tobrun <tobrun@mapbox.com> | 2019-01-28 15:06:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-28 15:06:54 +0100 |
commit | 50018b7574cb1e13a8bbeecd359d83d2a54c6b33 (patch) | |
tree | 2db2797b8d75919e3465dd9e5632c5b60cf40bac /platform/android/MapboxGLAndroidSDK/src/test | |
parent | 2a821db75475b3ba6bfff851c769439d699f8ef8 (diff) | |
download | qtlocation-mapboxgl-50018b7574cb1e13a8bbeecd359d83d2a54c6b33.tar.gz |
Add image support with drawable overload (#13793)
* [android] - add addImage support that takes a Drawable as parameter
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/test')
2 files changed, 43 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt index cb42b0b33d..2dd6b55e28 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleBuilderTest.kt @@ -1,11 +1,14 @@ package com.mapbox.mapboxsdk.maps import android.graphics.Bitmap +import android.graphics.drawable.ShapeDrawable import com.mapbox.mapboxsdk.style.layers.SymbolLayer import com.mapbox.mapboxsdk.style.layers.TransitionOptions import com.mapbox.mapboxsdk.style.sources.GeoJsonSource +import com.mapbox.mapboxsdk.utils.BitmapUtils import io.mockk.mockk import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @@ -96,6 +99,21 @@ class StyleBuilderTest { } @Test + fun testWithImageDrawable() { + val drawable = ShapeDrawable() + drawable.intrinsicWidth = 1 + drawable.intrinsicHeight = 1 + val builder = Style.Builder() + builder.withImage("id", drawable, true) + assertTrue(BitmapUtils.equals( + BitmapUtils.getBitmapFromDrawable(drawable)!!, + builder.images[0].bitmap) + ) + assertEquals("id", builder.images[0].id) + assertEquals(true, builder.images[0].sdf) + } + + @Test fun testWithTransitionOptions() { val transitionOptions = TransitionOptions(100, 200) val builder = Style.Builder() 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 83769914ef..58aac9cc78 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 @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.maps import android.graphics.Bitmap +import android.graphics.drawable.ShapeDrawable import com.mapbox.mapboxsdk.constants.MapboxConstants import com.mapbox.mapboxsdk.style.layers.SymbolLayer import com.mapbox.mapboxsdk.style.layers.TransitionOptions @@ -14,7 +15,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import java.lang.IllegalStateException @RunWith(RobolectricTestRunner::class) class StyleTest { @@ -277,4 +277,27 @@ class StyleTest { style!!.addLayer(mockk<SymbolLayer>()) } -}
\ No newline at end of file + @Test + fun testAddImage() { + val bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + val builder = Style.Builder().fromUrl(Style.SATELLITE).withImage("id", bitmap) + mapboxMap.setStyle(builder) + verify(exactly = 1) { nativeMapView.styleUrl = Style.SATELLITE } + verify(exactly = 0) { nativeMapView.addImages(any()) } + mapboxMap.notifyStyleLoaded() + verify(exactly = 1) { nativeMapView.addImages(any()) } + } + + @Test + fun testAddDrawable() { + val drawable = ShapeDrawable() + drawable.intrinsicHeight = 10 + drawable.intrinsicWidth = 10 + val builder = Style.Builder().fromUrl(Style.SATELLITE).withImage("id", drawable) + mapboxMap.setStyle(builder) + verify(exactly = 1) { nativeMapView.styleUrl = Style.SATELLITE } + verify(exactly = 0) { nativeMapView.addImages(any()) } + mapboxMap.notifyStyleLoaded() + verify(exactly = 1) { nativeMapView.addImages(any()) } + } +} |