diff options
Diffstat (limited to 'android/app/src/androidTest')
28 files changed, 273 insertions, 317 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Actions.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Actions.kt index ebd570252a..c87672108f 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Actions.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Actions.kt @@ -7,7 +7,8 @@ import androidx.compose.ui.test.longClick import androidx.compose.ui.test.performTouchInput fun SemanticsNodeInteraction.performLongClick(): SemanticsNodeInteraction { - @OptIn(ExperimentalTestApi::class) return this.invokeGlobalAssertions().performLongClickImpl() + @OptIn(ExperimentalTestApi::class) + return this.invokeGlobalAssertions().performLongClickImpl() } private fun SemanticsNodeInteraction.performLongClickImpl(): SemanticsNodeInteraction { diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt index 384f365e5e..1dbbe1e481 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt @@ -10,6 +10,6 @@ fun SemanticsNodeInteractionsProvider.onNodeWithTagAndText( text: String, substring: Boolean = false, ignoreCase: Boolean = false, - useUnmergedTree: Boolean = false + useUnmergedTree: Boolean = false, ): SemanticsNodeInteraction = onNode(hasTestTag(testTag).and(hasText(text, substring, ignoreCase)), useUnmergedTree) diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyApiAccessMethods.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyApiAccessMethods.kt index a644449a91..046360cf4d 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyApiAccessMethods.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyApiAccessMethods.kt @@ -15,7 +15,7 @@ val DIRECT_ACCESS_METHOD = id = ApiAccessMethodId.fromString(UUID1), name = ApiAccessMethodName.fromString("Direct"), enabled = true, - apiAccessMethod = ApiAccessMethod.Direct + apiAccessMethod = ApiAccessMethod.Direct, ) val CUSTOM_ACCESS_METHOD = @@ -28,6 +28,6 @@ val CUSTOM_ACCESS_METHOD = ip = "1.1.1.1", port = Port(123), password = "Password", - cipher = Cipher.RC4 - ) + cipher = Cipher.RC4, + ), ) diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt index 052f2d897a..3cea5e5c68 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt @@ -17,25 +17,22 @@ private val DUMMY_RELAY_1 = id = GeoLocationId.Hostname( city = GeoLocationId.City(GeoLocationId.Country("RCo1"), "Relay City 1"), - "Relay host 1" + "Relay host 1", ), active = true, provider = - Provider( - providerId = ProviderId("PROVIDER RENTED"), - ownership = Ownership.Rented, - ) + Provider(providerId = ProviderId("PROVIDER RENTED"), ownership = Ownership.Rented), ) private val DUMMY_RELAY_2 = RelayItem.Location.Relay( id = GeoLocationId.Hostname( city = GeoLocationId.City(GeoLocationId.Country("RCo2"), "Relay City 2"), - "Relay host 2" + "Relay host 2", ), active = true, provider = - Provider(providerId = ProviderId("PROVIDER OWNED"), ownership = Ownership.MullvadOwned) + Provider(providerId = ProviderId("PROVIDER OWNED"), ownership = Ownership.MullvadOwned), ) private val DUMMY_RELAY_CITY_1 = RelayItem.Location.City( @@ -53,13 +50,13 @@ private val DUMMY_RELAY_COUNTRY_1 = RelayItem.Location.Country( name = "Relay Country 1", id = GeoLocationId.Country("RCo1"), - cities = listOf(DUMMY_RELAY_CITY_1) + cities = listOf(DUMMY_RELAY_CITY_1), ) private val DUMMY_RELAY_COUNTRY_2 = RelayItem.Location.Country( name = "Relay Country 2", id = GeoLocationId.Country("RCo2"), - cities = listOf(DUMMY_RELAY_CITY_2) + cities = listOf(DUMMY_RELAY_CITY_2), ) private val DUMMY_WIREGUARD_PORT_RANGES = ArrayList<PortRange>() @@ -67,11 +64,7 @@ private val DUMMY_WIREGUARD_ENDPOINT_DATA = WireguardEndpointData(DUMMY_WIREGUAR val DUMMY_RELAY_COUNTRIES = listOf(DUMMY_RELAY_COUNTRY_1, DUMMY_RELAY_COUNTRY_2) -val DUMMY_RELAY_LIST = - RelayList( - DUMMY_RELAY_COUNTRIES, - DUMMY_WIREGUARD_ENDPOINT_DATA, - ) +val DUMMY_RELAY_LIST = RelayList(DUMMY_RELAY_COUNTRIES, DUMMY_WIREGUARD_ENDPOINT_DATA) val DUMMY_RELAY_ITEM_CUSTOM_LISTS = listOf( @@ -80,19 +73,19 @@ val DUMMY_RELAY_ITEM_CUSTOM_LISTS = CustomList( name = CustomListName.fromString("First list"), id = CustomListId("1"), - locations = emptyList() + locations = emptyList(), ), - locations = DUMMY_RELAY_COUNTRIES + locations = DUMMY_RELAY_COUNTRIES, ), RelayItem.CustomList( customList = CustomList( name = CustomListName.fromString("Empty list"), id = CustomListId("2"), - locations = emptyList() + locations = emptyList(), ), - locations = emptyList() - ) + locations = emptyList(), + ), ) val DUMMY_CUSTOM_LISTS = @@ -100,11 +93,11 @@ val DUMMY_CUSTOM_LISTS = CustomList( name = CustomListName.fromString("First list"), id = CustomListId("1"), - locations = DUMMY_RELAY_COUNTRIES.map { it.id } + locations = DUMMY_RELAY_COUNTRIES.map { it.id }, ), CustomList( name = CustomListName.fromString("Empty list"), id = CustomListId("2"), - locations = emptyList() - ) + locations = emptyList(), + ), ) diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialogTest.kt index bcb3908fae..930e5f5201 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialogTest.kt @@ -40,7 +40,7 @@ class CustomPortDialogTest { initialPort = initialPort, allowedPortRanges = allowedPortRanges, onSave = onSave, - onDismiss = onDismiss + onDismiss = onDismiss, ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteCustomListConfirmationDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteCustomListConfirmationDialogTest.kt index 184cd7defe..abe7abfbcf 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteCustomListConfirmationDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteCustomListConfirmationDialogTest.kt @@ -32,7 +32,7 @@ class DeleteCustomListConfirmationDialogTest { val name = CustomListName.fromString("List should be deleted") setContentWithTheme { DeleteCustomListConfirmationDialog( - state = DeleteCustomListUiState(name = name, deleteError = null), + state = DeleteCustomListUiState(name = name, deleteError = null) ) } @@ -49,7 +49,7 @@ class DeleteCustomListConfirmationDialogTest { setContentWithTheme { DeleteCustomListConfirmationDialog( state = DeleteCustomListUiState(name = name, deleteError = null), - onDelete = mockedOnDelete + onDelete = mockedOnDelete, ) } @@ -69,7 +69,7 @@ class DeleteCustomListConfirmationDialogTest { setContentWithTheme { DeleteCustomListConfirmationDialog( state = DeleteCustomListUiState(name = name, deleteError = null), - onBack = mockedOnBack + onBack = mockedOnBack, ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt index 0882c1dd42..20cf2357db 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt @@ -24,7 +24,7 @@ class DnsDialogTest { validationError = null, isLocal = false, isAllowLanEnabled = false, - index = null + index = null, ) @SuppressLint("ComposableNaming") @@ -34,7 +34,7 @@ class DnsDialogTest { onDnsInputChange: (String) -> Unit = { _ -> }, onSaveDnsClick: () -> Unit = {}, onRemoveDnsClick: (Int) -> Unit = {}, - onDismiss: () -> Unit = {} + onDismiss: () -> Unit = {}, ) { DnsDialog(state, onDnsInputChange, onSaveDnsClick, onRemoveDnsClick, onDismiss) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt index 5fe812cd44..9d6b09fe2d 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt @@ -44,7 +44,7 @@ class MtuDialogTest { onInputChanged = onInputChanged, onSaveMtu = onSaveMtu, onResetMtu = onResetMtu, - onDismiss = onDismiss + onDismiss = onDismiss, ) } @@ -62,11 +62,7 @@ class MtuDialogTest { fun testMtuDialogWithEditValue() = composeExtension.use { // Arrange - setContentWithTheme { - testMtuDialog( - mtuInput = VALID_DUMMY_MTU_VALUE, - ) - } + setContentWithTheme { testMtuDialog(mtuInput = VALID_DUMMY_MTU_VALUE) } // Assert onNodeWithText(VALID_DUMMY_MTU_VALUE).assertExists() @@ -78,10 +74,7 @@ class MtuDialogTest { // Arrange val mockedSubmitHandler: (String) -> Unit = mockk(relaxed = true) setContentWithTheme { - testMtuDialog( - VALID_DUMMY_MTU_VALUE, - onSaveMtu = mockedSubmitHandler, - ) + testMtuDialog(VALID_DUMMY_MTU_VALUE, onSaveMtu = mockedSubmitHandler) } // Act @@ -107,10 +100,7 @@ class MtuDialogTest { // Arrange val mockedClickHandler: () -> Unit = mockk(relaxed = true) setContentWithTheme { - testMtuDialog( - mtuInput = VALID_DUMMY_MTU_VALUE, - onResetMtu = mockedClickHandler, - ) + testMtuDialog(mtuInput = VALID_DUMMY_MTU_VALUE, onResetMtu = mockedClickHandler) } // Act @@ -125,11 +115,7 @@ class MtuDialogTest { composeExtension.use { // Arrange val mockedClickHandler: () -> Unit = mockk(relaxed = true) - setContentWithTheme { - testMtuDialog( - onDismiss = mockedClickHandler, - ) - } + setContentWithTheme { testMtuDialog(onDismiss = mockedClickHandler) } // Assert onNodeWithText("Cancel").performClick() diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/ResetServerIPOverridesConfirmationDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/ResetServerIPOverridesConfirmationDialogTest.kt index df06f00fc7..107c03f1d6 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/ResetServerIPOverridesConfirmationDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/ResetServerIPOverridesConfirmationDialogTest.kt @@ -34,7 +34,7 @@ class ResetServerIPOverridesConfirmationDialogTest { setContentWithTheme { ResetServerIpOverridesConfirmationDialog( onNavigateBack = clickHandler, - onClearAllOverrides = {} + onClearAllOverrides = {}, ) } @@ -54,7 +54,7 @@ class ResetServerIPOverridesConfirmationDialogTest { setContentWithTheme { ResetServerIpOverridesConfirmationDialog( onNavigateBack = {}, - onClearAllOverrides = clickHandler + onClearAllOverrides = clickHandler, ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/SaveApiAccessMethodDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/SaveApiAccessMethodDialogTest.kt index 07f8b039eb..afd6d0e15d 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/SaveApiAccessMethodDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/SaveApiAccessMethodDialogTest.kt @@ -29,7 +29,7 @@ class SaveApiAccessMethodDialogTest { state = SaveApiAccessMethodUiState( testingState = TestApiAccessMethodState.Testing, - isSaving = false + isSaving = false, ) ) } @@ -48,7 +48,7 @@ class SaveApiAccessMethodDialogTest { state = SaveApiAccessMethodUiState( testingState = TestApiAccessMethodState.Result.Failure, - isSaving = false + isSaving = false, ) ) } @@ -67,7 +67,7 @@ class SaveApiAccessMethodDialogTest { state = SaveApiAccessMethodUiState( testingState = TestApiAccessMethodState.Result.Successful, - isSaving = true + isSaving = true, ) ) } @@ -87,9 +87,9 @@ class SaveApiAccessMethodDialogTest { state = SaveApiAccessMethodUiState( testingState = TestApiAccessMethodState.Testing, - isSaving = false + isSaving = false, ), - onCancel = onCancelClick + onCancel = onCancelClick, ) } @@ -110,9 +110,9 @@ class SaveApiAccessMethodDialogTest { state = SaveApiAccessMethodUiState( testingState = TestApiAccessMethodState.Result.Failure, - isSaving = false + isSaving = false, ), - onSave = onSaveClick + onSave = onSaveClick, ) } 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 48ce7590a2..3a55dfb9fd 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 @@ -47,10 +47,9 @@ class AccountScreenTest { deviceName = DUMMY_DEVICE_NAME, accountNumber = DUMMY_ACCOUNT_NUMBER, accountExpiry = null, - showSitePayment = false + showSitePayment = false, ), - uiSideEffect = - MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), + uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), ) } @@ -75,7 +74,7 @@ class AccountScreenTest { ), uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), - onManageAccountClick = mockedClickHandler + onManageAccountClick = mockedClickHandler, ) } @@ -98,11 +97,11 @@ class AccountScreenTest { deviceName = DUMMY_DEVICE_NAME, accountNumber = DUMMY_ACCOUNT_NUMBER, accountExpiry = null, - showSitePayment = false + showSitePayment = false, ), uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), - onRedeemVoucherClick = mockedClickHandler + onRedeemVoucherClick = mockedClickHandler, ) } @@ -125,11 +124,11 @@ class AccountScreenTest { deviceName = DUMMY_DEVICE_NAME, accountNumber = DUMMY_ACCOUNT_NUMBER, accountExpiry = null, - showSitePayment = false + showSitePayment = false, ), uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), - onLogoutClick = mockedClickHandler + onLogoutClick = mockedClickHandler, ) } @@ -149,8 +148,7 @@ class AccountScreenTest { state = AccountUiState.default() .copy(billingPaymentState = PaymentState.Error.Billing), - uiSideEffect = - MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), + uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), ) } @@ -173,8 +171,7 @@ class AccountScreenTest { billingPaymentState = PaymentState.PaymentAvailable(listOf(mockPaymentProduct)) ), - uiSideEffect = - MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), + uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), ) } @@ -197,8 +194,7 @@ class AccountScreenTest { billingPaymentState = PaymentState.PaymentAvailable(listOf(mockPaymentProduct)) ), - uiSideEffect = - MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), + uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), ) } @@ -224,7 +220,7 @@ class AccountScreenTest { ), uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), - navigateToVerificationPendingDialog = mockNavigateToVerificationPending + navigateToVerificationPendingDialog = mockNavigateToVerificationPending, ) } @@ -250,8 +246,7 @@ class AccountScreenTest { billingPaymentState = PaymentState.PaymentAvailable(listOf(mockPaymentProduct)) ), - uiSideEffect = - MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), + uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), ) } @@ -277,8 +272,7 @@ class AccountScreenTest { PaymentState.PaymentAvailable(listOf(mockPaymentProduct)) ), onPurchaseBillingProductClick = clickHandler, - uiSideEffect = - MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), + uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(), ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessListScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessListScreenTest.kt index 97eed92d91..e08d46d9d3 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessListScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessListScreenTest.kt @@ -59,7 +59,7 @@ class ApiAccessListScreenTest { setContentWithTheme { ApiAccessListScreen( state = ApiAccessListUiState(), - onAddMethodClick = onAddMethodClick + onAddMethodClick = onAddMethodClick, ) } @@ -78,7 +78,7 @@ class ApiAccessListScreenTest { setContentWithTheme { ApiAccessListScreen( state = ApiAccessListUiState(), - onApiAccessInfoClick = onApiAccessInfoClick + onApiAccessInfoClick = onApiAccessInfoClick, ) } @@ -98,7 +98,7 @@ class ApiAccessListScreenTest { setContentWithTheme { ApiAccessListScreen( state = ApiAccessListUiState(apiAccessMethodSettings = listOf(apiAccessMethod)), - onApiAccessMethodClick = onApiAccessMethodClick + onApiAccessMethodClick = onApiAccessMethodClick, ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessMethodDetailsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessMethodDetailsScreenTest.kt index 8dbd8f9832..e895c45f63 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessMethodDetailsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessMethodDetailsScreenTest.kt @@ -38,7 +38,7 @@ class ApiAccessMethodDetailsScreenTest { isEditable = false, isDisableable = true, isCurrentMethod = true, - isTestingAccessMethod = false + isTestingAccessMethod = false, ) ) } @@ -64,9 +64,9 @@ class ApiAccessMethodDetailsScreenTest { isEditable = false, isDisableable = false, isCurrentMethod = true, - isTestingAccessMethod = false + isTestingAccessMethod = false, ), - onEnableClicked = onEnableClicked + onEnableClicked = onEnableClicked, ) } @@ -94,9 +94,9 @@ class ApiAccessMethodDetailsScreenTest { isEditable = true, isDisableable = false, isCurrentMethod = true, - isTestingAccessMethod = false + isTestingAccessMethod = false, ), - onDeleteApiAccessMethodClicked = onDeleteApiAccessMethodClicked + onDeleteApiAccessMethodClicked = onDeleteApiAccessMethodClicked, ) } @@ -124,9 +124,9 @@ class ApiAccessMethodDetailsScreenTest { isEditable = true, isDisableable = false, isCurrentMethod = true, - isTestingAccessMethod = false + isTestingAccessMethod = false, ), - onEditMethodClicked = onEditMethodClicked + onEditMethodClicked = onEditMethodClicked, ) } @@ -153,9 +153,9 @@ class ApiAccessMethodDetailsScreenTest { isEditable = false, isDisableable = true, isCurrentMethod = true, - isTestingAccessMethod = false + isTestingAccessMethod = false, ), - onEnableClicked = onEnableClicked + onEnableClicked = onEnableClicked, ) } @@ -182,9 +182,9 @@ class ApiAccessMethodDetailsScreenTest { isEditable = false, isDisableable = true, isCurrentMethod = true, - isTestingAccessMethod = false + isTestingAccessMethod = false, ), - onTestMethodClicked = onTestMethodClicked + onTestMethodClicked = onTestMethodClicked, ) } @@ -211,9 +211,9 @@ class ApiAccessMethodDetailsScreenTest { isEditable = false, isDisableable = true, isCurrentMethod = false, - isTestingAccessMethod = false + isTestingAccessMethod = false, ), - onUseMethodClicked = onUseMethodClicked + onUseMethodClicked = onUseMethodClicked, ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt index f4003d1f07..48161a4690 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt @@ -38,11 +38,8 @@ class ChangelogDialogTest { setContentWithTheme { ChangelogDialog( - Changelog( - changes = listOf(CHANGELOG_ITEM), - version = CHANGELOG_VERSION, - ), - onDismiss = { mockedViewModel.markChangelogAsRead() } + Changelog(changes = listOf(CHANGELOG_ITEM), version = CHANGELOG_VERSION), + onDismiss = { mockedViewModel.markChangelogAsRead() }, ) } 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 435bbeab00..c9cd30e439 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,11 +56,7 @@ class ConnectScreenTest { fun testDefaultState() { composeExtension.use { // Arrange - setContentWithTheme { - ConnectScreen( - state = ConnectUiState.INITIAL, - ) - } + setContentWithTheme { ConnectScreen(state = ConnectUiState.INITIAL) } // Assert onNodeWithTag(SCROLLABLE_COLUMN_TEST_TAG).assertExists() @@ -86,8 +82,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = InAppNotification.TunnelStateBlocked, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -116,7 +112,7 @@ class ConnectScreenTest { TunnelState.Connecting( endpoint = mockTunnelEndpoint, null, - emptyList() + emptyList(), ), inAddress = null, outAddress = "", @@ -124,8 +120,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = InAppNotification.TunnelStateBlocked, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -157,8 +153,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -189,8 +185,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -219,8 +215,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -249,8 +245,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -285,8 +281,8 @@ class ConnectScreenTest { InAppNotification.TunnelStateError( ErrorState(ErrorStateCause.StartTunnelError, true) ), - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -322,8 +318,8 @@ class ConnectScreenTest { InAppNotification.TunnelStateError( ErrorState(ErrorStateCause.StartTunnelError, false) ), - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -354,8 +350,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = InAppNotification.TunnelStateBlocked, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -386,8 +382,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = InAppNotification.TunnelStateBlocked, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -418,9 +414,9 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false + isPlayBuild = false, ), - onSwitchLocationClick = mockedClickHandler + onSwitchLocationClick = mockedClickHandler, ) } @@ -452,9 +448,9 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false + isPlayBuild = false, ), - onDisconnectClick = mockedClickHandler + onDisconnectClick = mockedClickHandler, ) } @@ -486,9 +482,9 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false + isPlayBuild = false, ), - onReconnectClick = mockedClickHandler + onReconnectClick = mockedClickHandler, ) } @@ -518,9 +514,9 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false + isPlayBuild = false, ), - onConnectClick = mockedClickHandler + onConnectClick = mockedClickHandler, ) } @@ -550,9 +546,9 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false + isPlayBuild = false, ), - onCancelClick = mockedClickHandler + onCancelClick = mockedClickHandler, ) } @@ -591,8 +587,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = null, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -625,8 +621,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = InAppNotification.UnsupportedVersion(versionInfo), - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -657,8 +653,8 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = InAppNotification.AccountExpiry(expiryDate), - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } @@ -688,7 +684,7 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = InAppNotification.UnsupportedVersion(versionInfo), - isPlayBuild = false + isPlayBuild = false, ), ) } @@ -721,7 +717,7 @@ class ConnectScreenTest { deviceName = "", daysLeftUntilExpiry = null, inAppNotification = InAppNotification.AccountExpiry(expiryDate), - isPlayBuild = false + isPlayBuild = false, ), ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListLocationsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListLocationsScreenTest.kt index 1a8d35a5a9..444bbd2c5b 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListLocationsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListLocationsScreenTest.kt @@ -84,13 +84,10 @@ class CustomListLocationsScreenTest { locations = listOf( RelayLocationListItem(DUMMY_RELAY_COUNTRIES[0], checked = true), - RelayLocationListItem( - DUMMY_RELAY_COUNTRIES[1], - checked = false - ), + RelayLocationListItem(DUMMY_RELAY_COUNTRIES[1], checked = false), ), - searchTerm = "" - ), + searchTerm = "", + ) ) } @@ -111,9 +108,9 @@ class CustomListLocationsScreenTest { CustomListLocationsUiState.Content.Data( newList = false, locations = - listOf(RelayLocationListItem(selectedCountry, checked = true)) + listOf(RelayLocationListItem(selectedCountry, checked = true)), ), - onRelaySelectionClick = mockedOnRelaySelectionClicked + onRelaySelectionClick = mockedOnRelaySelectionClicked, ) } @@ -136,7 +133,7 @@ class CustomListLocationsScreenTest { newList = false, locations = emptyList(), ), - onSearchTermInput = mockedSearchTermInput + onSearchTermInput = mockedSearchTermInput, ) } val mockSearchString = "SEARCH" @@ -159,9 +156,9 @@ class CustomListLocationsScreenTest { state = CustomListLocationsUiState.Content.Empty( newList = false, - searchTerm = mockSearchString + searchTerm = mockSearchString, ), - onSearchTermInput = mockedSearchTermInput + onSearchTermInput = mockedSearchTermInput, ) } @@ -181,7 +178,7 @@ class CustomListLocationsScreenTest { state = CustomListLocationsUiState.Content.Empty( newList = false, - searchTerm = emptySearchString + searchTerm = emptySearchString, ) ) } @@ -203,7 +200,7 @@ class CustomListLocationsScreenTest { locations = emptyList(), saveEnabled = true, ), - onSaveClick = mockOnSaveClick + onSaveClick = mockOnSaveClick, ) } @@ -227,7 +224,7 @@ class CustomListLocationsScreenTest { locations = emptyList(), saveEnabled = false, ), - onSaveClick = mockOnSaveClick + onSaveClick = mockOnSaveClick, ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreenTest.kt index bdcb796997..47e88bb52f 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreenTest.kt @@ -35,7 +35,7 @@ class CustomListsScreenTest { setContentWithTheme { CustomListsScreen( state = CustomListsUiState.Loading, - snackbarHostState = SnackbarHostState() + snackbarHostState = SnackbarHostState(), ) } @@ -51,7 +51,7 @@ class CustomListsScreenTest { setContentWithTheme { CustomListsScreen( state = CustomListsUiState.Content(customLists = customLists), - snackbarHostState = SnackbarHostState() + snackbarHostState = SnackbarHostState(), ) } @@ -70,7 +70,7 @@ class CustomListsScreenTest { CustomListsScreen( state = CustomListsUiState.Content(customLists = customLists), snackbarHostState = SnackbarHostState(), - addCustomList = mockedAddCustomList + addCustomList = mockedAddCustomList, ) } @@ -92,7 +92,7 @@ class CustomListsScreenTest { CustomListsScreen( state = CustomListsUiState.Content(customLists = customLists), snackbarHostState = SnackbarHostState(), - openCustomList = mockedOpenCustomList + openCustomList = mockedOpenCustomList, ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreenTest.kt index 584be7e074..d737f5459f 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreenTest.kt @@ -33,7 +33,7 @@ class EditApiAccessMethodScreenTest { editMode = true, formData = EditApiAccessFormData.empty(), hasChanges = false, - isTestingApiAccessMethod = false + isTestingApiAccessMethod = false, ) ) } @@ -53,7 +53,7 @@ class EditApiAccessMethodScreenTest { editMode = false, formData = EditApiAccessFormData.empty(), hasChanges = false, - isTestingApiAccessMethod = false + isTestingApiAccessMethod = false, ) ) } @@ -78,10 +78,10 @@ class EditApiAccessMethodScreenTest { serverIp = "", username = "", password = "", - port = "" + port = "", ), hasChanges = false, - isTestingApiAccessMethod = false + isTestingApiAccessMethod = false, ) ) } @@ -106,10 +106,10 @@ class EditApiAccessMethodScreenTest { serverIpError = InvalidDataError.ServerIpError.Invalid, username = "", password = "", - port = "" + port = "", ), hasChanges = false, - isTestingApiAccessMethod = false + isTestingApiAccessMethod = false, ) ) } @@ -137,10 +137,10 @@ class EditApiAccessMethodScreenTest { portError = InvalidDataError.PortError.Invalid( ParsePortError.OutOfRange(1111111111) - ) + ), ), hasChanges = false, - isTestingApiAccessMethod = false + isTestingApiAccessMethod = false, ) ) } @@ -162,9 +162,9 @@ class EditApiAccessMethodScreenTest { editMode = false, formData = EditApiAccessFormData.empty(), hasChanges = false, - isTestingApiAccessMethod = false + isTestingApiAccessMethod = false, ), - onNameChanged = onNameChanged + onNameChanged = onNameChanged, ) } @@ -192,10 +192,10 @@ class EditApiAccessMethodScreenTest { password = "", port = "", enableAuthentication = true, - apiAccessMethodTypes = ApiAccessMethodTypes.SOCKS5_REMOTE + apiAccessMethodTypes = ApiAccessMethodTypes.SOCKS5_REMOTE, ), hasChanges = false, - isTestingApiAccessMethod = false + isTestingApiAccessMethod = false, ) ) } @@ -217,9 +217,9 @@ class EditApiAccessMethodScreenTest { editMode = false, formData = EditApiAccessFormData.empty(), hasChanges = false, - isTestingApiAccessMethod = false + isTestingApiAccessMethod = false, ), - onTestMethod = onTestMethod + onTestMethod = onTestMethod, ) } @@ -242,9 +242,9 @@ class EditApiAccessMethodScreenTest { editMode = false, formData = EditApiAccessFormData.empty(), hasChanges = false, - isTestingApiAccessMethod = false + isTestingApiAccessMethod = false, ), - onAddMethod = onAddMethod + onAddMethod = onAddMethod, ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreenTest.kt index 2bc53013ca..7284a3294d 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreenTest.kt @@ -60,7 +60,7 @@ class EditCustomListScreenTest { EditCustomListState.Content( id = customList.id, name = customList.name, - locations = customList.locations + locations = customList.locations, ) ) } @@ -80,7 +80,7 @@ class EditCustomListScreenTest { EditCustomListState.Content( id = customList.id, name = customList.name, - locations = customList.locations + locations = customList.locations, ) ) } @@ -101,9 +101,9 @@ class EditCustomListScreenTest { EditCustomListState.Content( id = customList.id, name = customList.name, - locations = customList.locations + locations = customList.locations, ), - onDeleteList = mockedOnDelete + onDeleteList = mockedOnDelete, ) } @@ -127,9 +127,9 @@ class EditCustomListScreenTest { EditCustomListState.Content( id = customList.id, name = customList.name, - locations = customList.locations + locations = customList.locations, ), - onNameClicked = mockedOnNameClicked + onNameClicked = mockedOnNameClicked, ) } @@ -152,9 +152,9 @@ class EditCustomListScreenTest { EditCustomListState.Content( id = customList.id, name = customList.name, - locations = customList.locations + locations = customList.locations, ), - onLocationsClicked = mockedOnLocationsClicked + onLocationsClicked = mockedOnLocationsClicked, ) } 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 b3cfd7972f..b978fc49a0 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 @@ -34,7 +34,7 @@ class FilterScreenTest { selectedOwnership = null, selectedProviders = DUMMY_SELECTED_PROVIDERS, ), - onSelectedProvider = { _, _ -> } + onSelectedProvider = { _, _ -> }, ) } onNodeWithText("Ownership").assertExists() @@ -50,9 +50,9 @@ class FilterScreenTest { RelayFilterState( allProviders = DUMMY_RELAY_ALL_PROVIDERS, selectedOwnership = null, - selectedProviders = DUMMY_SELECTED_PROVIDERS + selectedProviders = DUMMY_SELECTED_PROVIDERS, ), - onSelectedProvider = { _, _ -> } + onSelectedProvider = { _, _ -> }, ) } onNodeWithText("Ownership").performClick() @@ -68,9 +68,9 @@ class FilterScreenTest { RelayFilterState( allProviders = DUMMY_RELAY_ALL_PROVIDERS, selectedOwnership = Ownership.MullvadOwned, - selectedProviders = DUMMY_SELECTED_PROVIDERS + selectedProviders = DUMMY_SELECTED_PROVIDERS, ), - onSelectedProvider = { _, _ -> } + onSelectedProvider = { _, _ -> }, ) } onNodeWithText("Ownership").performClick() @@ -86,9 +86,9 @@ class FilterScreenTest { RelayFilterState( allProviders = DUMMY_RELAY_ALL_PROVIDERS, selectedOwnership = Ownership.Rented, - selectedProviders = DUMMY_SELECTED_PROVIDERS + selectedProviders = DUMMY_SELECTED_PROVIDERS, ), - onSelectedProvider = { _, _ -> } + onSelectedProvider = { _, _ -> }, ) } onNodeWithText("Ownership").performClick() @@ -104,9 +104,9 @@ class FilterScreenTest { RelayFilterState( allProviders = DUMMY_RELAY_ALL_PROVIDERS, selectedOwnership = null, - selectedProviders = DUMMY_SELECTED_PROVIDERS + selectedProviders = DUMMY_SELECTED_PROVIDERS, ), - onSelectedProvider = { _, _ -> } + onSelectedProvider = { _, _ -> }, ) } @@ -126,10 +126,10 @@ class FilterScreenTest { allProviders = listOf(), selectedOwnership = null, selectedProviders = - listOf(Provider(ProviderId("31173"), Ownership.MullvadOwned)) + listOf(Provider(ProviderId("31173"), Ownership.MullvadOwned)), ), onSelectedProvider = { _, _ -> }, - onApplyClick = mockClickListener + onApplyClick = mockClickListener, ) } onNodeWithText("Apply").performClick() @@ -155,7 +155,7 @@ class FilterScreenTest { Provider(ProviderId("Quadranet"), Ownership.Rented), Provider(ProviderId("techfutures"), Ownership.Rented), Provider(ProviderId("Tzulo"), Ownership.Rented), - Provider(ProviderId("xtom"), Ownership.Rented) + Provider(ProviderId("xtom"), Ownership.Rented), ) private val DUMMY_SELECTED_PROVIDERS = @@ -176,7 +176,7 @@ class FilterScreenTest { Provider(ProviderId("Quadranet"), Ownership.Rented), Provider(ProviderId("techfutures"), Ownership.Rented), Provider(ProviderId("Tzulo"), Ownership.Rented), - Provider(ProviderId("xtom"), Ownership.Rented) + Provider(ProviderId("xtom"), Ownership.Rented), ) } } 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 3ead3828d3..4294577836 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 @@ -42,14 +42,14 @@ class OutOfTimeScreenTest { onRedeemVoucherClick = {}, onSettingsClick = {}, onAccountClick = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } // Assert onNodeWithText( "Either buy credit on our website or redeem a voucher.", - substring = true + substring = true, ) .assertDoesNotExist() onNodeWithText("Buy credit").assertDoesNotExist() @@ -66,7 +66,7 @@ class OutOfTimeScreenTest { onRedeemVoucherClick = {}, onSettingsClick = {}, onAccountClick = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -86,7 +86,7 @@ class OutOfTimeScreenTest { onRedeemVoucherClick = {}, onSettingsClick = {}, onAccountClick = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -109,7 +109,7 @@ class OutOfTimeScreenTest { onRedeemVoucherClick = mockClickListener, onSettingsClick = {}, onAccountClick = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -131,13 +131,13 @@ class OutOfTimeScreenTest { OutOfTimeUiState( tunnelState = TunnelState.Connecting(null, null, emptyList()), deviceName = "", - showSitePayment = true + showSitePayment = true, ), onSitePaymentClick = {}, onRedeemVoucherClick = {}, onSettingsClick = {}, onAccountClick = {}, - onDisconnectClick = mockClickListener + onDisconnectClick = mockClickListener, ) } @@ -157,13 +157,13 @@ class OutOfTimeScreenTest { state = OutOfTimeUiState( showSitePayment = true, - billingPaymentState = PaymentState.Error.Billing + billingPaymentState = PaymentState.Error.Billing, ), onSitePaymentClick = {}, onRedeemVoucherClick = {}, onSettingsClick = {}, onAccountClick = {}, - onPurchaseBillingProductClick = { _ -> } + onPurchaseBillingProductClick = { _ -> }, ) } @@ -184,13 +184,13 @@ class OutOfTimeScreenTest { OutOfTimeUiState( showSitePayment = true, billingPaymentState = - PaymentState.PaymentAvailable(listOf(mockPaymentProduct)) + PaymentState.PaymentAvailable(listOf(mockPaymentProduct)), ), onSitePaymentClick = {}, onRedeemVoucherClick = {}, onSettingsClick = {}, onAccountClick = {}, - onPurchaseBillingProductClick = { _ -> } + onPurchaseBillingProductClick = { _ -> }, ) } @@ -211,8 +211,8 @@ class OutOfTimeScreenTest { OutOfTimeUiState( showSitePayment = true, billingPaymentState = - PaymentState.PaymentAvailable(listOf(mockPaymentProduct)) - ), + PaymentState.PaymentAvailable(listOf(mockPaymentProduct)), + ) ) } @@ -234,9 +234,9 @@ class OutOfTimeScreenTest { OutOfTimeUiState( showSitePayment = true, billingPaymentState = - PaymentState.PaymentAvailable(listOf(mockPaymentProduct)) + PaymentState.PaymentAvailable(listOf(mockPaymentProduct)), ), - navigateToVerificationPendingDialog = mockNavigateToVerificationPending + navigateToVerificationPendingDialog = mockNavigateToVerificationPending, ) } @@ -291,7 +291,7 @@ class OutOfTimeScreenTest { onRedeemVoucherClick = {}, onSettingsClick = {}, onAccountClick = {}, - onPurchaseBillingProductClick = clickHandler + onPurchaseBillingProductClick = clickHandler, ) } 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 d8159dafd0..10e7af7923 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 @@ -39,7 +39,7 @@ class RedeemVoucherDialogTest { state = VoucherDialogUiState.INITIAL, onVoucherInputChange = {}, onRedeem = {}, - onDismiss = mockedClickHandler + onDismiss = mockedClickHandler, ) } @@ -60,7 +60,7 @@ class RedeemVoucherDialogTest { state = VoucherDialogUiState(voucherState = VoucherDialogState.Success(0)), onVoucherInputChange = {}, onRedeem = {}, - onDismiss = mockedClickHandler + onDismiss = mockedClickHandler, ) } @@ -81,7 +81,7 @@ class RedeemVoucherDialogTest { state = VoucherDialogUiState(), onVoucherInputChange = mockedClickHandler, onRedeem = {}, - onDismiss = {} + onDismiss = {}, ) } @@ -101,7 +101,7 @@ class RedeemVoucherDialogTest { state = VoucherDialogUiState(voucherState = VoucherDialogState.Verifying), onVoucherInputChange = {}, onRedeem = {}, - onDismiss = {} + onDismiss = {}, ) } @@ -118,7 +118,7 @@ class RedeemVoucherDialogTest { state = VoucherDialogUiState(voucherState = VoucherDialogState.Success(0)), onVoucherInputChange = {}, onRedeem = {}, - onDismiss = {} + onDismiss = {}, ) } @@ -139,7 +139,7 @@ class RedeemVoucherDialogTest { ), onVoucherInputChange = {}, onRedeem = {}, - onDismiss = {} + onDismiss = {}, ) } 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 4f3bac57e2..31097725db 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 @@ -37,11 +37,7 @@ class SelectLocationScreenTest { fun testDefaultState() = composeExtension.use { // Arrange - setContentWithTheme { - SelectLocationScreen( - state = SelectLocationUiState.Loading, - ) - } + setContentWithTheme { SelectLocationScreen(state = SelectLocationUiState.Loading) } // Assert onNodeWithTag(CIRCULAR_PROGRESS_INDICATOR).assertExists() @@ -62,7 +58,7 @@ class SelectLocationScreenTest { RelayListItem.GeoLocationItem(item = it) }, customLists = emptyList(), - ), + ) ) } @@ -87,9 +83,9 @@ class SelectLocationScreenTest { searchTerm = "", filterChips = emptyList(), relayListItems = emptyList(), - customLists = emptyList() + customLists = emptyList(), ), - onSearchTermInput = mockedSearchTermInput + onSearchTermInput = mockedSearchTermInput, ) } val mockSearchString = "SEARCH" @@ -117,7 +113,7 @@ class SelectLocationScreenTest { listOf(RelayListItem.LocationsEmptyText(mockSearchString)), customLists = emptyList(), ), - onSearchTermInput = mockedSearchTermInput + onSearchTermInput = mockedSearchTermInput, ) } @@ -139,7 +135,7 @@ class SelectLocationScreenTest { filterChips = emptyList(), relayListItems = listOf(RelayListItem.CustomListFooter(false)), customLists = emptyList(), - ), + ) ) } @@ -160,7 +156,7 @@ class SelectLocationScreenTest { filterChips = emptyList(), relayListItems = emptyList(), customLists = DUMMY_RELAY_ITEM_CUSTOM_LISTS, - ), + ) ) } @@ -182,9 +178,9 @@ class SelectLocationScreenTest { searchTerm = "", filterChips = emptyList(), relayListItems = listOf(RelayListItem.CustomListItem(customList)), - customLists = DUMMY_RELAY_ITEM_CUSTOM_LISTS + customLists = DUMMY_RELAY_ITEM_CUSTOM_LISTS, ), - onSelectRelay = mockedOnSelectRelay + onSelectRelay = mockedOnSelectRelay, ) } @@ -209,9 +205,9 @@ class SelectLocationScreenTest { filterChips = emptyList(), relayListItems = listOf(RelayListItem.CustomListItem(item = customList)), - customLists = DUMMY_RELAY_ITEM_CUSTOM_LISTS + customLists = DUMMY_RELAY_ITEM_CUSTOM_LISTS, ), - onSelectRelay = mockedOnSelectRelay + onSelectRelay = mockedOnSelectRelay, ) } @@ -237,7 +233,7 @@ class SelectLocationScreenTest { relayListItems = listOf(RelayListItem.GeoLocationItem(relayItem)), customLists = emptyList(), ), - onSelectRelay = mockedOnSelectRelay + onSelectRelay = mockedOnSelectRelay, ) } diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreenTest.kt index 32bab72de2..2cd3163e78 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreenTest.kt @@ -46,7 +46,7 @@ class ServerIpOverridesScreenTest { onInfoClick = onInfoClick, onResetOverridesClick = onResetOverridesClick, onImportByFile = onImportByFile, - onImportByText = onImportByText + onImportByText = onImportByText, ) } @@ -100,7 +100,7 @@ class ServerIpOverridesScreenTest { setContentWithTheme { ScreenWithDefault( state = ServerIpOverridesViewState.Loaded(false), - onInfoClick = clickHandler + onInfoClick = clickHandler, ) } @@ -119,7 +119,7 @@ class ServerIpOverridesScreenTest { setContentWithTheme { ScreenWithDefault( state = ServerIpOverridesViewState.Loaded(true), - onResetOverridesClick = clickHandler + onResetOverridesClick = clickHandler, ) } @@ -139,7 +139,7 @@ class ServerIpOverridesScreenTest { setContentWithTheme { ScreenWithDefault( state = ServerIpOverridesViewState.Loaded(false), - onImportByFile = clickHandler + onImportByFile = clickHandler, ) } @@ -159,7 +159,7 @@ class ServerIpOverridesScreenTest { setContentWithTheme { ScreenWithDefault( state = ServerIpOverridesViewState.Loaded(false), - onImportByText = clickHandler + onImportByText = clickHandler, ) } 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 469fb629a4..f108efab8e 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 @@ -32,8 +32,8 @@ class SettingsScreenTest { appVersion = "", isLoggedIn = true, isSupportedVersion = true, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } // Assert @@ -55,8 +55,8 @@ class SettingsScreenTest { appVersion = "", isLoggedIn = false, isSupportedVersion = true, - isPlayBuild = false - ), + isPlayBuild = false, + ) ) } // Assert 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 04b88ce3b5..500349c861 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 @@ -54,13 +54,13 @@ class SplitTunnelingScreenTest { AppData( packageName = EXCLUDED_APP_PACKAGE_NAME, iconRes = 0, - name = EXCLUDED_APP_NAME + name = EXCLUDED_APP_NAME, ) val includedApp = AppData( packageName = INCLUDED_APP_PACKAGE_NAME, iconRes = 0, - name = INCLUDED_APP_NAME + name = INCLUDED_APP_NAME, ) setContentWithTheme { SplitTunnelingScreen( @@ -69,7 +69,7 @@ class SplitTunnelingScreenTest { enabled = true, excludedApps = listOf(excludedApp), includedApps = listOf(includedApp), - showSystemApps = false + showSystemApps = false, ) ) } @@ -92,7 +92,7 @@ class SplitTunnelingScreenTest { AppData( packageName = INCLUDED_APP_PACKAGE_NAME, iconRes = 0, - name = INCLUDED_APP_NAME + name = INCLUDED_APP_NAME, ) setContentWithTheme { SplitTunnelingScreen( @@ -101,7 +101,7 @@ class SplitTunnelingScreenTest { enabled = true, excludedApps = emptyList(), includedApps = listOf(includedApp), - showSystemApps = false + showSystemApps = false, ) ) } @@ -124,13 +124,13 @@ class SplitTunnelingScreenTest { AppData( packageName = EXCLUDED_APP_PACKAGE_NAME, iconRes = 0, - name = EXCLUDED_APP_NAME + name = EXCLUDED_APP_NAME, ) val includedApp = AppData( packageName = INCLUDED_APP_PACKAGE_NAME, iconRes = 0, - name = INCLUDED_APP_NAME + name = INCLUDED_APP_NAME, ) val mockedClickHandler: (String) -> Unit = mockk(relaxed = true) setContentWithTheme { @@ -140,9 +140,9 @@ class SplitTunnelingScreenTest { enabled = true, excludedApps = listOf(excludedApp), includedApps = listOf(includedApp), - showSystemApps = false + showSystemApps = false, ), - onExcludeAppClick = mockedClickHandler + onExcludeAppClick = mockedClickHandler, ) } @@ -161,13 +161,13 @@ class SplitTunnelingScreenTest { AppData( packageName = EXCLUDED_APP_PACKAGE_NAME, iconRes = 0, - name = EXCLUDED_APP_NAME + name = EXCLUDED_APP_NAME, ) val includedApp = AppData( packageName = INCLUDED_APP_PACKAGE_NAME, iconRes = 0, - name = INCLUDED_APP_NAME + name = INCLUDED_APP_NAME, ) val mockedClickHandler: (String) -> Unit = mockk(relaxed = true) setContentWithTheme { @@ -177,9 +177,9 @@ class SplitTunnelingScreenTest { enabled = true, excludedApps = listOf(excludedApp), includedApps = listOf(includedApp), - showSystemApps = false + showSystemApps = false, ), - onIncludeAppClick = mockedClickHandler + onIncludeAppClick = mockedClickHandler, ) } @@ -198,13 +198,13 @@ class SplitTunnelingScreenTest { AppData( packageName = EXCLUDED_APP_PACKAGE_NAME, iconRes = 0, - name = EXCLUDED_APP_NAME + name = EXCLUDED_APP_NAME, ) val includedApp = AppData( packageName = INCLUDED_APP_PACKAGE_NAME, iconRes = 0, - name = INCLUDED_APP_NAME + name = INCLUDED_APP_NAME, ) val mockedClickHandler: (Boolean) -> Unit = mockk(relaxed = true) setContentWithTheme { @@ -214,9 +214,9 @@ class SplitTunnelingScreenTest { enabled = true, excludedApps = listOf(excludedApp), includedApps = listOf(includedApp), - showSystemApps = false + showSystemApps = false, ), - onShowSystemAppsClick = mockedClickHandler + onShowSystemAppsClick = mockedClickHandler, ) } 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 2a3031ecec..b2079e0e78 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 @@ -48,11 +48,7 @@ class VpnSettingsScreenTest { fun testDefaultState() = composeExtension.use { // Arrange - setContentWithTheme { - VpnSettingsScreen( - state = VpnSettingsUiState.createDefault(), - ) - } + setContentWithTheme { VpnSettingsScreen(state = VpnSettingsUiState.createDefault()) } onNodeWithText("Auto-connect (legacy)").assertExists() @@ -75,7 +71,7 @@ class VpnSettingsScreenTest { state = VpnSettingsUiState.createDefault( mtu = Mtu.fromString(VALID_DUMMY_MTU_VALUE).getOrNull()!! - ), + ) ) } @@ -99,9 +95,9 @@ class VpnSettingsScreenTest { listOf( CustomDnsItem(address = DUMMY_DNS_ADDRESS, false), CustomDnsItem(address = DUMMY_DNS_ADDRESS_2, false), - CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false) - ) - ), + CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false), + ), + ) ) } @@ -122,8 +118,8 @@ class VpnSettingsScreenTest { VpnSettingsUiState.createDefault( isCustomDnsEnabled = false, customDnsItems = - listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false)) - ), + listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false)), + ) ) } onNodeWithTag(LAZY_LIST_TEST_TAG) @@ -144,8 +140,8 @@ class VpnSettingsScreenTest { isCustomDnsEnabled = true, isLocalNetworkSharingEnabled = true, customDnsItems = - listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)) - ), + listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)), + ) ) } @@ -163,8 +159,8 @@ class VpnSettingsScreenTest { VpnSettingsUiState.createDefault( isCustomDnsEnabled = true, customDnsItems = - listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)) - ), + listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)), + ) ) } @@ -182,8 +178,8 @@ class VpnSettingsScreenTest { VpnSettingsUiState.createDefault( isCustomDnsEnabled = true, customDnsItems = - listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)) - ), + listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)), + ) ) } @@ -201,8 +197,8 @@ class VpnSettingsScreenTest { VpnSettingsUiState.createDefault( isCustomDnsEnabled = true, customDnsItems = - listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)) - ), + listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)), + ) ) } @@ -220,9 +216,9 @@ class VpnSettingsScreenTest { state = VpnSettingsUiState.createDefault( selectedObfuscation = SelectedObfuscation.Udp2Tcp, - selectedObfuscationPort = Constraint.Only(Port(5001)) + selectedObfuscationPort = Constraint.Only(Port(5001)), ), - onObfuscationPortSelected = onObfuscationPortSelected + onObfuscationPortSelected = onObfuscationPortSelected, ) } @@ -238,7 +234,7 @@ class VpnSettingsScreenTest { // Assert onNodeWithTagAndText( testTag = String.format(LAZY_LIST_UDP_OVER_TCP_PORT_ITEM_X_TEST_TAG, 5001), - text = "5001" + text = "5001", ) .assertExists() .performClick() @@ -255,9 +251,9 @@ class VpnSettingsScreenTest { VpnSettingsScreen( state = VpnSettingsUiState.createDefault( - selectedObfuscation = SelectedObfuscation.Off, + selectedObfuscation = SelectedObfuscation.Off ), - onObfuscationPortSelected = onObfuscationPortSelected + onObfuscationPortSelected = onObfuscationPortSelected, ) } @@ -287,7 +283,7 @@ class VpnSettingsScreenTest { state = VpnSettingsUiState.createDefault( quantumResistant = QuantumResistantState.On - ), + ) ) } onNodeWithTag(LAZY_LIST_TEST_TAG) @@ -308,7 +304,7 @@ class VpnSettingsScreenTest { VpnSettingsScreen( state = VpnSettingsUiState.createDefault( - quantumResistant = QuantumResistantState.Auto, + quantumResistant = QuantumResistantState.Auto ), onSelectQuantumResistanceSetting = mockSelectQuantumResistantSettingListener, ) @@ -333,7 +329,7 @@ class VpnSettingsScreenTest { state = VpnSettingsUiState.createDefault( selectedWireguardPort = Constraint.Only(Port(53)) - ), + ) ) } @@ -346,7 +342,7 @@ class VpnSettingsScreenTest { // Assert onNodeWithTagAndText( testTag = String.format(LAZY_LIST_WIREGUARD_PORT_ITEM_X_TEST_TAG, 51820), - text = "51820" + text = "51820", ) .assertExists() } @@ -374,7 +370,7 @@ class VpnSettingsScreenTest { ) onNodeWithTagAndText( testTag = String.format(LAZY_LIST_WIREGUARD_PORT_ITEM_X_TEST_TAG, 51820), - text = "51820" + text = "51820", ) .performClick() @@ -393,7 +389,7 @@ class VpnSettingsScreenTest { state = VpnSettingsUiState.createDefault( customWireguardPort = Constraint.Only(Port(4000)) - ), + ) ) } @@ -415,9 +411,9 @@ class VpnSettingsScreenTest { state = VpnSettingsUiState.createDefault( selectedWireguardPort = Constraint.Only(Port(4000)), - customWireguardPort = Constraint.Only(Port(4000)) + customWireguardPort = Constraint.Only(Port(4000)), ), - onWireguardPortSelected = onWireguardPortSelected + onWireguardPortSelected = onWireguardPortSelected, ) } @@ -440,7 +436,7 @@ class VpnSettingsScreenTest { setContentWithTheme { VpnSettingsScreen( state = VpnSettingsUiState.createDefault(), - navigateToMtuDialog = mockedClickHandler + navigateToMtuDialog = mockedClickHandler, ) } @@ -462,7 +458,7 @@ class VpnSettingsScreenTest { setContentWithTheme { VpnSettingsScreen( state = VpnSettingsUiState.createDefault(isCustomDnsEnabled = true), - navigateToDns = mockedClickHandler + navigateToDns = mockedClickHandler, ) } @@ -482,7 +478,7 @@ class VpnSettingsScreenTest { setContentWithTheme { VpnSettingsScreen( state = VpnSettingsUiState.createDefault(), - navigateToObfuscationInfo = mockedNavigateToObfuscationInfo + navigateToObfuscationInfo = mockedNavigateToObfuscationInfo, ) } @@ -505,7 +501,7 @@ class VpnSettingsScreenTest { setContentWithTheme { VpnSettingsScreen( state = VpnSettingsUiState.createDefault(), - navigateToQuantumResistanceInfo = mockedShowTunnelQuantumInfoClick + navigateToQuantumResistanceInfo = mockedShowTunnelQuantumInfoClick, ) } @@ -528,7 +524,7 @@ class VpnSettingsScreenTest { setContentWithTheme { VpnSettingsScreen( state = VpnSettingsUiState.createDefault(), - navigateToWireguardPortInfo = mockedClickHandler + navigateToWireguardPortInfo = mockedClickHandler, ) } @@ -546,7 +542,7 @@ class VpnSettingsScreenTest { setContentWithTheme { VpnSettingsScreen( state = VpnSettingsUiState.createDefault(), - navigateToWireguardPortDialog = mockedClickHandler + navigateToWireguardPortDialog = mockedClickHandler, ) } @@ -566,7 +562,7 @@ class VpnSettingsScreenTest { setContentWithTheme { VpnSettingsScreen( state = VpnSettingsUiState.createDefault(), - navigateToWireguardPortDialog = mockOnShowCustomPortDialog + navigateToWireguardPortDialog = mockOnShowCustomPortDialog, ) } @@ -590,7 +586,7 @@ class VpnSettingsScreenTest { VpnSettingsUiState.createDefault( selectedWireguardPort = Constraint.Only(Port(4000)) ), - navigateToWireguardPortDialog = mockOnShowCustomPortDialog + navigateToWireguardPortDialog = mockOnShowCustomPortDialog, ) } 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 cd5afa18fc..a9f1658308 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 @@ -46,7 +46,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -69,14 +69,14 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } // Assert onNodeWithText( "Either buy credit on our website or redeem a voucher.", - substring = true + substring = true, ) .assertDoesNotExist() onNodeWithText("Buy credit").assertDoesNotExist() @@ -98,7 +98,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -121,7 +121,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -147,7 +147,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -172,7 +172,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -201,7 +201,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -231,7 +231,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -262,7 +262,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToVerificationPendingDialog = mockShowPendingInfo, navigateToDeviceInfoDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -295,7 +295,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = { _ -> }, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -326,7 +326,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = clickHandler, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = {} + onDisconnectClick = {}, ) } @@ -354,7 +354,7 @@ class WelcomeScreenTest { onPurchaseBillingProductClick = {}, navigateToDeviceInfoDialog = {}, navigateToVerificationPendingDialog = {}, - onDisconnectClick = clickHandler + onDisconnectClick = clickHandler, ) } |