summaryrefslogtreecommitdiffhomepage
path: root/android/app/src/androidTest
diff options
context:
space:
mode:
Diffstat (limited to 'android/app/src/androidTest')
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt8
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt52
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreenTest.kt14
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt15
4 files changed, 45 insertions, 44 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
index c4d2fab62e..41bf449369 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
@@ -35,7 +35,7 @@ class AccountScreenTest {
accountNumber = DUMMY_ACCOUNT_NUMBER,
accountExpiry = null
),
- viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
)
}
@@ -60,7 +60,7 @@ class AccountScreenTest {
accountNumber = DUMMY_ACCOUNT_NUMBER,
accountExpiry = null
),
- viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
onManageAccountClick = mockedClickHandler
)
@@ -86,7 +86,7 @@ class AccountScreenTest {
accountNumber = DUMMY_ACCOUNT_NUMBER,
accountExpiry = null
),
- viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
onRedeemVoucherClick = mockedClickHandler
)
@@ -112,7 +112,7 @@ class AccountScreenTest {
accountNumber = DUMMY_ACCOUNT_NUMBER,
accountExpiry = null
),
- viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
onLogoutClick = mockedClickHandler
)
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
index 40f9b278b8..02a148b22d 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
@@ -56,7 +56,7 @@ class ConnectScreenTest {
composeTestRule.setContent {
ConnectScreen(
uiState = ConnectUiState.INITIAL,
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -86,7 +86,7 @@ class ConnectScreenTest {
connectNotificationState =
ConnectNotificationState.ShowTunnelStateNotificationBlocked
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -121,7 +121,7 @@ class ConnectScreenTest {
connectNotificationState =
ConnectNotificationState.ShowTunnelStateNotificationBlocked
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -153,7 +153,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -184,7 +184,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -216,7 +216,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -248,7 +248,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -285,7 +285,7 @@ class ConnectScreenTest {
ErrorState(ErrorStateCause.StartTunnelError, true)
)
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -323,7 +323,7 @@ class ConnectScreenTest {
ErrorState(ErrorStateCause.StartTunnelError, false)
)
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -356,7 +356,7 @@ class ConnectScreenTest {
connectNotificationState =
ConnectNotificationState.ShowTunnelStateNotificationBlocked
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -391,7 +391,7 @@ class ConnectScreenTest {
connectNotificationState =
ConnectNotificationState.ShowTunnelStateNotificationBlocked
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -425,7 +425,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
onSwitchLocationClick = mockedClickHandler
)
}
@@ -456,7 +456,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
onDisconnectClick = mockedClickHandler
)
}
@@ -487,7 +487,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
onReconnectClick = mockedClickHandler
)
}
@@ -517,7 +517,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
onConnectClick = mockedClickHandler
)
}
@@ -547,7 +547,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
onCancelClick = mockedClickHandler
)
}
@@ -578,7 +578,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = false,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
onToggleTunnelInfo = mockedClickHandler
)
}
@@ -616,7 +616,7 @@ class ConnectScreenTest {
isTunnelInfoExpanded = true,
connectNotificationState = ConnectNotificationState.HideNotification
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -654,7 +654,7 @@ class ConnectScreenTest {
connectNotificationState =
ConnectNotificationState.ShowVersionInfoNotification(versionInfo)
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -690,7 +690,7 @@ class ConnectScreenTest {
connectNotificationState =
ConnectNotificationState.ShowVersionInfoNotification(versionInfo)
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -723,7 +723,7 @@ class ConnectScreenTest {
connectNotificationState =
ConnectNotificationState.ShowAccountExpiryNotification(expiryDate)
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -761,7 +761,7 @@ class ConnectScreenTest {
connectNotificationState =
ConnectNotificationState.ShowVersionInfoNotification(versionInfo)
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -793,7 +793,7 @@ class ConnectScreenTest {
connectNotificationState =
ConnectNotificationState.ShowAccountExpiryNotification(expiryDate)
),
- viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+ uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
)
}
@@ -810,9 +810,9 @@ class ConnectScreenTest {
composeTestRule.setContent {
ConnectScreen(
uiState = ConnectUiState.INITIAL,
- viewActions =
+ uiSideEffect =
MutableStateFlow(
- ConnectViewModel.ViewAction.OpenAccountManagementPageInBrowser("222")
+ ConnectViewModel.UiSideEffect.OpenAccountManagementPageInBrowser("222")
)
)
}
@@ -828,7 +828,7 @@ class ConnectScreenTest {
composeTestRule.setContent {
ConnectScreen(
uiState = ConnectUiState.INITIAL,
- viewActions = MutableStateFlow(ConnectViewModel.ViewAction.OpenOutOfTimeView),
+ uiSideEffect = MutableStateFlow(ConnectViewModel.UiSideEffect.OpenOutOfTimeView),
onOpenOutOfTimeScreen = mockedOpenScreenHandler
)
}
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreenTest.kt
index a97e587c8c..a177aa8ac1 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreenTest.kt
@@ -30,7 +30,7 @@ class OutOfTimeScreenTest {
OutOfTimeScreen(
showSitePayment = false,
uiState = OutOfTimeUiState(),
- viewActions = MutableSharedFlow(),
+ uiSideEffect = MutableSharedFlow(),
onSitePaymentClick = {},
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -58,8 +58,8 @@ class OutOfTimeScreenTest {
OutOfTimeScreen(
showSitePayment = true,
uiState = OutOfTimeUiState(),
- viewActions =
- MutableStateFlow(OutOfTimeViewModel.ViewAction.OpenAccountView("222")),
+ uiSideEffect =
+ MutableStateFlow(OutOfTimeViewModel.UiSideEffect.OpenAccountView("222")),
onSitePaymentClick = {},
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -81,7 +81,7 @@ class OutOfTimeScreenTest {
OutOfTimeScreen(
showSitePayment = true,
uiState = OutOfTimeUiState(),
- viewActions = MutableStateFlow(OutOfTimeViewModel.ViewAction.OpenConnectScreen),
+ uiSideEffect = MutableStateFlow(OutOfTimeViewModel.UiSideEffect.OpenConnectScreen),
onSitePaymentClick = {},
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -103,7 +103,7 @@ class OutOfTimeScreenTest {
OutOfTimeScreen(
showSitePayment = true,
uiState = OutOfTimeUiState(),
- viewActions = MutableSharedFlow(),
+ uiSideEffect = MutableSharedFlow(),
onSitePaymentClick = mockClickListener,
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -128,7 +128,7 @@ class OutOfTimeScreenTest {
OutOfTimeScreen(
showSitePayment = true,
uiState = OutOfTimeUiState(),
- viewActions = MutableSharedFlow(),
+ uiSideEffect = MutableSharedFlow(),
onSitePaymentClick = {},
onRedeemVoucherClick = mockClickListener,
onSettingsClick = {},
@@ -153,7 +153,7 @@ class OutOfTimeScreenTest {
OutOfTimeScreen(
showSitePayment = true,
uiState = OutOfTimeUiState(tunnelState = TunnelState.Connecting(null, null)),
- viewActions = MutableSharedFlow(),
+ uiSideEffect = MutableSharedFlow(),
onSitePaymentClick = {},
onRedeemVoucherClick = {},
onSettingsClick = {},
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt
index 051b16b6b1..4efa98225b 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt
@@ -29,7 +29,7 @@ class WelcomeScreenTest {
WelcomeScreen(
showSitePayment = true,
uiState = WelcomeUiState(),
- viewActions = MutableSharedFlow(),
+ uiSideEffect = MutableSharedFlow(),
onSitePaymentClick = {},
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -52,7 +52,7 @@ class WelcomeScreenTest {
WelcomeScreen(
showSitePayment = false,
uiState = WelcomeUiState(),
- viewActions = MutableSharedFlow(),
+ uiSideEffect = MutableSharedFlow(),
onSitePaymentClick = {},
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -81,7 +81,7 @@ class WelcomeScreenTest {
WelcomeScreen(
showSitePayment = true,
uiState = WelcomeUiState(accountNumber = rawAccountNumber),
- viewActions = MutableSharedFlow(),
+ uiSideEffect = MutableSharedFlow(),
onSitePaymentClick = {},
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -101,7 +101,8 @@ class WelcomeScreenTest {
WelcomeScreen(
showSitePayment = true,
uiState = WelcomeUiState(),
- viewActions = MutableStateFlow(WelcomeViewModel.ViewAction.OpenAccountView("222")),
+ uiSideEffect =
+ MutableStateFlow(WelcomeViewModel.UiSideEffect.OpenAccountView("222")),
onSitePaymentClick = {},
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -122,7 +123,7 @@ class WelcomeScreenTest {
WelcomeScreen(
showSitePayment = true,
uiState = WelcomeUiState(),
- viewActions = MutableStateFlow(WelcomeViewModel.ViewAction.OpenConnectScreen),
+ uiSideEffect = MutableStateFlow(WelcomeViewModel.UiSideEffect.OpenConnectScreen),
onSitePaymentClick = {},
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -143,7 +144,7 @@ class WelcomeScreenTest {
WelcomeScreen(
showSitePayment = true,
uiState = WelcomeUiState(),
- viewActions = MutableStateFlow(WelcomeViewModel.ViewAction.OpenConnectScreen),
+ uiSideEffect = MutableStateFlow(WelcomeViewModel.UiSideEffect.OpenConnectScreen),
onSitePaymentClick = mockClickListener,
onRedeemVoucherClick = {},
onSettingsClick = {},
@@ -167,7 +168,7 @@ class WelcomeScreenTest {
WelcomeScreen(
showSitePayment = true,
uiState = WelcomeUiState(),
- viewActions = MutableStateFlow(WelcomeViewModel.ViewAction.OpenConnectScreen),
+ uiSideEffect = MutableStateFlow(WelcomeViewModel.UiSideEffect.OpenConnectScreen),
onSitePaymentClick = {},
onRedeemVoucherClick = mockClickListener,
onSettingsClick = {},
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.