1 files changed, 30 insertions, 49 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java
index 819282f7a8..fd666d9fd3 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java
@@ -1,17 +1,10 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
-
-import android.support.test.espresso.UiController;
-
 import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.Style;
 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.espresso.EspressoTestActivity;
+import com.mapbox.mapboxsdk.testapp.activity.EspressoTest;
 import com.mapbox.mapboxsdk.testapp.utils.ResourceUtils;
-
 import org.junit.Test;
 
 import java.io.IOException;
@@ -22,56 +15,44 @@ import static org.junit.Assert.assertEquals;
 /**
  * Tests around style loading
  */
-public class StyleLoaderTest extends BaseActivityTest {
-
-
-  @Override
-  protected Class getActivityClass() {
-    return EspressoTestActivity.class;
-  }
+public class StyleLoaderTest extends EspressoTest {
 
   @Test
-  public void testSetGetStyleJsonString() throws Exception {
+  public void testSetGetStyleJsonString() {
     validateTestSetup();
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        try {
-          String expected = ResourceUtils.readRawResource(rule.getActivity(), R.raw.local_style);
-          mapboxMap.setStyle(new Style.Builder().fromJson(expected));
-          String actual = mapboxMap.getStyle().getJson();
-          assertEquals("Style json should match", expected, actual);
-        } catch (IOException exception) {
-          exception.printStackTrace();
-        }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      try {
+        String expected = ResourceUtils.readRawResource(rule.getActivity(), R.raw.local_style);
+        mapboxMap.setStyle(new Style.Builder().fromJson(expected));
+        String actual = mapboxMap.getStyle().getJson();
+        assertEquals("Style json should match", expected, actual);
+      } catch (IOException exception) {
+        exception.printStackTrace();
       }
     });
   }
 
   @Test
-  public void testDefaultStyleLoadWithActivityLifecycleChange() throws Exception {
+  public void testDefaultStyleLoadWithActivityLifecycleChange() {
     validateTestSetup();
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        try {
-          String expected = ResourceUtils.readRawResource(rule.getActivity(), R.raw.local_style);
-          mapboxMap.setStyle(new Style.Builder().fromJson(expected));
-
-          // fake activity stop/start
-          MapView mapView = (MapView) rule.getActivity().findViewById(R.id.mapView);
-          mapView.onPause();
-          mapView.onStop();
-
-          mapView.onStart();
-          mapView.onResume();
-
-          String actual = mapboxMap.getStyle().getJson();
-          assertEquals("Style URL should be empty", "", mapboxMap.getStyle().getUrl());
-          assertEquals("Style json should match", expected, actual);
-        } catch (IOException exception) {
-          exception.printStackTrace();
-        }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      try {
+        String expected = ResourceUtils.readRawResource(rule.getActivity(), R.raw.local_style);
+        mapboxMap.setStyle(new Style.Builder().fromJson(expected));
+
+        // fake activity stop/start
+        MapView mapView = (MapView) rule.getActivity().findViewById(R.id.mapView);
+        mapView.onPause();
+        mapView.onStop();
+
+        mapView.onStart();
+        mapView.onResume();
+
+        String actual = mapboxMap.getStyle().getJson();
+        assertEquals("Style URL should be empty", "", mapboxMap.getStyle().getUrl());
+        assertEquals("Style json should match", expected, actual);
+      } catch (IOException exception) {
+        exception.printStackTrace();
       }
     });
   }