1 files changed, 17 insertions, 17 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt
index 37b3e8b802..fb450de527 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt
@@ -75,7 +75,7 @@ class LocationLayerControllerTest : EspressoTest() {
                 .build())
         component.isLocationComponentEnabled = true
         component.renderMode = RenderMode.NORMAL
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
         assertThat(style.getSource(LOCATION_SOURCE), notNullValue())
       }
@@ -99,7 +99,7 @@ class LocationLayerControllerTest : EspressoTest() {
         component.isLocationComponentEnabled = true
         component.renderMode = RenderMode.NORMAL
         component.forceLocationUpdate(location)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
         assertThat(mapboxMap.isLayerVisible(FOREGROUND_LAYER), `is`(true))
         assertThat(mapboxMap.isLayerVisible(BACKGROUND_LAYER), `is`(true))
@@ -123,7 +123,7 @@ class LocationLayerControllerTest : EspressoTest() {
         component.isLocationComponentEnabled = true
         component.renderMode = RenderMode.COMPASS
         component.forceLocationUpdate(location)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
         assertThat(mapboxMap.isLayerVisible(FOREGROUND_LAYER), `is`(true))
         assertThat(mapboxMap.isLayerVisible(BACKGROUND_LAYER), `is`(true))
@@ -147,7 +147,7 @@ class LocationLayerControllerTest : EspressoTest() {
         component.isLocationComponentEnabled = true
         component.renderMode = RenderMode.GPS
         component.forceLocationUpdate(location)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
         assertThat(mapboxMap.isLayerVisible(FOREGROUND_LAYER), `is`(true))
         assertThat(mapboxMap.isLayerVisible(BACKGROUND_LAYER), `is`(true))
@@ -171,7 +171,7 @@ class LocationLayerControllerTest : EspressoTest() {
         component.isLocationComponentEnabled = true
         component.forceLocationUpdate(location)
         component.isLocationComponentEnabled = false
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
         component.renderMode = RenderMode.GPS
 
         assertThat(mapboxMap.isLayerVisible(FOREGROUND_LAYER), `is`(false))
@@ -197,7 +197,7 @@ class LocationLayerControllerTest : EspressoTest() {
         component.renderMode = RenderMode.NORMAL
         component.forceLocationUpdate(location)
         component.isLocationComponentEnabled = false
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
         // Check that all layers visibilities are set to none
         assertThat(mapboxMap.isLayerVisible(FOREGROUND_LAYER), `is`(false))
@@ -223,7 +223,7 @@ class LocationLayerControllerTest : EspressoTest() {
         component.renderMode = RenderMode.NORMAL
         component.forceLocationUpdate(location)
         styleChangeIdlingResource.waitForStyle(mapboxMap, Style.LIGHT)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
         assertThat(component.renderMode, `is`(equalTo(RenderMode.NORMAL)))
 
@@ -254,13 +254,13 @@ class LocationLayerControllerTest : EspressoTest() {
         component.isLocationComponentEnabled = true
         component.applyStyle(LocationComponentOptions.builder(context).staleStateTimeout(100).build())
         component.forceLocationUpdate(location)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
         uiController.loopMainThreadForAtLeast(150)
 
         assertThat(mapboxMap.querySourceFeatures(LOCATION_SOURCE)[0].getBooleanProperty(PROPERTY_LOCATION_STALE), `is`(true))
 
         mapboxMap.setStyle(Style.Builder().fromUrl(Style.LIGHT))
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
         assertThat(mapboxMap.querySourceFeatures(LOCATION_SOURCE)[0].getBooleanProperty(PROPERTY_LOCATION_STALE), `is`(true))
       }
@@ -279,9 +279,9 @@ class LocationLayerControllerTest : EspressoTest() {
                 .build())
         component.isLocationComponentEnabled = true
         component.forceLocationUpdate(location)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
         component.isLocationComponentEnabled = false
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
         assertThat(mapboxMap.queryRenderedFeatures(location, FOREGROUND_LAYER).isEmpty(), `is`(true))
 
         val options =
@@ -291,7 +291,7 @@ class LocationLayerControllerTest : EspressoTest() {
             .build()
 
         component.applyStyle(options)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
         assertThat(mapboxMap.queryRenderedFeatures(location, FOREGROUND_LAYER).isEmpty(), `is`(true))
       }
     }
@@ -338,7 +338,7 @@ class LocationLayerControllerTest : EspressoTest() {
           show = !show
         }
 
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
       }
     }
     executeComponentTest(componentAction)
@@ -359,7 +359,7 @@ class LocationLayerControllerTest : EspressoTest() {
         component.isLocationComponentEnabled = true
         mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(LatLng(location), 16.0))
         component.forceLocationUpdate(location)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
         uiController.loopMainThreadForAtLeast(ACCURACY_RADIUS_ANIMATION_DURATION)
 
         assertEquals(Utils.calculateZoomLevelRadius(mapboxMap, location) /*meters projected to radius on zoom 16*/,
@@ -386,7 +386,7 @@ class LocationLayerControllerTest : EspressoTest() {
         val zoom = 16.0
         mapboxMap.easeCamera(CameraUpdateFactory.newLatLngZoom(target, zoom), 300)
         uiController.loopMainThreadForAtLeast(300)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
 
         assertThat(Math.abs(zoom - mapboxMap.cameraPosition.zoom) < 0.1
@@ -418,7 +418,7 @@ class LocationLayerControllerTest : EspressoTest() {
         val target = LatLng(location)
         val zoom = 16.0
         mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(target, zoom))
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
         assertThat(Math.abs(zoom - mapboxMap.cameraPosition.zoom) < 0.1
           && Math.abs(target.latitude - mapboxMap.cameraPosition.target.latitude) < 0.1
@@ -445,7 +445,7 @@ class LocationLayerControllerTest : EspressoTest() {
                 .build())
         component.isLocationComponentEnabled = true
         component.forceLocationUpdate(location)
-        TestingAsyncUtils.waitForLayer(uiController, idlingResource.mapView)
+        TestingAsyncUtils.waitForLayer(uiController, mapView)
 
         component.applyStyle(LocationComponentOptions.builder(context).layerBelow("road-label").build())