summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2019-02-22 13:46:06 +0100
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2019-02-26 09:35:15 +0100
commitdc308f2dd4a07c5d06a3a1ba5d75b996f737c815 (patch)
treeb79173f1d46a457ae6eca6439b1b94518ef6e640
parent36e4e5bdfb99d96833daee755a42069b37d77ce6 (diff)
downloadqtlocation-mapboxgl-dc308f2dd4a07c5d06a3a1ba5d75b996f737c815.tar.gz
[android] fix naming for re-open tests
(cherry picked from commit 7c874ab815fed39f8655bda313d1c469f14cac2d)
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GLSurfaceViewReopenTest.kt12
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TextureViewReopenTest.kt12
2 files changed, 12 insertions, 12 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GLSurfaceViewReopenTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GLSurfaceViewReopenTest.kt
index eb44463d72..98b251027f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GLSurfaceViewReopenTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/GLSurfaceViewReopenTest.kt
@@ -11,8 +11,6 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import java.lang.Thread.sleep
-import android.support.test.uiautomator.UiSelector
-import android.support.test.uiautomator.UiScrollable
private const val BASIC_SAMPLE_PACKAGE = "com.mapbox.mapboxsdk.testapp"
private const val LAUNCH_TIMEOUT = 5000L
@@ -50,21 +48,19 @@ class GLSurfaceViewReopenTest {
LAUNCH_TIMEOUT
)
- // open TextureView debug activity
- val appView = UiScrollable(UiSelector().scrollable(true))
- appView.scrollIntoView(UiSelector().text("TextureView debug"))
- device.findObject(UiSelector().text("TextureView debug")).clickAndWaitForNewWindow()
+ // open SimpleMapActivity
+ device.findObject(UiSelector().text("Simple Map")).clickAndWaitForNewWindow()
// wait for idle
device.waitForIdle(LAUNCH_TIMEOUT)
}
@Test
- fun reopenTextureViewDebugActivity() {
+ fun reopenSimpleMapActivity() {
// return to home screen
device.pressHome()
- // press recent apps button
+ // press recents apps button
device.pressRecentApps()
// click to reopen app
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TextureViewReopenTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TextureViewReopenTest.kt
index 6ccfa70bdf..cd139ccc40 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TextureViewReopenTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TextureViewReopenTest.kt
@@ -11,6 +11,8 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import java.lang.Thread.sleep
+import android.support.test.uiautomator.UiSelector
+import android.support.test.uiautomator.UiScrollable
private const val BASIC_SAMPLE_PACKAGE = "com.mapbox.mapboxsdk.testapp"
private const val LAUNCH_TIMEOUT = 5000L
@@ -48,19 +50,21 @@ class TextureViewReopenTest {
LAUNCH_TIMEOUT
)
- // open SimpleMapActivity
- device.findObject(UiSelector().text("Simple Map")).clickAndWaitForNewWindow()
+ // open TextureView debug activity
+ val appView = UiScrollable(UiSelector().scrollable(true))
+ appView.scrollIntoView(UiSelector().text("TextureView debug"))
+ device.findObject(UiSelector().text("TextureView debug")).clickAndWaitForNewWindow()
// wait for idle
device.waitForIdle(LAUNCH_TIMEOUT)
}
@Test
- fun reopenSimpleMapActivity() {
+ fun reopenTextureViewDebugActivity() {
// return to home screen
device.pressHome()
- // press recents apps button
+ // press recent apps button
device.pressRecentApps()
// click to reopen app