From 51996ff726f996d27d0210b914fa2a7c4bb38b15 Mon Sep 17 00:00:00 2001 From: Sergey Boishtyan Date: Mon, 9 May 2022 19:48:16 +0300 Subject: [PATCH] Tech | Fix | Delete MockDataFactory.kt copy-paste (#2244) --- app/build.gradle | 2 +- .../features/auth/SetupSelectedAccountTest.kt | 2 +- .../features/editor/CreateBlockTesting.kt | 13 +--- .../features/editor/DeleteBlockTesting.kt | 2 +- .../features/editor/DescriptionTesting.kt | 2 +- .../editor/EditorIntegrationTesting.kt | 2 +- .../editor/FeaturedRelationTesting.kt | 2 +- .../anytype/features/editor/LayoutTesting.kt | 2 +- .../features/editor/ListBlockTesting.kt | 2 +- .../anytype/features/editor/MarkupTesting.kt | 2 +- .../features/editor/MentionUpdateTesting.kt | 2 +- .../features/editor/MergeBlockTesting.kt | 2 +- .../anytype/features/editor/ProfileTesting.kt | 2 +- .../features/editor/RelationBlockUITesting.kt | 2 +- .../features/editor/ScrollAndMoveTesting.kt | 2 +- .../editor/SlashTextWatcherTesting.kt | 2 +- .../features/editor/SlashWidgetTesting.kt | 2 +- .../features/editor/SplitBlockTesting.kt | 2 +- .../features/editor/SplitTitleTesting.kt | 2 +- .../features/editor/base/EditorTestSetup.kt | 13 +--- .../editor/base/MentionWidgetTesting.kt | 2 +- .../emoji/DocumentEmojiPickerFragmentTest.kt | 2 +- .../relations/AddRelationStatusValueTest.kt | 2 +- .../relations/AddRelationTagValueTest.kt | 2 +- .../DisplayObjectRelationTextValueTest.kt | 2 +- .../DisplayRelationNumberValueTest.kt | 2 +- .../DisplayRelationObjectValueTest.kt | 2 +- .../DisplayRelationStatusValueTest.kt | 2 +- .../relations/DisplayRelationTagValueTest.kt | 2 +- .../relations/EditRelationTagValueTest.kt | 2 +- .../relations/ObjectRelationDateValueTest.kt | 2 +- .../relations/ObjectRelationListTest.kt | 2 +- .../dv/ObjectSetGridColumnRenderingTest.kt | 2 +- .../dv/ObjectSetGridFileCellRenderingTest.kt | 2 +- .../ObjectSetGridNumberCellRenderingTest.kt | 2 +- .../ObjectSetGridObjectCellRenderingTest.kt | 2 +- .../dv/ObjectSetGridPrimitiveRelationTest.kt | 2 +- .../dv/ObjectSetGridTagCellRenderingTest.kt | 2 +- .../features/sets/dv/ObjectSetHeaderTest.kt | 2 +- .../features/sets/dv/TestObjectSetSetup.kt | 2 +- .../sets/filter/CreateSelectedFilterTest.kt | 2 +- .../features/sets/filter/FilterListTest.kt | 2 +- .../sets/filter/ModifyInputValueFilterTest.kt | 2 +- .../sets/filter/ModifyStatusFilterTest.kt | 2 +- .../sets/filter/ModifyTagFilterTest.kt | 2 +- .../sets/sort/ViewerObjectSortTest.kt | 2 +- .../anytype/mocking/MockDataFactory.kt | 64 ------------------- clipboard/build.gradle | 1 + .../anytype/clipboard/AndroidClipboardTest.kt | 1 + .../anytype/clipboard/MockDataFactory.kt | 63 ------------------ core-ui/build.gradle | 2 +- .../anytype/core_ui/BlockAdapterTest.kt | 1 + .../anytype/core_ui/BlockViewDiffUtilTest.kt | 1 + .../core_ui/BlockViewSearchTextTest.kt | 1 + .../anytype/core_ui/HeaderBlockTest.kt | 1 + .../anytype/core_ui/HighlightingBlockTest.kt | 1 + .../anytype/core_ui/MockDataFactory.kt | 64 ------------------- .../features/dv/CellViewDiffUtilTest.kt | 2 +- .../features/dv/ColumnViewDiffUtilTest.kt | 2 +- .../editor/BlockAdapterCheckboxTest.kt | 2 +- .../editor/BlockAdapterCursorBindingTest.kt | 2 +- .../editor/BlockAdapterIndentationTest.kt | 2 +- .../editor/BlockAdapterMovementMethodTest.kt | 2 +- .../editor/BlockAdapterNumberedListTest.kt | 2 +- .../editor/BlockAdapterReadWriteModeTest.kt | 2 +- .../editor/BlockAdapterTextBindingTest.kt | 2 +- .../editor/BlockAdapterTextColorTest.kt | 2 +- .../features/editor/BlockAdapterToggleTest.kt | 2 +- .../features/editor/TextBlockSetTextTest.kt | 2 +- .../navigation/LinkToObjectViewKtTest.kt | 2 +- .../core_ui/features/page/BlockViewTest.kt | 2 +- .../core_ui/uitests/CheckBoxTodoBlockTest.kt | 2 +- .../anytypeio/anytype/data/MockDataFactory.kt | 64 ------------------- .../auth/CheckAuthorizationStatusTest.kt | 1 - .../anytype/domain/auth/CreateAccountTest.kt | 1 - .../domain/auth/GetCurrentAccountTest.kt | 1 - .../domain/auth/ObserveAccountsTest.kt | 1 - .../anytype/domain/auth/StartAccountTest.kt | 1 - .../GetCompatibleObjectTypesTest.kt | 1 - .../domain/block/interactor/SplitBlockTest.kt | 1 - .../interactor/sets/StoreObjectTypesTest.kt | 1 - .../anytype/domain/common/MockDataFactory.kt | 64 ------------------- .../domain/dashboard/GetProfileTest.kt | 1 - .../domain/dashboard/OpenDashboardTest.kt | 1 - .../anytype/domain/ext/BlockExtensionTest.kt | 1 - .../domain/ext/BlockMentionUpdateTest.kt | 1 - .../domain/ext/ObjectWrapperExtTest.kt | 1 - .../anytype/domain/markup/MarkupExtTest.kt | 1 - .../anytype/domain/misc/GetObjectTypeTest.kt | 1 - .../navigation/GetObjectInfoWithLinksTest.kt | 1 - middleware/build.gradle | 1 + .../anytype/MiddlewareEventChannelTest.kt | 3 +- .../com/anytypeio/anytype/MiddlewareTest.kt | 4 +- .../anytype/common/MockDataFactory.kt | 64 ------------------- persistence/build.gradle | 2 +- .../com/anytypeio/anytype/AccountDaoTest.kt | 1 + .../com/anytypeio/anytype/MockDataFactory.kt | 64 ------------------- presentation/build.gradle | 1 + presentation/src/test/java/MockDataFactory.kt | 61 ------------------ .../anytype/presentation/MockBlockFactory.kt | 2 +- .../presentation/MockRelationFactory.kt | 2 +- .../MockTypicalDocumentFactory.kt | 2 +- .../presentation/TypicalTwoRecordObjectSet.kt | 2 +- .../auth/CreateAccountViewModelTest.kt | 2 +- .../auth/SelectAccountViewModelTest.kt | 2 +- .../auth/SetupSelectedAccountViewModelTest.kt | 2 +- .../dashboard/DashboardBinTest.kt | 2 +- .../dashboard/DashboardDragAndDropTest.kt | 2 +- .../dashboard/DashboardTestSetup.kt | 2 +- .../dashboard/HomeDashboardViewModelTest.kt | 2 +- .../presentation/editor/BlockReadModeTest.kt | 3 +- .../editor/ControlPanelStateReducerTest.kt | 2 +- .../editor/DefaultBlockViewRendererTest.kt | 2 +- .../DocumentExternalEventReducerTest.kt | 2 +- .../editor/EditorViewModelTest.kt | 2 +- .../editor/editor/EditorAddBlockTest.kt | 2 +- .../editor/EditorBackspaceDeleteTest.kt | 2 +- .../editor/editor/EditorCheckboxTest.kt | 2 +- .../editor/editor/EditorDuplicateTest.kt | 2 +- .../editor/EditorEmptySpaceInteractionTest.kt | 2 +- .../editor/editor/EditorErrorMessageTest.kt | 3 +- .../editor/EditorEventSubscriptionTest.kt | 2 +- .../editor/EditorFeaturedRelationsTest.kt | 2 +- .../editor/editor/EditorFocusTest.kt | 2 +- .../editor/editor/EditorGranularChangeTest.kt | 2 +- .../editor/editor/EditorLatexBlockTest.kt | 2 +- .../editor/editor/EditorListBlockTest.kt | 3 +- .../editor/editor/EditorLockPageTest.kt | 2 +- .../editor/editor/EditorMarkupObjectTest.kt | 2 +- .../editor/editor/EditorMentionTest.kt | 2 +- .../editor/editor/EditorMergeTest.kt | 2 +- .../editor/EditorMultiSelectModeTest.kt | 2 +- .../editor/editor/EditorNoteLayoutTest.kt | 2 +- .../EditorObjectTypeChangeWidgetTest.kt | 2 +- .../editor/EditorPresentationTestSetup.kt | 2 +- .../EditorQuickStartingScrollAndMoveTest.kt | 3 +- .../editor/editor/EditorRelationBlockTest.kt | 2 +- .../editor/editor/EditorScrollAndMoveTest.kt | 2 +- .../editor/EditorSlashWidgetActionsTest.kt | 2 +- .../editor/EditorSlashWidgetClicksTest.kt | 2 +- .../editor/EditorSlashWidgetColorTest.kt | 2 +- .../editor/EditorSlashWidgetCutFilterTest.kt | 3 +- .../editor/EditorSlashWidgetFilterTest.kt | 2 +- .../editor/EditorSlashWidgetMarksTest.kt | 2 +- .../editor/EditorSlashWidgetRelationsTest.kt | 3 +- .../editor/EditorSlashWidgetStyleTypeTest.kt | 2 +- .../editor/editor/EditorSplitTest.kt | 2 +- .../editor/EditorTableOfContentsBlockTest.kt | 1 + .../editor/editor/EditorTextUpdateTest.kt | 2 +- .../editor/editor/EditorTitleAddBlockTest.kt | 2 +- .../editor/editor/EditorTitleTest.kt | 2 +- .../editor/editor/EditorTurnIntoTest.kt | 5 +- .../editor/editor/StyleConfigKtTest.kt | 2 +- .../editor/editor/ext/BlockViewCutTextTest.kt | 2 +- .../editor/editor/mention/MentionExtKtTest.kt | 2 +- .../extension/DashboardViewExtensionKtTest.kt | 3 +- .../extension/FilterConditionExtensionTest.kt | 2 +- .../extension/MarkupExtensionTest.kt | 1 + .../extension/RelationValueExtensionTest.kt | 2 +- .../keychain/KeychainPhraseViewModelTest.kt | 2 +- .../mapper/MapperExtensionKtTest.kt | 2 +- .../relations/ObjectSetRenderMapperTest.kt | 2 +- .../relations/RelationExtensionsTest.kt | 2 +- .../presentation/sets/MockObjectSetFactory.kt | 2 +- .../sets/ObjectSetRecordViewModelTest.kt | 2 +- .../presentation/sets/ObjectSetReducerTest.kt | 2 +- .../sets/SearchRelationViewModelTest.kt | 3 +- .../presentation/sets/TagAndStatusTests.kt | 2 +- .../sets/ViewerSortByViewModelTest.kt | 2 +- .../sets/filter/FilterExtensionsTest.kt | 2 +- ...ilterViewModelInputFieldValueCreateTest.kt | 2 +- ...ilterViewModelInputFieldValueModifyTest.kt | 2 +- .../main/ObjectSetAddOrUpdateViewerTest.kt | 2 +- .../sets/main/ObjectSetCellTest.kt | 2 +- .../sets/main/ObjectSetHeaderTest.kt | 2 +- .../sets/main/ObjectSetInitializationTest.kt | 2 +- .../sets/main/ObjectSetNavigationTest.kt | 2 +- .../sets/main/ObjectSetRecordCreateTest.kt | 2 +- .../main/ObjectSetSettingActiveViewerTest.kt | 2 +- .../main/ObjectSetUpdateViewerSortTest.kt | 2 +- .../sets/main/ObjectSetViewModelTestSetup.kt | 2 +- .../sets/main/ObjectSetViewerDeleteTest.kt | 2 +- .../sets/main/ObjectSetViewerFilterTest.kt | 2 +- .../sets/main/ObjectSetZeroDataViewTest.kt | 1 + .../sets/main/ObjectSetZeroViewTest.kt | 2 +- .../anytype/sample/helpers/MockDataFactory.kt | 64 ------------------- test/android-utils/build.gradle | 4 +- 187 files changed, 163 insertions(+), 774 deletions(-) delete mode 100644 app/src/androidTest/java/com/anytypeio/anytype/mocking/MockDataFactory.kt delete mode 100644 clipboard/src/test/java/com/anytypeio/anytype/clipboard/MockDataFactory.kt delete mode 100644 core-ui/src/test/java/com/anytypeio/anytype/core_ui/MockDataFactory.kt delete mode 100644 data/src/test/java/com/anytypeio/anytype/data/MockDataFactory.kt delete mode 100644 domain/src/test/java/com/anytypeio/anytype/domain/common/MockDataFactory.kt delete mode 100644 middleware/src/test/java/com/anytypeio/anytype/common/MockDataFactory.kt delete mode 100644 persistence/src/test/java/com/anytypeio/anytype/MockDataFactory.kt delete mode 100644 presentation/src/test/java/MockDataFactory.kt delete mode 100644 sample/src/main/java/com/anytypeio/anytype/sample/helpers/MockDataFactory.kt diff --git a/app/build.gradle b/app/build.gradle index 7cdde81405..0ff4a4484a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -195,13 +195,13 @@ dependencies { androidTestImplementation project(':test:android-utils') androidTestImplementation acceptanceTesting.mockitoAndroid androidTestImplementation unitTestDependencies.mockitoKotlin - androidTestImplementation acceptanceTesting.espressoCore androidTestImplementation acceptanceTesting.espressoContrib androidTestImplementation acceptanceTesting.androidJUnit androidTestImplementation unitTestDependencies.kotlinTest androidTestImplementation acceptanceTesting.testRules androidTestImplementation acceptanceTesting.disableAnimation androidTestImplementation acceptanceTesting.navigationTesting + androidTestImplementation project(":test:utils") androidTestImplementation(unitTestDependencies.coroutineTesting) { exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" 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 8982d941c5..58e28a9bd5 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 @@ -16,9 +16,9 @@ import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.config.FeaturesConfigProvider import com.anytypeio.anytype.domain.device.PathProvider import com.anytypeio.anytype.features.auth.fragments.TestSetupSelectedAccountFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.auth.account.SetupSelectedAccountViewModel import com.anytypeio.anytype.presentation.auth.account.SetupSelectedAccountViewModelFactory +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.matchView import com.anytypeio.anytype.ui.auth.Keys 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 597be1a8be..0759060360 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 @@ -21,8 +21,8 @@ import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.block.interactor.UpdateTextStyle import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule @@ -248,17 +248,6 @@ class CreateBlockTesting : EditorTestSetup() { ) ) - val new = Block( - id = MockDataFactory.randomUuid(), - fields = Block.Fields.empty(), - children = emptyList(), - content = Block.Content.Text( - text = "", - marks = emptyList(), - style = Block.Content.Text.Style.P - ) - ) - val page = Block( id = root, fields = Block.Fields(emptyMap()), 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 dcd3aa3ed5..7d85edcaaa 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 @@ -21,8 +21,8 @@ import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.UnlinkBlocks import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DescriptionTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DescriptionTesting.kt index f53661558c..8e0c2f98ad 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DescriptionTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DescriptionTesting.kt @@ -13,7 +13,7 @@ import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsRecyclerSize import com.anytypeio.anytype.test_utils.utils.onItemView 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 bca37f413a..423eed6bf8 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 @@ -28,7 +28,6 @@ import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_BULLET import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_CHECKBOX import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_H1 @@ -40,6 +39,7 @@ import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_PARAGRAPH import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_PARAGRAPH_1 import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_TOGGLE import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.scrollTo diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/FeaturedRelationTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/FeaturedRelationTesting.kt index 8e20465075..a8bb089d74 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/FeaturedRelationTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/FeaturedRelationTesting.kt @@ -13,7 +13,7 @@ import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasViewGroupChildWithText import com.anytypeio.anytype.test_utils.utils.matchView import com.anytypeio.anytype.ui.editor.EditorFragment diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/LayoutTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/LayoutTesting.kt index 008a3845fb..7463bf4d0a 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/LayoutTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/LayoutTesting.kt @@ -11,8 +11,8 @@ import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.cover.CoverColor +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsDisplayed import com.anytypeio.anytype.test_utils.utils.checkIsNotDisplayed 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 ff2dc191ca..46a5048e4c 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 @@ -22,8 +22,8 @@ import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.block.interactor.UpdateTextStyle import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils import com.anytypeio.anytype.ui.editor.EditorFragment import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MarkupTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MarkupTesting.kt index 9d0747b2bd..378bbdafc7 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MarkupTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MarkupTesting.kt @@ -10,8 +10,8 @@ import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.onItemView import com.anytypeio.anytype.test_utils.utils.rVMatcher diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MentionUpdateTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MentionUpdateTesting.kt index d72f6bb19d..aaeea6f040 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MentionUpdateTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MentionUpdateTesting.kt @@ -14,8 +14,8 @@ import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.base.Result import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.onItemView import com.anytypeio.anytype.test_utils.utils.rVMatcher 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 8b802f8733..23327f5b79 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 @@ -20,8 +20,8 @@ import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.MergeBlocks import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ProfileTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ProfileTesting.kt index 36df68dbaa..b6d7e56f44 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ProfileTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ProfileTesting.kt @@ -12,8 +12,8 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.cover.CoverColor +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsDisplayed import com.anytypeio.anytype.test_utils.utils.onItemView diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt index ea8c3548c0..fc2562b781 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt @@ -16,9 +16,9 @@ import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasBackgroundColor import com.anytypeio.anytype.test_utils.utils.checkHasNoBackground import com.anytypeio.anytype.test_utils.utils.checkHasText diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ScrollAndMoveTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ScrollAndMoveTesting.kt index aa56a8464b..0c645573d2 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ScrollAndMoveTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ScrollAndMoveTesting.kt @@ -13,8 +13,8 @@ import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.ui.editor.EditorFragment import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashTextWatcherTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashTextWatcherTesting.kt index 9ba7960a87..e51d92a193 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashTextWatcherTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashTextWatcherTesting.kt @@ -13,8 +13,8 @@ import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkIsDisplayed import com.anytypeio.anytype.test_utils.utils.checkIsNotDisplayed import com.anytypeio.anytype.test_utils.utils.matchView diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashWidgetTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashWidgetTesting.kt index a101eed83e..d8ea5e300b 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashWidgetTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashWidgetTesting.kt @@ -23,9 +23,9 @@ import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.relations.NumberParser +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsDisplayed import com.anytypeio.anytype.test_utils.utils.checkIsNotDisplayed 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 5502f15419..737ebf6d9a 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 @@ -18,8 +18,8 @@ import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitTitleTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitTitleTesting.kt index 8edd6cd8db..ee2eb86e0e 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitTitleTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitTitleTesting.kt @@ -17,8 +17,8 @@ import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.features.editor.base.TestEditorFragment -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsDisplayed import com.anytypeio.anytype.test_utils.utils.checkIsFocused 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 1e06a5f826..69d1fae7bc 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 @@ -77,7 +77,6 @@ import com.anytypeio.anytype.domain.templates.ApplyTemplate import com.anytypeio.anytype.domain.templates.GetTemplates import com.anytypeio.anytype.domain.unsplash.DownloadUnsplashImage import com.anytypeio.anytype.domain.unsplash.UnsplashRepository -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.common.Delegator import com.anytypeio.anytype.presentation.editor.DocumentExternalEventReducer import com.anytypeio.anytype.presentation.editor.Editor @@ -95,6 +94,7 @@ import com.anytypeio.anytype.presentation.editor.template.EditorTemplateDelegate import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.util.CopyFileToCacheDirectory import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.test.StandardTestDispatcher @@ -452,17 +452,6 @@ open class EditorTestSetup { } } - fun stubReplaceBlock( - command: Command.Replace, - events: List - ) { - repo.stub { - onBlocking { - replace(command = command) - } doReturn Pair(command.context, Payload(command.context, events)) - } - } - fun stubSplitBlocks( command: Command.Split, new: Id, diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/MentionWidgetTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/MentionWidgetTesting.kt index 78ad64c481..d994dc5ee1 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/MentionWidgetTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/MentionWidgetTesting.kt @@ -10,8 +10,8 @@ import androidx.test.filters.LargeTest import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasChildViewWithText import com.anytypeio.anytype.test_utils.utils.checkIsDisplayed import com.anytypeio.anytype.test_utils.utils.checkIsNotDisplayed 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 11148264c0..fbdfd40fd0 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 @@ -27,10 +27,10 @@ import com.anytypeio.anytype.emojifier.data.Emoji import com.anytypeio.anytype.emojifier.data.EmojiProvider import com.anytypeio.anytype.emojifier.suggest.EmojiSuggester import com.anytypeio.anytype.emojifier.suggest.model.EmojiModel -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager import com.anytypeio.anytype.presentation.editor.picker.ObjectIconPickerViewModelFactory import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import org.hamcrest.CoreMatchers.not import org.junit.Before 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 2cd5b30e28..e4ce189b8c 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 @@ -23,7 +23,6 @@ import com.anytypeio.anytype.domain.dataview.interactor.AddTagToDataViewRecord import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRecord 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.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.RelationOptionValueDVAddViewModel @@ -33,6 +32,7 @@ import com.anytypeio.anytype.presentation.relations.providers.ObjectDetailProvid import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkHasTextColor import com.anytypeio.anytype.test_utils.utils.checkIsNotDisplayed 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 94324505c6..12e46b4550 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 @@ -23,7 +23,6 @@ import com.anytypeio.anytype.domain.dataview.interactor.AddTagToDataViewRecord import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRecord 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.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.RelationOptionValueDVAddViewModel @@ -33,6 +32,7 @@ import com.anytypeio.anytype.presentation.relations.providers.ObjectDetailProvid import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkHasTextColor import com.anytypeio.anytype.test_utils.utils.checkIsRecyclerSize 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 416517e8e5..d4ea92fab5 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 @@ -16,13 +16,13 @@ import androidx.test.filters.LargeTest import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Relation -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.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.RelationTextValueViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.espresso.TextLineCountMatcher import com.anytypeio.anytype.ui.relations.RelationTextValueFragment import com.anytypeio.anytype.utils.CoroutinesTestRule 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 46a01999fa..967ac0f8cf 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 @@ -15,7 +15,6 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.config.Gateway -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 @@ -23,6 +22,7 @@ import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.RelationTextValueViewModel import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils import com.anytypeio.anytype.ui.relations.RelationTextValueFragment import com.anytypeio.anytype.ui.relations.RelationTextValueFragment.Companion.FLOW_DATAVIEW 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 17a8ad28f6..dc604df3e2 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 @@ -28,7 +28,6 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRec import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToRecord -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 @@ -38,6 +37,7 @@ import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.RelationValueDVViewModel import com.anytypeio.anytype.presentation.util.CopyFileToCacheDirectory import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsRecyclerSize 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 38557afa8a..1a2128bc1e 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 @@ -28,7 +28,6 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRec import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToRecord -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider @@ -39,6 +38,7 @@ import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.RelationValueDVViewModel import com.anytypeio.anytype.presentation.util.CopyFileToCacheDirectory import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.test_utils.utils.espresso.WithTextColor import com.anytypeio.anytype.test_utils.utils.espresso.WithTextColorRes 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 1c2aed1936..f0c5680321 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 @@ -28,7 +28,6 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRec import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToRecord -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider @@ -39,6 +38,7 @@ import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.RelationValueDVViewModel import com.anytypeio.anytype.presentation.util.CopyFileToCacheDirectory import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.test_utils.utils.espresso.WithTextColor import com.anytypeio.anytype.test_utils.utils.espresso.WithTextColorRes 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 1715fd2d72..7c8350f2ce 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 @@ -23,7 +23,6 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRec import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToRecord -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider @@ -34,6 +33,7 @@ import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.RelationValueDVViewModel import com.anytypeio.anytype.presentation.util.CopyFileToCacheDirectory import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkHasTextColor import com.anytypeio.anytype.test_utils.utils.checkIsDisplayed 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 13211cc9b7..c1858c640d 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 @@ -16,13 +16,13 @@ import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_utils.const.DateConst.DEFAULT_DATE_FORMAT import com.anytypeio.anytype.core_utils.ext.timeInSecondsFormat -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.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.RelationDateValueViewModel +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.ui.relations.RelationDateValueFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule 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 b93e1566ba..a864f732ba 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 @@ -25,12 +25,12 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddToFeaturedRelations import com.anytypeio.anytype.domain.relations.DeleteRelationFromObject import com.anytypeio.anytype.domain.relations.RemoveFromFeaturedRelations -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.editor.Editor import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectRelationListViewModelFactory import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkHasTextColor import com.anytypeio.anytype.test_utils.utils.checkIsRecyclerSize diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridColumnRenderingTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridColumnRenderingTest.kt index d26d31e9d5..cbe52d3819 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridColumnRenderingTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridColumnRenderingTest.kt @@ -9,7 +9,7 @@ import com.anytypeio.anytype.core_models.DVViewerRelation import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.SmartBlockType -import com.anytypeio.anytype.mocking.MockDataFactory +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsRecyclerSize import com.anytypeio.anytype.test_utils.utils.onItemView diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridFileCellRenderingTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridFileCellRenderingTest.kt index 93b85b4569..ad02caa333 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridFileCellRenderingTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridFileCellRenderingTest.kt @@ -12,8 +12,8 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsRecyclerSize import com.anytypeio.anytype.test_utils.utils.onItemView diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridNumberCellRenderingTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridNumberCellRenderingTest.kt index 0f0d3c7b3c..e15d879aab 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridNumberCellRenderingTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridNumberCellRenderingTest.kt @@ -10,8 +10,8 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasChildViewCount import com.anytypeio.anytype.test_utils.utils.checkHasChildViewWithText import com.anytypeio.anytype.test_utils.utils.checkHasText diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridObjectCellRenderingTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridObjectCellRenderingTest.kt index bb5f47cb8c..9c0cb85974 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridObjectCellRenderingTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridObjectCellRenderingTest.kt @@ -13,8 +13,8 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsRecyclerSize import com.anytypeio.anytype.test_utils.utils.onItemView diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridPrimitiveRelationTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridPrimitiveRelationTest.kt index f0750b884b..8b1ef27b8d 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridPrimitiveRelationTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridPrimitiveRelationTest.kt @@ -10,8 +10,8 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasChildViewCount import com.anytypeio.anytype.test_utils.utils.checkHasChildViewWithText import com.anytypeio.anytype.test_utils.utils.checkHasText diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridTagCellRenderingTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridTagCellRenderingTest.kt index 966c9b53fc..77f94e3d6b 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridTagCellRenderingTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetGridTagCellRenderingTest.kt @@ -12,8 +12,8 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsRecyclerSize import com.anytypeio.anytype.test_utils.utils.onItemView diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetHeaderTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetHeaderTest.kt index 3e5894ee54..871c094734 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetHeaderTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/ObjectSetHeaderTest.kt @@ -9,7 +9,7 @@ import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.core_models.ext.content -import com.anytypeio.anytype.mocking.MockDataFactory +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.ui.sets.ObjectSetFragment import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule 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 829a5dca78..66f57563bd 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 @@ -34,7 +34,6 @@ import com.anytypeio.anytype.domain.templates.GetTemplates import com.anytypeio.anytype.domain.unsplash.DownloadUnsplashImage import com.anytypeio.anytype.domain.unsplash.UnsplashRepository import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.common.Action import com.anytypeio.anytype.presentation.common.Delegator import com.anytypeio.anytype.presentation.sets.ObjectSetRecordCache @@ -42,6 +41,7 @@ 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.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.test.StandardTestDispatcher import org.mockito.Mock 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 d346e926b8..6ca3f9a278 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 @@ -20,12 +20,12 @@ import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.filter.FilterViewModel import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.test_utils.utils.checkIsDisplayed 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 0d560618ca..d02a16ba07 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 @@ -19,13 +19,13 @@ import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.filter.ViewerFilterViewModel import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils import com.anytypeio.anytype.test_utils.utils.checkHasText import com.anytypeio.anytype.ui.sets.ViewerFilterFragment 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 5ad0254a0d..c54cb1c26f 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,12 +28,12 @@ import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.filter.FilterViewModel import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.ui.sets.modals.filter.ModifyFilterFromInputFieldValueFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule 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 92b8694551..b2c69f0311 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 @@ -25,12 +25,12 @@ import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.filter.FilterViewModel import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils import com.anytypeio.anytype.ui.sets.modals.filter.ModifyFilterFromSelectedValueFragment import com.anytypeio.anytype.utils.CoroutinesTestRule 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 bddbccb223..76642c8cb4 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 @@ -25,12 +25,12 @@ import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.filter.FilterViewModel import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils import com.anytypeio.anytype.ui.sets.modals.filter.ModifyFilterFromSelectedValueFragment import com.anytypeio.anytype.utils.CoroutinesTestRule 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 2fe6918eaf..a820e9b945 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 @@ -17,12 +17,12 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer -import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.sets.sort.ViewerSortViewModel import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.ui.sets.modals.sort.ViewerSortFragment import com.anytypeio.anytype.utils.CoroutinesTestRule diff --git a/app/src/androidTest/java/com/anytypeio/anytype/mocking/MockDataFactory.kt b/app/src/androidTest/java/com/anytypeio/anytype/mocking/MockDataFactory.kt deleted file mode 100644 index a6a55e0c02..0000000000 --- a/app/src/androidTest/java/com/anytypeio/anytype/mocking/MockDataFactory.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.anytypeio.anytype.mocking - -import java.util.* -import java.util.concurrent.ThreadLocalRandom - -object MockDataFactory { - - fun randomUuid(): String { - return UUID.randomUUID().toString() - } - - fun randomString(): String { - return randomUuid() - } - - - fun randomInt(): Int { - return ThreadLocalRandom.current().nextInt(0, 1000 + 1) - } - - fun randomInt(max: Int): Int { - return ThreadLocalRandom.current().nextInt(0, max) - } - - fun randomLong(): Long { - return randomInt().toLong() - } - - fun randomFloat(): Float { - return randomInt().toFloat() - } - - fun randomDouble(): Double { - return randomInt().toDouble() - } - - fun randomBoolean(): Boolean { - return Math.random() < 0.5 - } - - fun makeIntList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomInt()) - } - return items - } - - fun makeStringList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomUuid()) - } - return items - } - - fun makeDoubleList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomDouble()) - } - return items - } -} \ No newline at end of file diff --git a/clipboard/build.gradle b/clipboard/build.gradle index 76695fea65..84d670aaf3 100644 --- a/clipboard/build.gradle +++ b/clipboard/build.gradle @@ -53,6 +53,7 @@ dependencies { implementation applicationDependencies.coroutinesAndroid implementation applicationDependencies.timber + testImplementation project(":test:utils") testImplementation unitTestDependencies.junit testImplementation unitTestDependencies.kotlinTest testImplementation unitTestDependencies.androidXTestCore diff --git a/clipboard/src/test/java/com/anytypeio/anytype/clipboard/AndroidClipboardTest.kt b/clipboard/src/test/java/com/anytypeio/anytype/clipboard/AndroidClipboardTest.kt index e1bd1c4185..23306deeaa 100644 --- a/clipboard/src/test/java/com/anytypeio/anytype/clipboard/AndroidClipboardTest.kt +++ b/clipboard/src/test/java/com/anytypeio/anytype/clipboard/AndroidClipboardTest.kt @@ -4,6 +4,7 @@ import android.content.ClipboardManager import android.content.Context import android.os.Build import androidx.test.core.app.ApplicationProvider +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.Test diff --git a/clipboard/src/test/java/com/anytypeio/anytype/clipboard/MockDataFactory.kt b/clipboard/src/test/java/com/anytypeio/anytype/clipboard/MockDataFactory.kt deleted file mode 100644 index 8fb665af20..0000000000 --- a/clipboard/src/test/java/com/anytypeio/anytype/clipboard/MockDataFactory.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.anytypeio.anytype.clipboard - -import java.util.* -import java.util.concurrent.ThreadLocalRandom - -object MockDataFactory { - - fun randomUuid(): String { - return UUID.randomUUID().toString() - } - - fun randomString(): String { - return randomUuid() - } - - fun randomInt(): Int { - return ThreadLocalRandom.current().nextInt(0, 1000 + 1) - } - - fun randomInt(max: Int): Int { - return ThreadLocalRandom.current().nextInt(0, max) - } - - fun randomLong(): Long { - return randomInt().toLong() - } - - fun randomFloat(): Float { - return randomInt().toFloat() - } - - fun randomDouble(): Double { - return randomInt().toDouble() - } - - fun randomBoolean(): Boolean { - return Math.random() < 0.5 - } - - fun makeIntList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomInt()) - } - return items - } - - fun makeStringList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomUuid()) - } - return items - } - - fun makeDoubleList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomDouble()) - } - return items - } -} \ No newline at end of file diff --git a/core-ui/build.gradle b/core-ui/build.gradle index 420f5ad0b7..4376c9b102 100644 --- a/core-ui/build.gradle +++ b/core-ui/build.gradle @@ -77,7 +77,7 @@ dependencies { testImplementation acceptanceTesting.fragmentTesting testImplementation project(':test:android-utils') - testImplementation acceptanceTesting.espressoCore + testImplementation project(':test:utils') testImplementation unitTestDependencies.junit testImplementation unitTestDependencies.kotlinTest testImplementation unitTestDependencies.robolectricLatest diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockAdapterTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockAdapterTest.kt index cf3c34829b..16cfdacd6a 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockAdapterTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockAdapterTest.kt @@ -53,6 +53,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.types.Types import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_PARAGRAPH import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_TITLE import com.anytypeio.anytype.presentation.objects.ObjectIcon +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Test import org.junit.runner.RunWith diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewDiffUtilTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewDiffUtilTest.kt index 871f08e1b6..5ba5e59d43 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewDiffUtilTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewDiffUtilTest.kt @@ -13,6 +13,7 @@ import com.anytypeio.anytype.presentation.sets.model.FileView import com.anytypeio.anytype.presentation.sets.model.ObjectView import com.anytypeio.anytype.presentation.sets.model.StatusView import com.anytypeio.anytype.presentation.sets.model.TagView +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewSearchTextTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewSearchTextTest.kt index e3aa81f29e..571eecf799 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewSearchTextTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewSearchTextTest.kt @@ -4,6 +4,7 @@ import com.anytypeio.anytype.presentation.editor.editor.ext.nextSearchTarget import com.anytypeio.anytype.presentation.editor.editor.ext.previousSearchTarget import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.objects.ObjectIcon +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import kotlin.test.assertEquals diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HeaderBlockTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HeaderBlockTest.kt index 917260cab9..2f6b0517fd 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HeaderBlockTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HeaderBlockTest.kt @@ -24,6 +24,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_HEADER_ONE import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_HEADER_THREE import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_HEADER_TWO +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HighlightingBlockTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HighlightingBlockTest.kt index 1cb499dd1a..77b1771796 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HighlightingBlockTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HighlightingBlockTest.kt @@ -20,6 +20,7 @@ import com.anytypeio.anytype.core_ui.tools.ClipboardInterceptor import com.anytypeio.anytype.presentation.editor.editor.Markup import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_HIGHLIGHT +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/MockDataFactory.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/MockDataFactory.kt deleted file mode 100644 index ed7428a731..0000000000 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/MockDataFactory.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.anytypeio.anytype.core_ui - -import java.util.* -import java.util.concurrent.ThreadLocalRandom - -object MockDataFactory { - - fun randomUuid(): String { - return UUID.randomUUID().toString() - } - - fun randomString(): String { - return randomUuid() - } - - - fun randomInt(): Int { - return ThreadLocalRandom.current().nextInt(0, 1000 + 1) - } - - fun randomInt(max: Int): Int { - return ThreadLocalRandom.current().nextInt(0, max) - } - - fun randomLong(): Long { - return randomInt().toLong() - } - - fun randomFloat(): Float { - return randomInt().toFloat() - } - - fun randomDouble(): Double { - return randomInt().toDouble() - } - - fun randomBoolean(): Boolean { - return Math.random() < 0.5 - } - - fun makeIntList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomInt()) - } - return items - } - - fun makeStringList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomUuid()) - } - return items - } - - fun makeDoubleList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomDouble()) - } - return items - } -} \ No newline at end of file diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/dv/CellViewDiffUtilTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/dv/CellViewDiffUtilTest.kt index 9e0a939056..3184c55ff0 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/dv/CellViewDiffUtilTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/dv/CellViewDiffUtilTest.kt @@ -1,8 +1,8 @@ package com.anytypeio.anytype.core_ui.features.dv -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.dataview.diff.CellViewDiffUtil import com.anytypeio.anytype.presentation.sets.model.CellView +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import kotlin.test.assertEquals diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/dv/ColumnViewDiffUtilTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/dv/ColumnViewDiffUtilTest.kt index 4aaf0f0cb5..870acb7ed3 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/dv/ColumnViewDiffUtilTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/dv/ColumnViewDiffUtilTest.kt @@ -1,8 +1,8 @@ package com.anytypeio.anytype.core_ui.features.dv -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.dataview.diff.ColumnViewDiffUtil import com.anytypeio.anytype.presentation.sets.model.ColumnView +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import kotlin.test.assertEquals diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCheckboxTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCheckboxTest.kt index 9a2902ecb7..e3de48dbd4 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCheckboxTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCheckboxTest.kt @@ -4,7 +4,6 @@ import android.os.Build import androidx.core.text.getSpans import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.common.CheckedCheckboxColorSpan import com.anytypeio.anytype.core_ui.features.editor.holders.text.Bulleted import com.anytypeio.anytype.core_ui.features.editor.holders.text.Checkbox @@ -13,6 +12,7 @@ import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_BULLET import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_CHECKBOX +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCursorBindingTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCursorBindingTest.kt index 7145079532..dbdd7bc15f 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCursorBindingTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCursorBindingTest.kt @@ -9,7 +9,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider import com.anytypeio.anytype.core_models.Url -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.* import com.anytypeio.anytype.core_ui.tools.ClipboardInterceptor import com.anytypeio.anytype.presentation.editor.editor.model.BlockView @@ -22,6 +21,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_NUMBERED import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_PARAGRAPH import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_TOGGLE +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterIndentationTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterIndentationTest.kt index e7cb475d82..d748f9c670 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterIndentationTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterIndentationTest.kt @@ -4,7 +4,6 @@ import android.os.Build import androidx.core.view.marginLeft import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.features.editor.holders.text.* import com.anytypeio.anytype.core_utils.ext.dimen @@ -15,6 +14,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_HEADER_TWO import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_NUMBERED import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_PARAGRAPH +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterMovementMethodTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterMovementMethodTest.kt index c7e305a4bd..bc20151532 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterMovementMethodTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterMovementMethodTest.kt @@ -4,12 +4,12 @@ import android.os.Build import android.text.method.ArrowKeyMovementMethod import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Paragraph import com.anytypeio.anytype.core_ui.tools.CustomBetterLinkMovementMethod import com.anytypeio.anytype.presentation.editor.editor.Markup import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_PARAGRAPH +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterNumberedListTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterNumberedListTest.kt index fbc36466b1..68f28dc6cc 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterNumberedListTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterNumberedListTest.kt @@ -3,10 +3,10 @@ package com.anytypeio.anytype.core_ui.features.editor import android.os.Build import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Numbered import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_NUMBERED +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterReadWriteModeTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterReadWriteModeTest.kt index 555bdd0383..8abf7fdb16 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterReadWriteModeTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterReadWriteModeTest.kt @@ -5,12 +5,12 @@ import android.view.KeyEvent import android.view.inputmethod.EditorInfo import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Checkbox import com.anytypeio.anytype.core_ui.features.editor.holders.text.Paragraph import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_CHECKBOX import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_PARAGRAPH +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextBindingTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextBindingTest.kt index ed40af2d2c..3172bae2b9 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextBindingTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextBindingTest.kt @@ -3,7 +3,6 @@ package com.anytypeio.anytype.core_ui.features.editor import android.os.Build import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.* import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_BULLET @@ -15,6 +14,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_NUMBERED import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_PARAGRAPH import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_TOGGLE +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextColorTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextColorTest.kt index 495f159037..ccca1f3dc7 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextColorTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextColorTest.kt @@ -3,11 +3,11 @@ package com.anytypeio.anytype.core_ui.features.editor import android.os.Build import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Bulleted import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_BULLET +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterToggleTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterToggleTest.kt index 9e80d6087e..2440614c19 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterToggleTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterToggleTest.kt @@ -3,10 +3,10 @@ package com.anytypeio.anytype.core_ui.features.editor import android.os.Build import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Toggle import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_TOGGLE +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockSetTextTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockSetTextTest.kt index d4eade07c4..0b791296c5 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockSetTextTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockSetTextTest.kt @@ -4,12 +4,12 @@ import android.os.Build import android.text.method.ArrowKeyMovementMethod import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Paragraph import com.anytypeio.anytype.core_ui.tools.CustomBetterLinkMovementMethod import com.anytypeio.anytype.presentation.editor.editor.Markup import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_PARAGRAPH +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/navigation/LinkToObjectViewKtTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/navigation/LinkToObjectViewKtTest.kt index 7cfe60fc36..57a2130640 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/navigation/LinkToObjectViewKtTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/navigation/LinkToObjectViewKtTest.kt @@ -1,10 +1,10 @@ package com.anytypeio.anytype.core_ui.features.navigation -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.presentation.navigation.ObjectView import com.anytypeio.anytype.presentation.navigation.filterBy import com.anytypeio.anytype.presentation.navigation.isContainsText import com.anytypeio.anytype.presentation.objects.ObjectIcon +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Assert.* import org.junit.Test diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/page/BlockViewTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/page/BlockViewTest.kt index 69bd00faad..5500246ed8 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/page/BlockViewTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/page/BlockViewTest.kt @@ -1,11 +1,11 @@ package com.anytypeio.anytype.core_ui.features.page -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_VIDEO import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_VIDEO_ERROR import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_VIDEO_PLACEHOLDER import com.anytypeio.anytype.presentation.editor.editor.model.types.Types.HOLDER_VIDEO_UPLOAD +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Assert.assertEquals import org.junit.Test diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/uitests/CheckBoxTodoBlockTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/uitests/CheckBoxTodoBlockTest.kt index 7b877beef1..03ae97eec9 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/uitests/CheckBoxTodoBlockTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/uitests/CheckBoxTodoBlockTest.kt @@ -8,9 +8,9 @@ import androidx.fragment.app.testing.launchFragmentInContainer import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider -import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.test_utils.MockDataFactory import com.anytypeio.anytype.test_utils.TestFragment import com.anytypeio.anytype.test_utils.utils.onItemView import com.anytypeio.anytype.test_utils.utils.performClick diff --git a/data/src/test/java/com/anytypeio/anytype/data/MockDataFactory.kt b/data/src/test/java/com/anytypeio/anytype/data/MockDataFactory.kt deleted file mode 100644 index 64369b5f4d..0000000000 --- a/data/src/test/java/com/anytypeio/anytype/data/MockDataFactory.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.anytypeio.anytype.data - -import java.util.* -import java.util.concurrent.ThreadLocalRandom - -object MockDataFactory { - - fun randomUuid(): String { - return UUID.randomUUID().toString() - } - - fun randomString(): String { - return randomUuid() - } - - - fun randomInt(): Int { - return ThreadLocalRandom.current().nextInt(0, 1000 + 1) - } - - fun randomInt(max: Int): Int { - return ThreadLocalRandom.current().nextInt(0, max) - } - - fun randomLong(): Long { - return randomInt().toLong() - } - - fun randomFloat(): Float { - return randomInt().toFloat() - } - - fun randomDouble(): Double { - return randomInt().toDouble() - } - - fun randomBoolean(): Boolean { - return Math.random() < 0.5 - } - - fun makeIntList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomInt()) - } - return items - } - - fun makeStringList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomUuid()) - } - return items - } - - fun makeDoubleList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomDouble()) - } - return items - } -} \ No newline at end of file diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/auth/CheckAuthorizationStatusTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/auth/CheckAuthorizationStatusTest.kt index ded39664a0..21768d0703 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/auth/CheckAuthorizationStatusTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/auth/CheckAuthorizationStatusTest.kt @@ -6,7 +6,6 @@ import com.anytypeio.anytype.domain.auth.model.AuthStatus import com.anytypeio.anytype.domain.auth.repo.AuthRepository import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.core_models.CoroutineTestRule -import com.anytypeio.anytype.domain.common.MockDataFactory import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/auth/CreateAccountTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/auth/CreateAccountTest.kt index 7dc5be50c1..6487d3a8a4 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/auth/CreateAccountTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/auth/CreateAccountTest.kt @@ -4,7 +4,6 @@ import com.anytypeio.anytype.domain.auth.interactor.CreateAccount import com.anytypeio.anytype.domain.auth.model.Account import com.anytypeio.anytype.domain.auth.repo.AuthRepository import com.anytypeio.anytype.core_models.CoroutineTestRule -import com.anytypeio.anytype.domain.common.MockDataFactory import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/auth/GetCurrentAccountTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/auth/GetCurrentAccountTest.kt index dd4408da41..277f19c829 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/auth/GetCurrentAccountTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/auth/GetCurrentAccountTest.kt @@ -6,7 +6,6 @@ import com.anytypeio.anytype.domain.base.BaseUseCase import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.common.MockDataFactory import com.anytypeio.anytype.core_models.Config import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.core_models.Event diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/auth/ObserveAccountsTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/auth/ObserveAccountsTest.kt index dfbeeae571..21cb00cab4 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/auth/ObserveAccountsTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/auth/ObserveAccountsTest.kt @@ -4,7 +4,6 @@ import com.anytypeio.anytype.domain.auth.interactor.ObserveAccounts import com.anytypeio.anytype.domain.auth.model.Account import com.anytypeio.anytype.domain.auth.repo.AuthRepository import com.anytypeio.anytype.core_models.CoroutineTestRule -import com.anytypeio.anytype.domain.common.MockDataFactory import com.nhaarman.mockitokotlin2.doReturn import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/auth/StartAccountTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/auth/StartAccountTest.kt index 3af67683a8..4d1eb59513 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/auth/StartAccountTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/auth/StartAccountTest.kt @@ -7,7 +7,6 @@ import com.anytypeio.anytype.domain.auth.interactor.StartAccount import com.anytypeio.anytype.domain.auth.model.Account import com.anytypeio.anytype.domain.auth.repo.AuthRepository import com.anytypeio.anytype.domain.base.Either -import com.anytypeio.anytype.domain.common.MockDataFactory import com.anytypeio.anytype.domain.config.FeaturesConfigProvider import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/GetCompatibleObjectTypesTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/GetCompatibleObjectTypesTest.kt index 6fc2d10516..de78eaf3ac 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/GetCompatibleObjectTypesTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/GetCompatibleObjectTypesTest.kt @@ -4,7 +4,6 @@ import com.anytypeio.anytype.core_models.CoroutineTestRule import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.common.MockDataFactory import com.anytypeio.anytype.domain.dataview.interactor.GetCompatibleObjectTypes import com.nhaarman.mockitokotlin2.doReturn import com.nhaarman.mockitokotlin2.stub diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/SplitBlockTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/SplitBlockTest.kt index 77f6ef2f93..65eb727825 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/SplitBlockTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/SplitBlockTest.kt @@ -5,7 +5,6 @@ import com.anytypeio.anytype.core_models.BlockSplitMode import com.anytypeio.anytype.core_models.Command import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.core_models.CoroutineTestRule -import com.anytypeio.anytype.domain.common.MockDataFactory import com.nhaarman.mockitokotlin2.times import com.nhaarman.mockitokotlin2.verify import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/sets/StoreObjectTypesTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/sets/StoreObjectTypesTest.kt index 2ff568c153..5372e46ca5 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/sets/StoreObjectTypesTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/block/interactor/sets/StoreObjectTypesTest.kt @@ -4,7 +4,6 @@ import com.anytypeio.anytype.core_models.CoroutineTestRule import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.common.MockDataFactory import com.nhaarman.mockitokotlin2.doReturn import com.nhaarman.mockitokotlin2.stub import com.nhaarman.mockitokotlin2.times diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/common/MockDataFactory.kt b/domain/src/test/java/com/anytypeio/anytype/domain/common/MockDataFactory.kt deleted file mode 100644 index bf30836d32..0000000000 --- a/domain/src/test/java/com/anytypeio/anytype/domain/common/MockDataFactory.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.anytypeio.anytype.domain.common - -import java.util.* -import java.util.concurrent.ThreadLocalRandom - -object MockDataFactory { - - fun randomUuid(): String { - return UUID.randomUUID().toString() - } - - fun randomString(): String { - return randomUuid() - } - - - fun randomInt(): Int { - return ThreadLocalRandom.current().nextInt(0, 1000 + 1) - } - - fun randomInt(max: Int): Int { - return ThreadLocalRandom.current().nextInt(0, max) - } - - fun randomLong(): Long { - return randomInt().toLong() - } - - fun randomFloat(): Float { - return randomInt().toFloat() - } - - fun randomDouble(): Double { - return randomInt().toDouble() - } - - fun randomBoolean(): Boolean { - return Math.random() < 0.5 - } - - fun makeIntList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomInt()) - } - return items - } - - fun makeStringList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomUuid()) - } - return items - } - - fun makeDoubleList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomDouble()) - } - return items - } -} \ No newline at end of file diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/dashboard/GetProfileTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/dashboard/GetProfileTest.kt index e185543747..80d397f920 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/dashboard/GetProfileTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/dashboard/GetProfileTest.kt @@ -4,7 +4,6 @@ import app.cash.turbine.test import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.domain.auth.interactor.GetProfile import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.common.MockDataFactory import com.anytypeio.anytype.domain.search.SubscriptionEventChannel import com.nhaarman.mockitokotlin2.doReturn import com.nhaarman.mockitokotlin2.stub diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/dashboard/OpenDashboardTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/dashboard/OpenDashboardTest.kt index af9f0728df..def5420dc9 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/dashboard/OpenDashboardTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/dashboard/OpenDashboardTest.kt @@ -2,7 +2,6 @@ package com.anytypeio.anytype.domain.dashboard import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.core_models.CoroutineTestRule -import com.anytypeio.anytype.domain.common.MockDataFactory import com.anytypeio.anytype.core_models.Config import com.anytypeio.anytype.domain.auth.repo.AuthRepository import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/ext/BlockExtensionTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/ext/BlockExtensionTest.kt index 3ce84f70b1..a6288058ee 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/ext/BlockExtensionTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/ext/BlockExtensionTest.kt @@ -1,7 +1,6 @@ package com.anytypeio.anytype.domain.ext import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.domain.common.MockDataFactory import com.anytypeio.anytype.core_models.ext.* import org.junit.Test import kotlin.test.assertEquals diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/ext/BlockMentionUpdateTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/ext/BlockMentionUpdateTest.kt index b64bafe1fb..a105627dc2 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/ext/BlockMentionUpdateTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/ext/BlockMentionUpdateTest.kt @@ -1,7 +1,6 @@ package com.anytypeio.anytype.domain.ext import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.domain.common.MockDataFactory import com.anytypeio.anytype.core_models.ext.addMention import com.anytypeio.anytype.core_models.ext.replaceRangeWithWord import org.junit.Test diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/ext/ObjectWrapperExtTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/ext/ObjectWrapperExtTest.kt index a0daad8421..fc6554796a 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/ext/ObjectWrapperExtTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/ext/ObjectWrapperExtTest.kt @@ -5,7 +5,6 @@ import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.domain.`object`.amend import com.anytypeio.anytype.domain.`object`.move import com.anytypeio.anytype.domain.`object`.unset -import com.anytypeio.anytype.domain.common.MockDataFactory import org.junit.Test import kotlin.test.assertEquals diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/markup/MarkupExtTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/markup/MarkupExtTest.kt index 52aaf21615..ff257013ff 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/markup/MarkupExtTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/markup/MarkupExtTest.kt @@ -1,7 +1,6 @@ package com.anytypeio.anytype.domain.markup import com.anytypeio.anytype.core_models.Block.Content.Text.Mark -import com.anytypeio.anytype.domain.common.MockDataFactory import com.anytypeio.anytype.core_models.ext.* import com.anytypeio.anytype.core_models.misc.Overlap import org.junit.Test diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/misc/GetObjectTypeTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/misc/GetObjectTypeTest.kt index cbd8ec52c0..9b125d8d22 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/misc/GetObjectTypeTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/misc/GetObjectTypeTest.kt @@ -1,7 +1,6 @@ package com.anytypeio.anytype.domain.misc import com.anytypeio.anytype.core_models.CoroutineTestRule -import com.anytypeio.anytype.domain.common.MockDataFactory import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes import com.anytypeio.anytype.domain.block.repo.BlockRepository diff --git a/domain/src/test/java/com/anytypeio/anytype/domain/page/navigation/GetObjectInfoWithLinksTest.kt b/domain/src/test/java/com/anytypeio/anytype/domain/page/navigation/GetObjectInfoWithLinksTest.kt index f99ea749c1..56f907c395 100644 --- a/domain/src/test/java/com/anytypeio/anytype/domain/page/navigation/GetObjectInfoWithLinksTest.kt +++ b/domain/src/test/java/com/anytypeio/anytype/domain/page/navigation/GetObjectInfoWithLinksTest.kt @@ -2,7 +2,6 @@ package com.anytypeio.anytype.domain.page.navigation import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.common.MockDataFactory import com.nhaarman.mockitokotlin2.doReturn import com.nhaarman.mockitokotlin2.stub import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/middleware/build.gradle b/middleware/build.gradle index 9e75bf21b4..16e04e2807 100644 --- a/middleware/build.gradle +++ b/middleware/build.gradle @@ -37,6 +37,7 @@ dependencies { implementation applicationDependencies.coroutinesAndroid implementation anytypeDependencies.middleware + testImplementation project(":test:utils") testImplementation unitTestDependencies.junit testImplementation unitTestDependencies.kotlinTest testImplementation unitTestDependencies.mockitoKotlin diff --git a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt index 908f0efc10..9573a4022f 100644 --- a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt +++ b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt @@ -1,12 +1,11 @@ package com.anytypeio.anytype import anytype.model.Block -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.anytypeio.anytype.middleware.mappers.MSmartBlockType -import kotlinx.coroutines.flow.collect +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.runBlocking import org.junit.Before diff --git a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt index bf42fd3583..ecce62b05d 100644 --- a/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt +++ b/middleware/src/test/java/com/anytypeio/anytype/MiddlewareTest.kt @@ -4,13 +4,13 @@ import anytype.ResponseEvent import anytype.Rpc import anytype.model.Block import anytype.model.Range -import com.anytypeio.anytype.common.MockDataFactory import com.anytypeio.anytype.core_models.BlockSplitMode import com.anytypeio.anytype.core_models.Command 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.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Test import org.mockito.Mock @@ -228,8 +228,6 @@ class MiddlewareTest { key = emojiIconKey, value_ = emojiValue ) - val imageValue = "" - val imageDetail = Rpc.Block.Set.Details.Detail( key = imageIconKey ) diff --git a/middleware/src/test/java/com/anytypeio/anytype/common/MockDataFactory.kt b/middleware/src/test/java/com/anytypeio/anytype/common/MockDataFactory.kt deleted file mode 100644 index ac4bc5a7c5..0000000000 --- a/middleware/src/test/java/com/anytypeio/anytype/common/MockDataFactory.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.anytypeio.anytype.common - -import java.util.* -import java.util.concurrent.ThreadLocalRandom - -object MockDataFactory { - - fun randomUuid(): String { - return UUID.randomUUID().toString() - } - - fun randomString(): String { - return randomUuid() - } - - - fun randomInt(): Int { - return ThreadLocalRandom.current().nextInt(0, 1000 + 1) - } - - fun randomInt(max: Int): Int { - return ThreadLocalRandom.current().nextInt(0, max) - } - - fun randomLong(): Long { - return randomInt().toLong() - } - - fun randomFloat(): Float { - return randomInt().toFloat() - } - - fun randomDouble(): Double { - return randomInt().toDouble() - } - - fun randomBoolean(): Boolean { - return Math.random() < 0.5 - } - - fun makeIntList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomInt()) - } - return items - } - - fun makeStringList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomUuid()) - } - return items - } - - fun makeDoubleList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomDouble()) - } - return items - } -} \ No newline at end of file diff --git a/persistence/build.gradle b/persistence/build.gradle index c33b827a95..b5cceef373 100644 --- a/persistence/build.gradle +++ b/persistence/build.gradle @@ -57,8 +57,8 @@ dependencies { implementation applicationDependencies.timber + testImplementation project(":test:utils") testImplementation databaseDependencies.roomTesting - testImplementation unitTestDependencies.junit testImplementation unitTestDependencies.kotlinTest testImplementation unitTestDependencies.mockitoKotlin diff --git a/persistence/src/test/java/com/anytypeio/anytype/AccountDaoTest.kt b/persistence/src/test/java/com/anytypeio/anytype/AccountDaoTest.kt index 6127c11bab..7dda07c08e 100644 --- a/persistence/src/test/java/com/anytypeio/anytype/AccountDaoTest.kt +++ b/persistence/src/test/java/com/anytypeio/anytype/AccountDaoTest.kt @@ -5,6 +5,7 @@ import androidx.room.Room import androidx.test.platform.app.InstrumentationRegistry import com.anytypeio.anytype.persistence.db.AnytypeDatabase import com.anytypeio.anytype.persistence.model.AccountTable +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import org.junit.After diff --git a/persistence/src/test/java/com/anytypeio/anytype/MockDataFactory.kt b/persistence/src/test/java/com/anytypeio/anytype/MockDataFactory.kt deleted file mode 100644 index 74f3f3540c..0000000000 --- a/persistence/src/test/java/com/anytypeio/anytype/MockDataFactory.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.anytypeio.anytype - -import java.util.* -import java.util.concurrent.ThreadLocalRandom - -object MockDataFactory { - - fun randomUuid(): String { - return UUID.randomUUID().toString() - } - - fun randomString(): String { - return randomUuid() - } - - - fun randomInt(): Int { - return ThreadLocalRandom.current().nextInt(0, 1000 + 1) - } - - fun randomInt(max: Int): Int { - return ThreadLocalRandom.current().nextInt(0, max) - } - - fun randomLong(): Long { - return randomInt().toLong() - } - - fun randomFloat(): Float { - return randomInt().toFloat() - } - - fun randomDouble(): Double { - return randomInt().toDouble() - } - - fun randomBoolean(): Boolean { - return Math.random() < 0.5 - } - - fun makeIntList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomInt()) - } - return items - } - - fun makeStringList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomUuid()) - } - return items - } - - fun makeDoubleList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomDouble()) - } - return items - } -} \ No newline at end of file diff --git a/presentation/build.gradle b/presentation/build.gradle index 8573c1a87d..5862390b4d 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -55,5 +55,6 @@ dependencies { testImplementation unitTestDependencies.robolectricLatest testImplementation unitTestDependencies.timberJUnit testImplementation unitTestDependencies.turbine + testImplementation project(":test:utils") testImplementation project(":test:core-models-stub") } diff --git a/presentation/src/test/java/MockDataFactory.kt b/presentation/src/test/java/MockDataFactory.kt deleted file mode 100644 index 1eb04e487c..0000000000 --- a/presentation/src/test/java/MockDataFactory.kt +++ /dev/null @@ -1,61 +0,0 @@ -import java.util.* -import java.util.concurrent.ThreadLocalRandom - -object MockDataFactory { - - fun randomUuid(): String { - return UUID.randomUUID().toString() - } - - fun randomString(): String { - return randomUuid() - } - - fun randomInt(): Int { - return ThreadLocalRandom.current().nextInt(0, 1000 + 1) - } - - fun randomInt(max: Int): Int { - return ThreadLocalRandom.current().nextInt(0, max) - } - - fun randomLong(): Long { - return randomInt().toLong() - } - - fun randomFloat(): Float { - return randomInt().toFloat() - } - - fun randomDouble(): Double { - return randomInt().toDouble() - } - - fun randomBoolean(): Boolean { - return Math.random() < 0.5 - } - - fun makeIntList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomInt()) - } - return items - } - - fun makeStringList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomUuid()) - } - return items - } - - fun makeDoubleList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomDouble()) - } - return items - } -} \ No newline at end of file diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/MockBlockFactory.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/MockBlockFactory.kt index 8d81c2c2a5..7acb8d10f2 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/MockBlockFactory.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/MockBlockFactory.kt @@ -1,9 +1,9 @@ package com.anytypeio.anytype.presentation -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.SmartBlockType +import com.anytypeio.anytype.test_utils.MockDataFactory object MockBlockFactory { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/MockRelationFactory.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/MockRelationFactory.kt index fb7101ed02..08b090b61b 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/MockRelationFactory.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/MockRelationFactory.kt @@ -1,7 +1,7 @@ package com.anytypeio.anytype.presentation -import MockDataFactory import com.anytypeio.anytype.core_models.Relation +import com.anytypeio.anytype.test_utils.MockDataFactory object MockRelationFactory { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/MockTypicalDocumentFactory.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/MockTypicalDocumentFactory.kt index 9f0d8708c1..7a42c56c83 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/MockTypicalDocumentFactory.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/MockTypicalDocumentFactory.kt @@ -1,7 +1,7 @@ package com.anytypeio.anytype.presentation -import MockDataFactory import com.anytypeio.anytype.core_models.* +import com.anytypeio.anytype.test_utils.MockDataFactory object MockTypicalDocumentFactory { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/TypicalTwoRecordObjectSet.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/TypicalTwoRecordObjectSet.kt index d5b745b1ae..1605cb2965 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/TypicalTwoRecordObjectSet.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/TypicalTwoRecordObjectSet.kt @@ -1,12 +1,12 @@ package com.anytypeio.anytype.presentation -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.DV import com.anytypeio.anytype.core_models.DVViewer import com.anytypeio.anytype.core_models.DVViewerRelation import com.anytypeio.anytype.presentation.relations.ObjectSetConfig +import com.anytypeio.anytype.test_utils.MockDataFactory class TypicalTwoRecordObjectSet { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/CreateAccountViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/CreateAccountViewModelTest.kt index a8dabfcadb..21d03a03e0 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/CreateAccountViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/CreateAccountViewModelTest.kt @@ -1,12 +1,12 @@ package com.anytypeio.anytype.presentation.auth -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.presentation.auth.account.CreateAccountViewModel import com.anytypeio.anytype.presentation.auth.model.Session import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule 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 54bcff56a3..ca06319c76 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 @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.auth -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.domain.auth.interactor.ObserveAccounts @@ -8,6 +7,7 @@ import com.anytypeio.anytype.domain.auth.interactor.StartLoadingAccounts 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.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.flow diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/SetupSelectedAccountViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/SetupSelectedAccountViewModelTest.kt index a12fa609fe..e2fd6abbe6 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/SetupSelectedAccountViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/SetupSelectedAccountViewModelTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.auth -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.AccountStatus @@ -15,6 +14,7 @@ import com.anytypeio.anytype.domain.config.FeaturesConfigProvider import com.anytypeio.anytype.domain.device.PathProvider import com.anytypeio.anytype.presentation.auth.account.SetupSelectedAccountViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardBinTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardBinTest.kt index aadd505db1..c98216be81 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardBinTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardBinTest.kt @@ -1,11 +1,11 @@ package com.anytypeio.anytype.presentation.dashboard -import MockDataFactory import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.presentation.search.ObjectSearchConstants import com.anytypeio.anytype.presentation.search.Subscriptions +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.emptyFlow import org.junit.Before import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardDragAndDropTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardDragAndDropTest.kt index 69440a0db1..7282374016 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardDragAndDropTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardDragAndDropTest.kt @@ -1,12 +1,12 @@ package com.anytypeio.anytype.presentation.dashboard -import MockDataFactory import com.anytypeio.anytype.core_models.* 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.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.presentation.mapper.toDashboardViews +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.delay import kotlinx.coroutines.flow.flow diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt index 5bde34e283..2e038c019c 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.dashboard -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Config @@ -35,6 +34,7 @@ import com.anytypeio.anytype.domain.search.ObjectSearchSubscriptionContainer import com.anytypeio.anytype.domain.search.SubscriptionEventChannel import com.anytypeio.anytype.domain.templates.GetTemplates import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt index 6f1d8ec440..29fe1a1b6e 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.dashboard -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Block @@ -33,6 +32,7 @@ import com.anytypeio.anytype.domain.search.ObjectSearchSubscriptionContainer import com.anytypeio.anytype.domain.templates.GetTemplates import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/BlockReadModeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/BlockReadModeTest.kt index 47a9bac1ce..628a413fb7 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/BlockReadModeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/BlockReadModeTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor -import MockDataFactory import android.os.Build import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event @@ -11,11 +10,11 @@ import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.test.runBlockingTest import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/ControlPanelStateReducerTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/ControlPanelStateReducerTest.kt index ea8ca0c967..358fb2792b 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/ControlPanelStateReducerTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/ControlPanelStateReducerTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.misc.UrlBuilder @@ -11,6 +10,7 @@ import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig import com.anytypeio.anytype.presentation.editor.editor.styling.StylingType import com.anytypeio.anytype.presentation.editor.markup.MarkupStyleDescriptor import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DefaultBlockViewRendererTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DefaultBlockViewRendererTest.kt index 5956a0d62f..2b02bfe6cb 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DefaultBlockViewRendererTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DefaultBlockViewRendererTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor -import MockDataFactory import android.util.Log import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.core_models.ext.asMap @@ -22,6 +21,7 @@ import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.runBlocking import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducerTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducerTest.kt index 00e260a7af..dd1d77841b 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducerTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducerTest.kt @@ -1,10 +1,10 @@ package com.anytypeio.anytype.presentation.editor -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Block.Fields.Companion.NAME_KEY import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_models.ext.content +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.runBlocking import org.junit.Test import kotlin.test.assertEquals diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt index f573e63182..d61a3faf3f 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor -import MockDataFactory import android.os.Build import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics @@ -97,6 +96,7 @@ import com.anytypeio.anytype.presentation.util.CopyFileToCacheDirectory import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorAddBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorAddBlockTest.kt index 386c306727..5365359f8e 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorAddBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorAddBlockTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Payload @@ -9,6 +8,7 @@ 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.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackspaceDeleteTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackspaceDeleteTest.kt index be0487bfe3..5a5ad30670 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackspaceDeleteTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackspaceDeleteTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event @@ -10,6 +9,7 @@ import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorCheckboxTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorCheckboxTest.kt index c2ffaa2fe6..475721ea70 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorCheckboxTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorCheckboxTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Payload @@ -9,6 +8,7 @@ import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.UpdateCheckbox import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorDuplicateTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorDuplicateTest.kt index 020d5e6092..69a8311c2f 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorDuplicateTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorDuplicateTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event @@ -11,6 +10,7 @@ import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEmptySpaceInteractionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEmptySpaceInteractionTest.kt index 4b937c67d0..64fc58611b 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEmptySpaceInteractionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEmptySpaceInteractionTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Position @@ -9,6 +8,7 @@ import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.presentation.MockBlockFactory import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorErrorMessageTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorErrorMessageTest.kt index 3d396a71fd..7849425465 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorErrorMessageTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorErrorMessageTest.kt @@ -1,11 +1,10 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import kotlinx.coroutines.flow.collect +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.launch import kotlinx.coroutines.test.runBlockingTest import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEventSubscriptionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEventSubscriptionTest.kt index a7a0654718..e515b6e5ca 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEventSubscriptionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEventSubscriptionTest.kt @@ -1,10 +1,10 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory 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.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFeaturedRelationsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFeaturedRelationsTest.kt index e735e4fd52..dcad053a92 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFeaturedRelationsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFeaturedRelationsTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -14,6 +13,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.mapper.toView import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFocusTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFocusTest.kt index 1e7b2d7b48..97db590eb3 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFocusTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFocusTest.kt @@ -1,12 +1,12 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.model.Focusable import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorGranularChangeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorGranularChangeTest.kt index 44535a4982..49d29d2073 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorGranularChangeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorGranularChangeTest.kt @@ -1,12 +1,12 @@ package com.anytypeio.anytype.presentation.editor.editor -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.core_models.ext.content import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.delay import kotlinx.coroutines.flow.flow diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorLatexBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorLatexBlockTest.kt index 4e3e68d3c9..e498a7cf93 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorLatexBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorLatexBlockTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content @@ -8,6 +7,7 @@ import com.anytypeio.anytype.presentation.MockBlockFactory import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorListBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorListBlockTest.kt index 20a1211589..e669f85937 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorListBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorListBlockTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event @@ -8,11 +7,11 @@ import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.SplitBlock import com.anytypeio.anytype.domain.block.interactor.UpdateTextStyle -import com.anytypeio.anytype.presentation.MockBlockFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorLockPageTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorLockPageTest.kt index 8c691edba0..a2b9486a3d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorLockPageTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorLockPageTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ObjectType @@ -14,6 +13,7 @@ import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMarkupObjectTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMarkupObjectTest.kt index bbfce53e52..9f050f8361 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMarkupObjectTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMarkupObjectTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -12,6 +11,7 @@ import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMentionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMentionTest.kt index f127e65e3d..66e964fb02 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMentionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMentionTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import app.cash.turbine.test @@ -20,6 +19,7 @@ import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import net.lachlanmckee.timberjunit.TimberTestRule import kotlinx.coroutines.runBlocking diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMergeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMergeTest.kt index e7325a281a..67c174f2b9 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMergeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMergeTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content @@ -8,6 +7,7 @@ import com.anytypeio.anytype.domain.block.interactor.MergeBlocks import com.anytypeio.anytype.domain.block.interactor.UpdateText import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMultiSelectModeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMultiSelectModeTest.kt index aa1e0c8e35..9cecde0f7d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMultiSelectModeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMultiSelectModeTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.os.Build import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -22,6 +21,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorNoteLayoutTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorNoteLayoutTest.kt index 5de35bc796..db43fefd15 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorNoteLayoutTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorNoteLayoutTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import app.cash.turbine.test @@ -11,6 +10,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.model.EditorFooter import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.runBlocking import net.lachlanmckee.timberjunit.TimberTestRule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorObjectTypeChangeWidgetTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorObjectTypeChangeWidgetTest.kt index 67aa09c401..8236c1f8d5 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorObjectTypeChangeWidgetTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorObjectTypeChangeWidgetTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -8,6 +7,7 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt index 5bf76261e4..a8d27c2dcb 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event @@ -78,6 +77,7 @@ import com.anytypeio.anytype.presentation.editor.template.EditorTemplateDelegate import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.util.CopyFileToCacheDirectory import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flowOf diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorQuickStartingScrollAndMoveTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorQuickStartingScrollAndMoveTest.kt index 7206e4725d..e7854445e8 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorQuickStartingScrollAndMoveTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorQuickStartingScrollAndMoveTest.kt @@ -1,16 +1,15 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.presentation.editor.EditorViewModel -import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState.Toolbar import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorRelationBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorRelationBlockTest.kt index 0f2e5a9ee5..368ac817ed 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorRelationBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorRelationBlockTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Relation @@ -13,6 +12,7 @@ import com.anytypeio.anytype.presentation.mapper.toView import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt index 03221cbefe..3e570277f0 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Position @@ -13,6 +12,7 @@ import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.launch import kotlinx.coroutines.test.runBlockingTest diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetActionsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetActionsTest.kt index 4467a8f617..9dfd7efea2 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetActionsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetActionsTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.block.interactor.DuplicateBlock @@ -14,6 +13,7 @@ import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelStat import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.After import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetClicksTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetClicksTest.kt index 055446c45d..e29e034ba1 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetClicksTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetClicksTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ObjectType @@ -15,6 +14,7 @@ import com.anytypeio.anytype.presentation.editor.editor.slash.SlashWidgetState import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.relations.NumberParser import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetColorTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetColorTest.kt index 3428db3d45..6651867a50 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetColorTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetColorTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.os.Build import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -14,6 +13,7 @@ import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.editor.editor.slash.SlashWidgetState import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.After import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetCutFilterTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetCutFilterTest.kt index a140f438e9..94698c5167 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetCutFilterTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetCutFilterTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.os.Build import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -11,7 +10,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import kotlinx.coroutines.flow.collect +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.launch import kotlinx.coroutines.test.runBlockingTest import org.junit.After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetFilterTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetFilterTest.kt index 9b0c27d8f6..1d90b3a012 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetFilterTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetFilterTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.os.Build import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -15,6 +14,7 @@ import com.anytypeio.anytype.presentation.editor.editor.slash.SlashRelationView import com.anytypeio.anytype.presentation.editor.editor.slash.SlashWidgetState import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.runner.RunWith diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetMarksTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetMarksTest.kt index f9fa5aab34..b5e936f8d6 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetMarksTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetMarksTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -13,6 +12,7 @@ import com.anytypeio.anytype.presentation.editor.editor.model.types.Types import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetRelationsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetRelationsTest.kt index 3f4b4db98c..041e6f99c3 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetRelationsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetRelationsTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -9,7 +8,6 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.block.interactor.ReplaceBlock -import com.anytypeio.anytype.domain.block.interactor.UpdateText import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.model.BlockView @@ -19,6 +17,7 @@ import com.anytypeio.anytype.presentation.editor.editor.slash.SlashRelationView import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetStyleTypeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetStyleTypeTest.kt index 6979c2fe27..2af4a9ea3c 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetStyleTypeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetStyleTypeTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -11,6 +10,7 @@ import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_ import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSplitTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSplitTest.kt index e3ff42c3d8..74844fbec3 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSplitTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSplitTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.* @@ -10,6 +9,7 @@ import com.anytypeio.anytype.domain.block.interactor.SplitBlock import com.anytypeio.anytype.domain.block.interactor.UpdateText import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTableOfContentsBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTableOfContentsBlockTest.kt index 19c2c7b122..49da0ccf69 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTableOfContentsBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTableOfContentsBlockTest.kt @@ -10,6 +10,7 @@ import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTextUpdateTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTextUpdateTest.kt index 4f07d10cbf..26a172f4cd 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTextUpdateTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTextUpdateTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content @@ -10,6 +9,7 @@ import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.test.runBlockingTest import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleAddBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleAddBlockTest.kt index 7f929c5dcd..c25e8085bd 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleAddBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleAddBlockTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Payload @@ -10,6 +9,7 @@ import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.page.CreateDocument import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleTest.kt index 6a91b56f50..269f5bc1d8 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block @@ -14,6 +13,7 @@ import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.delay import kotlinx.coroutines.flow.flow diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTurnIntoTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTurnIntoTest.kt index d2353dc55d..81aec532d6 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTurnIntoTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTurnIntoTest.kt @@ -1,23 +1,20 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.block.interactor.TurnIntoDocument import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.presentation.editor.EditorViewModel -import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory 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 class EditorTurnIntoTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/StyleConfigKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/StyleConfigKtTest.kt index d3e808056a..cc78cecfcd 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/StyleConfigKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/StyleConfigKtTest.kt @@ -1,11 +1,11 @@ package com.anytypeio.anytype.presentation.editor.editor -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.presentation.editor.editor.model.Alignment import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig import com.anytypeio.anytype.presentation.editor.editor.styling.StylingType import com.anytypeio.anytype.presentation.editor.editor.styling.getStyleConfig +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Assert.assertEquals import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewCutTextTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewCutTextTest.kt index 93385587d3..b91bf35035 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewCutTextTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewCutTextTest.kt @@ -1,9 +1,9 @@ package com.anytypeio.anytype.presentation.editor.editor.ext -import MockDataFactory import com.anytypeio.anytype.presentation.editor.editor.Markup import com.anytypeio.anytype.presentation.editor.editor.model.Alignment import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlin.test.Test import kotlin.test.assertEquals diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt index e1de92a4a3..02a221dc2d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.editor.editor.mention -import MockDataFactory import android.util.Log import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ObjectType @@ -10,6 +9,7 @@ import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.editor.editor.Markup import com.anytypeio.anytype.presentation.navigation.DefaultObjectView +import com.anytypeio.anytype.test_utils.MockDataFactory import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtensionKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtensionKtTest.kt index 7425dc7d43..acc591a2b1 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtensionKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtensionKtTest.kt @@ -1,11 +1,10 @@ package com.anytypeio.anytype.presentation.extension import FakeGateWay -import MockDataFactory import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.dashboard.DashboardView +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import kotlin.test.assertEquals diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/FilterConditionExtensionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/FilterConditionExtensionTest.kt index 931b386f9f..7e499aaf09 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/FilterConditionExtensionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/FilterConditionExtensionTest.kt @@ -1,9 +1,9 @@ package com.anytypeio.anytype.presentation.extension -import MockDataFactory import com.anytypeio.anytype.core_models.DVFilterCondition import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.presentation.sets.model.Viewer +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import kotlin.test.assertFails import kotlin.test.asserter diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionTest.kt index aa8a7e7d42..3bd4e5e242 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionTest.kt @@ -1,6 +1,7 @@ package com.anytypeio.anytype.presentation.extension import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import kotlin.test.assertEquals diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/RelationValueExtensionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/RelationValueExtensionTest.kt index 5e74b5984b..c7e65eaeb2 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/RelationValueExtensionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/RelationValueExtensionTest.kt @@ -1,11 +1,11 @@ package com.anytypeio.anytype.presentation.extension -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_utils.const.DateConst import com.anytypeio.anytype.presentation.relations.DateParser import com.anytypeio.anytype.presentation.relations.getDateRelationFormat import com.anytypeio.anytype.presentation.sets.model.ColumnView +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.junit.Test 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 fbdc2dcbb7..35f9cc357f 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 @@ -1,11 +1,11 @@ package com.anytypeio.anytype.presentation.keychain -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics 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.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import org.junit.Before import org.junit.Rule 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 51f812674e..0bf581599c 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 @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.mapper -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.domain.config.Gateway @@ -8,6 +7,7 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.editor.editor.Markup import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.objects.appearance.getLinkToObjectAppearanceParams +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Test import org.mockito.Mock diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapperTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapperTest.kt index 3769525899..330e91e8b8 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapperTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapperTest.kt @@ -1,11 +1,11 @@ package com.anytypeio.anytype.presentation.relations -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.DVViewer import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.presentation.mapper.toView import com.anytypeio.anytype.presentation.sets.model.SimpleRelationView +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Test import kotlin.test.assertEquals diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/RelationExtensionsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/RelationExtensionsTest.kt index c77cad9a33..a6d9443ce0 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/RelationExtensionsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/RelationExtensionsTest.kt @@ -1,8 +1,8 @@ package com.anytypeio.anytype.presentation.relations -import MockDataFactory import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.presentation.relations.model.RelationView +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Assert.assertEquals import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/MockObjectSetFactory.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/MockObjectSetFactory.kt index 2ebb92726c..e347f0dcb5 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/MockObjectSetFactory.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/MockObjectSetFactory.kt @@ -1,8 +1,8 @@ package com.anytypeio.anytype.presentation.sets -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Relation +import com.anytypeio.anytype.test_utils.MockDataFactory object MockObjectSetFactory { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ObjectSetRecordViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ObjectSetRecordViewModelTest.kt index 243ee37c94..f6da48393c 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ObjectSetRecordViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ObjectSetRecordViewModelTest.kt @@ -1,11 +1,11 @@ package com.anytypeio.anytype.presentation.sets -import MockDataFactory import app.cash.turbine.test import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.test.runTest diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ObjectSetReducerTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ObjectSetReducerTest.kt index a1e1843db9..04cda2f5f6 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ObjectSetReducerTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/ObjectSetReducerTest.kt @@ -1,9 +1,9 @@ package com.anytypeio.anytype.presentation.sets -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_models.Relation +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Test import kotlin.test.assertEquals diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModelTest.kt index 1c2d00e76f..72bd0035a8 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModelTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import app.cash.turbine.test import com.anytypeio.anytype.analytics.base.Analytics @@ -22,6 +21,7 @@ import com.anytypeio.anytype.presentation.sets.model.ColumnView import com.anytypeio.anytype.presentation.sets.model.SimpleRelationView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.runBlocking @@ -41,7 +41,6 @@ class SearchRelationViewModelTest { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val root = MockDataFactory.randomUuid() private val dataViewId = MockDataFactory.randomString() private val session = ObjectSetSession() 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 f3f4c6f1c9..57b7f59c03 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 @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.config.Gateway @@ -8,6 +7,7 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.mapper.toViewerColumns import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.sets.model.* +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Test import org.mockito.Mock 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 9090294b7e..a6cfa2f837 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 @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.presentation.sets.MockObjectSetFactory.defaultRelations @@ -8,6 +7,7 @@ import com.anytypeio.anytype.presentation.sets.model.ColumnView import com.anytypeio.anytype.presentation.sets.model.SortingView import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterExtensionsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterExtensionsTest.kt index cf9e030012..22519da615 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterExtensionsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterExtensionsTest.kt @@ -1,11 +1,11 @@ package com.anytypeio.anytype.presentation.sets.filter -import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.DVFilter import com.anytypeio.anytype.core_models.DVFilterCondition import com.anytypeio.anytype.presentation.extension.checkboxFilter import com.anytypeio.anytype.presentation.sets.model.Viewer +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Assert import org.junit.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 25120be356..c61d1a0953 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 @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets.filter -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.* @@ -16,6 +15,7 @@ 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.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Before import org.junit.Rule 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 bf56415a7a..e087084253 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,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets.filter -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Block @@ -19,6 +18,7 @@ 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.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Before import org.junit.Rule 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 1face24ce0..47f62bbb20 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 @@ -1,10 +1,10 @@ package com.anytypeio.anytype.presentation.sets.main -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.presentation.sets.model.ViewerTabView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.Rule 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 19ef5af6b7..a384f8ca1f 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 @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets.main -import MockDataFactory import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.* @@ -10,6 +9,7 @@ import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.sets.ObjectSetViewModel import com.anytypeio.anytype.presentation.sets.model.CellView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import net.lachlanmckee.timberjunit.TimberTestRule 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 67fa4e7820..e8c6a750c5 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 @@ -1,11 +1,11 @@ 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.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetInitializationTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetInitializationTest.kt index 6593a614ba..39d1015a5c 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetInitializationTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetInitializationTest.kt @@ -1,11 +1,11 @@ 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.Id import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetNavigationTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetNavigationTest.kt index e9f34ff338..c499337525 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetNavigationTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetNavigationTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets.main -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import app.cash.turbine.test import com.anytypeio.anytype.core_models.* @@ -12,6 +11,7 @@ import com.anytypeio.anytype.presentation.sets.ObjectSetCommand import com.anytypeio.anytype.presentation.sets.ObjectSetViewModel import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import com.jraska.livedata.test import kotlinx.coroutines.runBlocking import org.junit.After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetRecordCreateTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetRecordCreateTest.kt index 91f366e487..5bfa1c5dd5 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetRecordCreateTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetRecordCreateTest.kt @@ -1,6 +1,5 @@ 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 @@ -8,6 +7,7 @@ import com.anytypeio.anytype.core_models.DVViewer import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.domain.dataview.interactor.CreateDataViewRecord import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test 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 9ea1bfe461..d30e42301e 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 @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets.main -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_models.Payload @@ -12,6 +11,7 @@ import com.anytypeio.anytype.presentation.sets.model.CellView import com.anytypeio.anytype.presentation.sets.model.ColumnView import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.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 72a8157ce2..23e8466a0e 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 @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets.main -import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.DVSort import com.anytypeio.anytype.core_models.DVSortType @@ -12,6 +11,7 @@ import com.anytypeio.anytype.presentation.relations.ObjectSetConfig 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.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test 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 da44b11a9c..3b6ba6f45f 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 @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets.main -import MockDataFactory import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event @@ -35,6 +34,7 @@ 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.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flowOf diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewerDeleteTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewerDeleteTest.kt index 7330bf34bd..5f9199e29e 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewerDeleteTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetViewerDeleteTest.kt @@ -1,6 +1,5 @@ package com.anytypeio.anytype.presentation.sets.main -import MockDataFactory import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.domain.base.Either @@ -11,6 +10,7 @@ import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetSession import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.Dispatcher +import com.anytypeio.anytype.test_utils.MockDataFactory import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.test.runBlockingTest 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 27853dd2c8..5c5f437e5c 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 @@ -1,6 +1,5 @@ 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 @@ -12,6 +11,7 @@ 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.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetZeroDataViewTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetZeroDataViewTest.kt index ca3f397a47..2baac62a27 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetZeroDataViewTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetZeroDataViewTest.kt @@ -5,6 +5,7 @@ import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.presentation.sets.ObjectSetViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetZeroViewTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetZeroViewTest.kt index b9b925b2ac..a8b050d826 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetZeroViewTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/main/ObjectSetZeroViewTest.kt @@ -1,12 +1,12 @@ 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.Relations import com.anytypeio.anytype.presentation.sets.ObjectSetViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule +import com.anytypeio.anytype.test_utils.MockDataFactory import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/sample/src/main/java/com/anytypeio/anytype/sample/helpers/MockDataFactory.kt b/sample/src/main/java/com/anytypeio/anytype/sample/helpers/MockDataFactory.kt deleted file mode 100644 index 2a6fc6f8d8..0000000000 --- a/sample/src/main/java/com/anytypeio/anytype/sample/helpers/MockDataFactory.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.anytypeio.anytype.sample.helpers - -import java.util.* -import java.util.concurrent.ThreadLocalRandom - -object MockDataFactory { - - fun randomUuid(): String { - return UUID.randomUUID().toString() - } - - fun randomString(): String { - return randomUuid() - } - - - fun randomInt(): Int { - return ThreadLocalRandom.current().nextInt(0, 1000 + 1) - } - - fun randomInt(max: Int): Int { - return ThreadLocalRandom.current().nextInt(0, max) - } - - fun randomLong(): Long { - return randomInt().toLong() - } - - fun randomFloat(): Float { - return randomInt().toFloat() - } - - fun randomDouble(): Double { - return randomInt().toDouble() - } - - fun randomBoolean(): Boolean { - return Math.random() < 0.5 - } - - fun makeIntList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomInt()) - } - return items - } - - fun makeStringList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomUuid()) - } - return items - } - - fun makeDoubleList(count: Int): List { - val items = mutableListOf() - repeat(count) { - items.add(randomDouble()) - } - return items - } -} \ No newline at end of file diff --git a/test/android-utils/build.gradle b/test/android-utils/build.gradle index 58e5113a12..c325b77752 100644 --- a/test/android-utils/build.gradle +++ b/test/android-utils/build.gradle @@ -19,12 +19,12 @@ android { } dependencies { + api acceptanceTesting.espressoCore + implementation mainApplication.appcompat implementation mainApplication.kotlin implementation mainApplication.coroutinesAndroid implementation mainApplication.androidxCore - implementation acceptanceTesting.espressoCore - implementation mainApplication.design implementation mainApplication.recyclerView } \ No newline at end of file