From dabf5d0c3a76f9fbe8b866f64f51accf12d1a2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Mon, 22 Jul 2019 15:29:52 +0200 Subject: [android] remove layers first when clearing the style --- .../java/com/mapbox/mapboxsdk/maps/StyleTest.kt | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt') 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 7b5ed67184..9a7462b8d0 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 @@ -8,10 +8,7 @@ import com.mapbox.mapboxsdk.style.layers.SymbolLayer import com.mapbox.mapboxsdk.style.layers.TransitionOptions import com.mapbox.mapboxsdk.style.sources.CannotAddSourceException import com.mapbox.mapboxsdk.style.sources.GeoJsonSource -import io.mockk.every -import io.mockk.mockk -import io.mockk.spyk -import io.mockk.verify +import io.mockk.* import org.junit.Assert import org.junit.Before import org.junit.Test @@ -408,4 +405,22 @@ class StyleTest { Assert.assertEquals("Layer that failed to be added shouldn't be cached", layer1, mapboxMap.style!!.getLayer("layer1")) } } + + @Test + fun testClearRemovesSourcesFirst() { + val source1 = mockk(relaxed = true) + every { source1.id } returns "source1" + val layer1 = mockk(relaxed = true) + every { layer1.id } returns "layer1" + + val builder = Style.Builder().withLayer(layer1).withSource(source1) + mapboxMap.setStyle(builder) + mapboxMap.notifyStyleLoaded() + mapboxMap.setStyle(Style.MAPBOX_STREETS) + + verifyOrder { + nativeMapView.removeLayer(layer1) + nativeMapView.removeSource(source1) + } + } } \ No newline at end of file -- cgit v1.2.1