From d27ab1d31a628763eeeb14defd6a11cde8c8a167 Mon Sep 17 00:00:00 2001 From: David Perez Date: Thu, 6 Feb 2025 08:52:09 -0600 Subject: [PATCH] Apply formatter to the entire app (#4698) --- .../auth/repository/AuthRepositoryImpl.kt | 2 + .../manager/Fido2CredentialManagerImpl.kt | 1 - .../datasource/disk/ConfigDiskSourceImpl.kt | 1 - .../disk/EnvironmentDiskSourceImpl.kt | 1 - .../datasource/disk/EventDiskSourceImpl.kt | 1 - .../datasource/disk/SettingsDiskSource.kt | 4 +- .../tiles/BitwardenGeneratorTileService.kt | 1 - .../data/tiles/BitwardenVaultTileService.kt | 1 - .../disk/GeneratorDiskSourceImpl.kt | 1 - .../datasource/disk/VaultDiskSourceImpl.kt | 1 - .../datasource/sdk/VaultSdkSourceImpl.kt | 2 +- .../components/coachmark/CoachMarkScope.kt | 1 - .../coachmark/CoachMarkScopeInstance.kt | 1 - .../dialog/BitwardenLoadingDialog.kt | 2 +- .../auth/datasource/sdk/AuthSdkSourceTest.kt | 2 +- .../manager/Fido2CredentialManagerTest.kt | 1 - .../disk/EnvironmentDiskSourceTest.kt | 1 - .../manager/FirstTimeActionManagerTest.kt | 6 +- .../disk/GeneratorDiskSourceTest.kt | 1 - .../datasource/sdk/VaultSdkSourceTest.kt | 8 +-- ...NewDeviceNoticeEmailAccessViewModelTest.kt | 63 ++++++++++--------- .../VaultUnlockedNavBarViewModelTest.kt | 1 + .../generator/GeneratorViewModelTest.kt | 8 +-- .../bitwarden/ui/util/ComposeTestHelpers.kt | 4 +- 24 files changed, 54 insertions(+), 61 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt index 0b92fc6ce4..bf6b287853 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt @@ -1372,6 +1372,7 @@ class AuthRepositoryImpl( // the notice needs to appear again NewDeviceNoticeDisplayStatus.HAS_SEEN -> newDeviceNoticeState.shouldDisplayNoticeIfSeen + NewDeviceNoticeDisplayStatus.HAS_NOT_SEEN -> true // the user never needs to see the notice again NewDeviceNoticeDisplayStatus.CAN_ACCESS_EMAIL_PERMANENT -> false @@ -1592,6 +1593,7 @@ class AuthRepositoryImpl( configDiskSource.serverConfig?.isOfficialBitwardenServer == false -> { LoginResult.UnofficialServerError } + else -> LoginResult.Error(errorMessage = null) } }, diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt index bb2c6eca2c..c301e2afad 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerImpl.kt @@ -24,7 +24,6 @@ import com.x8bit.bitwarden.data.vault.datasource.sdk.util.toAndroidAttestationRe import com.x8bit.bitwarden.data.vault.datasource.sdk.util.toAndroidFido2PublicKeyCredential import com.x8bit.bitwarden.ui.platform.base.util.toHostOrPathOrNull import kotlinx.serialization.SerializationException -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceImpl.kt index 28fc492438..b57902c5c3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceImpl.kt @@ -6,7 +6,6 @@ import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFl import com.x8bit.bitwarden.data.platform.util.decodeFromStringOrNull import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.onSubscription -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json private const val SERVER_CONFIGURATIONS = "serverConfigurations" diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt index b7c6893d20..4e78be4260 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt @@ -6,7 +6,6 @@ import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFl import com.x8bit.bitwarden.data.platform.util.decodeFromStringOrNull import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.onSubscription -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json private const val PRE_AUTH_URLS_KEY = "preAuthEnvironmentUrls" diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt index 752252e075..dd7319e0e0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt @@ -6,7 +6,6 @@ import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEv import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEventType import kotlinx.coroutines.withContext -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSource.kt index 7cd600bf2a..2fed12817d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSource.kt @@ -394,8 +394,8 @@ interface SettingsDiskSource { fun getShouldShowGeneratorCoachMarkFlow(): Flow /** - * Stores the given [screenData] as the screen to resume to identified by [userId]. - */ + * Stores the given [screenData] as the screen to resume to identified by [userId]. + */ fun storeAppResumeScreen(userId: String, screenData: AppResumeScreenData?) /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt index 5bd13239b4..e8924db7bf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt @@ -8,7 +8,6 @@ import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.Runnable import javax.inject.Inject /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt index 0c241a30c5..a265577ce6 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt @@ -8,7 +8,6 @@ import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.Runnable import javax.inject.Inject /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt index fd53940ab9..714293d8d0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt @@ -5,7 +5,6 @@ import com.x8bit.bitwarden.data.platform.datasource.disk.BaseDiskSource import com.x8bit.bitwarden.data.platform.util.decodeFromStringOrNull import com.x8bit.bitwarden.data.tools.generator.repository.model.PasscodeGenerationOptions import com.x8bit.bitwarden.data.tools.generator.repository.model.UsernameGenerationOptions -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json private const val PASSWORD_GENERATION_OPTIONS_KEY = "passwordGenerationOptions" diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt index ce659e852d..906b13e4f5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt @@ -23,7 +23,6 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import timber.log.Timber diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt index 084e3c0175..a9d51c59c5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt @@ -13,8 +13,8 @@ import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAssertionResponse import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAttestationResponse import com.bitwarden.sdk.BitwardenException -import com.bitwarden.sdk.VaultClient import com.bitwarden.sdk.Fido2CredentialStore +import com.bitwarden.sdk.VaultClient import com.bitwarden.send.Send import com.bitwarden.send.SendView import com.bitwarden.vault.Attachment diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScope.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScope.kt index 8286024c11..fb5e041331 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScope.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScope.kt @@ -3,7 +3,6 @@ package com.x8bit.bitwarden.ui.platform.components.coachmark import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.lazy.LazyListScope -import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import com.x8bit.bitwarden.ui.platform.base.util.Text diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScopeInstance.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScopeInstance.kt index 66bbb63bee..3b5a2a276a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScopeInstance.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkScopeInstance.kt @@ -24,7 +24,6 @@ import androidx.compose.ui.semantics.SemanticsPropertyReceiver import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.base.util.Text import com.x8bit.bitwarden.ui.platform.base.util.toListItemCardStyle import com.x8bit.bitwarden.ui.platform.components.coachmark.model.CoachMarkHighlightShape diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLoadingDialog.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLoadingDialog.kt index bbbda66284..5c6eddf5f0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLoadingDialog.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLoadingDialog.kt @@ -6,8 +6,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.semantics.testTag +import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupProperties diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt index 7b262e35cd..e038ce22fd 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/sdk/AuthSdkSourceTest.kt @@ -8,8 +8,8 @@ import com.bitwarden.core.RegisterKeyResponse import com.bitwarden.core.RegisterTdeKeyResponse import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf -import com.bitwarden.sdk.Client import com.bitwarden.sdk.AuthClient +import com.bitwarden.sdk.Client import com.bitwarden.sdk.PlatformClient import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength import com.x8bit.bitwarden.data.platform.manager.SdkClientManager diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerTest.kt index 17d42cb988..4625aba935 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2CredentialManagerTest.kt @@ -37,7 +37,6 @@ import io.mockk.slot import io.mockk.unmockkStatic import kotlinx.coroutines.test.runTest import kotlinx.serialization.SerializationException -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt index 9e853b6267..4c91d94620 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt @@ -6,7 +6,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJso import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences import com.x8bit.bitwarden.data.platform.repository.model.Environment import kotlinx.coroutines.test.runTest -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.encodeToJsonElement import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt index 964f39ad66..98a5fdb0cd 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt @@ -349,13 +349,13 @@ class FirstTimeActionManagerTest { fun `shouldShowGeneratorCoachMarkFlow updates when onboarding feature value changes`() = runTest { firstTimeActionManager.shouldShowGeneratorCoachMarkFlow.test { - // Null will be mapped to false + // Null will be mapped to false assertFalse(awaitItem()) mutableOnboardingFeatureFlow.update { true } - // Take the value from disk. + // Take the value from disk. assertTrue(awaitItem()) + } } - } @Suppress("MaxLineLength") @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt index 9a804bbb30..acc6153d02 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt @@ -4,7 +4,6 @@ import androidx.core.content.edit import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences import com.x8bit.bitwarden.data.tools.generator.repository.model.PasscodeGenerationOptions import com.x8bit.bitwarden.data.tools.generator.repository.model.UsernameGenerationOptions -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotNull diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt index d7e98f9e03..b4be23af6a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt @@ -15,20 +15,20 @@ import com.bitwarden.fido.Origin import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAssertionResponse import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAttestationResponse import com.bitwarden.fido.UnverifiedAssetLink +import com.bitwarden.sdk.AuthClient import com.bitwarden.sdk.BitwardenException import com.bitwarden.sdk.Client -import com.bitwarden.sdk.AuthClient import com.bitwarden.sdk.ClientCiphers -import com.bitwarden.sdk.CryptoClient -import com.bitwarden.sdk.ExporterClient import com.bitwarden.sdk.ClientFido2 import com.bitwarden.sdk.ClientFido2Authenticator import com.bitwarden.sdk.ClientFido2Client import com.bitwarden.sdk.ClientPasswordHistory +import com.bitwarden.sdk.CryptoClient +import com.bitwarden.sdk.ExporterClient +import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.sdk.PlatformClient import com.bitwarden.sdk.SendClient import com.bitwarden.sdk.VaultClient -import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.send.Send import com.bitwarden.send.SendView import com.bitwarden.vault.Attachment diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessViewModelTest.kt index 0b431cbea1..538927218d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessViewModelTest.kt @@ -99,40 +99,43 @@ class NewDeviceNoticeEmailAccessViewModelTest : BaseViewModelTest() { @Test @Suppress("MaxLineLength") - fun `ContinueClick should emit NavigateBackToVault if isEmailAccessEnabled and NewDevicePermanentDismiss flag is off`() = runTest { - every { featureFlagManager.getFeatureFlag(FlagKey.NewDevicePermanentDismiss) } returns false + fun `ContinueClick should emit NavigateBackToVault if isEmailAccessEnabled and NewDevicePermanentDismiss flag is off`() = + runTest { + every { + featureFlagManager.getFeatureFlag(FlagKey.NewDevicePermanentDismiss) + } returns false - val viewModel = createViewModel() - viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.EmailAccessToggle(true)) - viewModel.eventFlow.test { - viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.ContinueClick) - assertEquals( - NewDeviceNoticeEmailAccessEvent.NavigateBackToVault, - awaitItem(), - ) - verify(exactly = 1) { - authRepository.setNewDeviceNoticeState( - NewDeviceNoticeState( - displayStatus = NewDeviceNoticeDisplayStatus.CAN_ACCESS_EMAIL, - lastSeenDate = null, - ), + val viewModel = createViewModel() + viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.EmailAccessToggle(true)) + viewModel.eventFlow.test { + viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.ContinueClick) + assertEquals( + NewDeviceNoticeEmailAccessEvent.NavigateBackToVault, + awaitItem(), + ) + verify(exactly = 1) { + authRepository.setNewDeviceNoticeState( + NewDeviceNoticeState( + displayStatus = NewDeviceNoticeDisplayStatus.CAN_ACCESS_EMAIL, + lastSeenDate = null, + ), + ) + } + } + } + + @Test + fun `ContinueClick should emit NavigateToTwoFactorOptions if isEmailAccessEnabled is false`() = + runTest { + val viewModel = createViewModel() + viewModel.eventFlow.test { + viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.ContinueClick) + assertEquals( + NewDeviceNoticeEmailAccessEvent.NavigateToTwoFactorOptions, + awaitItem(), ) } } - } - - @Test - @Suppress("MaxLineLength") - fun `ContinueClick should emit NavigateToTwoFactorOptions if isEmailAccessEnabled is false`() = runTest { - val viewModel = createViewModel() - viewModel.eventFlow.test { - viewModel.trySendAction(NewDeviceNoticeEmailAccessAction.ContinueClick) - assertEquals( - NewDeviceNoticeEmailAccessEvent.NavigateToTwoFactorOptions, - awaitItem(), - ) - } - } @Test fun `LearnMoreClick should emit NavigateToLearnMore`() = diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarViewModelTest.kt index 60c547fa1e..02950a10cb 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarViewModelTest.kt @@ -248,6 +248,7 @@ class VaultUnlockedNavBarViewModelTest : BaseViewModelTest() { viewModel.stateFlow.value, ) } + @Suppress("MaxLineLength") @Test fun `on init with SendShortcut special circumstance should navigate to the send screen with shortcut event`() = diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt index 2d805738fc..14a803eb05 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt @@ -2258,15 +2258,15 @@ class GeneratorViewModelTest : BaseViewModelTest() { @Test fun `StartExploreGeneratorTour action calls first time action manager markCoachMarkTourCompleted called and show coach mark event sent`() = runTest { - val viewModel = createViewModel() + val viewModel = createViewModel() viewModel.eventFlow.test { viewModel.trySendAction(GeneratorAction.StartExploreGeneratorTour) assertEquals(GeneratorEvent.StartCoachMarkTour, awaitItem()) } - verify(exactly = 1) { - firstTimeActionManager.markCoachMarkTourCompleted(CoachMarkTourType.GENERATOR) + verify(exactly = 1) { + firstTimeActionManager.markCoachMarkTourCompleted(CoachMarkTourType.GENERATOR) + } } - } //region Helper Functions @Suppress("LongParameterList") diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/util/ComposeTestHelpers.kt b/app/src/test/java/com/x8bit/bitwarden/ui/util/ComposeTestHelpers.kt index 41867db70c..ebee5291d4 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/util/ComposeTestHelpers.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/util/ComposeTestHelpers.kt @@ -65,8 +65,8 @@ fun ComposeContentTestRule.assertNoDialogExists() { } /** -* Asserts that no popup currently exists. -*/ + * Asserts that no popup currently exists. + */ fun ComposeContentTestRule.assertNoPopupExists() { this .onNode(isPopup())