From 2a2641b258ae2b5e8a65a856a17604ee635274fd Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Wed, 5 May 2021 18:07:22 +0300 Subject: [PATCH] Testing | Update Kotlin Mockito (#1450) --- .github/workflows/check.yml | 2 +- .../features/auth/SetupSelectedAccountTest.kt | 6 +++--- .../features/editor/ClipboardTesting.kt | 2 +- .../features/editor/CreateBlockTesting.kt | 8 ++++---- .../features/editor/DeleteBlockTesting.kt | 8 ++++---- .../editor/EditorIntegrationTesting.kt | 2 +- .../features/editor/ListBlockTesting.kt | 8 ++++---- .../features/editor/MergeBlockTesting.kt | 2 +- .../features/editor/SplitBlockTesting.kt | 6 +++--- .../features/editor/base/EditorTestSetup.kt | 8 ++++---- .../emoji/DocumentEmojiPickerFragmentTest.kt | 2 +- .../relations/AddRelationStatusValueTest.kt | 4 ++-- .../relations/AddRelationTagValueTest.kt | 2 +- .../relations/EditRelationTagValueTest.kt | 4 ++-- .../features/sets/dv/TestObjectSetSetup.kt | 6 +++--- .../sets/filter/ModifyInputValueFilterTest.kt | 4 ++-- .../sets/filter/ModifyStatusFilterTest.kt | 4 ++-- .../anytypeio/anytype/MarkupExtractTest.kt | 6 +++--- .../anytype/core_ui/common/SpanTest.kt | 4 ++-- core-utils/build.gradle | 2 +- .../anytype/data/AuthDataRepositoryTest.kt | 2 +- dependencies.gradle | 11 ++++------- library-kanban-widget/build.gradle | 2 +- middleware/build.gradle | 1 - .../anytype/MiddlewareEventChannelTest.kt | 4 ++-- .../com/anytypeio/anytype/MiddlewareTest.kt | 2 +- persistence/build.gradle | 2 +- .../auth/SelectAccountViewModelTest.kt | 6 +++--- .../home/DashboardDragAndDropTest.kt | 10 +++++----- .../presentation/home/DashboardTestSetup.kt | 17 ++++++++++------- .../home/HomeDashboardViewModelTest.kt | 19 +++++++++++-------- .../keychain/KeychainPhraseViewModelTest.kt | 2 +- .../page/DefaultBlockViewRendererTest.kt | 4 ++-- .../presentation/page/PageViewModelTest.kt | 2 +- .../page/editor/EditorAddBlockTest.kt | 10 +++++----- .../page/editor/EditorBackButtonTest.kt | 4 ++-- .../page/editor/EditorCheckboxTest.kt | 6 +++--- .../editor/EditorEmptySpaceInteractionTest.kt | 8 ++++---- .../page/editor/EditorErrorMessageTest.kt | 8 ++++---- .../editor/EditorEventSubscriptionTest.kt | 6 +++--- .../page/editor/EditorFocusTest.kt | 2 +- .../page/editor/EditorListBlockTest.kt | 8 ++++---- .../page/editor/EditorMentionTest.kt | 2 +- .../page/editor/EditorMergeTest.kt | 12 ++++++------ .../page/editor/EditorMultiSelectModeTest.kt | 4 ++-- .../editor/EditorPresentationTestSetup.kt | 6 +++--- .../page/editor/EditorScrollAndMoveTest.kt | 8 ++++---- .../page/editor/EditorTextUpdateTest.kt | 8 ++++---- .../page/editor/EditorTitleAddBlockTest.kt | 14 +++++++------- .../page/editor/EditorTitleTest.kt | 4 ++-- .../page/editor/EditorTurnIntoTest.kt | 4 ++-- ...ilterViewModelInputFieldValueCreateTest.kt | 4 ++-- ...ilterViewModelInputFieldValueModifyTest.kt | 4 ++-- .../main/ObjectSetUpdateViewerSortTest.kt | 6 +++--- .../sets/main/ObjectSetViewModelTestSetup.kt | 6 +++--- .../sets/main/ObjectSetViewerFilterTest.kt | 6 +++--- .../splash/SplashViewModelTest.kt | 2 +- 57 files changed, 159 insertions(+), 157 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 54f78d1407..54ac043ffc 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,7 +1,7 @@ on: pull_request: # add "synchronize" in "types", in order to trigger workflow for pull request commit(s) pushes. - types: [synchronize] + types: [open,synchronize] branches: [develop] name: Run debug unit tests jobs: diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/auth/SetupSelectedAccountTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/auth/SetupSelectedAccountTest.kt index 7f3828076c..fb6a78f453 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/auth/SetupSelectedAccountTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/auth/SetupSelectedAccountTest.kt @@ -22,15 +22,15 @@ import com.anytypeio.anytype.presentation.auth.account.SetupSelectedAccountViewM import com.anytypeio.anytype.ui.auth.Keys import com.anytypeio.anytype.utils.CoroutinesTestRule import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.stub import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.stub @RunWith(AndroidJUnit4::class) @LargeTest diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ClipboardTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ClipboardTesting.kt index 64896fa5dc..bc67f13eab 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ClipboardTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ClipboardTesting.kt @@ -25,13 +25,13 @@ import com.anytypeio.anytype.ui.page.PageFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.* import kotlinx.android.synthetic.main.fragment_page.* import org.hamcrest.CoreMatchers.anyOf import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.* import kotlin.test.assertEquals @RunWith(AndroidJUnit4::class) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateBlockTesting.kt index b90ca04371..d3c82aa1d9 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateBlockTesting.kt @@ -27,15 +27,15 @@ import com.anytypeio.anytype.ui.page.PageFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import kotlinx.android.synthetic.main.fragment_page.* import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking import kotlin.test.assertEquals @RunWith(AndroidJUnit4::class) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DeleteBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DeleteBlockTesting.kt index a705b52152..38509d7ee5 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DeleteBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DeleteBlockTesting.kt @@ -27,15 +27,15 @@ import com.anytypeio.anytype.ui.page.PageFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import kotlinx.android.synthetic.main.fragment_page.* import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking import kotlin.test.assertEquals @RunWith(AndroidJUnit4::class) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/EditorIntegrationTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/EditorIntegrationTesting.kt index 633db0fb89..39edd17ba1 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/EditorIntegrationTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/EditorIntegrationTesting.kt @@ -39,13 +39,13 @@ import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.utils.scrollTo import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.* import kotlinx.android.synthetic.main.fragment_page.* import org.hamcrest.CoreMatchers.not import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.* import kotlin.test.assertEquals /** diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ListBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ListBlockTesting.kt index 3fed49c933..bb516a0efc 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ListBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ListBlockTesting.kt @@ -23,14 +23,14 @@ import com.anytypeio.anytype.ui.page.PageFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import kotlinx.android.synthetic.main.fragment_page.* import org.junit.Before import org.junit.Rule import org.junit.Test +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking import kotlin.test.assertEquals class ListBlockTesting : EditorTestSetup() { diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MergeBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MergeBlockTesting.kt index 828a0cb4a5..c2ab1aafc8 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MergeBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MergeBlockTesting.kt @@ -26,12 +26,12 @@ import com.anytypeio.anytype.ui.page.PageFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.* import kotlinx.android.synthetic.main.fragment_page.* import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.* import kotlin.test.assertEquals @RunWith(AndroidJUnit4::class) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitBlockTesting.kt index d26c9b77e2..32f5743d90 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitBlockTesting.kt @@ -24,14 +24,14 @@ import com.anytypeio.anytype.ui.page.PageFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import kotlinx.android.synthetic.main.fragment_page.* import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking import kotlin.test.assertEquals @RunWith(AndroidJUnit4::class) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt index 12a6fa9ebc..f2bfd1ff89 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt @@ -44,14 +44,14 @@ import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.util.Dispatcher -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.emptyFlow import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.stub open class EditorTestSetup { diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/DocumentEmojiPickerFragmentTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/DocumentEmojiPickerFragmentTest.kt index 391f95139d..014443bdd6 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/DocumentEmojiPickerFragmentTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/DocumentEmojiPickerFragmentTest.kt @@ -23,7 +23,6 @@ import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager import com.anytypeio.anytype.presentation.page.picker.DocumentEmojiIconPickerViewModelFactory import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.utils.TestUtils.withRecyclerView -import com.nhaarman.mockitokotlin2.* import kotlinx.android.synthetic.main.fragment_page_icon_picker.* import org.hamcrest.CoreMatchers.not import org.junit.Before @@ -31,6 +30,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* import kotlin.test.assertEquals @RunWith(AndroidJUnit4::class) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationStatusValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationStatusValueTest.kt index 5ef46c568f..642086197f 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationStatusValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationStatusValueTest.kt @@ -19,8 +19,8 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddObjectRelationOption import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.relations.RelationOptionValueDVAddViewModel import com.anytypeio.anytype.presentation.relations.ObjectSetConfig +import com.anytypeio.anytype.presentation.relations.RelationOptionValueDVAddViewModel import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectValueProvider import com.anytypeio.anytype.presentation.relations.providers.ObjectDetailProvider @@ -31,7 +31,6 @@ import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.ui.relations.RelationOptionValueBaseAddFragment import com.anytypeio.anytype.utils.* import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Before import org.junit.Rule @@ -39,6 +38,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* @RunWith(AndroidJUnit4::class) @LargeTest diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt index 0f38be8021..6352185b37 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt @@ -31,7 +31,6 @@ import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.ui.relations.RelationOptionValueBaseAddFragment import com.anytypeio.anytype.utils.* import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Before import org.junit.Rule @@ -39,6 +38,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* @RunWith(AndroidJUnit4::class) @LargeTest diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt index dbb10e7131..d236e36898 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt @@ -27,8 +27,6 @@ import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.ui.relations.RelationValueBaseFragment import com.anytypeio.anytype.utils.* import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Before import org.junit.Rule @@ -36,6 +34,8 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking @RunWith(AndroidJUnit4::class) @LargeTest diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/TestObjectSetSetup.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/TestObjectSetSetup.kt index bf7645f943..461e01a08a 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/TestObjectSetSetup.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/TestObjectSetSetup.kt @@ -20,12 +20,12 @@ import com.anytypeio.anytype.presentation.sets.ObjectSetReducer import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.ObjectSetViewModelFactory import com.anytypeio.anytype.presentation.util.Dispatcher -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.flow.emptyFlow import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub abstract class TestObjectSetSetup { diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyInputValueFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyInputValueFilterTest.kt index 0ba0f34012..3ffff34120 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyInputValueFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyInputValueFilterTest.kt @@ -28,8 +28,6 @@ import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.ui.sets.modals.filter.ModifyFilterFromInputFieldValueFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Before import org.junit.Rule @@ -37,6 +35,8 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking @RunWith(AndroidJUnit4::class) @LargeTest diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt index d57f7ca782..99c0dfac08 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt @@ -27,8 +27,6 @@ import com.anytypeio.anytype.ui.sets.modals.filter.ModifyFilterFromSelectedValue import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import kotlinx.coroutines.flow.MutableStateFlow import org.hamcrest.CoreMatchers.not import org.junit.Before @@ -37,6 +35,8 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking @RunWith(AndroidJUnit4::class) @LargeTest diff --git a/app/src/test/java/com/anytypeio/anytype/MarkupExtractTest.kt b/app/src/test/java/com/anytypeio/anytype/MarkupExtractTest.kt index 99ed4017b9..5e42f17b7b 100644 --- a/app/src/test/java/com/anytypeio/anytype/MarkupExtractTest.kt +++ b/app/src/test/java/com/anytypeio/anytype/MarkupExtractTest.kt @@ -3,20 +3,20 @@ package com.anytypeio.anytype import android.os.Build import android.text.Spannable import android.text.SpannableString +import com.anytypeio.anytype.core_models.Block.Content.Text.Mark import com.anytypeio.anytype.core_ui.common.Span import com.anytypeio.anytype.core_ui.common.toSpannable -import com.anytypeio.anytype.core_models.Block.Content.Text.Mark import com.anytypeio.anytype.ext.extractMarks import com.anytypeio.anytype.ext.isSpanInRange import com.anytypeio.anytype.presentation.page.editor.Markup import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import kotlin.test.assertEquals diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/common/SpanTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/common/SpanTest.kt index 45be653973..6d3dca3739 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/common/SpanTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/common/SpanTest.kt @@ -3,9 +3,9 @@ package com.anytypeio.anytype.core_ui.common import androidx.core.text.getSpans import com.anytypeio.anytype.core_utils.ext.hasSpan import com.anytypeio.anytype.presentation.page.editor.Markup -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import org.mockito.MockitoAnnotations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/core-utils/build.gradle b/core-utils/build.gradle index 6b85bc6ddc..b38ca4923e 100644 --- a/core-utils/build.gradle +++ b/core-utils/build.gradle @@ -44,7 +44,7 @@ dependencies { testImplementation unitTestDependencies.junit testImplementation unitTestDependencies.kotlinTest - testImplementation unitTestDependencies.mockito + testImplementation unitTestDependencies.mockitoKotlin implementation applicationDependencies.navigation implementation applicationDependencies.navigationUi diff --git a/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt b/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt index 2271e391b8..5a752339e1 100644 --- a/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt +++ b/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt @@ -5,12 +5,12 @@ import com.anytypeio.anytype.data.auth.model.WalletEntity import com.anytypeio.anytype.data.auth.repo.* import com.anytypeio.anytype.data.auth.repo.config.Configurator import com.anytypeio.anytype.domain.auth.model.Account -import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* class AuthDataRepositoryTest { diff --git a/dependencies.gradle b/dependencies.gradle index 7436ae70d7..78cd9e1eca 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -53,12 +53,11 @@ ext { robolectric_version = '4.3.1' robolectric_latest_version = '4.5.1' junit_version = '4.12' - mockito_version = '1.4.0' kluent_version = '1.14' coroutine_testing_version = '1.4.3' live_data_testing_version = '1.1.0' - mockito_kotlin_version = '2.2.0' - mockito_android_version = '2.25.0' + mockito_kotlin_version = '3.2.0' + mockito_android_version = '3.9.0' // Acceptance Testing runner_version = '1.1.0' @@ -142,8 +141,7 @@ ext { robolectric: "org.robolectric:robolectric:$robolectric_version", robolectricLatest: "org.robolectric:robolectric:$robolectric_latest_version", junit: "junit:junit:$junit_version", - mockito: "com.nhaarman:mockito-kotlin:$mockito_version", - mockitoKotlin: "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockito_kotlin_version", + mockitoKotlin: "org.mockito.kotlin:mockito-kotlin:$mockito_kotlin_version", kluent: "org.amshove.kluent:kluent:$kluent_version", archCoreTesting: "androidx.arch.core:core-testing:$androidx_core_testing_version", liveDataTesting: "com.jraska.livedata:testing-ktx:$live_data_testing_version", @@ -160,8 +158,7 @@ ext { espressoContrib: "androidx.test.espresso:espresso-contrib:$espresso_version", espressoIntents: "androidx.test.espresso:espresso-intents:$espresso_version", androidAnnotations: "androidx.annotation:annotation:$appcompat_version", - mockito: "com.nhaarman:mockito-kotlin:$mockito_version", - mockitoKotlin: "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockito_kotlin_version", + mockitoKotlin: "org.mockito.kotlin:mockito-kotlin:$mockito_kotlin_version", mockitoAndroid: "org.mockito:mockito-android:$mockito_android_version", disableAnimation: "com.bartoszlipinski:disable-animations-rule:$disable_animation_version", fragmentTesting: "androidx.fragment:fragment-testing:$fragment_version" diff --git a/library-kanban-widget/build.gradle b/library-kanban-widget/build.gradle index 906b292b4b..83ca1c112a 100755 --- a/library-kanban-widget/build.gradle +++ b/library-kanban-widget/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation applicationDependencies.cardView testImplementation unitTestDependencies.robolectric - testImplementation unitTestDependencies.mockito + testImplementation unitTestDependencies.mockitoKotlin testImplementation unitTestDependencies.junit testImplementation unitTestDependencies.assertj } \ No newline at end of file diff --git a/middleware/build.gradle b/middleware/build.gradle index bbf98d4985..392f325906 100644 --- a/middleware/build.gradle +++ b/middleware/build.gradle @@ -45,5 +45,4 @@ dependencies { testImplementation unitTestDependencies.junit testImplementation unitTestDependencies.kotlinTest testImplementation unitTestDependencies.mockitoKotlin - testImplementation unitTestDependencies.mockito } \ No newline at end of file diff --git a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt index 5a060e465e..ce83c44538 100644 --- a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt +++ b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt @@ -6,8 +6,6 @@ import com.anytypeio.anytype.common.MockDataFactory import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.middleware.EventProxy import com.anytypeio.anytype.middleware.interactor.MiddlewareEventChannel -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.runBlocking @@ -15,6 +13,8 @@ import org.junit.Before import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub import kotlin.test.assertEquals class MiddlewareEventChannelTest { diff --git a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt index 8606ce0b64..feef66e2c7 100644 --- a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt +++ b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt @@ -11,11 +11,11 @@ import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.middleware.interactor.Middleware import com.anytypeio.anytype.middleware.interactor.MiddlewareFactory import com.anytypeio.anytype.middleware.service.MiddlewareService -import com.nhaarman.mockitokotlin2.* import org.junit.Before import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/persistence/build.gradle b/persistence/build.gradle index b3f1ba2f8e..a725e67539 100644 --- a/persistence/build.gradle +++ b/persistence/build.gradle @@ -43,7 +43,7 @@ dependencies { testImplementation unitTestDependencies.junit testImplementation unitTestDependencies.kotlinTest - testImplementation unitTestDependencies.mockito + testImplementation unitTestDependencies.mockitoKotlin testImplementation unitTestDependencies.robolectric testImplementation unitTestDependencies.archCoreTesting } \ No newline at end of file diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/SelectAccountViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/SelectAccountViewModelTest.kt index 40d1dc9958..e3ef4a8690 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/SelectAccountViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/SelectAccountViewModelTest.kt @@ -8,8 +8,6 @@ import com.anytypeio.anytype.domain.auth.model.Account import com.anytypeio.anytype.presentation.auth.account.SelectAccountViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.test.runBlockingTest @@ -18,6 +16,8 @@ import org.junit.Rule import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub class SelectAccountViewModelTest { @@ -37,7 +37,7 @@ class SelectAccountViewModelTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } private fun buildViewModel(): SelectAccountViewModel { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardDragAndDropTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardDragAndDropTest.kt index 00101fb016..71377a897d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardDragAndDropTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardDragAndDropTest.kt @@ -1,23 +1,23 @@ package com.anytypeio.anytype.presentation.home import MockDataFactory +import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.core_models.Event +import com.anytypeio.anytype.core_models.Payload +import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.core_utils.ext.shift import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.Move -import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.domain.event.interactor.InterceptEvents -import com.anytypeio.anytype.core_models.Event -import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.presentation.desktop.HomeDashboardStateMachine import com.anytypeio.anytype.presentation.mapper.toDashboardViews import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.delay import kotlinx.coroutines.flow.flow import org.junit.Before import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* class DashboardDragAndDropTest : DashboardTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardTestSetup.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardTestSetup.kt index e77f2aa808..06a39b0e2d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardTestSetup.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardTestSetup.kt @@ -4,29 +4,32 @@ import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Config +import com.anytypeio.anytype.core_models.Event +import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.auth.interactor.GetProfile import com.anytypeio.anytype.domain.auth.model.Account import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.Move -import com.anytypeio.anytype.domain.config.* +import com.anytypeio.anytype.domain.config.DebugSettings +import com.anytypeio.anytype.domain.config.Gateway +import com.anytypeio.anytype.domain.config.GetConfig +import com.anytypeio.anytype.domain.config.GetDebugSettings import com.anytypeio.anytype.domain.dashboard.interactor.CloseDashboard import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard import com.anytypeio.anytype.domain.event.interactor.InterceptEvents -import com.anytypeio.anytype.core_models.Event -import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.page.CreatePage import com.anytypeio.anytype.presentation.desktop.HomeDashboardEventConverter import com.anytypeio.anytype.presentation.desktop.HomeDashboardViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import org.junit.Rule import org.mockito.Mock +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub open class DashboardTestSetup { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/HomeDashboardViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/home/HomeDashboardViewModelTest.kt index ec60394d0d..6a3cfaf710 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/HomeDashboardViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/home/HomeDashboardViewModelTest.kt @@ -3,18 +3,21 @@ package com.anytypeio.anytype.presentation.home import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics -import com.anytypeio.anytype.domain.auth.interactor.GetProfile -import com.anytypeio.anytype.domain.base.Either -import com.anytypeio.anytype.domain.block.interactor.Move import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Config -import com.anytypeio.anytype.domain.config.* -import com.anytypeio.anytype.domain.dashboard.interactor.CloseDashboard -import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard -import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_models.ext.getChildrenIdsList +import com.anytypeio.anytype.domain.auth.interactor.GetProfile +import com.anytypeio.anytype.domain.base.Either +import com.anytypeio.anytype.domain.block.interactor.Move +import com.anytypeio.anytype.domain.config.DebugSettings +import com.anytypeio.anytype.domain.config.Gateway +import com.anytypeio.anytype.domain.config.GetConfig +import com.anytypeio.anytype.domain.config.GetDebugSettings +import com.anytypeio.anytype.domain.dashboard.interactor.CloseDashboard +import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard +import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.page.CreatePage import com.anytypeio.anytype.presentation.desktop.DashboardView @@ -24,7 +27,6 @@ import com.anytypeio.anytype.presentation.desktop.HomeDashboardViewModel import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.test.runBlockingTest @@ -33,6 +35,7 @@ import org.junit.Rule import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* class HomeDashboardViewModelTest { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/keychain/KeychainPhraseViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/keychain/KeychainPhraseViewModelTest.kt index c8c38c0f52..9089f5488d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/keychain/KeychainPhraseViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/keychain/KeychainPhraseViewModelTest.kt @@ -6,12 +6,12 @@ import com.anytypeio.anytype.core_utils.ui.ViewState import com.anytypeio.anytype.domain.auth.interactor.GetMnemonic import com.anytypeio.anytype.domain.base.Either import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.* import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* class KeychainPhraseViewModelTest { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/DefaultBlockViewRendererTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/DefaultBlockViewRendererTest.kt index d13cc16570..0d5654196a 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/DefaultBlockViewRendererTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/DefaultBlockViewRendererTest.kt @@ -15,13 +15,13 @@ import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.page.render.BlockViewRenderer import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub import kotlin.test.assertEquals class DefaultBlockViewRendererTest { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/PageViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/PageViewModelTest.kt index 6c4297358d..bec47182ed 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/PageViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/PageViewModelTest.kt @@ -48,7 +48,6 @@ import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow @@ -61,6 +60,7 @@ import org.junit.Rule import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertNotNull diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorAddBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorAddBlockTest.kt index 5737db7737..757ca7958d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorAddBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorAddBlockTest.kt @@ -2,18 +2,18 @@ package com.anytypeio.anytype.presentation.page.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule +import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.core_models.Payload +import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.block.interactor.ReplaceBlock -import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.core_models.Position -import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.* import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* class EditorAddBlockTest : EditorPresentationTestSetup() { @@ -25,7 +25,7 @@ class EditorAddBlockTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackButtonTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackButtonTest.kt index 2a56c4b8f5..8a3a600fcb 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackButtonTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackButtonTest.kt @@ -5,12 +5,12 @@ import com.anytypeio.anytype.domain.page.CloseBlock import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking import kotlin.test.assertFalse import kotlin.test.assertNotNull import kotlin.test.assertTrue diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorCheckboxTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorCheckboxTest.kt index 72511bdcb0..ee0abf41bc 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorCheckboxTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorCheckboxTest.kt @@ -2,18 +2,18 @@ package com.anytypeio.anytype.presentation.page.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.anytypeio.anytype.domain.base.Either -import com.anytypeio.anytype.domain.block.interactor.UpdateCheckbox import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_models.ext.content +import com.anytypeio.anytype.domain.base.Either +import com.anytypeio.anytype.domain.block.interactor.UpdateCheckbox import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.* import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* class EditorCheckboxTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEmptySpaceInteractionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEmptySpaceInteractionTest.kt index c08766ba80..ea2b1bae8a 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEmptySpaceInteractionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEmptySpaceInteractionTest.kt @@ -9,14 +9,14 @@ import com.anytypeio.anytype.presentation.MockBlockFactory import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking -import com.nhaarman.mockitokotlin2.verifyZeroInteractions import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.eq +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking +import org.mockito.kotlin.verifyZeroInteractions class EditorEmptySpaceInteractionTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorErrorMessageTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorErrorMessageTest.kt index aa8f8c0b9a..c78fa09b1b 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorErrorMessageTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorErrorMessageTest.kt @@ -2,12 +2,9 @@ package com.anytypeio.anytype.presentation.page.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch import kotlinx.coroutines.test.runBlockingTest @@ -15,6 +12,9 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub import kotlin.test.assertEquals class EditorErrorMessageTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEventSubscriptionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEventSubscriptionTest.kt index 5d991c4ba2..7893fd7bd8 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEventSubscriptionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEventSubscriptionTest.kt @@ -5,13 +5,13 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyZeroInteractions import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyZeroInteractions class EditorEventSubscriptionTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFocusTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFocusTest.kt index 9af99b00b0..eddb3f3f81 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFocusTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFocusTest.kt @@ -7,11 +7,11 @@ import com.anytypeio.anytype.presentation.page.PageViewModel import com.anytypeio.anytype.presentation.page.editor.model.Focusable import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.verifyZeroInteractions import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.verifyZeroInteractions class EditorFocusTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorListBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorListBlockTest.kt index b8a96ebf55..b3a7ae5cad 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorListBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorListBlockTest.kt @@ -13,14 +13,14 @@ import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking -import com.nhaarman.mockitokotlin2.verifyZeroInteractions import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.eq +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking +import org.mockito.kotlin.verifyZeroInteractions class EditorListBlockTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMentionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMentionTest.kt index f1aef2f5af..5a1064ecc6 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMentionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMentionTest.kt @@ -16,13 +16,13 @@ import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.* import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.Mock import org.mockito.Mockito import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* class EditorMentionTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMergeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMergeTest.kt index b4fd0ad943..c7490c381a 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMergeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMergeTest.kt @@ -2,20 +2,20 @@ package com.anytypeio.anytype.presentation.page.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.anytypeio.anytype.domain.block.interactor.MergeBlocks -import com.anytypeio.anytype.domain.block.interactor.UpdateText import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content +import com.anytypeio.anytype.domain.block.interactor.MergeBlocks +import com.anytypeio.anytype.domain.block.interactor.UpdateText import com.anytypeio.anytype.presentation.page.PageViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking -import com.nhaarman.mockitokotlin2.verifyZeroInteractions import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.eq +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking +import org.mockito.kotlin.verifyZeroInteractions class EditorMergeTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMultiSelectModeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMultiSelectModeTest.kt index 3c805eed16..899b8ad6e0 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMultiSelectModeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMultiSelectModeTest.kt @@ -17,12 +17,12 @@ import com.anytypeio.anytype.presentation.page.editor.model.UiBlock import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking class EditorMultiSelectModeTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorPresentationTestSetup.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorPresentationTestSetup.kt index 68249a459d..91ec29488e 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorPresentationTestSetup.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorPresentationTestSetup.kt @@ -33,13 +33,13 @@ import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.util.Dispatcher -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flowOf import org.mockito.Mock +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub open class EditorPresentationTestSetup { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorScrollAndMoveTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorScrollAndMoveTest.kt index 03e4c18445..6b0898df28 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorScrollAndMoveTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorScrollAndMoveTest.kt @@ -2,19 +2,16 @@ package com.anytypeio.anytype.presentation.page.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.anytypeio.anytype.domain.block.interactor.Move import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.core_models.ext.content +import com.anytypeio.anytype.domain.block.interactor.Move import com.anytypeio.anytype.presentation.page.PageViewModel import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking -import com.nhaarman.mockitokotlin2.verifyZeroInteractions import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch import kotlinx.coroutines.test.runBlockingTest @@ -22,6 +19,9 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking +import org.mockito.kotlin.verifyZeroInteractions import kotlin.test.assertEquals diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTextUpdateTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTextUpdateTest.kt index 767b02c108..7ec6607263 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTextUpdateTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTextUpdateTest.kt @@ -10,15 +10,15 @@ import com.anytypeio.anytype.presentation.page.PageViewModel import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT -import com.nhaarman.mockitokotlin2.inOrder -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking -import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import kotlinx.coroutines.test.runBlockingTest import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.inOrder +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking +import org.mockito.kotlin.verifyNoMoreInteractions class EditorTextUpdateTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleAddBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleAddBlockTest.kt index c0820708d4..fa4c73b582 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleAddBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleAddBlockTest.kt @@ -2,22 +2,22 @@ package com.anytypeio.anytype.presentation.page.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule +import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.core_models.Payload +import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.CreateBlock -import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.domain.event.interactor.InterceptEvents -import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.page.CreateDocument import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking class EditorTitleAddBlockTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleTest.kt index bd373b4d9e..460419022a 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleTest.kt @@ -10,8 +10,6 @@ import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.verifyBlocking -import com.nhaarman.mockitokotlin2.verifyZeroInteractions import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch import kotlinx.coroutines.test.runBlockingTest @@ -19,6 +17,8 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.verifyBlocking +import org.mockito.kotlin.verifyZeroInteractions import kotlin.test.assertEquals class EditorTitleTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTurnIntoTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTurnIntoTest.kt index 480b589ed9..ddc3332088 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTurnIntoTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTurnIntoTest.kt @@ -11,12 +11,12 @@ import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType import com.anytypeio.anytype.presentation.page.editor.model.UiBlock import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueCreateTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueCreateTest.kt index 6fd7b86a37..76d820cb7d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueCreateTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueCreateTest.kt @@ -16,14 +16,14 @@ import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.Dispatcher -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking class FilterViewModelInputFieldValueCreateTest { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueModifyTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueModifyTest.kt index 22890c5465..4fe66c7677 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueModifyTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueModifyTest.kt @@ -12,14 +12,14 @@ import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.Dispatcher -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking class FilterViewModelInputFieldValueModifyTest { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetUpdateViewerSortTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetUpdateViewerSortTest.kt index 1a856ccb20..e36e3dbb17 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetUpdateViewerSortTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetUpdateViewerSortTest.kt @@ -4,19 +4,19 @@ import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.DVSort import com.anytypeio.anytype.core_models.DVSortType +import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.domain.dataview.interactor.SetActiveViewer import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer -import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.presentation.TypicalTwoRecordObjectSet import com.anytypeio.anytype.presentation.sets.model.SortingExpression import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking class ObjectSetUpdateViewerSortTest : ObjectSetViewModelTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewModelTestSetup.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewModelTestSetup.kt index 3ba1f86a5e..21ea28eb95 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewModelTestSetup.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewModelTestSetup.kt @@ -15,12 +15,12 @@ import com.anytypeio.anytype.presentation.sets.ObjectSetReducer import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.ObjectSetViewModel import com.anytypeio.anytype.presentation.util.Dispatcher -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import org.mockito.Mock +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub open class ObjectSetViewModelTestSetup { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewerFilterTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewerFilterTest.kt index 6c665abaef..2ffdaec993 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewerFilterTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewerFilterTest.kt @@ -3,20 +3,20 @@ package com.anytypeio.anytype.presentation.sets.main import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.domain.dataview.interactor.SetActiveViewer import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer -import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.presentation.TypicalTwoRecordObjectSet import com.anytypeio.anytype.presentation.sets.model.FilterExpression import com.anytypeio.anytype.presentation.sets.model.FilterValue import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verifyBlocking import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking class ObjectSetViewerFilterTest : ObjectSetViewModelTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/splash/SplashViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/splash/SplashViewModelTest.kt index 54a93bfd8e..371f41904d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/splash/SplashViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/splash/SplashViewModelTest.kt @@ -12,13 +12,13 @@ import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.mockito.kotlin.* class SplashViewModelTest {