2 files changed, 46 insertions, 12 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
new file mode 100644
index 0000000000..1f9acbb291
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/StyleLoadTest.kt
@@ -0,0 +1,45 @@
+package com.mapbox.mapboxsdk.testapp.maps
+
+import android.support.test.espresso.UiController
+import android.support.test.runner.AndroidJUnit4
+import com.mapbox.mapboxsdk.maps.MapView
+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.activity.BaseActivityTest
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class StyleLoadTest : BaseActivityTest() {
+
+    private lateinit var mapView: MapView
+
+    override fun getActivityClass(): Class<*> {
+        return EspressoTestActivity::class.java
+    }
+
+    @Before
+    override fun beforeTest() {
+        super.beforeTest()
+        mapView = (rule.activity as EspressoTestActivity).mapView
+    }
+
+    @Test
+    fun updateSourceAfterStyleLoad() {
+        validateTestSetup()
+        MapboxMapAction.invoke(mapboxMap) { uiController: UiController, mapboxMap: MapboxMap ->
+            val source = GeoJsonSource("id")
+            val layer = SymbolLayer("id", "id")
+            mapboxMap.setStyle(Style.Builder().withSource(source).withLayer(layer))
+            uiController.loopMainThreadForAtLeast(100)
+            mapboxMap.setStyle(Style.Builder().fromUrl(Style.MAPBOX_STREETS))
+            uiController.loopMainThreadForAtLeast(100)
+            source.setGeoJson("{}")
+        }
+    }
+}
+\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java
index caa15d05be..1bcab3932e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java
@@ -3,19 +3,14 @@ package com.mapbox.mapboxsdk.testapp.utils;
 import android.app.Activity;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
 import android.support.test.espresso.IdlingResource;
-
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.mapboxsdk.testapp.R;
 
-import junit.framework.Assert;
-
-public class OnMapReadyIdlingResource implements IdlingResource, OnMapReadyCallback {
+public class OnMapReadyIdlingResource implements IdlingResource {
 
   private boolean styleLoaded;
   private MapboxMap mapboxMap;
@@ -61,10 +56,4 @@ public class OnMapReadyIdlingResource implements IdlingResource, OnMapReadyCallb
   public MapboxMap getMapboxMap() {
     return mapboxMap;
   }
-
-  @Override
-  public void onMapReady(@NonNull MapboxMap mapboxMap) {
-    Assert.assertNotNull("MapboxMap should not be null", mapboxMap);
-    this.mapboxMap = mapboxMap;
-  }
 }
 \ No newline at end of file