1 files changed, 43 insertions, 21 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java
index bbfa4ec73a..7c56f4c874 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java
@@ -4,17 +4,18 @@ import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.LargeTest;
 
+import com.mapbox.mapboxsdk.testapp.utils.DrawerUtils;
+import com.mapbox.mapboxsdk.testapp.utils.GestureUtils;
+import com.mapbox.mapboxsdk.testapp.utils.ScreenshotUtil;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.action.ViewActions.doubleClick;
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
 
 /**
  * Tests on MainActivity with screenshots
@@ -23,8 +24,6 @@ import static android.support.test.espresso.matcher.ViewMatchers.withText;
 @LargeTest
 public class MainActivityScreenTest extends BaseTest {
 
-    private final static String HOME_BUTTON_STRING = "Navigate up";
-
     @Rule
     public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(
             MainActivity.class);
@@ -41,26 +40,49 @@ public class MainActivityScreenTest extends BaseTest {
         checkViewIsDisplayed(R.id.mainMapView);
     }
 
-    /*
-     * Take a screenshot of Mapbox Streets to monitor #1649
-     */
+    @Test
+    public void testStyleEmerald() {
+        DrawerUtils.openDrawer();
+        DrawerUtils.clickItem(R.string.styleEmerald);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        takeNamedScreenshot(mActivity, "testEmeraldStyle");
+    }
 
     @Test
-    public void testMapboxStreetsBlackAndWhite() {
-        // Click home and switch to Mapbox streets
-        onView(withContentDescription(HOME_BUTTON_STRING))
-                .perform(click());
-        onView(withText(R.string.styleMapboxStreets))
-                .perform(click());
+    public void testStyleStreets() {
+        DrawerUtils.openDrawer();
+        DrawerUtils.clickItem(R.string.styleMapboxStreets);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        takeNamedScreenshot(mActivity, "testStreetsStyle");
+    }
 
-        // Zoom in
-        onView(withId(R.id.mainMapView))
-                .perform(doubleClick());
-        onView(withId(R.id.mainMapView))
-                .perform(doubleClick());
+    @Test
+    public void testStyleDark() {
+        DrawerUtils.openDrawer();
+        DrawerUtils.clickItem(R.string.styleDark);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        takeNamedScreenshot(mActivity, "testDarkStyle");
+    }
 
-        // Standard screenshot
-        takeNamedScreenshot(mActivity, "testMapboxStreetsBlackAndWhite");
+    @Test
+    public void testStyleLight() {
+        DrawerUtils.openDrawer();
+        DrawerUtils.clickItem(R.string.styleLight);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        takeNamedScreenshot(mActivity, "testLightStyle");
+    }
+
+    @Test
+    public void testStyleSatellite() {
+        DrawerUtils.openDrawer();
+        DrawerUtils.clickItem(R.string.styleSatellite);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        takeNamedScreenshot(mActivity, "testSatelliteStyle");
     }
 
 }