From dce2f5cf9031085b863909b00fff6c0fef063331 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 17 Nov 2025 22:14:40 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../datasource/local/logs/LogsSanitizerTest.kt | 4 ++-- .../NetworkDerivationPathConverterTest.kt | 6 +++--- domain/account/build.gradle.kts | 5 +---- .../domain/account/models/AccountListTest.kt | 8 ++++---- .../usecase/GetArchivedAccountsUseCaseTest.kt | 17 +---------------- domain/models/build.gradle.kts | 4 +--- .../domain/models/account/AccountIdTest.kt | 4 ++-- .../domain/models/account/AccountNameTest.kt | 4 ++-- .../models/account/CryptoPortfolioIconTest.kt | 8 ++++---- .../models/account/DerivationIndexTest.kt | 4 ++-- 10 files changed, 22 insertions(+), 42 deletions(-) diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/local/logs/LogsSanitizerTest.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/local/logs/LogsSanitizerTest.kt index db62131d61..0507efde15 100644 --- a/core/datasource/src/test/kotlin/com/tangem/datasource/local/logs/LogsSanitizerTest.kt +++ b/core/datasource/src/test/kotlin/com/tangem/datasource/local/logs/LogsSanitizerTest.kt @@ -1,9 +1,9 @@ package com.tangem.datasource.local.logs import com.google.common.truth.Truth +import com.tangem.test.core.ProvideTestModels import org.junit.jupiter.api.TestInstance import org.junit.jupiter.params.ParameterizedTest -import org.junit.jupiter.params.provider.MethodSource /** [REDACTED_AUTHOR] @@ -12,7 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource internal class LogsSanitizerTest { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun sanitize(model: TestModel) { // Act val actual = LogsSanitizer.sanitize(model.input) diff --git a/data/networks/src/test/java/com/tangem/data/networks/converters/NetworkDerivationPathConverterTest.kt b/data/networks/src/test/java/com/tangem/data/networks/converters/NetworkDerivationPathConverterTest.kt index a2502860b0..6d92ebd874 100644 --- a/data/networks/src/test/java/com/tangem/data/networks/converters/NetworkDerivationPathConverterTest.kt +++ b/data/networks/src/test/java/com/tangem/data/networks/converters/NetworkDerivationPathConverterTest.kt @@ -3,10 +3,10 @@ package com.tangem.data.networks.converters import com.google.common.truth.Truth import com.tangem.datasource.local.network.entity.NetworkStatusDM import com.tangem.domain.models.network.Network +import com.tangem.test.core.ProvideTestModels import org.junit.jupiter.api.Nested import org.junit.jupiter.api.TestInstance import org.junit.jupiter.params.ParameterizedTest -import org.junit.jupiter.params.provider.MethodSource /** [REDACTED_AUTHOR] @@ -18,7 +18,7 @@ class NetworkDerivationPathConverterTest { inner class Convert { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun convert(model: ConvertModel) { // Act val actual = NetworkDerivationPathConverter.convert(value = model.value) @@ -57,7 +57,7 @@ class NetworkDerivationPathConverterTest { inner class ConvertBack { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun convertBack(model: ConvertBackModel) { // Act val actual = NetworkDerivationPathConverter.convertBack(value = model.value) diff --git a/domain/account/build.gradle.kts b/domain/account/build.gradle.kts index 75db105c86..984f798a2b 100644 --- a/domain/account/build.gradle.kts +++ b/domain/account/build.gradle.kts @@ -18,9 +18,6 @@ dependencies { implementation(deps.kotlin.coroutines) implementation(deps.kotlin.serialization) - testImplementation(deps.test.coroutine) - testImplementation(deps.test.junit5) + testImplementation(projects.test.core) testRuntimeOnly(deps.test.junit5.engine) - testImplementation(deps.test.mockk) - testImplementation(deps.test.truth) } \ No newline at end of file diff --git a/domain/account/src/test/kotlin/com/tangem/domain/account/models/AccountListTest.kt b/domain/account/src/test/kotlin/com/tangem/domain/account/models/AccountListTest.kt index 96020e2f35..70de7ff158 100644 --- a/domain/account/src/test/kotlin/com/tangem/domain/account/models/AccountListTest.kt +++ b/domain/account/src/test/kotlin/com/tangem/domain/account/models/AccountListTest.kt @@ -9,11 +9,11 @@ import com.tangem.domain.models.account.Account import com.tangem.domain.models.account.AccountName import com.tangem.domain.models.account.CryptoPortfolioIcon import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.test.core.ProvideTestModels import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.params.ParameterizedTest -import org.junit.jupiter.params.provider.MethodSource /** [REDACTED_AUTHOR] @@ -81,7 +81,7 @@ class AccountListTest { inner class Create { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun invoke(model: CreateTestModel) { // Act val actual = AccountList( @@ -158,7 +158,7 @@ class AccountListTest { inner class Plus { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun invoke(model: PlusTestModel) { // Act val actual = model.initial.plus(other = model.toAdd) @@ -231,7 +231,7 @@ class AccountListTest { inner class Minus { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun invoke(model: MinusTestModel) { // Act val actual = model.initial.minus(model.toRemove) diff --git a/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/GetArchivedAccountsUseCaseTest.kt b/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/GetArchivedAccountsUseCaseTest.kt index 6c926ab2ec..5fe1763d23 100644 --- a/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/GetArchivedAccountsUseCaseTest.kt +++ b/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/GetArchivedAccountsUseCaseTest.kt @@ -7,14 +7,10 @@ import com.tangem.domain.core.utils.lceContent import com.tangem.domain.core.utils.lceError import com.tangem.domain.core.utils.lceLoading import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.test.core.getEmittedValues import io.mockk.* import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.flow.toList -import kotlinx.coroutines.launch -import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test @@ -85,15 +81,4 @@ class GetArchivedAccountsUseCaseTest { coVerifyOrder { crudRepository.fetchArchivedAccounts(userWalletId) } coVerify(inverse = true) { crudRepository.getArchivedAccounts(any()) } } - - @OptIn(ExperimentalCoroutinesApi::class) - fun TestScope.getEmittedValues(flow: Flow): List { - val values = mutableListOf() - - backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) { - flow.toList(values) - } - - return values - } } \ No newline at end of file diff --git a/domain/models/build.gradle.kts b/domain/models/build.gradle.kts index 5cb3097c77..c8e4147a78 100644 --- a/domain/models/build.gradle.kts +++ b/domain/models/build.gradle.kts @@ -23,8 +23,6 @@ dependencies { ksp(deps.moshi.kotlin.codegen) implementation(deps.arrow.core) - testImplementation(deps.test.junit5) + testImplementation(projects.test.core) testRuntimeOnly(deps.test.junit5.engine) - testImplementation(deps.test.truth) - testImplementation(deps.test.mockk) } \ No newline at end of file diff --git a/domain/models/src/test/kotlin/com/tangem/domain/models/account/AccountIdTest.kt b/domain/models/src/test/kotlin/com/tangem/domain/models/account/AccountIdTest.kt index e988ec9fc1..0bd90246fd 100644 --- a/domain/models/src/test/kotlin/com/tangem/domain/models/account/AccountIdTest.kt +++ b/domain/models/src/test/kotlin/com/tangem/domain/models/account/AccountIdTest.kt @@ -2,15 +2,15 @@ package com.tangem.domain.models.account import com.google.common.truth.Truth import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.test.core.ProvideTestModels import org.junit.jupiter.api.TestInstance import org.junit.jupiter.params.ParameterizedTest -import org.junit.jupiter.params.provider.MethodSource @TestInstance(TestInstance.Lifecycle.PER_CLASS) class AccountIdTest { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun forCryptoPortfolio(model: ForCryptoPortfolioModel) { // Arrange val userWalletId = UserWalletId("27163F47405CE73110837F24DF82607FF11C7AF9D78C93F409E4FEAFF3400C8F") diff --git a/domain/models/src/test/kotlin/com/tangem/domain/models/account/AccountNameTest.kt b/domain/models/src/test/kotlin/com/tangem/domain/models/account/AccountNameTest.kt index d68bc46ab9..a770886408 100644 --- a/domain/models/src/test/kotlin/com/tangem/domain/models/account/AccountNameTest.kt +++ b/domain/models/src/test/kotlin/com/tangem/domain/models/account/AccountNameTest.kt @@ -3,9 +3,9 @@ package com.tangem.domain.models.account import arrow.core.Either import arrow.core.left import com.google.common.truth.Truth +import com.tangem.test.core.ProvideTestModels import org.junit.jupiter.api.TestInstance import org.junit.jupiter.params.ParameterizedTest -import org.junit.jupiter.params.provider.MethodSource /** [REDACTED_AUTHOR] @@ -14,7 +14,7 @@ import org.junit.jupiter.params.provider.MethodSource class AccountNameTest { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun invoke(model: InvokeTestModel) { // Act val actual = AccountName(value = model.value) diff --git a/domain/models/src/test/kotlin/com/tangem/domain/models/account/CryptoPortfolioIconTest.kt b/domain/models/src/test/kotlin/com/tangem/domain/models/account/CryptoPortfolioIconTest.kt index ec55aabdcd..5bc8836d2d 100644 --- a/domain/models/src/test/kotlin/com/tangem/domain/models/account/CryptoPortfolioIconTest.kt +++ b/domain/models/src/test/kotlin/com/tangem/domain/models/account/CryptoPortfolioIconTest.kt @@ -4,6 +4,7 @@ import com.google.common.truth.Truth import com.tangem.domain.models.account.CryptoPortfolioIcon.Color import com.tangem.domain.models.account.CryptoPortfolioIcon.Icon import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.test.core.ProvideTestModels import io.mockk.every import io.mockk.mockkObject import io.mockk.unmockkObject @@ -11,7 +12,6 @@ import io.mockk.verifyOrder import org.junit.jupiter.api.Nested import org.junit.jupiter.api.TestInstance import org.junit.jupiter.params.ParameterizedTest -import org.junit.jupiter.params.provider.MethodSource import kotlin.random.Random /** @@ -25,7 +25,7 @@ class CryptoPortfolioIconTest { inner class OfMainAccount { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun ofMainAccount(model: OfMainAccountModel) { // Act val actual = CryptoPortfolioIcon.ofMainAccount(userWalletId = model.userWalletId) @@ -84,7 +84,7 @@ class CryptoPortfolioIconTest { inner class OfDefaultCustomAccount { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun ofCustomAccount(model: OfDefaultCustomAccountModel) { // Arrange val availableIcons = Icon.entries - setOf(Icon.Letter, Icon.Star) @@ -139,7 +139,7 @@ class CryptoPortfolioIconTest { inner class OfCustomAccountWithTypeAndColor { @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun ofCustomAccount(model: OfCustomAccountModel) { // Act val actual = CryptoPortfolioIcon.ofCustomAccount(value = model.icon, color = model.color) diff --git a/domain/models/src/test/kotlin/com/tangem/domain/models/account/DerivationIndexTest.kt b/domain/models/src/test/kotlin/com/tangem/domain/models/account/DerivationIndexTest.kt index f7daa8a9b2..dfb6db5ae2 100644 --- a/domain/models/src/test/kotlin/com/tangem/domain/models/account/DerivationIndexTest.kt +++ b/domain/models/src/test/kotlin/com/tangem/domain/models/account/DerivationIndexTest.kt @@ -4,10 +4,10 @@ import arrow.core.Either import arrow.core.left import arrow.core.right import com.google.common.truth.Truth +import com.tangem.test.core.ProvideTestModels import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.params.ParameterizedTest -import org.junit.jupiter.params.provider.MethodSource /** [REDACTED_AUTHOR] @@ -27,7 +27,7 @@ class DerivationIndexTest { } @ParameterizedTest - @MethodSource("provideTestModels") + @ProvideTestModels fun invoke(model: InvokeTestModel) { // Act val actual = DerivationIndex(model.index)