1 files changed, 42 insertions, 56 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 bf8bcb9f66..fc526176d4 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
@@ -8,7 +8,6 @@ import android.support.test.espresso.ViewAction;
 import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 
-import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.CannotAddLayerException;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
@@ -22,7 +21,6 @@ import com.mapbox.mapboxsdk.style.sources.RasterSource;
 import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.mapboxsdk.style.sources.VectorSource;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
 
@@ -192,41 +190,38 @@ public class RuntimeStyleTests extends BaseActivityTest {
   @Test
   public void testAddRemoveSource() {
     validateTestSetup();
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
-        mapboxMap.removeSource("my-source");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
+      mapboxMap.removeSource("my-source");
 
-        // Add initial source
-        mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
+      // Add initial source
+      mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
 
-        // Remove
-        Source mySource = mapboxMap.removeSource("my-source");
-        assertNotNull(mySource);
-        assertNull(mapboxMap.getLayer("my-source"));
+      // Remove
+      Source mySource = mapboxMap.removeSource("my-source");
+      assertNotNull(mySource);
+      assertNull(mapboxMap.getLayer("my-source"));
 
-        // Add
-        Source source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-        mapboxMap.addSource(source);
+      // Add
+      Source source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+      mapboxMap.addSource(source);
 
-        // Remove, preserving the reference
-        mapboxMap.removeSource(source);
+      // Remove, preserving the reference
+      mapboxMap.removeSource(source);
 
-        // Re-add the reference...
-        mapboxMap.addSource(source);
+      // Re-add the reference...
+      mapboxMap.addSource(source);
 
-        // Ensure it's there
-        Assert.assertNotNull(mapboxMap.getSource(source.getId()));
+      // Ensure it's there
+      Assert.assertNotNull(mapboxMap.getSource(source.getId()));
 
-        // Test adding a duplicate source
-        try {
-          Source source2 = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-          mapboxMap.addSource(source2);
-          fail("Should not have been allowed to add a source with a duplicate id");
-        } catch (CannotAddSourceException cannotAddSourceException) {
-          // OK
-        }
+      // Test adding a duplicate source
+      try {
+        Source source2 = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+        mapboxMap.addSource(source2);
+        fail("Should not have been allowed to add a source with a duplicate id");
+      } catch (CannotAddSourceException cannotAddSourceException) {
+        // OK
       }
     });
 
@@ -235,45 +230,36 @@ public class RuntimeStyleTests extends BaseActivityTest {
   @Test
   public void testVectorSourceUrlGetter() {
     validateTestSetup();
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        VectorSource source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-        mapboxMap.addSource(source);
-        assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      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();
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        RasterSource source = new RasterSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-        mapboxMap.addSource(source);
-        assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      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 {
     validateTestSetup();
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        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 exception) {
-          fail();
-        }
-        assertEquals("http://mapbox.com/my-file.json", source.getUrl());
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      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 exception) {
+        fail();
       }
+      assertEquals("http://mapbox.com/my-file.json", source.getUrl());
     });
   }