summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlangsmith <langstonlmcs@gmail.com>2019-10-07 16:59:38 -0700
committerlangsmith <langstonlmcs@gmail.com>2019-10-07 16:59:38 -0700
commit16f5254bb24e24964be9b6c0fee371a8436820e5 (patch)
tree7b3993c66ae5b833f6bfca860e16890c9a7a23e7
parent867edcb8a6713479cbbcb939672dc0b881e758b6 (diff)
downloadqtlocation-mapboxgl-upstream/langsmith-increased-support-for-camera-movement-via-keyboard.tar.gz
[android] adding view click to keyboard support testsupstream/langsmith-increased-support-for-camera-movement-via-keyboard
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapKeyListenerTest.kt53
1 files changed, 48 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapKeyListenerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapKeyListenerTest.kt
index 62506f1b9c..d6c87e8aa4 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapKeyListenerTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapKeyListenerTest.kt
@@ -2,7 +2,8 @@ package com.mapbox.mapboxsdk.maps
import android.support.test.espresso.Espresso.onView
import android.support.test.espresso.action.EspressoKey
-import android.support.test.espresso.action.ViewActions
+import android.support.test.espresso.action.ViewActions.click
+import android.support.test.espresso.action.ViewActions.pressKey
import android.support.test.espresso.matcher.ViewMatchers.withId
import android.view.KeyEvent
import com.mapbox.mapboxsdk.camera.CameraPosition
@@ -37,7 +38,7 @@ class MapKeyListenerTest : BaseTest() {
mapboxMap.uiSettings.isTiltGesturesEnabled = true
}
// Tap the up arrow while holding shift on the keyboard directional pad
- onView(withId(R.id.mapView)).perform(ViewActions.pressKey(
+ onView(withId(R.id.mapView)).perform(click()).perform(pressKey(
EspressoKey.Builder()
.withShiftPressed(true)
.withKeyCode(KeyEvent.KEYCODE_DPAD_UP)
@@ -57,7 +58,7 @@ class MapKeyListenerTest : BaseTest() {
mapboxMap.uiSettings.isRotateGesturesEnabled = true
}
// Tap the left arrow while holding shift on the keyboard directional pad
- onView(withId(R.id.mapView)).perform(ViewActions.pressKey(
+ onView(withId(R.id.mapView)).perform(click()).perform(pressKey(
EspressoKey.Builder()
.withShiftPressed(true)
.withKeyCode(KeyEvent.KEYCODE_DPAD_LEFT)
@@ -80,7 +81,7 @@ class MapKeyListenerTest : BaseTest() {
}
// Tap the up arrow on the keyboard directional pad
- onView(withId(R.id.mapView)).perform(ViewActions.pressKey(
+ onView(withId(R.id.mapView)).perform(click()).perform(pressKey(
EspressoKey.Builder()
.withKeyCode(KeyEvent.KEYCODE_DPAD_UP)
.build()))
@@ -103,7 +104,7 @@ class MapKeyListenerTest : BaseTest() {
}
// Tap the down arrow on the keyboard directional pad
- onView(withId(R.id.mapView)).perform(ViewActions.pressKey(
+ onView(withId(R.id.mapView)).perform(click()).perform(pressKey(
EspressoKey.Builder()
.withKeyCode(KeyEvent.KEYCODE_DPAD_DOWN)
.build()))
@@ -113,4 +114,46 @@ class MapKeyListenerTest : BaseTest() {
assertNotEquals(initialCameraPosition!!.target.longitude, mapboxMap.cameraPosition.target.longitude)
}
}
+
+ @Test
+ fun increaseZoom() {
+ validateTestSetup()
+ var initialCameraPosition: CameraPosition? = null
+ rule.runOnUiThread {
+ // zoom in so we can move vertically
+ mapboxMap.moveCamera(CameraUpdateFactory.zoomTo(4.0))
+ initialCameraPosition = mapboxMap.cameraPosition
+ mapboxMap.uiSettings.isQuickZoomGesturesEnabled = true
+ }
+
+ // Tap the down arrow on the keyboard directional pad
+ onView(withId(R.id.mapView)).perform(click()).perform(pressKey(KeyEvent.KEYCODE_EQUALS))
+ onView(withId(R.id.mapView)).perform(pressKey(KeyEvent.KEYCODE_EQUALS))
+
+ rule.runOnUiThread {
+ assertNotEquals(initialCameraPosition!!.target.latitude, mapboxMap.cameraPosition.target.latitude)
+ assertNotEquals(initialCameraPosition!!.target.longitude, mapboxMap.cameraPosition.target.longitude)
+ }
+ }
+
+ @Test
+ fun decreaseZoom() {
+ validateTestSetup()
+ var initialCameraPosition: CameraPosition? = null
+ rule.runOnUiThread {
+ // zoom in so we can move vertically
+ mapboxMap.moveCamera(CameraUpdateFactory.zoomTo(4.0))
+ initialCameraPosition = mapboxMap.cameraPosition
+ mapboxMap.uiSettings.isQuickZoomGesturesEnabled = true
+ }
+
+ // Tap the down arrow on the keyboard directional pad
+ onView(withId(R.id.mapView)).perform(click()).perform(pressKey(KeyEvent.KEYCODE_MINUS))
+ onView(withId(R.id.mapView)).perform(pressKey(KeyEvent.KEYCODE_MINUS))
+
+ rule.runOnUiThread {
+ assertNotEquals(initialCameraPosition!!.target.latitude, mapboxMap.cameraPosition.target.latitude)
+ assertNotEquals(initialCameraPosition!!.target.longitude, mapboxMap.cameraPosition.target.longitude)
+ }
+ }
} \ No newline at end of file