diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-08-30 13:54:11 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-08-30 13:54:11 +0200 |
| commit | b0c1bcc5b49aa83c80dc125980f8ab745008397e (patch) | |
| tree | b324a4dfcb01d4206f773390809ec4fc8b3a5b2c /android/test | |
| parent | 2c8d4f1be088c7d55526c5d2dea6e65bc6f94193 (diff) | |
| parent | 7f1fcf7503b5f0a8556d067dcf6e1bab443c849f (diff) | |
| download | mullvadvpn-b0c1bcc5b49aa83c80dc125980f8ab745008397e.tar.xz mullvadvpn-b0c1bcc5b49aa83c80dc125980f8ab745008397e.zip | |
Merge branch 'managementservicestop-sometimes-crashes-droid-1284'
Diffstat (limited to 'android/test')
2 files changed, 6 insertions, 6 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 9abd2aa7e2..5684b58e17 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,7 +6,7 @@ import android.widget.Button 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.ApiEndpointOverride 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 @@ -23,7 +23,7 @@ class AppInteractor( private val targetContext: Context, private val targetPackageName: String, ) { - fun launch(customApiEndpointConfiguration: CustomApiEndpointConfiguration? = null) { + fun launch(customApiEndpointConfiguration: ApiEndpointOverride? = null) { device.pressHome() // Wait for launcher device.wait( diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt index bd236bb978..d3590fc056 100644 --- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt +++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt @@ -8,7 +8,7 @@ import androidx.test.uiautomator.UiDevice import co.touchlab.kermit.Logger import de.mannodermaus.junit5.extensions.GrantPermissionExtension import java.net.InetAddress -import net.mullvad.mullvadvpn.lib.endpoint.CustomApiEndpointConfiguration +import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointOverride import net.mullvad.mullvadvpn.test.common.interactor.AppInteractor import net.mullvad.mullvadvpn.test.common.rule.CaptureScreenshotOnFailedTestRule import net.mullvad.mullvadvpn.test.mockapi.constant.LOG_TAG @@ -33,7 +33,7 @@ abstract class MockApiTest { lateinit var device: UiDevice lateinit var targetContext: Context lateinit var app: AppInteractor - lateinit var endpoint: CustomApiEndpointConfiguration + lateinit var endpoint: ApiEndpointOverride @BeforeEach open fun setup() { @@ -54,8 +54,8 @@ abstract class MockApiTest { mockWebServer.shutdown() } - private fun createEndpoint(port: Int): CustomApiEndpointConfiguration { - return CustomApiEndpointConfiguration( + private fun createEndpoint(port: Int): ApiEndpointOverride { + return ApiEndpointOverride( InetAddress.getLocalHost().hostName, port, disableAddressCache = true, |