diff options
Diffstat (limited to 'android/app/src/androidTest')
10 files changed, 101 insertions, 105 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 88aae0dd2f..a40cb14d65 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 @@ -41,7 +41,7 @@ class AccountScreenTest { // Arrange setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState( deviceName = DUMMY_DEVICE_NAME, accountNumber = DUMMY_ACCOUNT_NUMBER, @@ -65,7 +65,7 @@ class AccountScreenTest { val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState( showSitePayment = true, deviceName = DUMMY_DEVICE_NAME, @@ -92,7 +92,7 @@ class AccountScreenTest { val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState( deviceName = DUMMY_DEVICE_NAME, accountNumber = DUMMY_ACCOUNT_NUMBER, @@ -119,7 +119,7 @@ class AccountScreenTest { val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState( deviceName = DUMMY_DEVICE_NAME, accountNumber = DUMMY_ACCOUNT_NUMBER, @@ -145,7 +145,7 @@ class AccountScreenTest { // Arrange setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState.default() .copy(billingPaymentState = PaymentState.Error.Billing), uiSideEffect = @@ -166,7 +166,7 @@ class AccountScreenTest { every { mockPaymentProduct.status } returns null setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState.default() .copy( billingPaymentState = @@ -190,7 +190,7 @@ class AccountScreenTest { every { mockPaymentProduct.status } returns PaymentStatus.PENDING setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState.default() .copy( billingPaymentState = @@ -215,7 +215,7 @@ class AccountScreenTest { val mockNavigateToVerificationPending: () -> Unit = mockk(relaxed = true) setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState.default() .copy( billingPaymentState = @@ -243,7 +243,7 @@ class AccountScreenTest { every { mockPaymentProduct.status } returns PaymentStatus.VERIFICATION_IN_PROGRESS setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState.default() .copy( billingPaymentState = @@ -269,7 +269,7 @@ class AccountScreenTest { every { mockPaymentProduct.status } returns null setContentWithTheme { AccountScreen( - uiState = + state = AccountUiState.default() .copy( billingPaymentState = 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 630c70e96a..851866818b 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 @@ -58,7 +58,7 @@ class ConnectScreenTest { // Arrange setContentWithTheme { ConnectScreen( - uiState = ConnectUiState.INITIAL, + state = ConnectUiState.INITIAL, ) } @@ -75,7 +75,7 @@ class ConnectScreenTest { // Arrange setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -109,7 +109,7 @@ class ConnectScreenTest { every { mockTunnelEndpoint.quantumResistant } returns true setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -144,7 +144,7 @@ class ConnectScreenTest { val mockTunnelEndpoint: TunnelEndpoint = mockk(relaxed = true) setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -176,7 +176,7 @@ class ConnectScreenTest { every { mockTunnelEndpoint.quantumResistant } returns true setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -209,7 +209,7 @@ class ConnectScreenTest { every { mockSelectedLocation.locationName } returns mockLocationName setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = mockSelectedLocation, @@ -244,7 +244,7 @@ class ConnectScreenTest { every { mockSelectedLocation.locationName } returns mockLocationName setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = mockSelectedLocation, @@ -277,7 +277,7 @@ class ConnectScreenTest { every { mockSelectedLocation.locationName } returns mockLocationName setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = mockSelectedLocation, @@ -320,7 +320,7 @@ class ConnectScreenTest { every { mockSelectedLocation.locationName } returns mockLocationName setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = mockSelectedLocation, @@ -361,7 +361,7 @@ class ConnectScreenTest { // Arrange setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -398,7 +398,7 @@ class ConnectScreenTest { every { mockSelectedLocation.locationName } returns mockLocationName setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = mockSelectedLocation, @@ -434,7 +434,7 @@ class ConnectScreenTest { val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = mockSelectedLocation, @@ -468,7 +468,7 @@ class ConnectScreenTest { val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -502,7 +502,7 @@ class ConnectScreenTest { val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -535,7 +535,7 @@ class ConnectScreenTest { val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -568,7 +568,7 @@ class ConnectScreenTest { val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -609,7 +609,7 @@ class ConnectScreenTest { every { mockLocation.hostname } returns mockHostName setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = mockLocation, selectedRelayItem = null, @@ -650,7 +650,7 @@ class ConnectScreenTest { ) setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -686,7 +686,7 @@ class ConnectScreenTest { ) setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -719,7 +719,7 @@ class ConnectScreenTest { val expiryDate = DateTime(2020, 11, 11, 10, 10) setContentWithTheme { ConnectScreen( - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -757,7 +757,7 @@ class ConnectScreenTest { setContentWithTheme { ConnectScreen( onUpdateVersionClick = mockedClickHandler, - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -791,7 +791,7 @@ class ConnectScreenTest { setContentWithTheme { ConnectScreen( onManageAccountClick = mockedClickHandler, - uiState = + state = ConnectUiState( location = null, selectedRelayItem = null, @@ -822,10 +822,7 @@ class ConnectScreenTest { // Arrange val onAccountClickMockk: () -> Unit = mockk(relaxed = true) setContentWithTheme { - ConnectScreen( - uiState = ConnectUiState.INITIAL, - onAccountClick = onAccountClickMockk - ) + ConnectScreen(state = ConnectUiState.INITIAL, onAccountClick = onAccountClickMockk) } // Assert diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreenTest.kt index 4eb3c4517c..c57c5c3f62 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreenTest.kt @@ -27,7 +27,7 @@ class FilterScreenTest { composeExtension.use { setContentWithTheme { FilterScreen( - uiState = + state = RelayFilterState( allProviders = DUMMY_RELAY_ALL_PROVIDERS, selectedOwnership = null, @@ -45,7 +45,7 @@ class FilterScreenTest { composeExtension.use { setContentWithTheme { FilterScreen( - uiState = + state = RelayFilterState( allProviders = DUMMY_RELAY_ALL_PROVIDERS, selectedOwnership = null, @@ -63,7 +63,7 @@ class FilterScreenTest { composeExtension.use { setContentWithTheme { FilterScreen( - uiState = + state = RelayFilterState( allProviders = DUMMY_RELAY_ALL_PROVIDERS, selectedOwnership = Ownership.MullvadOwned, @@ -81,7 +81,7 @@ class FilterScreenTest { composeExtension.use { setContentWithTheme { FilterScreen( - uiState = + state = RelayFilterState( allProviders = DUMMY_RELAY_ALL_PROVIDERS, selectedOwnership = Ownership.Rented, @@ -99,7 +99,7 @@ class FilterScreenTest { composeExtension.use { setContentWithTheme { FilterScreen( - uiState = + state = RelayFilterState( allProviders = DUMMY_RELAY_ALL_PROVIDERS, selectedOwnership = null, @@ -120,7 +120,7 @@ class FilterScreenTest { val mockClickListener: () -> Unit = mockk(relaxed = true) setContentWithTheme { FilterScreen( - uiState = + state = RelayFilterState( allProviders = listOf(), selectedOwnership = null, 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 548114a760..f54944356f 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 @@ -37,7 +37,7 @@ class OutOfTimeScreenTest { // Arrange setContentWithTheme { OutOfTimeScreen( - uiState = OutOfTimeUiState(deviceName = ""), + state = OutOfTimeUiState(deviceName = ""), onSitePaymentClick = {}, onRedeemVoucherClick = {}, onSettingsClick = {}, @@ -61,7 +61,7 @@ class OutOfTimeScreenTest { // Arrange setContentWithTheme { OutOfTimeScreen( - uiState = OutOfTimeUiState(deviceName = "", showSitePayment = true), + state = OutOfTimeUiState(deviceName = "", showSitePayment = true), onSitePaymentClick = {}, onRedeemVoucherClick = {}, onSettingsClick = {}, @@ -81,7 +81,7 @@ class OutOfTimeScreenTest { val mockClickListener: () -> Unit = mockk(relaxed = true) setContentWithTheme { OutOfTimeScreen( - uiState = OutOfTimeUiState(deviceName = "", showSitePayment = true), + state = OutOfTimeUiState(deviceName = "", showSitePayment = true), onSitePaymentClick = mockClickListener, onRedeemVoucherClick = {}, onSettingsClick = {}, @@ -104,7 +104,7 @@ class OutOfTimeScreenTest { val mockClickListener: () -> Unit = mockk(relaxed = true) setContentWithTheme { OutOfTimeScreen( - uiState = OutOfTimeUiState(deviceName = "", showSitePayment = true), + state = OutOfTimeUiState(deviceName = "", showSitePayment = true), onSitePaymentClick = {}, onRedeemVoucherClick = mockClickListener, onSettingsClick = {}, @@ -127,7 +127,7 @@ class OutOfTimeScreenTest { val mockClickListener: () -> Unit = mockk(relaxed = true) setContentWithTheme { OutOfTimeScreen( - uiState = + state = OutOfTimeUiState( tunnelState = TunnelState.Connecting(null, null), deviceName = "", @@ -154,7 +154,7 @@ class OutOfTimeScreenTest { // Arrange setContentWithTheme { OutOfTimeScreen( - uiState = + state = OutOfTimeUiState( showSitePayment = true, billingPaymentState = PaymentState.Error.Billing @@ -180,7 +180,7 @@ class OutOfTimeScreenTest { every { mockPaymentProduct.status } returns null setContentWithTheme { OutOfTimeScreen( - uiState = + state = OutOfTimeUiState( showSitePayment = true, billingPaymentState = @@ -207,7 +207,7 @@ class OutOfTimeScreenTest { every { mockPaymentProduct.status } returns PaymentStatus.PENDING setContentWithTheme { OutOfTimeScreen( - uiState = + state = OutOfTimeUiState( showSitePayment = true, billingPaymentState = @@ -230,7 +230,7 @@ class OutOfTimeScreenTest { val mockNavigateToVerificationPending: () -> Unit = mockk(relaxed = true) setContentWithTheme { OutOfTimeScreen( - uiState = + state = OutOfTimeUiState( showSitePayment = true, billingPaymentState = @@ -257,7 +257,7 @@ class OutOfTimeScreenTest { every { mockPaymentProduct.status } returns PaymentStatus.VERIFICATION_IN_PROGRESS setContentWithTheme { OutOfTimeScreen( - uiState = + state = OutOfTimeUiState( billingPaymentState = PaymentState.PaymentAvailable(listOf(mockPaymentProduct)), @@ -281,7 +281,7 @@ class OutOfTimeScreenTest { every { mockPaymentProduct.status } returns null setContentWithTheme { OutOfTimeScreen( - uiState = + state = OutOfTimeUiState( billingPaymentState = PaymentState.PaymentAvailable(listOf(mockPaymentProduct)), diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt index 34a8a8908f..b3ac57d95c 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt @@ -35,7 +35,7 @@ class RedeemVoucherDialogTest { val mockedClickHandler: (Boolean) -> Unit = mockk(relaxed = true) setContentWithTheme { RedeemVoucherDialog( - uiState = VoucherDialogUiState.INITIAL, + state = VoucherDialogUiState.INITIAL, onVoucherInputChange = {}, onRedeem = {}, onDismiss = mockedClickHandler @@ -56,7 +56,7 @@ class RedeemVoucherDialogTest { val mockedClickHandler: (Boolean) -> Unit = mockk(relaxed = true) setContentWithTheme { RedeemVoucherDialog( - uiState = VoucherDialogUiState(voucherState = VoucherDialogState.Success(0)), + state = VoucherDialogUiState(voucherState = VoucherDialogState.Success(0)), onVoucherInputChange = {}, onRedeem = {}, onDismiss = mockedClickHandler @@ -77,7 +77,7 @@ class RedeemVoucherDialogTest { val mockedClickHandler: (String) -> Unit = mockk(relaxed = true) setContentWithTheme { RedeemVoucherDialog( - uiState = VoucherDialogUiState(), + state = VoucherDialogUiState(), onVoucherInputChange = mockedClickHandler, onRedeem = {}, onDismiss = {} @@ -97,7 +97,7 @@ class RedeemVoucherDialogTest { // Arrange setContentWithTheme { RedeemVoucherDialog( - uiState = VoucherDialogUiState(voucherState = VoucherDialogState.Verifying), + state = VoucherDialogUiState(voucherState = VoucherDialogState.Verifying), onVoucherInputChange = {}, onRedeem = {}, onDismiss = {} @@ -114,7 +114,7 @@ class RedeemVoucherDialogTest { // Arrange setContentWithTheme { RedeemVoucherDialog( - uiState = VoucherDialogUiState(voucherState = VoucherDialogState.Success(0)), + state = VoucherDialogUiState(voucherState = VoucherDialogState.Success(0)), onVoucherInputChange = {}, onRedeem = {}, onDismiss = {} @@ -131,7 +131,7 @@ class RedeemVoucherDialogTest { // Arrange setContentWithTheme { RedeemVoucherDialog( - uiState = + state = VoucherDialogUiState( voucherState = VoucherDialogState.Error(ERROR_MESSAGE) ), diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt index 475e3a8802..fe28357048 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt @@ -40,7 +40,7 @@ class SelectLocationScreenTest { // Arrange setContentWithTheme { SelectLocationScreen( - uiState = SelectLocationUiState.Loading, + state = SelectLocationUiState.Loading, ) } @@ -54,7 +54,7 @@ class SelectLocationScreenTest { // Arrange setContentWithTheme { SelectLocationScreen( - uiState = + state = SelectLocationUiState.Data( relayListState = RelayListState.RelayList( @@ -94,7 +94,7 @@ class SelectLocationScreenTest { // Arrange setContentWithTheme { SelectLocationScreen( - uiState = + state = SelectLocationUiState.Data( relayListState = RelayListState.RelayList( @@ -124,7 +124,7 @@ class SelectLocationScreenTest { val mockedSearchTermInput: (String) -> Unit = mockk(relaxed = true) setContentWithTheme { SelectLocationScreen( - uiState = + state = SelectLocationUiState.Data( relayListState = RelayListState.RelayList( @@ -155,7 +155,7 @@ class SelectLocationScreenTest { val mockSearchString = "SEARCH" setContentWithTheme { SelectLocationScreen( - uiState = + state = SelectLocationUiState.Data( relayListState = RelayListState.Empty, selectedOwnership = null, diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt index 7a4cb6c2c2..b8b6a4e4b8 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt @@ -27,7 +27,7 @@ class SettingsScreenTest { // Arrange setContentWithTheme { SettingsScreen( - uiState = + state = SettingsUiState( appVersion = "", isLoggedIn = true, @@ -49,7 +49,7 @@ class SettingsScreenTest { // Arrange setContentWithTheme { SettingsScreen( - uiState = + state = SettingsUiState( appVersion = "", isLoggedIn = false, diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt index 766bbc961f..89f1a58f7a 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt @@ -35,7 +35,7 @@ class SplitTunnelingScreenTest { composeExtension.use { // Arrange setContentWithTheme { - SplitTunnelingScreen(uiState = SplitTunnelingUiState.Loading(enabled = true)) + SplitTunnelingScreen(state = SplitTunnelingUiState.Loading(enabled = true)) } // Assert @@ -64,7 +64,7 @@ class SplitTunnelingScreenTest { ) setContentWithTheme { SplitTunnelingScreen( - uiState = + state = SplitTunnelingUiState.ShowAppList( enabled = true, excludedApps = listOf(excludedApp), @@ -96,7 +96,7 @@ class SplitTunnelingScreenTest { ) setContentWithTheme { SplitTunnelingScreen( - uiState = + state = SplitTunnelingUiState.ShowAppList( enabled = true, excludedApps = emptyList(), @@ -135,7 +135,7 @@ class SplitTunnelingScreenTest { val mockedClickHandler: (String) -> Unit = mockk(relaxed = true) setContentWithTheme { SplitTunnelingScreen( - uiState = + state = SplitTunnelingUiState.ShowAppList( enabled = true, excludedApps = listOf(excludedApp), @@ -172,7 +172,7 @@ class SplitTunnelingScreenTest { val mockedClickHandler: (String) -> Unit = mockk(relaxed = true) setContentWithTheme { SplitTunnelingScreen( - uiState = + state = SplitTunnelingUiState.ShowAppList( enabled = true, excludedApps = listOf(excludedApp), @@ -209,7 +209,7 @@ class SplitTunnelingScreenTest { val mockedClickHandler: (Boolean) -> Unit = mockk(relaxed = true) setContentWithTheme { SplitTunnelingScreen( - uiState = + state = SplitTunnelingUiState.ShowAppList( enabled = true, excludedApps = listOf(excludedApp), diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt index 8c686e8489..471e39c38f 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt @@ -45,7 +45,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = VpnSettingsUiState.createDefault(), + state = VpnSettingsUiState.createDefault(), ) } @@ -67,7 +67,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = VpnSettingsUiState.createDefault(mtu = VALID_DUMMY_MTU_VALUE), + state = VpnSettingsUiState.createDefault(mtu = VALID_DUMMY_MTU_VALUE), ) } @@ -84,7 +84,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( isCustomDnsEnabled = true, customDnsItems = @@ -110,7 +110,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( isCustomDnsEnabled = false, customDnsItems = @@ -131,7 +131,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( isCustomDnsEnabled = true, isLocalNetworkSharingEnabled = true, @@ -151,7 +151,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( isCustomDnsEnabled = true, customDnsItems = @@ -170,7 +170,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( isCustomDnsEnabled = true, customDnsItems = @@ -189,7 +189,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( isCustomDnsEnabled = true, customDnsItems = @@ -208,7 +208,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( quantumResistant = QuantumResistantState.On ), @@ -230,7 +230,7 @@ class VpnSettingsScreenTest { mockk(relaxed = true) setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( quantumResistant = QuantumResistantState.Auto, ), @@ -254,7 +254,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( selectedWireguardPort = Constraint.Only(Port(53)) ), @@ -283,7 +283,7 @@ class VpnSettingsScreenTest { mockk(relaxed = true) setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( selectedWireguardPort = Constraint.Only(Port(53)) ), @@ -314,7 +314,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( customWireguardPort = Constraint.Only(Port(4000)) ), @@ -336,7 +336,7 @@ class VpnSettingsScreenTest { val onWireguardPortSelected: (Constraint<Port>) -> Unit = mockk(relaxed = true) setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( selectedWireguardPort = Constraint.Only(Port(4000)), customWireguardPort = Constraint.Only(Port(4000)) @@ -363,7 +363,7 @@ class VpnSettingsScreenTest { val mockedClickHandler: (Int?) -> Unit = mockk(relaxed = true) setContentWithTheme { VpnSettingsScreen( - uiState = VpnSettingsUiState.createDefault(), + state = VpnSettingsUiState.createDefault(), navigateToMtuDialog = mockedClickHandler ) } @@ -385,7 +385,7 @@ class VpnSettingsScreenTest { val mockedClickHandler: (Int?, String?) -> Unit = mockk(relaxed = true) setContentWithTheme { VpnSettingsScreen( - uiState = VpnSettingsUiState.createDefault(isCustomDnsEnabled = true), + state = VpnSettingsUiState.createDefault(isCustomDnsEnabled = true), navigateToDns = mockedClickHandler ) } @@ -405,7 +405,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = VpnSettingsUiState.createDefault(), + state = VpnSettingsUiState.createDefault(), navigateToQuantumResistanceInfo = mockedShowTunnelQuantumInfoClick ) } @@ -428,7 +428,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = VpnSettingsUiState.createDefault(), + state = VpnSettingsUiState.createDefault(), navigateToWireguardPortInfo = mockedClickHandler ) } @@ -446,7 +446,7 @@ class VpnSettingsScreenTest { // Arrange setContentWithTheme { VpnSettingsScreen( - uiState = VpnSettingsUiState.createDefault(), + state = VpnSettingsUiState.createDefault(), navigateToWireguardPortDialog = mockedClickHandler ) } @@ -466,7 +466,7 @@ class VpnSettingsScreenTest { val mockOnShowCustomPortDialog: () -> Unit = mockk(relaxed = true) setContentWithTheme { VpnSettingsScreen( - uiState = VpnSettingsUiState.createDefault(), + state = VpnSettingsUiState.createDefault(), navigateToWireguardPortDialog = mockOnShowCustomPortDialog ) } @@ -487,7 +487,7 @@ class VpnSettingsScreenTest { val mockOnShowCustomPortDialog: () -> Unit = mockk(relaxed = true) setContentWithTheme { VpnSettingsScreen( - uiState = + state = VpnSettingsUiState.createDefault( selectedWireguardPort = Constraint.Only(Port(4000)) ), 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 49983faa27..d8711b4b61 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 @@ -36,7 +36,7 @@ class WelcomeScreenTest { // Arrange setContentWithTheme { WelcomeScreen( - uiState = WelcomeUiState(), + state = WelcomeUiState(), onSitePaymentClick = {}, onRedeemVoucherClick = {}, onSettingsClick = {}, @@ -58,7 +58,7 @@ class WelcomeScreenTest { // Arrange setContentWithTheme { WelcomeScreen( - uiState = WelcomeUiState(), + state = WelcomeUiState(), onSitePaymentClick = {}, onRedeemVoucherClick = {}, onSettingsClick = {}, @@ -86,7 +86,7 @@ class WelcomeScreenTest { val expectedAccountNumber = "1111 2222 3333 4444" setContentWithTheme { WelcomeScreen( - uiState = WelcomeUiState(accountNumber = rawAccountNumber), + state = WelcomeUiState(accountNumber = rawAccountNumber), onSitePaymentClick = {}, onRedeemVoucherClick = {}, onSettingsClick = {}, @@ -108,7 +108,7 @@ class WelcomeScreenTest { val mockClickListener: () -> Unit = mockk(relaxed = true) setContentWithTheme { WelcomeScreen( - uiState = WelcomeUiState(showSitePayment = true), + state = WelcomeUiState(showSitePayment = true), onSitePaymentClick = mockClickListener, onRedeemVoucherClick = {}, onSettingsClick = {}, @@ -133,7 +133,7 @@ class WelcomeScreenTest { val mockClickListener: () -> Unit = mockk(relaxed = true) setContentWithTheme { WelcomeScreen( - uiState = WelcomeUiState(), + state = WelcomeUiState(), onSitePaymentClick = {}, onRedeemVoucherClick = mockClickListener, onSettingsClick = {}, @@ -157,8 +157,7 @@ class WelcomeScreenTest { // Arrange setContentWithTheme { WelcomeScreen( - uiState = - WelcomeUiState().copy(billingPaymentState = PaymentState.Error.Billing), + state = WelcomeUiState().copy(billingPaymentState = PaymentState.Error.Billing), onSitePaymentClick = {}, onRedeemVoucherClick = {}, onSettingsClick = {}, @@ -182,7 +181,7 @@ class WelcomeScreenTest { every { mockPaymentProduct.status } returns null setContentWithTheme { WelcomeScreen( - uiState = + state = WelcomeUiState( billingPaymentState = PaymentState.PaymentAvailable(listOf(mockPaymentProduct)) @@ -210,7 +209,7 @@ class WelcomeScreenTest { every { mockPaymentProduct.status } returns PaymentStatus.PENDING setContentWithTheme { WelcomeScreen( - uiState = + state = WelcomeUiState() .copy( billingPaymentState = @@ -240,7 +239,7 @@ class WelcomeScreenTest { val mockShowPendingInfo = mockk<() -> Unit>(relaxed = true) setContentWithTheme { WelcomeScreen( - uiState = + state = WelcomeUiState() .copy( billingPaymentState = @@ -272,7 +271,7 @@ class WelcomeScreenTest { every { mockPaymentProduct.status } returns PaymentStatus.VERIFICATION_IN_PROGRESS setContentWithTheme { WelcomeScreen( - uiState = + state = WelcomeUiState() .copy( billingPaymentState = @@ -303,7 +302,7 @@ class WelcomeScreenTest { every { mockPaymentProduct.status } returns null setContentWithTheme { WelcomeScreen( - uiState = + state = WelcomeUiState( billingPaymentState = PaymentState.PaymentAvailable(listOf(mockPaymentProduct)) |