[android] clear previous style loaded listener when setting a new styleupstream/lp-clear-style-callback-14337

1 files changed, 28 insertions, 0 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 dbb4bf1116..885b71f7fb 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
@@ -123,4 +123,32 @@ class MapboxMapTest {
     mapboxMap.onDestroy()
     verify(exactly = 1) { style.clear() }
   }
+
+  @Test
+  fun testStyleCallbackNotCalledWhenPreviousFailed() {
+    val style = mockk<Style>(relaxed = true)
+    val builder = mockk<Style.Builder>(relaxed = true)
+    every { builder.build(nativeMapView) } returns style
+    val onStyleLoadedListener = mockk<Style.OnStyleLoaded>(relaxed = true)
+
+    mapboxMap.setStyle(builder, onStyleLoadedListener)
+    mapboxMap.onFailLoadingStyle()
+    mapboxMap.setStyle(builder, onStyleLoadedListener)
+    mapboxMap.onFinishLoadingStyle()
+    verify(exactly = 1) { onStyleLoadedListener.onStyleLoaded(style) }
+  }
+
+  @Test
+  fun testStyleCallbackNotCalledWhenPreviousNotFinished() {
+    // regression test for #14337
+    val style = mockk<Style>(relaxed = true)
+    val builder = mockk<Style.Builder>(relaxed = true)
+    every { builder.build(nativeMapView) } returns style
+    val onStyleLoadedListener = mockk<Style.OnStyleLoaded>(relaxed = true)
+
+    mapboxMap.setStyle(builder, onStyleLoadedListener)
+    mapboxMap.setStyle(builder, onStyleLoadedListener)
+    mapboxMap.onFinishLoadingStyle()
+    verify(exactly = 1) { onStyleLoadedListener.onStyleLoaded(style) }
+  }
 }
\ No newline at end of file