1 files changed, 25 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt
index 84af279bd0..10be2f36ec 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt
@@ -7,10 +7,11 @@ import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.mapboxsdk.style.layers.SymbolLayer
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource
-import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke
 import com.mapbox.mapboxsdk.testapp.activity.EspressoTest
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity
 import com.mapbox.mapboxsdk.testapp.utils.TestingAsyncUtils
+import junit.framework.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,7 +30,7 @@ class StyleLoadTest : EspressoTest() {
     @Test
     fun updateSourceAfterStyleLoad() {
         validateTestSetup()
-        MapboxMapAction.invoke(mapboxMap) { uiController: UiController, mapboxMap: MapboxMap ->
+        invoke(mapboxMap) { uiController: UiController, mapboxMap: MapboxMap ->
             val source = GeoJsonSource("id")
             val layer = SymbolLayer("id", "id")
             mapboxMap.setStyle(Style.Builder().withSource(source).withLayer(layer))
@@ -39,4 +40,26 @@ class StyleLoadTest : EspressoTest() {
             source.setGeoJson("{}")
         }
     }
+
+    @Test
+    fun loadingNewStyle_sourcesDetached() {
+        invoke(mapboxMap) { _: UiController, mapboxMap: MapboxMap ->
+            val sources = mapboxMap.style!!.sources
+            mapboxMap.setStyle(Style.DARK)
+            for (source in sources) {
+                Assert.assertTrue(source.nativeIsDetached())
+            }
+        }
+    }
+
+    @Test
+    fun loadingNewStyle_layersDetached() {
+        invoke(mapboxMap) { _: UiController, mapboxMap: MapboxMap ->
+            val layers = mapboxMap.style!!.layers
+            mapboxMap.setStyle(Style.DARK)
+            for (layer in layers) {
+                Assert.assertTrue(layer.nativeIsDetached())
+            }
+        }
+    }
 }
 \ No newline at end of file