diff options
Diffstat (limited to 'android/test')
6 files changed, 12 insertions, 3 deletions
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/constant/TimeoutConstants.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/constant/TimeoutConstants.kt index 0da1d02aaf..6e4b6fa733 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/constant/TimeoutConstants.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/constant/TimeoutConstants.kt @@ -5,4 +5,5 @@ const val CONNECTION_TIMEOUT = 30000L const val DEFAULT_INTERACTION_TIMEOUT = 3000L const val LOGIN_TIMEOUT = 30000L const val LOGIN_FAILURE_TIMEOUT = 60000L +const val LOGIN_PROMPT_TIMEOUT = 30000L const val WEB_TIMEOUT = 30000L diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt index 1d6e9358a8..d4ddb37fba 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt @@ -10,6 +10,7 @@ import net.mullvad.mullvadvpn.lib.endpoint.CustomApiEndpointConfiguration import net.mullvad.mullvadvpn.lib.endpoint.putApiEndpointConfigurationExtra import net.mullvad.mullvadvpn.test.common.constant.APP_LAUNCH_TIMEOUT import net.mullvad.mullvadvpn.test.common.constant.CONNECTION_TIMEOUT +import net.mullvad.mullvadvpn.test.common.constant.LOGIN_PROMPT_TIMEOUT import net.mullvad.mullvadvpn.test.common.constant.LOGIN_TIMEOUT import net.mullvad.mullvadvpn.test.common.constant.MULLVAD_PACKAGE import net.mullvad.mullvadvpn.test.common.constant.SETTINGS_COG_ID @@ -53,7 +54,6 @@ class AppInteractor( } fun attemptLogin(accountToken: String) { - device.findObjectWithTimeout(By.text("Login")) val loginObject = device.findObjectWithTimeout(By.clazz("android.widget.EditText")) .apply { text = accountToken } loginObject.parent.findObject(By.clazz(ImageButton::class.java)).click() @@ -83,6 +83,12 @@ class AppInteractor( device.findObjectWithTimeout(By.text(text)).click() } + fun waitForLoginPrompt( + timeout: Long = LOGIN_PROMPT_TIMEOUT + ) { + device.findObjectWithTimeout(By.text("Login"), timeout) + } + private fun String.extractIpAddress(): String { return split(" ")[1].split(" ")[0] } diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts index 6310ca5b12..13f1bcaf46 100644 --- a/android/test/e2e/build.gradle.kts +++ b/android/test/e2e/build.gradle.kts @@ -43,7 +43,6 @@ android { testInstrumentationRunnerArguments += mutableMapOf<String, String>().apply { put("clearPackageData", "true") - put("useTestStorageService", "true") addOptionalPropertyAsArgument("valid_test_account_token") addOptionalPropertyAsArgument("invalid_test_account_token") } diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt index 9e106d45a2..07c1101bc4 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt @@ -26,6 +26,7 @@ class LoginTest : EndToEndTest() { // When app.launch() device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove() + app.waitForLoginPrompt() app.attemptLogin(invalidDummyAccountToken) // Then diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts index 7fd7634e63..cbdd8c0295 100644 --- a/android/test/mockapi/build.gradle.kts +++ b/android/test/mockapi/build.gradle.kts @@ -17,7 +17,6 @@ android { testInstrumentationRunnerArguments.putAll( mapOf( "clearPackageData" to "true", - "useTestStorageService" to "true" ) ) } diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt index 2a72b41373..51d0ac7ee6 100644 --- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt +++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt @@ -24,6 +24,7 @@ class LoginMockApiTest : MockApiTest() { // Act device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove() + app.waitForLoginPrompt() app.attemptLogin(validAccountToken) // Assert @@ -43,6 +44,7 @@ class LoginMockApiTest : MockApiTest() { // Act app.launch(endpoint) device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove() + app.waitForLoginPrompt() app.attemptLogin(validAccountToken) // Assert @@ -62,6 +64,7 @@ class LoginMockApiTest : MockApiTest() { // Act app.launch(endpoint) device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove() + app.waitForLoginPrompt() app.attemptLogin(validAccountToken) // Assert |