diff options
Diffstat (limited to 'android/test/common')
2 files changed, 17 insertions, 0 deletions
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SelectLocationPage.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SelectLocationPage.kt index 404a81f9a8..627af6252b 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SelectLocationPage.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SelectLocationPage.kt @@ -1,8 +1,11 @@ package net.mullvad.mullvadvpn.test.common.page import androidx.test.uiautomator.By +import androidx.test.uiautomator.Direction +import androidx.test.uiautomator.Until import net.mullvad.mullvadvpn.lib.ui.tag.EXPAND_BUTTON_TEST_TAG import net.mullvad.mullvadvpn.lib.ui.tag.GEOLOCATION_NAME_TAG +import net.mullvad.mullvadvpn.lib.ui.tag.SELECT_LOCATION_LIST_TEST_TAG import net.mullvad.mullvadvpn.lib.ui.tag.SELECT_LOCATION_SCREEN_TEST_TAG import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout @@ -24,4 +27,9 @@ class SelectLocationPage internal constructor() : Page() { fun clickLocationCell(locationName: String) { uiDevice.findObjectWithTimeout(By.text(locationName)).click() } + + fun scrollUntilCell(locationName: String) { + val scrollView2 = uiDevice.findObjectWithTimeout(By.res(SELECT_LOCATION_LIST_TEST_TAG)) + scrollView2.scrollUntil(Direction.DOWN, Until.hasObject(By.res(locationName))) + } } diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/VpnSettingsPage.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/VpnSettingsPage.kt index 8232369cdb..1e4f0dd4e1 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/VpnSettingsPage.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/VpnSettingsPage.kt @@ -9,6 +9,7 @@ import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_VPN_SETTINGS_TEST_TAG import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_WIREGUARD_CUSTOM_PORT_TEXT_TEST_TAG import net.mullvad.mullvadvpn.lib.ui.tag.SWITCH_TEST_TAG import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_OFF_CELL_TEST_TAG +import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_QUIC_CELL_TEST_TAG import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_SHADOWSOCKS_CELL_TEST_TAG import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_UDP_OVER_TCP_CELL_TEST_TAG import net.mullvad.mullvadvpn.test.common.extension.clickObjectAwaitIsChecked @@ -35,6 +36,10 @@ class VpnSettingsPage internal constructor() : Page() { scrollUntilCell(WIREGUARD_OBFUSCATION_UDP_OVER_TCP_CELL_TEST_TAG) } + fun scrollUntilWireGuardObfuscationQuicCell() { + scrollUntilCell(WIREGUARD_OBFUSCATION_QUIC_CELL_TEST_TAG) + } + fun scrollUntilWireGuardObfuscationOffCell() { scrollUntilCell(WIREGUARD_OBFUSCATION_OFF_CELL_TEST_TAG) } @@ -55,6 +60,10 @@ class VpnSettingsPage internal constructor() : Page() { uiDevice.clickObjectAwaitIsChecked(By.res(WIREGUARD_OBFUSCATION_UDP_OVER_TCP_CELL_TEST_TAG)) } + fun clickWireguardObfuscationQuicCell() { + uiDevice.clickObjectAwaitIsChecked(By.res(WIREGUARD_OBFUSCATION_QUIC_CELL_TEST_TAG)) + } + fun clickWireGuardObfuscationOffCell() { uiDevice.clickObjectAwaitIsChecked(By.res(WIREGUARD_OBFUSCATION_OFF_CELL_TEST_TAG)) } |