Add option to use custom api endpoint in debug builds

2 files changed, 9 insertions, 3 deletions

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 e225997534..83d217236f 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
@@ -6,6 +6,8 @@ import android.widget.ImageButton
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
+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_TIMEOUT
@@ -19,17 +21,21 @@ class AppInteractor(
     private val device: UiDevice,
     private val targetContext: Context
 ) {
-    fun launch() {
+    fun launch(customApiEndpointConfiguration: CustomApiEndpointConfiguration? = null) {
         device.pressHome()
         // Wait for launcher
         device.wait(
             Until.hasObject(By.pkg(device.launcherPackageName).depth(0)),
             APP_LAUNCH_TIMEOUT
         )
+
         val intent =
             targetContext.packageManager.getLaunchIntentForPackage(MULLVAD_PACKAGE)?.apply {
                 // Clear out any previous instances
                 addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                if (customApiEndpointConfiguration != null) {
+                    putApiEndpointConfigurationExtra(customApiEndpointConfiguration)
+                }
             }
         targetContext.startActivity(intent)
         device.wait(
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
index 7f70d98ca7..73d515c501 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
@@ -4,10 +4,10 @@ import android.util.Log
 import androidx.test.runner.screenshot.BasicScreenCaptureProcessor
 import androidx.test.runner.screenshot.ScreenCaptureProcessor
 import androidx.test.runner.screenshot.Screenshot
-import org.junit.rules.TestWatcher
-import org.junit.runner.Description
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import org.junit.rules.TestWatcher
+import org.junit.runner.Description
 
 class CaptureScreenshotOnFailedTestRule(private val logTag: String) : TestWatcher() {
     override fun failed(e: Throwable?, description: Description?) {