From 55a1bb83652dccc4587578058d4a508e31b8ec1c Mon Sep 17 00:00:00 2001 From: Tobrun Date: Mon, 14 Mar 2016 11:17:27 -0400 Subject: [PATCH] [android] #4301 - added robotium testing framework to perform integration testing --- .../MapboxGLAndroidSDKTestApp/build.gradle | 11 +++-- .../mapbox/mapboxsdk/maps/MapboxMapUtils.java | 18 ++++++++ .../testapp/{ => espresso}/BaseTest.java | 4 +- .../BulkMarkerActivityTest.java | 5 +- .../{ => espresso}/CameraActivityTest.java | 5 +- .../CoordinateChangeActivityTest.java | 5 +- .../DirectionsActivityTest.java | 5 +- .../{ => espresso}/DoubleMapActivityTest.java | 5 +- .../DynamicMarkerChangeActivityTest.java | 6 ++- .../{ => espresso}/GeocoderActivityTest.java | 5 +- .../InfoWindowActivityTest.java | 5 +- .../InfoWindowAdapterActivityTest.java | 5 +- .../InfoWindowConcurrentActivityTest.java | 5 +- .../LatLngBoundsActivityTest.java | 5 +- .../MainActivityScreenTest.java | 11 ++--- .../{ => espresso}/MainActivityTest.java | 5 +- .../ManualZoomActivityTest.java | 5 +- .../MapFragmentActivityTest.java | 5 +- .../MapPaddingActivityTest.java | 5 +- .../{ => espresso}/MapboxMapActivityTest.java | 5 +- .../MaxMinZoomActivityTest.java | 5 +- .../MyLocationTrackingModeActivityTest.java | 5 +- .../{ => espresso}/PolylineActivityTest.java | 5 +- .../PressForMarkerActivityTest.java | 5 +- .../{ => espresso}/ScrollByActivityTest.java | 5 +- .../SupportMapFragmentActivityTest.java | 5 +- .../{ => espresso}/TiltActivityTest.java | 5 +- .../{ => espresso}/utils/DrawerUtils.java | 2 +- .../{ => espresso}/utils/GestureUtils.java | 4 +- .../{ => espresso}/utils/ScreenshotUtil.java | 2 +- .../{ => espresso}/utils/ViewUtils.java | 2 +- .../robotium/BaseMainActivityTest.java | 42 +++++++++++++++++ .../testapp/robotium/CompassViewTest.java | 46 +++++++++++++++++++ .../testapp/robotium/utils/ViewAssertion.java | 17 +++++++ .../mapboxsdk/testapp/utils/ApiAccess.java | 1 - 35 files changed, 232 insertions(+), 44 deletions(-) create mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapUtils.java rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/BaseTest.java (90%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/BulkMarkerActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/CameraActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/CoordinateChangeActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/DirectionsActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/DoubleMapActivityTest.java (85%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/DynamicMarkerChangeActivityTest.java (77%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/GeocoderActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/InfoWindowActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/InfoWindowAdapterActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/InfoWindowConcurrentActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/LatLngBoundsActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/MainActivityScreenTest.java (87%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/MainActivityTest.java (98%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/ManualZoomActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/MapFragmentActivityTest.java (85%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/MapPaddingActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/MapboxMapActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/MaxMinZoomActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/MyLocationTrackingModeActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/PolylineActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/PressForMarkerActivityTest.java (85%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/ScrollByActivityTest.java (80%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/SupportMapFragmentActivityTest.java (84%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/TiltActivityTest.java (79%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/utils/DrawerUtils.java (94%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/utils/GestureUtils.java (82%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/utils/ScreenshotUtil.java (98%) rename platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/{ => espresso}/utils/ViewUtils.java (88%) create mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/BaseMainActivityTest.java create mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/CompassViewTest.java create mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/utils/ViewAssertion.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 76dd07b7d..762310d63 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -63,7 +63,7 @@ android { } buildTypes { - debug{ + debug { // run code coverage reports testCoverageEnabled = true } @@ -90,13 +90,13 @@ dependencies { releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1' // Directions SDK - compile ('com.mapbox.mapboxsdk:mapbox-android-directions:1.0.0@aar'){ - transitive=true + compile('com.mapbox.mapboxsdk:mapbox-android-directions:1.0.0@aar') { + transitive = true } // Geocoder SDK - compile ('com.mapbox.mapboxsdk:mapbox-android-geocoder:1.0.0@aar'){ - transitive=true + compile('com.mapbox.mapboxsdk:mapbox-android-geocoder:1.0.0@aar') { + transitive = true } // Testing dependencies @@ -106,6 +106,7 @@ dependencies { androidTestCompile 'com.android.support.test:runner:0.4.1' androidTestCompile 'com.android.support.test:rules:0.4.1' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1' + androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.5.4' } checkstyle { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapUtils.java new file mode 100644 index 000000000..73cebf22a --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapUtils.java @@ -0,0 +1,18 @@ +package com.mapbox.mapboxsdk.maps; + +/** + * Utility class to fetch a MapboxMap instance by bypassing package visibility + */ +public class MapboxMapUtils { + + /** + * Get the MapboxMap instance linked to passed MapView + * + * @param mapView + * @return + */ + public static MapboxMap getMapboxMap(MapView mapView){ + return mapView.getMapboxMap(); + } + +} diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BaseTest.java similarity index 90% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BaseTest.java index e432d5f57..e9292332d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BaseTest.java @@ -1,8 +1,8 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; -import com.mapbox.mapboxsdk.testapp.utils.ScreenshotUtil; +import com.mapbox.mapboxsdk.testapp.espresso.utils.ScreenshotUtil; import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.assertion.ViewAssertions.matches; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java index d66ae8f51..beb1b1957 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.BulkMarkerActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CameraActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/CameraActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CameraActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/CameraActivityTest.java index 1f176af87..a017ba053 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CameraActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/CameraActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.CameraActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/CoordinateChangeActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/CoordinateChangeActivityTest.java index 68633547e..fc7350d5c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/CoordinateChangeActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.CoordinateChangeActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DirectionsActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DirectionsActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DirectionsActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DirectionsActivityTest.java index 3ce8d00aa..679d8a15e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DirectionsActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DirectionsActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.DirectionsActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DoubleMapActivityTest.java similarity index 85% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DoubleMapActivityTest.java index db014b69a..16967ee92 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DoubleMapActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.DoubleMapActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DynamicMarkerChangeActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DynamicMarkerChangeActivityTest.java similarity index 77% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DynamicMarkerChangeActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DynamicMarkerChangeActivityTest.java index b6feb8f1b..d9284315c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DynamicMarkerChangeActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DynamicMarkerChangeActivityTest.java @@ -1,10 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.utils.ViewUtils; +import com.mapbox.mapboxsdk.testapp.DynamicMarkerChangeActivity; +import com.mapbox.mapboxsdk.testapp.R; +import com.mapbox.mapboxsdk.testapp.espresso.utils.ViewUtils; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/GeocoderActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/GeocoderActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/GeocoderActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/GeocoderActivityTest.java index c1ca7413c..816ab70ad 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/GeocoderActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/GeocoderActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.GeocoderActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowActivityTest.java index 9fb99fe26..561789159 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.InfoWindowActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowAdapterActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowAdapterActivityTest.java index 51bd163fc..2fe816e0e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowAdapterActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.InfoWindowAdapterActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowConcurrentActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowConcurrentActivityTest.java index e507c6cd6..60531bae8 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowConcurrentActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.InfoWindowConcurrentActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/LatLngBoundsActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/LatLngBoundsActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/LatLngBoundsActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/LatLngBoundsActivityTest.java index 057979aeb..13839226b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/LatLngBoundsActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/LatLngBoundsActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.LatLngBoundsActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; 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/espresso/MainActivityScreenTest.java similarity index 87% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MainActivityScreenTest.java index 7c56f4c87..d758b1b03 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/espresso/MainActivityScreenTest.java @@ -1,20 +1,19 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; 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 com.mapbox.mapboxsdk.testapp.MainActivity; +import com.mapbox.mapboxsdk.testapp.R; +import com.mapbox.mapboxsdk.testapp.espresso.utils.DrawerUtils; +import com.mapbox.mapboxsdk.testapp.espresso.utils.GestureUtils; 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.doubleClick; import static android.support.test.espresso.matcher.ViewMatchers.withId; /** diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MainActivityTest.java similarity index 98% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MainActivityTest.java index b9d00de08..a3ee33bec 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MainActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.MainActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ManualZoomActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ManualZoomActivityTest.java index 8ce8498d6..aadf8683e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ManualZoomActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.ManualZoomActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapFragmentActivityTest.java similarity index 85% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapFragmentActivityTest.java index e65860f4b..fc8b2d5d2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapFragmentActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.MapFragmentActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapPaddingActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapPaddingActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapPaddingActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapPaddingActivityTest.java index c25207785..77ed07d76 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapPaddingActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapPaddingActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.MapPaddingActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapboxMapActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapboxMapActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapboxMapActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapboxMapActivityTest.java index eaa1584a3..085c07cec 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapboxMapActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapboxMapActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.MapboxMapActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MaxMinZoomActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MaxMinZoomActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MaxMinZoomActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MaxMinZoomActivityTest.java index e93a7675f..2d00df430 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MaxMinZoomActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MaxMinZoomActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.MaxMinZoomActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MyLocationTrackingModeActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MyLocationTrackingModeActivityTest.java index b21cd070a..f8b2ac01d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MyLocationTrackingModeActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.MyLocationTrackingModeActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PolylineActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PolylineActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PolylineActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PolylineActivityTest.java index 653921497..d54100990 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PolylineActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PolylineActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.PolylineActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PressForMarkerActivityTest.java similarity index 85% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PressForMarkerActivityTest.java index ccb8354fc..a0660c2d5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PressForMarkerActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.PressForMarkerActivity; +import com.mapbox.mapboxsdk.testapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ScrollByActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ScrollByActivityTest.java similarity index 80% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ScrollByActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ScrollByActivityTest.java index 05386b089..2a9de05ef 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ScrollByActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ScrollByActivityTest.java @@ -1,9 +1,12 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.R; +import com.mapbox.mapboxsdk.testapp.ScrollByActivity; + import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SupportMapFragmentActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/SupportMapFragmentActivityTest.java similarity index 84% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SupportMapFragmentActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/SupportMapFragmentActivityTest.java index 7ae03e0d0..a93ae6e69 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SupportMapFragmentActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/SupportMapFragmentActivityTest.java @@ -1,10 +1,13 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.app.Activity; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; +import com.mapbox.mapboxsdk.testapp.R; +import com.mapbox.mapboxsdk.testapp.SupportMapFragmentActivity; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/TiltActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/TiltActivityTest.java similarity index 79% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/TiltActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/TiltActivityTest.java index a38af03a6..8b4dbbf76 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/TiltActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/TiltActivityTest.java @@ -1,7 +1,10 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.espresso; import android.support.test.rule.ActivityTestRule; +import com.mapbox.mapboxsdk.testapp.R; +import com.mapbox.mapboxsdk.testapp.TiltActivity; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/DrawerUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/DrawerUtils.java similarity index 94% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/DrawerUtils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/DrawerUtils.java index 8d8905fdf..7143fa948 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/DrawerUtils.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/DrawerUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.utils; +package com.mapbox.mapboxsdk.testapp.espresso.utils; import android.support.annotation.StringRes; import android.support.test.espresso.Espresso; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/GestureUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/GestureUtils.java similarity index 82% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/GestureUtils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/GestureUtils.java index 37c18399e..e2807af5b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/GestureUtils.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/GestureUtils.java @@ -1,9 +1,7 @@ -package com.mapbox.mapboxsdk.testapp.utils; +package com.mapbox.mapboxsdk.testapp.espresso.utils; import android.support.annotation.IdRes; -import com.mapbox.mapboxsdk.testapp.R; - import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.doubleClick; import static android.support.test.espresso.matcher.ViewMatchers.withId; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/ScreenshotUtil.java similarity index 98% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/ScreenshotUtil.java index d25afec81..bbb0c40ad 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/ScreenshotUtil.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.utils; +package com.mapbox.mapboxsdk.testapp.espresso.utils; import android.app.Activity; import android.graphics.Bitmap; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ViewUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/ViewUtils.java similarity index 88% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ViewUtils.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/ViewUtils.java index 01ee3e9b9..6611c8354 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ViewUtils.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/utils/ViewUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.utils; +package com.mapbox.mapboxsdk.testapp.espresso.utils; import android.support.annotation.IdRes; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/BaseMainActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/BaseMainActivityTest.java new file mode 100644 index 000000000..787a9d856 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/BaseMainActivityTest.java @@ -0,0 +1,42 @@ +package com.mapbox.mapboxsdk.testapp.robotium; + +import android.test.ActivityInstrumentationTestCase2; + +import com.mapbox.mapboxsdk.maps.MapView; +import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.maps.MapboxMapUtils; +import com.mapbox.mapboxsdk.testapp.MainActivity; +import com.mapbox.mapboxsdk.testapp.R; +import com.robotium.solo.Solo; + +import org.junit.Test; + +public abstract class BaseMainActivityTest extends ActivityInstrumentationTestCase2 { + + protected Solo solo; + protected MapView mapView; + protected MapboxMap mapboxMap; + + public BaseMainActivityTest() { + super(MainActivity.class); + } + + @Override + public void setUp() throws Exception { + solo = new Solo(getInstrumentation(), getActivity()); + mapView = (MapView) solo.getView(R.id.mainMapView); + mapboxMap = MapboxMapUtils.getMapboxMap(mapView); + } + + @Override + public void tearDown() throws Exception { + solo.finishOpenedActivities(); + } + + @Test + public void testSanity() throws Exception { + assertNotNull("Should be non null", solo); + assertNotNull("Should be non null", mapView); + assertNotNull("Should be non null", mapboxMap); + } +} diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/CompassViewTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/CompassViewTest.java new file mode 100644 index 000000000..2660a4849 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/CompassViewTest.java @@ -0,0 +1,46 @@ +package com.mapbox.mapboxsdk.testapp.robotium; + +import com.mapbox.mapboxsdk.camera.CameraPosition; +import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.maps.widgets.CompassView; +import com.mapbox.mapboxsdk.testapp.R; +import com.mapbox.mapboxsdk.testapp.robotium.utils.ViewAssertion; + +import org.junit.Test; + +public class CompassViewTest extends BaseMainActivityTest { + + private CompassView compassView; + + @Override + public void setUp() throws Exception { + super.setUp(); + compassView = (CompassView) solo.getView(R.id.compassView); + } + + @Test + public void testCompass() { + setCameraDirection(0); + solo.sleep(200); + ViewAssertion.isInvisible(compassView); + } + + @Test + public void testCompassClick() throws Exception { + setCameraDirection(20); + solo.sleep(200); + ViewAssertion.isVisible(compassView); + solo.clickOnView(compassView); + solo.sleep(200); + ViewAssertion.isVisible(compassView); + } + + private void setCameraDirection(float bearing) { + mapboxMap.setCameraPosition(new CameraPosition.Builder() + .target(new LatLng(0, 0)) + .tilt(0) + .zoom(15) + .bearing(bearing) + .build()); + } +} \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/utils/ViewAssertion.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/utils/ViewAssertion.java new file mode 100644 index 000000000..74410cce5 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/utils/ViewAssertion.java @@ -0,0 +1,17 @@ +package com.mapbox.mapboxsdk.testapp.robotium.utils; + +import android.view.View; + +import static junit.framework.Assert.assertEquals; + +public class ViewAssertion { + + public static void isVisible(View view) { + assertEquals(view.getClass().getSimpleName() + " should be visible", view.getVisibility(), View.VISIBLE); + } + + public static void isInvisible(View view) { + assertEquals(view.getClass().getSimpleName() + " should be visible", view.getVisibility(), View.INVISIBLE); + } + +} diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ApiAccess.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ApiAccess.java index 20ca2913e..0221ee37f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ApiAccess.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ApiAccess.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.constants.MapboxConstants;