diff --git a/build.gradle b/build.gradle index fdc4f5c99f..c595729b91 100644 --- a/build.gradle +++ b/build.gradle @@ -26,12 +26,12 @@ buildscript { classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" - classpath 'com.google.gms:google-services:4.3.13' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1' + classpath 'com.google.gms:google-services:4.3.14' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.3' classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - classpath 'com.squareup.wire:wire-gradle-plugin:4.4.1' + classpath 'com.squareup.wire:wire-gradle-plugin:4.4.2' } } diff --git a/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt b/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt index ab1c5c7352..4b611c55d6 100644 --- a/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt +++ b/data/src/test/java/com/anytypeio/anytype/data/AuthDataRepositoryTest.kt @@ -23,8 +23,8 @@ import org.mockito.kotlin.doThrow import org.mockito.kotlin.stub import org.mockito.kotlin.times import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoInteractions import org.mockito.kotlin.verifyNoMoreInteractions -import org.mockito.kotlin.verifyZeroInteractions class AuthDataRepositoryTest { @@ -74,7 +74,7 @@ class AuthDataRepositoryTest { path = path ) - verifyZeroInteractions(authCache) + verifyNoInteractions(authCache) verify(authRemote, times(1)).startAccount( id = id, @@ -109,7 +109,7 @@ class AuthDataRepositoryTest { invitationCode = "code" ) - verifyZeroInteractions(authCache) + verifyNoInteractions(authCache) verify(authRemote, times(1)).createAccount( name = name, @@ -129,7 +129,7 @@ class AuthDataRepositoryTest { repo.startLoadingAccounts() - verifyZeroInteractions(authCache) + verifyNoInteractions(authCache) verify(authRemote, times(1)).recoverAccount() verifyNoMoreInteractions(authRemote) } @@ -147,7 +147,7 @@ class AuthDataRepositoryTest { verify(authCache, times(1)).saveAccount(any()) verifyNoMoreInteractions(authCache) - verifyZeroInteractions(authRemote) + verifyNoInteractions(authRemote) } @Test @@ -165,7 +165,7 @@ class AuthDataRepositoryTest { repo.createWallet(path) - verifyZeroInteractions(authCache) + verifyNoInteractions(authCache) verify(authRemote, times(1)).createWallet(path) verifyNoMoreInteractions(authRemote) } @@ -185,7 +185,7 @@ class AuthDataRepositoryTest { repo.getCurrentAccount() - verifyZeroInteractions(authRemote) + verifyNoInteractions(authRemote) verify(authCache, times(1)).getCurrentAccount() verifyNoMoreInteractions(authCache) } @@ -201,7 +201,7 @@ class AuthDataRepositoryTest { repo.saveMnemonic(mnemonic) - verifyZeroInteractions(authRemote) + verifyNoInteractions(authRemote) verify(authCache, times(1)).saveMnemonic(mnemonic) verifyNoMoreInteractions(authCache) } @@ -217,7 +217,7 @@ class AuthDataRepositoryTest { repo.getMnemonic() - verifyZeroInteractions(authRemote) + verifyNoInteractions(authRemote) verify(authCache, times(1)).getMnemonic() verifyNoMoreInteractions(authCache) } @@ -249,7 +249,7 @@ class AuthDataRepositoryTest { repo.logout(false) } catch (e: Exception) { verify(authRemote, times(1)).logout(false) - verifyZeroInteractions(authCache) + verifyNoInteractions(authCache) } } } @@ -271,7 +271,7 @@ class AuthDataRepositoryTest { repo.getAccounts() - verifyZeroInteractions(authRemote) + verifyNoInteractions(authRemote) verify(authCache, times(1)).getAccounts() verifyNoMoreInteractions(authCache) } diff --git a/dependencies.gradle b/dependencies.gradle index e1c18b5690..8f4ee9c233 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ ext { // Kotlin - kotlin_coroutines_version = '1.6.0' - kotlinx_serialization_json_version = '1.3.1' + kotlin_coroutines_version = '1.6.4' + kotlinx_serialization_json_version = '1.4.0' // AndroidX androidx_core_version = '1.7.0' @@ -49,14 +49,14 @@ ext { kluent_version = '1.14' timber_junit = '1.0.1' turbine_version = '0.7.0' - coroutine_testing_version = '1.4.3' + coroutine_testing_version = '1.6.4' live_data_testing_version = '1.2.0' - mockito_kotlin_version = '3.2.0' - mockito_android_version = '3.9.0' + mockito_kotlin_version = '4.0.0' + mockito_android_version = '4.8.0' // Acceptance Testing - runner_version = '1.1.0' - espresso_version = '3.3.0' + runner_version = '1.4.0' + espresso_version = '3.4.0' android_junit_version = '1.1.3' disable_animation_version = '2.0.0' @@ -66,14 +66,14 @@ ext { // Logging, Analytics & Crash reporting - timber_version = '4.7.1' - crashlytics_version = '18.1.0' + timber_version = '5.0.1' + crashlytics_version = '18.3.0' // Protobuf protobuf_java_version = '3.9.2' protoc_version = '3.9.0' - wire_version = '4.0.1' + wire_version = '4.4.2' // DBB @@ -81,7 +81,7 @@ ext { // Analytics - amplitude_version = '2.31.1' + amplitude_version = '2.36.1' okhttp_version = '4.2.2' // Anytype diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/DeleteAccountViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/DeleteAccountViewModelTest.kt index 13fb021cba..1e41a49679 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/DeleteAccountViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/auth/DeleteAccountViewModelTest.kt @@ -18,7 +18,7 @@ import org.mockito.Mock import org.mockito.MockitoAnnotations import org.mockito.kotlin.times import org.mockito.kotlin.verifyBlocking -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions import java.time.Duration import kotlin.test.assertEquals @@ -232,7 +232,7 @@ class DeleteAccountViewModelTest { actual = vm.date.value ) - verifyZeroInteractions(repo) + verifyNoInteractions(repo) } @Test @@ -276,7 +276,7 @@ class DeleteAccountViewModelTest { actual = vm.date.value ) - verifyZeroInteractions(repo) + verifyNoInteractions(repo) } @Test @@ -320,6 +320,6 @@ class DeleteAccountViewModelTest { actual = vm.date.value ) - verifyZeroInteractions(repo) + verifyNoInteractions(repo) } } \ No newline at end of file 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 f7a607012e..4b933fac86 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 @@ -23,7 +23,7 @@ import org.mockito.kotlin.any import org.mockito.kotlin.eq import org.mockito.kotlin.times import org.mockito.kotlin.verify -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions class DashboardDragAndDropTest : DashboardTestSetup() { @@ -119,7 +119,7 @@ class DashboardDragAndDropTest : DashboardTestSetup() { views = views.toMutableList().shift(from, to) ) - verifyZeroInteractions(move) + verifyNoInteractions(move) vm.state.test().assertValue(expected) } 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 0e820a384b..c894165c95 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 @@ -19,7 +19,6 @@ import com.anytypeio.anytype.domain.config.GetConfig import com.anytypeio.anytype.domain.config.GetDebugSettings import com.anytypeio.anytype.domain.dashboard.interactor.CloseDashboard import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard -import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.objects.DeleteObjects @@ -28,6 +27,7 @@ import com.anytypeio.anytype.domain.objects.SetObjectListIsArchived import com.anytypeio.anytype.domain.page.CreateNewObject import com.anytypeio.anytype.domain.search.CancelSearchSubscription import com.anytypeio.anytype.domain.search.ObjectSearchSubscriptionContainer +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.presentation.MockBlockContentFactory.StubLinkContent import com.anytypeio.anytype.presentation.MockBlockFactory.link import com.anytypeio.anytype.presentation.navigation.AppNavigation @@ -54,7 +54,7 @@ import org.mockito.kotlin.eq import org.mockito.kotlin.stub import org.mockito.kotlin.times import org.mockito.kotlin.verify -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions import kotlin.test.assertContains class HomeDashboardViewModelTest { @@ -195,7 +195,7 @@ class HomeDashboardViewModelTest { vm = givenViewModel() verify(getConfig, times(1)).invoke(any(), any(), any()) - verifyZeroInteractions(openDashboard) + verifyNoInteractions(openDashboard) } @Test @@ -234,7 +234,7 @@ class HomeDashboardViewModelTest { vm = givenViewModel() verify(getConfig, times(1)).invoke(any(), any(), any()) - verifyZeroInteractions(openDashboard) + verifyNoInteractions(openDashboard) } @Test 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 fba644d159..ceabf608cf 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,5 +1,6 @@ package com.anytypeio.anytype.presentation.editor + import android.net.Uri import android.os.Build import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -141,8 +142,8 @@ import org.mockito.kotlin.stub import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.verifyBlocking +import org.mockito.kotlin.verifyNoInteractions import org.mockito.kotlin.verifyNoMoreInteractions -import org.mockito.kotlin.verifyZeroInteractions import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import kotlin.test.assertEquals @@ -381,7 +382,7 @@ open class EditorViewModelTest { @Test fun `should not start observing events when view model is initialized`() { givenViewModel() - verifyZeroInteractions(interceptEvents) + verifyNoInteractions(interceptEvents) } @Test @@ -472,7 +473,7 @@ open class EditorViewModelTest { vm.onStart(root) - verifyZeroInteractions(closePage) + verifyNoInteractions(closePage) vm.onSystemBackPressed(editorHasChildrenScreens = false) @@ -492,7 +493,7 @@ open class EditorViewModelTest { val testObserver = vm.navigation.test() - verifyZeroInteractions(closePage) + verifyNoInteractions(closePage) vm.onSystemBackPressed(editorHasChildrenScreens = false) @@ -519,7 +520,7 @@ open class EditorViewModelTest { val testObserver = vm.navigation.test() - verifyZeroInteractions(closePage) + verifyNoInteractions(closePage) vm.onSystemBackPressed(editorHasChildrenScreens = false) @@ -3052,7 +3053,7 @@ open class EditorViewModelTest { vm.onTextBlockTextChanged(blockView) runBlockingTest { - verifyZeroInteractions(updateText) + verifyNoInteractions(updateText) verify(replaceBlock, times(1)).invoke( params = ReplaceBlock.Params( @@ -3066,7 +3067,7 @@ open class EditorViewModelTest { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(updateText) + verifyNoInteractions(updateText) verifyNoMoreInteractions(replaceBlock) } } 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 8af0fb3867..6b6b4ec2ba 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 @@ -38,7 +38,7 @@ import org.junit.Test import org.mockito.MockitoAnnotations import org.mockito.kotlin.times import org.mockito.kotlin.verifyBlocking -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions import kotlin.test.assertEquals class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { @@ -693,8 +693,8 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = checkbox.id) } - verifyZeroInteractions(unlinkBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(unlinkBlocks) + verifyNoInteractions(updateText) verifyBlocking(updateTextStyle, times(1)) { invoke( UpdateTextStyle.Params( @@ -738,8 +738,8 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = bulleted.id) } - verifyZeroInteractions(unlinkBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(unlinkBlocks) + verifyNoInteractions(updateText) verifyBlocking(updateTextStyle, times(1)) { invoke( UpdateTextStyle.Params( @@ -783,8 +783,8 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = numbered.id) } - verifyZeroInteractions(unlinkBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(unlinkBlocks) + verifyNoInteractions(updateText) verifyBlocking(updateTextStyle, times(1)) { invoke( UpdateTextStyle.Params( @@ -828,8 +828,8 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = toggle.id) } - verifyZeroInteractions(unlinkBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(unlinkBlocks) + verifyNoInteractions(updateText) verifyBlocking(updateTextStyle, times(1)) { invoke( UpdateTextStyle.Params( @@ -873,8 +873,8 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = quote.id) } - verifyZeroInteractions(unlinkBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(unlinkBlocks) + verifyNoInteractions(updateText) verifyBlocking(updateTextStyle, times(1)) { invoke( UpdateTextStyle.Params( @@ -933,7 +933,7 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = checkbox.id) } - verifyZeroInteractions(unlinkBlocks) + verifyNoInteractions(unlinkBlocks) verifyBlocking(updateTextStyle, times(1)) { invoke( @@ -1016,7 +1016,7 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = bulleted.id) } - verifyZeroInteractions(unlinkBlocks) + verifyNoInteractions(unlinkBlocks) verifyBlocking(updateTextStyle, times(1)) { invoke( @@ -1099,7 +1099,7 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = quote.id) } - verifyZeroInteractions(unlinkBlocks) + verifyNoInteractions(unlinkBlocks) verifyBlocking(updateTextStyle, times(1)) { invoke( @@ -1182,7 +1182,7 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = toggle.id) } - verifyZeroInteractions(unlinkBlocks) + verifyNoInteractions(unlinkBlocks) verifyBlocking(updateTextStyle, times(1)) { invoke( @@ -1266,7 +1266,7 @@ class EditorBackspaceDeleteTest : EditorPresentationTestSetup() { onEmptyBlockBackspaceClicked(id = numbered.id) } - verifyZeroInteractions(unlinkBlocks) + verifyNoInteractions(unlinkBlocks) verifyBlocking(updateTextStyle, times(1)) { invoke( 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 f557a3795a..fd8fcc5f47 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 @@ -20,7 +20,7 @@ import org.mockito.MockitoAnnotations import org.mockito.kotlin.eq import org.mockito.kotlin.times import org.mockito.kotlin.verifyBlocking -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions class EditorEmptySpaceInteractionTest : EditorPresentationTestSetup() { @@ -59,7 +59,7 @@ class EditorEmptySpaceInteractionTest : EditorPresentationTestSetup() { fun `should ignore outside click if document isn't started yet`() { val vm = buildViewModel() vm.onOutsideClicked() - verifyZeroInteractions(createBlock) + verifyNoInteractions(createBlock) } @Test @@ -260,7 +260,7 @@ class EditorEmptySpaceInteractionTest : EditorPresentationTestSetup() { vm.onOutsideClicked() - verifyZeroInteractions(createBlock) + verifyNoInteractions(createBlock) // Checking that the last text block is focused and has empty text @@ -302,7 +302,7 @@ class EditorEmptySpaceInteractionTest : EditorPresentationTestSetup() { vm.onOutsideClicked() - verifyZeroInteractions(createBlock) + verifyNoInteractions(createBlock) } @Test 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 e515b6e5ca..4dd827c120 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 @@ -11,7 +11,7 @@ import org.junit.Test import org.mockito.MockitoAnnotations import org.mockito.kotlin.times import org.mockito.kotlin.verify -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions class EditorEventSubscriptionTest : EditorPresentationTestSetup() { @@ -60,7 +60,7 @@ class EditorEventSubscriptionTest : EditorPresentationTestSetup() { // TESTING - verifyZeroInteractions(interceptEvents) + verifyNoInteractions(interceptEvents) vm.onStart(root) 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 81e2c10570..12990fac05 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 @@ -16,7 +16,8 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.MockitoAnnotations -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions + class EditorFocusTest : EditorPresentationTestSetup() { @@ -279,7 +280,7 @@ class EditorFocusTest : EditorPresentationTestSetup() { } } - verifyZeroInteractions(createBlock) + verifyNoInteractions(createBlock) } @Test 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 ff85a97e6a..622967b82c 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 @@ -12,7 +12,6 @@ import com.anytypeio.anytype.domain.block.interactor.UpdateTextStyle import com.anytypeio.anytype.presentation.BuildConfig import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.editor.model.BlockView -import com.anytypeio.anytype.presentation.editor.render.parseThemeBackgroundColor import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.anytypeio.anytype.test_utils.MockDataFactory @@ -24,7 +23,7 @@ import org.mockito.MockitoAnnotations import org.mockito.kotlin.eq import org.mockito.kotlin.times import org.mockito.kotlin.verifyBlocking -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions class EditorListBlockTest : EditorPresentationTestSetup() { @@ -426,7 +425,7 @@ class EditorListBlockTest : EditorPresentationTestSetup() { ) } - verifyZeroInteractions(createBlock) + verifyNoInteractions(createBlock) // expected state after on-enter-pressed event @@ -560,7 +559,7 @@ class EditorListBlockTest : EditorPresentationTestSetup() { ) } - verifyZeroInteractions(createBlock) + verifyNoInteractions(createBlock) // expected state after on-enter-pressed event @@ -715,7 +714,7 @@ class EditorListBlockTest : EditorPresentationTestSetup() { ) } - verifyZeroInteractions(createBlock) + verifyNoInteractions(createBlock) // expected state after on-enter-pressed event @@ -850,7 +849,7 @@ class EditorListBlockTest : EditorPresentationTestSetup() { ) } - verifyZeroInteractions(createBlock) + verifyNoInteractions(createBlock) // expected state after on-enter-pressed event 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 d8ad829f18..e4d9474159 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 @@ -629,7 +629,7 @@ class EditorLockPageTest : EditorPresentationTestSetup() { listOf( BlockView.Decoration( background = ThemeColor.DEFAULT, - style = BlockView.Decoration.Style.Card + style = BlockView.Decoration.Style.None ) ) } else { 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 1d914a1e02..1f24de527b 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 @@ -23,15 +23,21 @@ 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 +import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.Before import org.junit.Rule import org.junit.Test import org.mockito.Mock import org.mockito.Mockito import org.mockito.MockitoAnnotations -import org.mockito.kotlin.* +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.stub +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyBlocking +import org.mockito.kotlin.verifyNoInteractions import kotlin.test.assertEquals import kotlin.time.ExperimentalTime @@ -894,7 +900,7 @@ class EditorMentionTest : EditorPresentationTestSetup() { val vm = buildViewModel() - verifyZeroInteractions(interceptEvents) + verifyNoInteractions(interceptEvents) vm.onStart(root) @@ -1041,7 +1047,7 @@ class EditorMentionTest : EditorPresentationTestSetup() { val vm = buildViewModel() - verifyZeroInteractions(interceptEvents) + verifyNoInteractions(interceptEvents) vm.onStart(root) 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 2845a0bd8b..3af1d943f4 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 @@ -19,7 +19,7 @@ import org.mockito.MockitoAnnotations import org.mockito.kotlin.eq import org.mockito.kotlin.times import org.mockito.kotlin.verifyBlocking -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions class EditorMergeTest : EditorPresentationTestSetup() { @@ -362,6 +362,6 @@ class EditorMergeTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(mergeBlocks) + verifyNoInteractions(mergeBlocks) } } \ No newline at end of file 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 26ad3e5eeb..2a06106312 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 @@ -25,7 +25,7 @@ import org.junit.Test import org.mockito.MockitoAnnotations import org.mockito.kotlin.times import org.mockito.kotlin.verifyBlocking -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions import kotlin.test.assertEquals @@ -651,7 +651,7 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() { ) } - verifyZeroInteractions(move) + verifyNoInteractions(move) assertEquals( expected = 1, @@ -747,7 +747,7 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() { ) } - verifyZeroInteractions(move) + verifyNoInteractions(move) assertEquals( expected = 1, 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 74844fbec3..e40975c9b7 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 @@ -2,7 +2,11 @@ package com.anytypeio.anytype.presentation.editor.editor import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.anytypeio.anytype.core_models.* +import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.core_models.Id +import com.anytypeio.anytype.core_models.Position +import com.anytypeio.anytype.core_models.Relation +import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.block.interactor.SplitBlock @@ -19,7 +23,7 @@ import org.mockito.MockitoAnnotations import org.mockito.kotlin.eq import org.mockito.kotlin.times import org.mockito.kotlin.verifyBlocking -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions import kotlin.test.assertEquals class EditorSplitTest : EditorPresentationTestSetup() { @@ -231,9 +235,9 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(updateText) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) + verifyNoInteractions(updateText) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) } //endregion @@ -632,10 +636,10 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(createBlock) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(createBlock) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) + verifyNoInteractions(updateText) val selection = orchestrator.stores.textSelection.current() val descLength = description.content.asText().text.length @@ -746,10 +750,10 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(createBlock) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(createBlock) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) + verifyNoInteractions(updateText) val selection = orchestrator.stores.textSelection.current() val descLength = description.content.asText().text.length @@ -797,10 +801,10 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(createBlock) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(createBlock) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) + verifyNoInteractions(updateText) val selection = orchestrator.stores.textSelection.current() val descLength = description.content.asText().text.length @@ -907,10 +911,10 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(createBlock) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(createBlock) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) + verifyNoInteractions(updateText) val selection = orchestrator.stores.textSelection.current() val descLength = description.content.asText().text.length @@ -973,10 +977,10 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(createBlock) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(createBlock) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) + verifyNoInteractions(updateText) val selection = orchestrator.stores.textSelection.current() val descLength = description.content.asText().text.length @@ -1037,10 +1041,10 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(createBlock) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(createBlock) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) + verifyNoInteractions(updateText) val selection = orchestrator.stores.textSelection.current() val descLength = description.content.asText().text.length @@ -1151,10 +1155,10 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(createBlock) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(createBlock) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) + verifyNoInteractions(updateText) val selection = orchestrator.stores.textSelection.current() val descLength = description.content.asText().text.length @@ -1216,10 +1220,10 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(createBlock) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(createBlock) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) + verifyNoInteractions(updateText) val selection = orchestrator.stores.textSelection.current() val descLength = description.content.asText().text.length @@ -1328,10 +1332,10 @@ class EditorSplitTest : EditorPresentationTestSetup() { coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) - verifyZeroInteractions(createBlock) - verifyZeroInteractions(splitBlock) - verifyZeroInteractions(mergeBlocks) - verifyZeroInteractions(updateText) + verifyNoInteractions(createBlock) + verifyNoInteractions(splitBlock) + verifyNoInteractions(mergeBlocks) + verifyNoInteractions(updateText) val selection = orchestrator.stores.textSelection.current() val descLength = description.content.asText().text.length 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 5ec6687d95..a77a747192 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 @@ -30,7 +30,6 @@ import org.mockito.kotlin.eq import org.mockito.kotlin.times import org.mockito.kotlin.verifyBlocking import org.mockito.kotlin.verifyNoMoreInteractions -import org.mockito.kotlin.verifyZeroInteractions import kotlin.test.assertEquals class EditorTitleTest : EditorPresentationTestSetup() { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/table/EditorTableBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/table/EditorTableBlockTest.kt index 78f437b6ed..f796c9bb0c 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/table/EditorTableBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/table/EditorTableBlockTest.kt @@ -21,7 +21,7 @@ import org.junit.Test import org.mockito.MockitoAnnotations import org.mockito.kotlin.times import org.mockito.kotlin.verify -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions import kotlin.test.assertEquals class EditorTableBlockTest : EditorPresentationTestSetup() { @@ -146,7 +146,7 @@ class EditorTableBlockTest : EditorPresentationTestSetup() { runBlocking { assertEquals(1, selectedState.size) assertEquals(cell1Id, selectedState.first()) - verifyZeroInteractions(fillTableRow) + verifyNoInteractions(fillTableRow) } } } \ No newline at end of file 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 c0ea6e8a96..b719c90227 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 @@ -22,7 +22,7 @@ import org.mockito.kotlin.doReturn import org.mockito.kotlin.stub import org.mockito.kotlin.times import org.mockito.kotlin.verifyBlocking -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions import kotlin.test.assertEquals class ObjectSetRecordViewModelTest { @@ -104,7 +104,7 @@ class ObjectSetRecordViewModelTest { input = MockDataFactory.randomString() ) - verifyZeroInteractions(setObjectDetails) + verifyNoInteractions(setObjectDetails) } @Test @@ -245,7 +245,7 @@ class ObjectSetRecordViewModelTest { ) } - verifyZeroInteractions(setObjectDetails) + verifyNoInteractions(setObjectDetails) } fun buildViewModel( 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 1c44692adc..3ea5fb3956 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 @@ -13,7 +13,7 @@ import org.mockito.MockitoAnnotations import org.mockito.kotlin.any import org.mockito.kotlin.doReturn import org.mockito.kotlin.stub -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoInteractions class ObjectSetInitializationTest : ObjectSetViewModelTestSetup() { @@ -82,6 +82,6 @@ class ObjectSetInitializationTest : ObjectSetViewModelTestSetup() { vm.onStart(ctx = ctx) vm.onCreateNewRecord() - verifyZeroInteractions(createDataViewRecord) + verifyNoInteractions(createDataViewRecord) } } \ No newline at end of file