From b7948948f00fcec715fc9c82576ea1ea00a48b1f Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Mon, 31 Mar 2025 13:38:45 -0400 Subject: [PATCH] [PM-19628] Migrate ResultExtensions to core module (#4934) --- .../service/NewAuthRequestServiceImpl.kt | 2 +- .../auth/manager/AuthRequestManagerImpl.kt | 6 ++--- .../auth/manager/KeyConnectorManagerImpl.kt | 2 +- .../auth/manager/TrustedDeviceManagerImpl.kt | 4 ++-- .../auth/repository/AuthRepositoryImpl.kt | 6 ++--- .../network/util/NetworkResultExtensions.kt | 4 ++-- .../network/service/CiphersServiceImpl.kt | 2 +- .../data/vault/manager/CipherManagerImpl.kt | 6 ++--- .../vault/manager/VaultLockManagerImpl.kt | 4 ++-- .../vault/repository/VaultRepositoryImpl.kt | 6 ++--- .../network/service/AccountsServiceTest.kt | 2 +- .../service/AuthRequestsServiceTest.kt | 2 +- .../network/service/DevicesServiceTest.kt | 2 +- .../network/service/IdentityServiceTest.kt | 2 +- .../service/NewAuthRequestServiceTest.kt | 2 +- .../service/OrganizationServiceTest.kt | 2 +- .../auth/datasource/sdk/AuthSdkSourceTest.kt | 2 +- .../auth/manager/AuthRequestManagerTest.kt | 4 ++-- .../auth/manager/KeyConnectorManagerTest.kt | 4 ++-- .../auth/manager/TrustedDeviceManagerTests.kt | 4 ++-- .../auth/repository/AuthRepositoryTest.kt | 4 ++-- .../manager/Fido2CredentialManagerTest.kt | 2 +- .../fido2/manager/Fido2OriginManagerTest.kt | 6 ++--- .../processor/Fido2ProviderProcessorTest.kt | 4 ++-- .../RefreshAuthenticatorTests.kt | 4 ++-- .../network/service/ConfigServiceTest.kt | 4 ++-- .../util/NetworkResultExtensionsTest.kt | 4 ++-- .../data/platform/manager/PushManagerTest.kt | 4 ++-- .../event/OrganizationEventManagerTest.kt | 2 +- .../AuthenticatorBridgeProcessorTest.kt | 2 +- .../AuthenticatorBridgeRepositoryTest.kt | 2 +- .../repository/ServerConfigRepositoryTest.kt | 2 +- .../repository/SettingsRepositoryTest.kt | 4 ++-- .../datasource/sdk/GeneratorSdkSourceTest.kt | 2 +- .../repository/GeneratorRepositoryTest.kt | 4 ++-- .../datasource/sdk/VaultSdkSourceTest.kt | 4 ++-- .../data/vault/manager/CipherManagerTest.kt | 4 ++-- .../data/vault/manager/TotpCodeManagerTest.kt | 4 ++-- .../vault/manager/VaultLockManagerTest.kt | 4 ++-- .../vault/repository/VaultRepositoryTest.kt | 4 ++-- .../environment/EnvironmentViewModelTest.kt | 2 +- .../datasource/network/core/ResultCall.kt | 4 ++-- .../data/platform/util/ResultExtensions.kt | 22 ------------------- .../network/service/ConfigServiceTest.kt | 4 ++-- .../repository/ServerConfigRepositoryTest.kt | 2 +- core/build.gradle.kts | 16 ++++++++++++++ .../core/data}/util/ResultExtensions.kt | 2 +- .../bitwarden/core/data}/util/ResultTest.kt | 2 +- 48 files changed, 93 insertions(+), 99 deletions(-) delete mode 100644 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/util/ResultExtensions.kt rename {app/src/main/java/com/x8bit/bitwarden/data/platform => core/src/main/kotlin/com/bitwarden/core/data}/util/ResultExtensions.kt (98%) rename {app/src/test/java/com/x8bit/bitwarden/data/platform => core/src/test/kotlin/com/bitwarden/core/data}/util/ResultTest.kt (99%) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceImpl.kt index 0b0c9e51f2..19a0a68558 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceImpl.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service +import com.bitwarden.core.data.util.asFailure import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedAuthRequestsApi import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedAuthRequestsApi import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestRequestJson import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestTypeJson import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestsResponseJson import com.x8bit.bitwarden.data.platform.datasource.network.util.toResult -import com.x8bit.bitwarden.data.platform.util.asFailure /** * The default implementation of the [NewAuthRequestService]. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt index b2768cfb26..f187d648c5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerImpl.kt @@ -1,6 +1,9 @@ package com.x8bit.bitwarden.data.auth.manager import com.bitwarden.core.AuthRequestResponse +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.core.data.util.flatMap import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestTypeJson @@ -17,9 +20,6 @@ import com.x8bit.bitwarden.data.auth.manager.model.CreateAuthRequestResult import com.x8bit.bitwarden.data.auth.manager.util.isSso import com.x8bit.bitwarden.data.auth.manager.util.toAuthRequestTypeJson import com.x8bit.bitwarden.data.platform.error.NoActiveUserException -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess -import com.x8bit.bitwarden.data.platform.util.flatMap import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import kotlinx.coroutines.currentCoroutineContext import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerImpl.kt index b9d5875ea5..db692face1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerImpl.kt @@ -1,13 +1,13 @@ package com.x8bit.bitwarden.data.auth.manager import com.bitwarden.core.KeyConnectorResponse +import com.bitwarden.core.data.util.flatMap import com.bitwarden.crypto.Kdf import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyRequestJson import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson import com.x8bit.bitwarden.data.auth.datasource.network.service.AccountsService import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource -import com.x8bit.bitwarden.data.platform.util.flatMap import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt index e3dc7d55cd..a14647751f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.auth.manager +import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.core.data.util.flatMap import com.bitwarden.crypto.TrustDeviceResponse import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesService import com.x8bit.bitwarden.data.auth.manager.util.toUserStateJson -import com.x8bit.bitwarden.data.platform.util.asSuccess -import com.x8bit.bitwarden.data.platform.util.flatMap import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource /** 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 53bfc4f9b9..19770280c1 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 @@ -3,6 +3,9 @@ package com.x8bit.bitwarden.data.auth.repository import com.bitwarden.core.AuthRequestMethod import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.core.data.util.flatMap import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource @@ -115,9 +118,6 @@ import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrls -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess -import com.x8bit.bitwarden.data.platform.util.flatMap import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/util/NetworkResultExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/util/NetworkResultExtensions.kt index 7f4e983bb3..a923361fc5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/util/NetworkResultExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/util/NetworkResultExtensions.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.platform.datasource.network.util +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess /** * Converts the [NetworkResult] to a [Result]. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt index 1170a2c610..c8e1829f5f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import androidx.core.net.toUri +import com.bitwarden.core.data.util.asFailure import com.bitwarden.vault.Attachment import com.x8bit.bitwarden.data.platform.datasource.network.model.toBitwardenError import com.x8bit.bitwarden.data.platform.datasource.network.util.NetworkErrorCode import com.x8bit.bitwarden.data.platform.datasource.network.util.parseErrorBodyOrNull import com.x8bit.bitwarden.data.platform.datasource.network.util.toResult -import com.x8bit.bitwarden.data.platform.util.asFailure import com.x8bit.bitwarden.data.vault.datasource.network.api.AzureApi import com.x8bit.bitwarden.data.vault.datasource.network.api.CiphersApi import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonRequest diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt index ddaf078723..b9bedf6527 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt @@ -2,15 +2,15 @@ package com.x8bit.bitwarden.data.vault.manager import android.net.Uri import androidx.core.net.toUri +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.core.data.util.flatMap import com.bitwarden.vault.AttachmentView import com.bitwarden.vault.Cipher import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess -import com.x8bit.bitwarden.data.platform.util.flatMap import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.ShareCipherJsonRequest diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt index 334e4e4a21..3b6852d24e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt @@ -8,6 +8,8 @@ import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.core.InitUserCryptoRequest import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.core.data.util.flatMap import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource @@ -26,8 +28,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.AppForegroundState import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction -import com.x8bit.bitwarden.data.platform.util.asSuccess -import com.x8bit.bitwarden.data.platform.util.flatMap import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.datasource.sdk.model.InitializeCryptoResult import com.x8bit.bitwarden.data.vault.manager.model.VaultStateEvent diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt index c500bf9b3c..a84bf75b0a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt @@ -6,6 +6,9 @@ import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.core.data.util.flatMap import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore @@ -41,9 +44,6 @@ import com.x8bit.bitwarden.data.platform.repository.util.mapNullable import com.x8bit.bitwarden.data.platform.repository.util.observeWhenSubscribedAndLoggedIn import com.x8bit.bitwarden.data.platform.repository.util.observeWhenSubscribedAndUnlocked import com.x8bit.bitwarden.data.platform.repository.util.updateToPendingOrLoading -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess -import com.x8bit.bitwarden.data.platform.util.flatMap import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt index 3618db7801..7ee7291f4c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedAccountsApi import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedKeyConnectorApi import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedAccountsApi @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendNewDeviceOtp import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson import com.x8bit.bitwarden.data.platform.base.BaseServiceTest -import com.x8bit.bitwarden.data.platform.util.asSuccess import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AuthRequestsServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AuthRequestsServiceTest.kt index 98f5930893..4a23456bd3 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AuthRequestsServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AuthRequestsServiceTest.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedAuthRequestsApi import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestsResponseJson import com.x8bit.bitwarden.data.platform.base.BaseServiceTest -import com.x8bit.bitwarden.data.platform.util.asSuccess import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt index 2ddd6d74e7..3faf2531c6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedDevicesApi import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedDevicesApi import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceKeysResponseJson import com.x8bit.bitwarden.data.platform.base.BaseServiceTest -import com.x8bit.bitwarden.data.platform.util.asSuccess import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt index d1657d0858..306881b65f 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedIdentityApi import com.x8bit.bitwarden.data.auth.datasource.network.model.GetTokenResponseJson import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenRe import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson import com.x8bit.bitwarden.data.platform.base.BaseServiceTest import com.x8bit.bitwarden.data.platform.util.DeviceModelProvider -import com.x8bit.bitwarden.data.platform.util.asSuccess import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceTest.kt index c5139f85fc..6600050dc0 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceTest.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedAuthRequestsApi import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedAuthRequestsApi import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestTypeJson import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestsResponseJson import com.x8bit.bitwarden.data.platform.base.BaseServiceTest -import com.x8bit.bitwarden.data.platform.util.asSuccess import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt index aea0efb7d4..27e7f8e213 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedOrganizationApi import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedOrganizationApi import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationAutoEnrollStatusResponseJson @@ -7,7 +8,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationDomain import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationKeysResponseJson import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifiedOrganizationDomainSsoDetailsResponse import com.x8bit.bitwarden.data.platform.base.BaseServiceTest -import com.x8bit.bitwarden.data.platform.util.asSuccess import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals 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 e038ce22fd..fedf481f41 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 @@ -6,6 +6,7 @@ import com.bitwarden.core.KeyConnectorResponse import com.bitwarden.core.MasterPasswordPolicyOptions import com.bitwarden.core.RegisterKeyResponse import com.bitwarden.core.RegisterTdeKeyResponse +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.bitwarden.sdk.AuthClient @@ -13,7 +14,6 @@ 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 -import com.x8bit.bitwarden.data.platform.util.asSuccess import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt index 74836f2fb0..cfb7af41c0 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt @@ -2,6 +2,8 @@ package com.x8bit.bitwarden.data.auth.manager import app.cash.turbine.test import com.bitwarden.core.AuthRequestResponse +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson @@ -20,8 +22,6 @@ import com.x8bit.bitwarden.data.auth.manager.model.AuthRequestUpdatesResult import com.x8bit.bitwarden.data.auth.manager.model.AuthRequestsResult import com.x8bit.bitwarden.data.auth.manager.model.AuthRequestsUpdatesResult import com.x8bit.bitwarden.data.auth.manager.model.CreateAuthRequestResult -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import io.mockk.coEvery import io.mockk.coVerify diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerTest.kt index 333ad33488..ed7a31f3b5 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerTest.kt @@ -1,6 +1,8 @@ package com.x8bit.bitwarden.data.auth.manager import com.bitwarden.core.KeyConnectorResponse +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.crypto.Kdf import com.bitwarden.crypto.RsaKeyPair import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson @@ -8,8 +10,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyReq import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson import com.x8bit.bitwarden.data.auth.datasource.network.service.AccountsService import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import io.mockk.coEvery import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt index f897443d6e..68ccd90832 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt @@ -1,5 +1,7 @@ package com.x8bit.bitwarden.data.auth.manager +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.crypto.TrustDeviceResponse import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson @@ -11,8 +13,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceUserD import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesService import com.x8bit.bitwarden.data.auth.manager.util.toUserStateJson -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import io.mockk.coEvery import io.mockk.coVerify diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt index 0ca5574051..c0ca0e1e0c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt @@ -9,6 +9,8 @@ import com.bitwarden.core.RegisterKeyResponse import com.bitwarden.core.RegisterTdeKeyResponse import com.bitwarden.core.UpdatePasswordResponse import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.bitwarden.crypto.RsaKeyPair @@ -120,8 +122,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.NotificationLogoutData import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson 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 2e6c377358..cfdbbce923 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 @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.autofill.fido2.manager import android.content.pm.Signature import android.content.pm.SigningInfo import android.util.Base64 +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.fido.ClientData import com.bitwarden.fido.Origin import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAssertionResponse @@ -18,7 +19,6 @@ import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2ValidateOriginResult import com.x8bit.bitwarden.data.autofill.fido2.model.PasskeyAssertionOptions import com.x8bit.bitwarden.data.autofill.fido2.model.PasskeyAttestationOptions import com.x8bit.bitwarden.data.autofill.fido2.model.createMockFido2CreateCredentialRequest -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.platform.util.decodeFromStringOrNull import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.datasource.sdk.model.AuthenticateFido2CredentialRequest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2OriginManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2OriginManagerTest.kt index 8b61f49725..ed0474bad7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2OriginManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/manager/Fido2OriginManagerTest.kt @@ -3,12 +3,12 @@ package com.x8bit.bitwarden.data.autofill.fido2.manager import android.content.pm.Signature import android.util.Base64 import androidx.credentials.provider.CallingAppInfo +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.model.DigitalAssetLinkResponseJson import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.service.DigitalAssetLinkService import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2ValidateOriginResult import com.x8bit.bitwarden.data.platform.manager.AssetManager -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every @@ -315,7 +315,7 @@ private const val FAIL_ALLOW_LIST = """ } } ] -} +} """ private val DEFAULT_STATEMENT = DigitalAssetLinkResponseJson( relation = listOf( diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt index 552411a988..b980bd58fa 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt @@ -25,6 +25,8 @@ import androidx.credentials.provider.BeginGetPublicKeyCredentialOption import androidx.credentials.provider.CallingAppInfo import androidx.credentials.provider.PublicKeyCredentialEntry import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -40,8 +42,6 @@ import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFido2CredentialAutofillView diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/authenticator/RefreshAuthenticatorTests.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/authenticator/RefreshAuthenticatorTests.kt index ac96ce841a..197ae28078 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/authenticator/RefreshAuthenticatorTests.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/authenticator/RefreshAuthenticatorTests.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.platform.datasource.network.authenticator +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.network.model.RefreshTokenResponseJson import com.x8bit.bitwarden.data.auth.repository.model.JwtTokenDataJson import com.x8bit.bitwarden.data.auth.repository.util.parseJwtTokenDataOrNull -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import io.mockk.every import io.mockk.just import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt index dd4e1feb26..aaf81a7f4c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.platform.base.BaseServiceTest import com.x8bit.bitwarden.data.platform.datasource.network.api.ConfigApi import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson -import com.x8bit.bitwarden.data.platform.util.asSuccess import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.JsonPrimitive import okhttp3.mockwebserver.MockResponse @@ -43,7 +43,7 @@ private const val CONFIG_RESPONSE_JSON = """ "featureStates": { "feature one": false } -} +} """ private val CONFIG_RESPONSE = ConfigResponseJson( type = "config", diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/util/NetworkResultExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/util/NetworkResultExtensionsTest.kt index e21e45406f..0b1a0318fd 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/util/NetworkResultExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/util/NetworkResultExtensionsTest.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.platform.datasource.network.util +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.platform.datasource.network.model.NetworkResult -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt index c1ed233944..8ea4995ed6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt @@ -1,6 +1,8 @@ package com.x8bit.bitwarden.data.platform.manager import app.cash.turbine.test +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson @@ -22,8 +24,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderUpsertData import com.x8bit.bitwarden.data.platform.manager.model.SyncSendDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncSendUpsertData -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import io.mockk.coEvery import io.mockk.coVerify import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt index fb422b14eb..4d4dfd5f5c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.platform.manager.event import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState @@ -10,7 +11,6 @@ import com.x8bit.bitwarden.data.platform.datasource.network.model.OrganizationEv import com.x8bit.bitwarden.data.platform.datasource.network.service.EventService import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEventType -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.util.FakeLifecycleOwner import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorTest.kt index 4eae793d86..fc274a289a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorTest.kt @@ -17,12 +17,12 @@ import com.bitwarden.authenticatorbridge.util.encrypt import com.bitwarden.authenticatorbridge.util.generateSecretKey import com.bitwarden.authenticatorbridge.util.toFingerprint import com.bitwarden.authenticatorbridge.util.toSymmetricEncryptionKeyData +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.manager.AddTotpItemFromAuthenticatorManagerImpl import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.AuthenticatorBridgeRepository -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.platform.util.createAddTotpItemFromAuthenticatorIntent import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.ui.vault.model.TotpData diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt index 3c094318a7..2436196699 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryTest.kt @@ -3,13 +3,13 @@ package com.x8bit.bitwarden.data.platform.repository import com.bitwarden.authenticatorbridge.model.SharedAccountData import com.bitwarden.authenticatorbridge.util.generateSecretKey import com.bitwarden.authenticatorbridge.util.toSymmetricEncryptionKeyData +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.vault.Cipher import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.repository.util.sanitizeTotpUri -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt index 40062ea2bf..8f44d1769d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.platform.repository import app.cash.turbine.test +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.model.ServerConfig import com.x8bit.bitwarden.data.platform.datasource.disk.util.FakeConfigDiskSource @@ -9,7 +10,6 @@ import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponse import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson.ServerJson import com.x8bit.bitwarden.data.platform.datasource.network.service.ConfigService import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager -import com.x8bit.bitwarden.data.platform.util.asSuccess import io.mockk.coEvery import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt index d7177609ae..c71ffc903f 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt @@ -5,6 +5,8 @@ import app.cash.turbine.test import com.bitwarden.authenticatorbridge.util.generateSecretKey import com.bitwarden.core.DerivePinKeyResponse import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson @@ -25,8 +27,6 @@ import com.x8bit.bitwarden.data.platform.repository.model.ClearClipboardFrequenc import com.x8bit.bitwarden.data.platform.repository.model.UriMatchType import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceTest.kt index 8b66fa48eb..4ef5e8271a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceTest.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.tools.generator.datasource.sdk +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.generators.AppendType import com.bitwarden.generators.ForwarderServiceType import com.bitwarden.generators.PassphraseGeneratorRequest @@ -8,7 +9,6 @@ import com.bitwarden.generators.UsernameGeneratorRequest import com.bitwarden.sdk.Client import com.bitwarden.sdk.GeneratorClients import com.x8bit.bitwarden.data.platform.manager.SdkClientManager -import com.x8bit.bitwarden.data.platform.util.asSuccess import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt index 15000f0336..0b44082053 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt @@ -1,6 +1,8 @@ package com.x8bit.bitwarden.data.tools.generator.repository import app.cash.turbine.test +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.generators.AppendType import com.bitwarden.generators.ForwarderServiceType import com.bitwarden.generators.PassphraseGeneratorRequest @@ -21,8 +23,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOpti import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource import com.x8bit.bitwarden.data.tools.generator.datasource.disk.PasswordHistoryDiskSource import com.x8bit.bitwarden.data.tools.generator.datasource.disk.entity.PasswordHistoryEntity 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 3fd4d52ba8..fe4e1e2675 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 @@ -6,6 +6,8 @@ import com.bitwarden.core.DerivePinKeyResponse import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoRequest import com.bitwarden.core.UpdatePasswordResponse +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.crypto.Kdf import com.bitwarden.crypto.TrustDeviceResponse import com.bitwarden.exporters.ExportFormat @@ -45,8 +47,6 @@ import com.bitwarden.vault.PasswordHistoryView import com.bitwarden.vault.TotpResponse import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.SdkClientManager -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.sdk.model.AuthenticateFido2CredentialRequest import com.x8bit.bitwarden.data.vault.datasource.sdk.model.Fido2CredentialSearchUserInterfaceImpl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.InitializeCryptoResult diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt index 03a79f8918..e870ab721d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt @@ -2,6 +2,8 @@ package com.x8bit.bitwarden.data.vault.manager import android.net.Uri import androidx.core.net.toUri +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.vault.Attachment import com.bitwarden.vault.AttachmentView import com.bitwarden.vault.Cipher @@ -11,8 +13,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt index d36b59c264..ad18d28587 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt @@ -2,12 +2,12 @@ package com.x8bit.bitwarden.data.vault.manager import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.TotpResponse import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockLoginView diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt index a8b31f1011..d8a6272674 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt @@ -7,6 +7,8 @@ import app.cash.turbine.test import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.core.InitUserCryptoRequest +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.crypto.HashPurpose import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson @@ -24,8 +26,6 @@ import com.x8bit.bitwarden.data.platform.manager.util.FakeAppStateManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.datasource.sdk.model.InitializeCryptoResult import com.x8bit.bitwarden.data.vault.manager.model.VaultStateEvent diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt index 55627b318d..66f12c1935 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt @@ -9,6 +9,8 @@ import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore @@ -39,8 +41,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderUpsertData import com.x8bit.bitwarden.data.platform.manager.model.SyncSendDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncSendUpsertData -import com.x8bit.bitwarden.data.platform.util.asFailure -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt index c5d94f1aac..23b8f10262 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.auth.feature.environment import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.core.data.util.asSuccess import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.platform.datasource.disk.model.MutualTlsKeyHost @@ -12,7 +13,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.manager.model.ImportPrivateKeyResult import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository -import com.x8bit.bitwarden.data.platform.util.asSuccess import com.x8bit.bitwarden.data.vault.manager.FileManager import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import com.x8bit.bitwarden.ui.platform.base.util.asText diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/core/ResultCall.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/core/ResultCall.kt index 1122c19d3d..979b11ab21 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/core/ResultCall.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/core/ResultCall.kt @@ -2,9 +2,9 @@ package com.bitwarden.authenticator.data.platform.datasource.network.core -import com.bitwarden.authenticator.data.platform.util.asFailure -import com.bitwarden.authenticator.data.platform.util.asSuccess import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.core.data.util.asFailure +import com.bitwarden.core.data.util.asSuccess import okhttp3.Request import okio.IOException import okio.Timeout diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/util/ResultExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/util/ResultExtensions.kt deleted file mode 100644 index 87a3eaba31..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/util/ResultExtensions.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.bitwarden.authenticator.data.platform.util - -/** - * Flat maps a successful [Result] with the given [transform] to another [Result], and leaves - * failures untouched. - */ -inline fun Result.flatMap(transform: (T) -> Result): Result = - this.exceptionOrNull() - ?.asFailure() - ?: transform(this.getOrThrow()) - -/** - * Returns the given receiver of type [T] as a "success" [Result]. - */ -fun T.asSuccess(): Result = - Result.success(this) - -/** - * Returns the given [Throwable] as a "failure" [Result]. - */ -fun Throwable.asFailure(): Result = - Result.failure(this) diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt index 7ff6ba4283..8859a29fc3 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt @@ -3,7 +3,7 @@ package com.bitwarden.authenticator.data.platform.datasource.network.service import com.bitwarden.authenticator.data.platform.base.BaseServiceTest import com.bitwarden.authenticator.data.platform.datasource.network.api.ConfigApi import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson -import com.bitwarden.authenticator.data.platform.util.asSuccess +import com.bitwarden.core.data.util.asSuccess import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.JsonPrimitive import okhttp3.mockwebserver.MockResponse @@ -43,7 +43,7 @@ private const val CONFIG_RESPONSE_JSON = """ "featureStates": { "feature one": false } -} +} """ private val CONFIG_RESPONSE = ConfigResponseJson( type = "config", diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt index dbb1b41d21..cdc80f934d 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt @@ -9,7 +9,7 @@ import com.bitwarden.authenticator.data.platform.datasource.network.model.Config import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson.ServerJson import com.bitwarden.authenticator.data.platform.datasource.network.service.ConfigService import com.bitwarden.authenticator.data.platform.manager.DispatcherManager -import com.bitwarden.authenticator.data.platform.util.asSuccess +import com.bitwarden.core.data.util.asSuccess import io.mockk.coEvery import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/core/build.gradle.kts b/core/build.gradle.kts index be73c907e7..7f6b81dde4 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -36,4 +36,20 @@ android { dependencies { implementation(libs.kotlinx.coroutines.android) + + testImplementation(platform(libs.junit.bom)) + testRuntimeOnly(libs.junit.platform.launcher) + testImplementation(libs.junit.junit5) + testImplementation(libs.junit.vintage) + testImplementation(libs.kotlinx.coroutines.test) +} + +tasks { + withType { + useJUnitPlatform() + maxHeapSize = "2g" + maxParallelForks = Runtime.getRuntime().availableProcessors() + jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" + android.sourceSets["main"].res.srcDirs("src/test/res") + } } diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/ResultExtensions.kt b/core/src/main/kotlin/com/bitwarden/core/data/util/ResultExtensions.kt similarity index 98% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/util/ResultExtensions.kt rename to core/src/main/kotlin/com/bitwarden/core/data/util/ResultExtensions.kt index 6b1a51775d..fe19ece859 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/ResultExtensions.kt +++ b/core/src/main/kotlin/com/bitwarden/core/data/util/ResultExtensions.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.util +package com.bitwarden.core.data.util import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/util/ResultTest.kt b/core/src/test/kotlin/com/bitwarden/core/data/util/ResultTest.kt similarity index 99% rename from app/src/test/java/com/x8bit/bitwarden/data/platform/util/ResultTest.kt rename to core/src/test/kotlin/com/bitwarden/core/data/util/ResultTest.kt index 1d6f4c75d9..3d6b6639ba 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/util/ResultTest.kt +++ b/core/src/test/kotlin/com/bitwarden/core/data/util/ResultTest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.util +package com.bitwarden.core.data.util import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Assertions.assertEquals