1 files changed, 23 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/Utils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/Utils.java
new file mode 100644
index 0000000000..1ca4f0df87
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/Utils.java
@@ -0,0 +1,23 @@
+package com.mapbox.mapboxsdk.testapp.utils;
+
+import android.support.test.espresso.UiController;
+
+import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.maps.MapboxMap;
+
+import static org.junit.Assert.assertFalse;
+
+public class Utils {
+
+  private static final long WAIT_TIMEOUT = 5000;
+  private static final long WAIT_DELAY = 150;
+
+  public static void waitForLayer(UiController uiController, MapboxMap mapboxMap, LatLng latLng, String... layerIds) {
+    int i = 0;
+    while (mapboxMap.queryRenderedFeatures(mapboxMap.getProjection().toScreenLocation(latLng), layerIds).isEmpty()) {
+      i++;
+      assertFalse("Waiting for layer timed out", i * WAIT_DELAY > WAIT_TIMEOUT);
+      uiController.loopMainThreadForAtLeast(WAIT_DELAY);
+    }
+  }
+}