From 1aea17ccd9c324db7b076edf27faa1c5a12f279b Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Fri, 22 Feb 2019 14:46:06 +0200 Subject: [android] fix naming for re-open tests --- .../com/mapbox/mapboxsdk/maps/GLSurfaceViewReopenTest.kt | 12 ++++-------- .../java/com/mapbox/mapboxsdk/maps/TextureViewReopenTest.kt | 12 ++++++++---- 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 -- cgit v1.2.1