2 files changed, 17 insertions, 8 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationChangeAction.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java
index 7f73d6a7f3..1bf5a87970 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationChangeAction.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/OrientationAction.java
@@ -1,6 +1,5 @@
 package com.mapbox.mapboxsdk.testapp.action;
 
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -11,30 +10,31 @@ import android.view.View;
 import android.view.ViewGroup;
 import org.hamcrest.Matcher;
 
+import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
 
-public class OrientationChangeAction implements ViewAction {
+public class OrientationAction implements ViewAction {
 
   private final int orientation;
 
-  private OrientationChangeAction(int orientation) {
+  private OrientationAction(int orientation) {
     this.orientation = orientation;
   }
 
   public static ViewAction orientationLandscape() {
-    return new OrientationChangeAction(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+    return new OrientationAction(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
   }
 
   public static ViewAction orientationPortrait() {
-    return new OrientationChangeAction(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+    return new OrientationAction(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
   }
 
   public static ViewAction orientationLandscapeReverse() {
-    return new OrientationChangeAction(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
+    return new OrientationAction(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
   }
 
   public static ViewAction orientationPortraitReverse() {
-    return new OrientationChangeAction(ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT);
+    return new OrientationAction(ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT);
   }
 
   @Override
@@ -61,6 +61,10 @@ public class OrientationChangeAction implements ViewAction {
     activity.setRequestedOrientation(orientation);
   }
 
+  public static void invoke(ViewAction action) {
+    onView(isRoot()).perform(action);
+  }
+
   private Activity getActivity(Context context) {
     while (context instanceof ContextWrapper) {
       if (context instanceof Activity) {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java
index 5d98ccb7f8..e3741f3d42 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java
@@ -3,10 +3,11 @@ package com.mapbox.mapboxsdk.testapp.action;
 import android.support.test.espresso.UiController;
 import android.support.test.espresso.ViewAction;
 import android.view.View;
-
 import org.hamcrest.Matcher;
 
+import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
 
 public final class WaitAction implements ViewAction {
 
@@ -30,5 +31,9 @@ public final class WaitAction implements ViewAction {
   public void perform(UiController uiController, View view) {
     uiController.loopMainThreadForAtLeast(loopTime);
   }
+
+  public static void invoke(long loopTime) {
+    onView(isRoot()).perform(new WaitAction(loopTime));
+  }
 }