diff options
author | Tobrun <tobrun@mapbox.com> | 2017-04-21 23:07:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-21 23:07:19 +0200 |
commit | eed7dedf030ed71aac6d004becef42dbec5606bf (patch) | |
tree | 4f3b6a327990887f8046e1c1988ebfdb757562a4 /platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps | |
parent | 43cc8dbdb80fb89ef13dd2fb039a481bc5a9f6ce (diff) | |
download | qtlocation-mapboxgl-eed7dedf030ed71aac6d004becef42dbec5606bf.tar.gz |
[android] - rework instrumentation tests (#8793)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java | 174 |
1 files changed, 52 insertions, 122 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java index 8480028a2f..a813b7f368 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java @@ -3,10 +3,8 @@ package com.mapbox.mapboxsdk.maps; import android.graphics.Color; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.test.espresso.Espresso; import android.support.test.espresso.UiController; import android.support.test.espresso.ViewAction; -import android.support.test.rule.ActivityTestRule; import android.view.View; import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions; @@ -21,23 +19,18 @@ import com.mapbox.mapboxsdk.exceptions.InvalidMarkerPositionException; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.testapp.R; +import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; -import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource; import com.mapbox.mapboxsdk.testapp.utils.TestConstants; import com.mapbox.mapboxsdk.testapp.utils.ViewUtils; import org.hamcrest.Matcher; -import org.junit.After; -import org.junit.Before; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; import java.util.ArrayList; import java.util.List; -import timber.log.Timber; - 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.withId; @@ -53,26 +46,16 @@ import static org.junit.Assert.assertTrue; * with the application UI-thread. * </p> */ -public class MapboxMapTest { - - @Rule - public final ActivityTestRule<EspressoTestActivity> rule = new ActivityTestRule<>(EspressoTestActivity.class); +public class MapboxMapTest extends BaseActivityTest { - private OnMapReadyIdlingResource idlingResource; - private EspressoTestActivity activity; - - @Before - public void beforeTest() { - activity = rule.getActivity(); - ViewUtils.checkViewIsDisplayed(R.id.mapView); - idlingResource = new OnMapReadyIdlingResource(activity); - Espresso.registerIdlingResources(idlingResource); + @Override + protected Class getActivityClass() { + return EspressoTestActivity.class; } @Test public void testSanity() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); assertNotNull("mapboxMap should not be null", mapboxMap); } @@ -82,8 +65,7 @@ public class MapboxMapTest { @Test public void testTransitionDuration() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -96,8 +78,7 @@ public class MapboxMapTest { @Test public void testTransitionDelay() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -114,7 +95,6 @@ public class MapboxMapTest { @Test public void testCameraForLatLngBounds() { ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -133,8 +113,7 @@ public class MapboxMapTest { @Test public void testMinZoom() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -146,8 +125,7 @@ public class MapboxMapTest { @Test public void testMaxZoom() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); final double zoom = 10; onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override @@ -161,8 +139,7 @@ public class MapboxMapTest { @Test @Ignore public void testInitialZoomLevels() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -180,8 +157,7 @@ public class MapboxMapTest { @Test public void testTrackingSettings() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); assertNotNull("TrackingSettings should not be null", mapboxMap.getTrackingSettings()); } @@ -191,8 +167,7 @@ public class MapboxMapTest { @Test public void testConcurrentInfoWindowEnabled() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -204,8 +179,7 @@ public class MapboxMapTest { @Test public void testConcurrentInfoWindowDisabled() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -217,8 +191,7 @@ public class MapboxMapTest { @Test public void testInfoWindowAdapter() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -242,8 +215,7 @@ public class MapboxMapTest { @Test @Ignore /* disabled due to enabling permissions during test #7177 */ public void testMyLocationEnabled() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -256,8 +228,7 @@ public class MapboxMapTest { @Test @Ignore /* can't create handler inside thread that not called Looper.prepare() */ public void testMyLocationDisabled() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -273,8 +244,7 @@ public class MapboxMapTest { @Test public void testFpsListener() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -292,8 +262,7 @@ public class MapboxMapTest { @Test public void testInfoWindowClickListener() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -311,8 +280,7 @@ public class MapboxMapTest { @Test public void testInfoWindowCloseListener() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -330,8 +298,7 @@ public class MapboxMapTest { @Test public void testInfoWindowLongClickListener() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -354,8 +321,7 @@ public class MapboxMapTest { @Test public void testAddMarker() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -373,8 +339,7 @@ public class MapboxMapTest { @Test public void testAddMarkers() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -393,8 +358,7 @@ public class MapboxMapTest { @Test public void testAddMarkersEmpty() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -407,8 +371,7 @@ public class MapboxMapTest { @Test public void testAddMarkersSingleMarker() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -424,8 +387,7 @@ public class MapboxMapTest { @Test public void testAddPolygon() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -438,8 +400,7 @@ public class MapboxMapTest { @Test public void testAddEmptyPolygon() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -452,8 +413,7 @@ public class MapboxMapTest { @Test public void testAddPolygons() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -475,8 +435,7 @@ public class MapboxMapTest { @Test public void addPolygonsEmpty() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -488,8 +447,7 @@ public class MapboxMapTest { @Test public void addPolygonsSingle() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -505,8 +463,7 @@ public class MapboxMapTest { @Test public void testAddPolyline() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -519,8 +476,7 @@ public class MapboxMapTest { @Test public void testAddEmptyPolyline() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -533,8 +489,7 @@ public class MapboxMapTest { @Test public void testAddPolylines() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -556,8 +511,7 @@ public class MapboxMapTest { @Test public void testAddPolylinesEmpty() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -569,8 +523,7 @@ public class MapboxMapTest { @Test public void testAddPolylinesSingle() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -586,8 +539,7 @@ public class MapboxMapTest { @Test public void testRemoveMarker() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -601,8 +553,7 @@ public class MapboxMapTest { @Test public void testRemovePolygon() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -616,8 +567,7 @@ public class MapboxMapTest { @Test public void testRemovePolyline() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -631,8 +581,7 @@ public class MapboxMapTest { @Test public void testRemoveAnnotation() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -646,8 +595,7 @@ public class MapboxMapTest { @Test public void testRemoveAnnotationById() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -662,8 +610,7 @@ public class MapboxMapTest { @Test public void testRemoveAnnotations() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -681,8 +628,7 @@ public class MapboxMapTest { @Test public void testClear() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -700,8 +646,7 @@ public class MapboxMapTest { @Test public void testRemoveAnnotationsByList() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -721,8 +666,7 @@ public class MapboxMapTest { @Test public void testGetAnnotationById() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -736,8 +680,7 @@ public class MapboxMapTest { @Test public void testGetAnnotations() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -748,8 +691,7 @@ public class MapboxMapTest { @Test public void testGetMarkers() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -760,8 +702,7 @@ public class MapboxMapTest { @Test public void testGetPolygons() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -772,8 +713,7 @@ public class MapboxMapTest { @Test public void testGetPolylines() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -784,8 +724,7 @@ public class MapboxMapTest { @Test public void testGetSelectedMarkers() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -796,8 +735,7 @@ public class MapboxMapTest { @Test public void testSelectMarker() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -811,8 +749,7 @@ public class MapboxMapTest { @Test public void testDeselectMarker() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -827,8 +764,7 @@ public class MapboxMapTest { @Test public void testDeselectMarkers() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = activity.getMapboxMap(); + validateTestSetup(); onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() { @Override public void onViewAction(UiController uiController, View view) { @@ -843,12 +779,6 @@ public class MapboxMapTest { })); } - @After - public void afterTest() { - Timber.e("@After test: unregister idle resource"); - Espresso.unregisterIdlingResources(idlingResource); - } - private class MapboxMapAction implements ViewAction { private InvokeViewAction invokeViewAction; |