diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 795ab9a0d7..3050600b8b 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: [opened] + types: [opened,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 fb6a78f453..89c5fecbfd 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 @@ -59,7 +59,7 @@ class SetupSelectedAccountTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) startAccount = StartAccount( repository = authRepository ) 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 5f84709bce..d116ac3f18 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 @@ -174,7 +174,7 @@ open class EditorTestSetup { ) open fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) splitBlock = SplitBlock(repo) createPage = CreatePage(repo, documentEmojiIconProvider) 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 014443bdd6..f790ef676e 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 @@ -53,7 +53,7 @@ class DocumentEmojiPickerFragmentTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) setEmojiIcon = SetDocumentEmojiIcon(repo = repo) TestDocumentEmojiPickerFragment.testViewModelFactory = DocumentEmojiIconPickerViewModelFactory( 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 642086197f..8579bd5534 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 @@ -73,7 +73,7 @@ class AddRelationStatusValueTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) addRelationOption = AddDataViewRelationOption(repo) addTagToDataViewRecord = AddTagToDataViewRecord(repo) addObjectRelationOption = AddObjectRelationOption(repo) 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 6352185b37..383fa8ceca 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 @@ -73,7 +73,7 @@ class AddRelationTagValueTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) addRelationOption = AddDataViewRelationOption(repo) addTagToDataViewRecord = AddTagToDataViewRecord(repo) addObjectRelationOption = AddObjectRelationOption(repo) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayObjectRelationTextValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayObjectRelationTextValueTest.kt index b5ed2a6231..364fc9c846 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayObjectRelationTextValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayObjectRelationTextValueTest.kt @@ -49,7 +49,7 @@ class DisplayObjectRelationTextValueTest { @Before fun before() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) TestRelationTextValueFragment.testVmFactory = RelationTextValueViewModel.Factory( relations = DataViewObjectRelationProvider(state), values = DataViewObjectValueProvider(state, session) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationNumberValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationNumberValueTest.kt index 5f72e860fb..ff80a20e43 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationNumberValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationNumberValueTest.kt @@ -61,7 +61,7 @@ class DisplayRelationNumberValueTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) TestRelationTextValueFragment.testVmFactory = RelationTextValueViewModel.Factory( relations = DataViewObjectRelationProvider(state), values = DataViewObjectValueProvider(state, session) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationObjectValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationObjectValueTest.kt index 9d253bc45a..5df90dcadd 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationObjectValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationObjectValueTest.kt @@ -73,7 +73,7 @@ class DisplayRelationObjectValueTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) addRelationOption = AddDataViewRelationOption(repo) addTagToDataViewRecord = AddTagToDataViewRecord(repo) removeTagFromDataViewRecord = RemoveTagFromDataViewRecord(repo) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt index e6b791781a..eac6b13620 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt @@ -76,7 +76,7 @@ class DisplayRelationStatusValueTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) addRelationOption = AddDataViewRelationOption(repo) addTagToDataViewRecord = AddTagToDataViewRecord(repo) updateDataViewRecord = UpdateDataViewRecord(repo) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt index dfb4a209fd..0107b7335f 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt @@ -77,7 +77,7 @@ class DisplayRelationTagValueTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) addRelationOption = AddDataViewRelationOption(repo) addTagToDataViewRecord = AddTagToDataViewRecord(repo) removeTagFromDataViewRecord = RemoveTagFromDataViewRecord(repo) 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 0e91a20a4b..3c8b1005a6 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 @@ -72,7 +72,7 @@ class EditRelationTagValueTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) addRelationOption = AddDataViewRelationOption(repo) addTagToDataViewRecord = AddTagToDataViewRecord(repo) removeTagFromDataViewRecord = RemoveTagFromDataViewRecord(repo) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationDateValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationDateValueTest.kt index 0dc0a490cc..74a6695c7f 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationDateValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationDateValueTest.kt @@ -18,9 +18,9 @@ import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectValueProvider -import com.anytypeio.anytype.presentation.sets.RelationDateValueViewModel import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession +import com.anytypeio.anytype.presentation.sets.RelationDateValueViewModel import com.anytypeio.anytype.ui.relations.RelationDateValueFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule @@ -50,7 +50,7 @@ class ObjectRelationDateValueTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) TestRelationDateValueFragment.testVmFactory = RelationDateValueViewModel.Factory( relations = DataViewObjectRelationProvider(state), diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt index e08a3eccf2..b2db74085e 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt @@ -72,7 +72,7 @@ class ObjectRelationListTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) urlBuilder = UrlBuilder(gateway) objectRelationList = ObjectRelationList(repo) updateDetail = UpdateDetail(repo) 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 dffdbf8631..c0799741dc 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 @@ -76,7 +76,7 @@ abstract class TestObjectSetSetup { ) open fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) addDataViewRelation = AddNewRelationToDataView(repo) updateText = UpdateText(repo) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/CreateSelectedFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/CreateSelectedFilterTest.kt index 78c0121290..48eb0b9454 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/CreateSelectedFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/CreateSelectedFilterTest.kt @@ -58,7 +58,7 @@ class CreateSelectedFilterTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) updateDataViewViewer = UpdateDataViewViewer(repo) searchObjects = SearchObjects(repo) urlBuilder = UrlBuilder(gateway) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/FilterListTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/FilterListTest.kt index b9e4abf4ab..95a7594aaa 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/FilterListTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/FilterListTest.kt @@ -61,7 +61,7 @@ class FilterListTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) updateDataViewViewer = UpdateDataViewViewer(repo) searchObjects = SearchObjects(repo) urlBuilder = UrlBuilder(gateway) 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 43a665e9a0..36e1cbef32 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 @@ -64,7 +64,7 @@ class ModifyInputValueFilterTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) updateDataViewViewer = UpdateDataViewViewer(repo) searchObjects = SearchObjects(repo) urlBuilder = UrlBuilder(gateway) 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 99c0dfac08..91d0780d5f 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 @@ -64,7 +64,7 @@ class ModifyStatusFilterTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) updateDataViewViewer = UpdateDataViewViewer(repo) searchObjects = SearchObjects(repo) urlBuilder = UrlBuilder(gateway) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt index e7a61546ee..b865101f5a 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt @@ -62,7 +62,7 @@ class ModifyTagFilterTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) updateDataViewViewer = UpdateDataViewViewer(repo) searchObjects = SearchObjects(repo) urlBuilder = UrlBuilder(gateway) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/sort/ViewerObjectSortTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/sort/ViewerObjectSortTest.kt index 0d66230979..bf1fddca8a 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/sort/ViewerObjectSortTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/sort/ViewerObjectSortTest.kt @@ -56,7 +56,7 @@ class ViewerObjectSortTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) updateDataViewViewer = UpdateDataViewViewer(repo) TestViewerSortFragment.testVmFactory = ViewerSortViewModel.Factory( state = state, diff --git a/app/src/test/java/com/anytypeio/anytype/MarkupExtractTest.kt b/app/src/test/java/com/anytypeio/anytype/MarkupExtractTest.kt index 5e42f17b7b..01128e9802 100644 --- a/app/src/test/java/com/anytypeio/anytype/MarkupExtractTest.kt +++ b/app/src/test/java/com/anytypeio/anytype/MarkupExtractTest.kt @@ -32,7 +32,7 @@ class MarkupExtractTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/build.gradle b/build.gradle index 846416ae14..ace6314e47 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ apply from: './dependencies.gradle' buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.5.20' ext.gradle_tools = '3.1.3' ext.build_tools = '29.0.0' ext.nav_version = '2.3.0' @@ -21,11 +21,11 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" classpath 'com.google.gms:google-services:4.3.8' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.0' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath 'com.squareup.wire:wire-gradle-plugin:3.5.0' diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/Relation.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/Relation.kt index 96d1e81e42..a48835e1ef 100644 --- a/core-models/src/main/java/com/anytypeio/anytype/core_models/Relation.kt +++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/Relation.kt @@ -45,7 +45,7 @@ data class Relation( val id: String, val text: String, val color: String, - val scope: OptionScope + val scope: OptionScope = OptionScope.LOCAL ) enum class OptionScope { 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 6d3dca3739..64f8909f9f 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 @@ -18,7 +18,7 @@ class SpanTest { ///@Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } //@Test 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 5a752339e1..4f15b57741 100644 --- a/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt +++ b/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt @@ -27,7 +27,7 @@ class AuthDataRepositoryTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) repo = AuthDataRepository( factory = AuthDataStoreFactory( cache = AuthCacheDataStore( diff --git a/dependencies.gradle b/dependencies.gradle index e5b7dfa149..e0747fe820 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,9 +4,9 @@ ext { kotlinx_serialization_json_version = '1.0.0' // AndroidX - androidx_core_version = '1.5.0' - androidx_core_ktx_version = '1.5.0' - androidx_test_core_version = '1.2.0' + androidx_core_version = '1.6.0' + androidx_core_ktx_version = '1.6.0' + androidx_test_core_version = '1.4.0' androidx_core_testing_version = '2.1.0' androidx_security_crypto_version = '1.0.0' @@ -16,13 +16,13 @@ ext { recyclerview_version = '1.2.1' cardview_version = '1.0.0' material_version = '1.3.0' - fragment_version = "1.3.4" + fragment_version = "1.3.5" emoji_compat_version = '1.1.0' view_pager_2_version = '1.0.0' // Architecture Components lifecycle_version = '2.3.1' - navigation_version = '2.3.0' + navigation_version = '2.3.5' // Third party libraries exoplayer_version = '2.14.1' @@ -56,7 +56,7 @@ ext { // Acceptance Testing runner_version = '1.1.0' - espresso_version = '3.1.0' + espresso_version = '3.3.0' android_junit_version = '1.1.0' disable_animation_version = '2.0.0' @@ -67,7 +67,7 @@ ext { // Logging, Analytics & Crash reporting timber_version = '4.7.1' - crashlytics_version = '18.0.0' + crashlytics_version = '18.1.0' // Protobuf diff --git a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt index 290b2639a1..c7e5482772 100644 --- a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt +++ b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt @@ -26,7 +26,7 @@ class MiddlewareEventChannelTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) channel = MiddlewareEventChannel(proxy) } diff --git a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt index feef66e2c7..51a1ab7008 100644 --- a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt +++ b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt @@ -36,7 +36,7 @@ class MiddlewareTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) middleware = Middleware(service, factory) } 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 5b9a725df4..5c16a951e2 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 @@ -20,7 +20,7 @@ class DashboardDragAndDropTest : DashboardTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 1950cd5298..7219b14d22 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 @@ -95,7 +95,7 @@ class HomeDashboardViewModelTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } private fun buildViewModel(): HomeDashboardViewModel { 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 9089f5488d..08a67a0c6e 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 @@ -26,7 +26,7 @@ class KeychainPhraseViewModelTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/mapper/MapperExtensionKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/mapper/MapperExtensionKtTest.kt index a28e93a51b..f94e82bc6c 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/mapper/MapperExtensionKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/mapper/MapperExtensionKtTest.kt @@ -20,7 +20,7 @@ class MapperExtensionKtTest { @Before fun before() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 89cb4fb10b..6159b46420 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 @@ -6,7 +6,6 @@ import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.core_models.ext.asMap import com.anytypeio.anytype.core_models.ext.content -import com.anytypeio.anytype.core_models.restrictions.DataViewRestrictions import com.anytypeio.anytype.core_models.restrictions.ObjectRestriction import com.anytypeio.anytype.core_utils.tools.Counter import com.anytypeio.anytype.domain.config.Gateway @@ -67,7 +66,7 @@ class DefaultBlockViewRendererTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) renderer = DefaultBlockViewRenderer( urlBuilder = UrlBuilder(gateway), toggleStateHolder = toggleStateHolder, diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/EditorFutureRelationsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/EditorFutureRelationsTest.kt index 6df3266085..fb1768f7e3 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/EditorFutureRelationsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/EditorFutureRelationsTest.kt @@ -40,7 +40,7 @@ class EditorFutureRelationsTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After 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 f705043858..56bcd2220e 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 @@ -246,7 +246,7 @@ open class PageViewModelTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) builder = UrlBuilder(gateway) } 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 cc0b7d5951..e64141d7c3 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 @@ -24,7 +24,7 @@ class EditorBackButtonTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackspaceNestedDeleteTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackspaceNestedDeleteTest.kt index a23d345d13..81eadc0ac6 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackspaceNestedDeleteTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackspaceNestedDeleteTest.kt @@ -25,7 +25,7 @@ class EditorBackspaceNestedDeleteTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 ee0abf41bc..dc289f1b6c 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 @@ -25,7 +25,7 @@ class EditorCheckboxTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 cdb27cdc78..516c80256c 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 @@ -49,7 +49,7 @@ class EditorEmptySpaceInteractionTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 c78fa09b1b..e20bd13211 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 @@ -27,7 +27,7 @@ class EditorErrorMessageTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 ee7b4c49a0..0fd1455390 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 @@ -23,7 +23,7 @@ class EditorEventSubscriptionTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 1ca8174685..c5c2d17af0 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 @@ -44,7 +44,7 @@ class EditorFocusTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorGranularChangeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorGranularChangeTest.kt index 6e3b6f0d30..53d2bc48aa 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorGranularChangeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorGranularChangeTest.kt @@ -25,7 +25,7 @@ class EditorGranularChangeTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 8d50c497d0..6bc034f691 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 @@ -32,7 +32,7 @@ class EditorListBlockTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 4e47e3345b..c703560f9a 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 @@ -37,7 +37,7 @@ class EditorMentionTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMenuTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMenuTest.kt index aa33b45318..ab1ccdd011 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMenuTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMenuTest.kt @@ -25,7 +25,7 @@ class EditorMenuTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 ff56ab030a..eaf3e3539e 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 @@ -27,7 +27,7 @@ class EditorMergeTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMoveToTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMoveToTest.kt index 81158d3f0f..5cea8a78bf 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMoveToTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMoveToTest.kt @@ -43,7 +43,7 @@ class EditorMoveToTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } 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 52af2ce667..e02342510c 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 @@ -34,7 +34,7 @@ class EditorMultiSelectModeTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorQuickStartingScrollAndMoveTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorQuickStartingScrollAndMoveTest.kt index 35071c2810..ab83933872 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorQuickStartingScrollAndMoveTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorQuickStartingScrollAndMoveTest.kt @@ -27,7 +27,7 @@ class EditorQuickStartingScrollAndMoveTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } val title = Block( diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorRelationBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorRelationBlockTest.kt index 2c91b292fa..4d4159feda 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorRelationBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorRelationBlockTest.kt @@ -48,7 +48,7 @@ class EditorRelationBlockTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 48133aa0f4..2ee4e29050 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 @@ -35,7 +35,7 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetActionsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetActionsTest.kt index 962231711f..a940d7569f 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetActionsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetActionsTest.kt @@ -1,7 +1,6 @@ package com.anytypeio.anytype.presentation.page.editor import MockDataFactory -import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.block.interactor.DuplicateBlock @@ -17,13 +16,14 @@ import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test -import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations -import org.mockito.kotlin.* +import org.mockito.kotlin.times +import org.mockito.kotlin.verifyBlocking +import org.mockito.kotlin.verifyNoMoreInteractions import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertNotNull @@ -46,7 +46,7 @@ class EditorSlashWidgetActionsTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetClicksTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetClicksTest.kt index 5fbb598cbd..4ceeb4519b 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetClicksTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetClicksTest.kt @@ -33,7 +33,7 @@ class EditorSlashWidgetClicksTest: EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } /** diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetColorTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetColorTest.kt index dd1b91211b..2694aed53f 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetColorTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetColorTest.kt @@ -40,7 +40,7 @@ class EditorSlashWidgetColorTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetCutFilterTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetCutFilterTest.kt index 09c0a5a2ef..2592f9327f 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetCutFilterTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetCutFilterTest.kt @@ -39,7 +39,7 @@ class EditorSlashWidgetCutFilterTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetFilterTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetFilterTest.kt index c6d7e568b6..9148cd6a9d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetFilterTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetFilterTest.kt @@ -4,17 +4,15 @@ import MockDataFactory import android.os.Build import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.presentation.BuildConfig import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.FLAVOUR_EXPERIMENTAL import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_HEADER_TWO import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_NUMBERED import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PARAGRAPH -import com.anytypeio.anytype.presentation.page.editor.slash.SlashWidgetState import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem -import com.anytypeio.anytype.presentation.relations.DocumentRelationView +import com.anytypeio.anytype.presentation.page.editor.slash.SlashWidgetState import com.anytypeio.anytype.presentation.relations.RelationListViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import org.junit.Before @@ -40,7 +38,7 @@ class EditorSlashWidgetFilterTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } /** diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetMarksTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetMarksTest.kt index e21c799b95..cad1a6a532 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetMarksTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetMarksTest.kt @@ -4,7 +4,6 @@ import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.core_utils.ui.ViewType import com.anytypeio.anytype.domain.block.interactor.UpdateBlocksMark import com.anytypeio.anytype.domain.editor.Editor import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory @@ -14,7 +13,6 @@ import com.anytypeio.anytype.presentation.page.editor.model.Types import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import kotlinx.coroutines.runBlocking import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After import org.junit.Before @@ -22,7 +20,6 @@ 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.verifyBlocking import kotlin.test.assertEquals import kotlin.test.assertFalse @@ -46,7 +43,7 @@ class EditorSlashWidgetMarksTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetObjectTypeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetObjectTypeTest.kt index 9cffde81cc..81f27d27fc 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetObjectTypeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetObjectTypeTest.kt @@ -27,7 +27,7 @@ class EditorSlashWidgetObjectTypeTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetRelationsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetRelationsTest.kt index 7d63c69ec7..9b95a0dfae 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetRelationsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetRelationsTest.kt @@ -33,7 +33,7 @@ class EditorSlashWidgetRelationsTest: EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetShowHideTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetShowHideTest.kt index 92094793b9..411bb33008 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetShowHideTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetShowHideTest.kt @@ -32,7 +32,7 @@ class EditorSlashWidgetShowHideTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetStyleTypeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetStyleTypeTest.kt index 36e3251b39..311ac64ed4 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetStyleTypeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetStyleTypeTest.kt @@ -41,7 +41,7 @@ class EditorSlashWidgetStyleTypeTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorStartupTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorStartupTest.kt index fccd44a87a..68b3bd6622 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorStartupTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorStartupTest.kt @@ -19,7 +19,7 @@ class EditorStartupTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 4c9fd8e3e8..d1563ec4c4 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 @@ -30,7 +30,7 @@ class EditorTextUpdateTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } val title = Block( 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 fd27330ddd..baa060962c 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 @@ -29,7 +29,7 @@ class EditorTitleAddBlockTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } val title = Block( 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 c0a66d275a..b4b2fb9447 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 @@ -34,7 +34,7 @@ class EditorTitleTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } val title = Block( 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 22885b779d..57c4f3568b 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 @@ -31,7 +31,7 @@ class EditorTurnIntoTest : EditorPresentationTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/TagAndStatusTests.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/TagAndStatusTests.kt index 3b1608977a..a494d04367 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/TagAndStatusTests.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/TagAndStatusTests.kt @@ -21,7 +21,7 @@ class TagAndStatusTests { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ViewerSortByViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ViewerSortByViewModelTest.kt index 0f190a37aa..9090294b7e 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ViewerSortByViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ViewerSortByViewModelTest.kt @@ -27,7 +27,7 @@ class ViewerSortByViewModelTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 4263f04b74..4853740024 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 @@ -150,7 +150,7 @@ class FilterViewModelInputFieldValueCreateTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) urlBuilder = UrlBuilder(gateway) viewModel = FilterViewModel( objectSetState = state, 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 eb3f506c67..e7d9586de9 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 @@ -1,7 +1,11 @@ package com.anytypeio.anytype.presentation.sets.filter +import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.anytypeio.anytype.core_models.* +import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.core_models.DVFilter +import com.anytypeio.anytype.core_models.Payload +import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects @@ -154,7 +158,7 @@ class FilterViewModelInputFieldValueModifyTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) urlBuilder = UrlBuilder(gateway) viewModel = FilterViewModel( objectSetState = state, diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetAddOrUpdateViewerTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetAddOrUpdateViewerTest.kt index e9f0735bc2..b9a95f5fad 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetAddOrUpdateViewerTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetAddOrUpdateViewerTest.kt @@ -2,11 +2,7 @@ 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.DV -import com.anytypeio.anytype.core_models.DVViewer -import com.anytypeio.anytype.core_models.Event -import com.anytypeio.anytype.core_models.Payload +import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.presentation.sets.model.ViewerTabView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import kotlinx.coroutines.runBlocking @@ -46,7 +42,7 @@ class ObjectSetAddOrUpdateViewerTest : ObjectSetViewModelTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetCellTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetCellTest.kt index ce12be71d8..d1d909dd54 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetCellTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetCellTest.kt @@ -38,7 +38,7 @@ class ObjectSetCellTest : ObjectSetViewModelTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetHeaderTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetHeaderTest.kt index 13080b81d5..413dac0000 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetHeaderTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetHeaderTest.kt @@ -42,7 +42,7 @@ class ObjectSetHeaderTest : ObjectSetViewModelTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetRestrictionsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetRestrictionsTest.kt index adbdcf3ada..fcfa1603c0 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetRestrictionsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetRestrictionsTest.kt @@ -25,7 +25,7 @@ class ObjectSetRestrictionsTest : ObjectSetViewModelTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetSettingActiveViewerTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetSettingActiveViewerTest.kt index 0f3a75050f..e7397e8bad 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetSettingActiveViewerTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetSettingActiveViewerTest.kt @@ -33,7 +33,7 @@ class ObjectSetSettingActiveViewerTest : ObjectSetViewModelTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } @Test 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 5fb67ed26b..72a8157ce2 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 @@ -29,7 +29,7 @@ class ObjectSetUpdateViewerSortTest : ObjectSetViewModelTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } val doc = TypicalTwoRecordObjectSet() 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 7eb7c92bd0..27853dd2c8 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 @@ -29,7 +29,7 @@ class ObjectSetViewerFilterTest : ObjectSetViewModelTestSetup() { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) } val doc = TypicalTwoRecordObjectSet() 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 371f41904d..0032fd9a8f 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 @@ -45,7 +45,7 @@ class SplashViewModelTest { @Before fun setup() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) vm = SplashViewModel( checkAuthorizationStatus = checkAuthorizationStatus, launchAccount = launchAccount,