[android] fix crash in runtime style ui tests

1 files changed, 37 insertions, 12 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
index a37615aadc..f1e2a6c418 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
@@ -199,29 +199,54 @@ public class RuntimeStyleTests extends BaseActivityTest {
   public void testVectorSourceUrlGetter() {
     validateTestSetup();
 
-    VectorSource source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-    mapboxMap.addSource(source);
-    assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
+    onView(withId(R.id.mapView)).perform(new BaseViewAction() {
+
+      @Override
+      public void perform(UiController uiController, View view) {
+        VectorSource source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+        mapboxMap.addSource(source);
+        assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
+      }
+
+    });
   }
 
   @Test
   public void testRasterSourceUrlGetter() {
     validateTestSetup();
 
-    RasterSource source = new RasterSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-    mapboxMap.addSource(source);
-    assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
+    onView(withId(R.id.mapView)).perform(new BaseViewAction() {
+
+      @Override
+      public void perform(UiController uiController, View view) {
+        RasterSource source = new RasterSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+        mapboxMap.addSource(source);
+        assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
+      }
+
+    });
   }
 
   @Test
-  public void testGeoJsonSourceUrlGetter() throws MalformedURLException {
+  public void testGeoJsonSourceUrlGetter() {
     validateTestSetup();
 
-    GeoJsonSource source = new GeoJsonSource("my-source");
-    mapboxMap.addSource(source);
-    assertNull(source.getUrl());
-    source.setUrl(new URL("http://mapbox.com/my-file.json"));
-    assertEquals("http://mapbox.com/my-file.json", source.getUrl());
+    onView(withId(R.id.mapView)).perform(new BaseViewAction() {
+
+      @Override
+      public void perform(UiController uiController, View view) {
+        GeoJsonSource source = new GeoJsonSource("my-source");
+        mapboxMap.addSource(source);
+        assertNull(source.getUrl());
+        try {
+          source.setUrl(new URL("http://mapbox.com/my-file.json"));
+        } catch (MalformedURLException err) {
+          assertTrue(err.getMessage(), false);
+        }
+        assertEquals("http://mapbox.com/my-file.json", source.getUrl());
+      }
+
+    });
   }
 
   @Test