Skip to content

Commit 20cb0e7

Browse files
build(deps): Bump org.mockito.kotlin:mockito-kotlin from 6.1.0 to 6.2.0 (#22485)
* build(deps): Bump org.mockito.kotlin:mockito-kotlin from 6.1.0 to 6.2.0 Bumps [org.mockito.kotlin:mockito-kotlin](https://github.com/mockito/mockito-kotlin) from 6.1.0 to 6.2.0. - [Release notes](https://github.com/mockito/mockito-kotlin/releases) - [Commits](mockito/mockito-kotlin@v6.1.0...v6.2.0) --- updated-dependencies: - dependency-name: org.mockito.kotlin:mockito-kotlin dependency-version: 6.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Fixing tests --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: adalpari <[email protected]>
1 parent a368ece commit 20cb0e7

File tree

10 files changed

+14
-14
lines changed

10 files changed

+14
-14
lines changed

WordPress/src/test/java/org/wordpress/android/ui/bloggingprompts/editor/EditorBloggingPromptsViewModelTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class EditorBloggingPromptsViewModelTest : BaseUnitTest() {
6060
)
6161
)
6262
private val bloggingPromptsStore: BloggingPromptsStore = mock {
63-
onBlocking { getPromptById(any(), any()) } doAnswer { mock ->
63+
on { getPromptById(any(), any()) } doAnswer { mock ->
6464
flowOf(bloggingPrompt.first { it.model?.id == mock.arguments[1] })
6565
}
6666
}

WordPress/src/test/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModelTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class DomainSuggestionsViewModelTest : BaseUnitTest() {
4747
@Mock
4848
lateinit var createCartUseCase: CreateCartUseCase
4949

50-
private val productsStore = mock<ProductsStore> { onBlocking { fetchProducts(any()) } doReturn mock() }
50+
private val productsStore = mock<ProductsStore> { on { fetchProducts(any()) } doReturn mock() }
5151
private lateinit var site: SiteModel
5252
private lateinit var domainRegistrationPurpose: DomainRegistrationPurpose
5353
private lateinit var viewModel: DomainSuggestionsViewModel

WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/AddExistingMediaToPostUseCaseTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class AddExistingMediaToPostUseCaseTest : BaseUnitTest() {
100100
}
101101

102102
private fun createGetMediaModelUseCase(): GetMediaModelUseCase = mock {
103-
onBlocking { loadMediaByRemoteId(anyOrNull(), anyOrNull()) } doAnswer { invocation ->
103+
on { loadMediaByRemoteId(anyOrNull(), anyOrNull()) } doAnswer { invocation ->
104104
// Creates dummy media models from provided model ids
105105
(invocation.getArgument(1) as Iterable<Long>)
106106
.map { createMediaModel(it) }

WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/AddLocalMediaToPostUseCaseTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ class AddLocalMediaToPostUseCaseTest : BaseUnitTest() {
290290

291291
fun createCopyMediaToAppStorageUseCase(copyMediaResult: CopyMediaResult = createCopyMediaResult()) =
292292
mock<CopyMediaToAppStorageUseCase> {
293-
onBlocking { copyFilesToAppStorageIfNecessary(any()) }.thenReturn(
293+
on { copyFilesToAppStorageIfNecessary(any()) }.thenReturn(
294294
copyMediaResult
295295
)
296296
}
@@ -305,7 +305,7 @@ class AddLocalMediaToPostUseCaseTest : BaseUnitTest() {
305305

306306
fun createOptimizeMediaUseCase(optimizeMediaResult: OptimizeMediaResult = createOptimizeMediaResult()) =
307307
mock<OptimizeMediaUseCase> {
308-
onBlocking {
308+
on {
309309
optimizeMediaIfSupportedAsync(
310310
any(),
311311
eq(FRESHLY_TAKEN),
@@ -324,12 +324,12 @@ class AddLocalMediaToPostUseCaseTest : BaseUnitTest() {
324324

325325
fun createGetMediaModelUseCase(createMediaModelResult: CreateMediaModelsResult = createMediaModelResult()) =
326326
mock<GetMediaModelUseCase> {
327-
onBlocking { loadMediaByLocalId(any()) }.thenAnswer { invocation ->
327+
on { loadMediaByLocalId(any()) }.thenAnswer { invocation ->
328328
val result = mutableListOf<MediaModel>()
329329
(invocation.getArgument(0) as List<Int>).forEach { result.add(mock()) }
330330
result
331331
}
332-
onBlocking {
332+
on {
333333
createMediaModelFromUri(eq(LOCAL_SITE_ID), any<List<Uri>>())
334334
}.thenReturn(createMediaModelResult)
335335
}

WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ class EditorMediaTest : BaseUnitTest() {
300300

301301
fun createAddLocalMediaToPostUseCase(resultForAddNewMediaToEditorAsync: Boolean = true) =
302302
mock<AddLocalMediaToPostUseCase> {
303-
onBlocking {
303+
on {
304304
addNewMediaToEditorAsync(
305305
anyOrNull(),
306306
anyOrNull(),
@@ -314,7 +314,7 @@ class EditorMediaTest : BaseUnitTest() {
314314

315315
fun createGetMediaModelUseCase(remoteMediaId: Long = MEDIA_MODEL_REMOTE_ID) =
316316
mock<GetMediaModelUseCase> {
317-
onBlocking { loadMediaByLocalId(anyOrNull()) } doAnswer { invocation ->
317+
on { loadMediaByLocalId(anyOrNull()) } doAnswer { invocation ->
318318
// Creates dummy media models from provided model ids
319319
(invocation.getArgument(0) as Iterable<Int>)
320320
.map {

WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/RetryFailedMediaUploadUseCaseTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class RetryFailedMediaUploadUseCaseTest : BaseUnitTest() {
128128
}
129129

130130
fun createGetMediaModelUseCase() = mock<GetMediaModelUseCase> {
131-
onBlocking { loadMediaByLocalId(any()) } doAnswer { invocation ->
131+
on { loadMediaByLocalId(any()) } doAnswer { invocation ->
132132
// Creates dummy media models from provided model ids
133133
(invocation.getArgument(0) as Iterable<Int>)
134134
.map { createMediaModel(it) }

WordPress/src/test/java/org/wordpress/android/ui/uploads/UploadStarterConcurrentTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class UploadStarterConcurrentTest : BaseUnitTest() {
4444
}
4545

4646
private val pageStore = mock<PageStore> {
47-
onBlocking { getPagesWithLocalChanges(any()) } doReturn emptyList()
47+
on { getPagesWithLocalChanges(any()) } doReturn emptyList()
4848
}
4949

5050
@Test

WordPress/src/test/java/org/wordpress/android/ui/uploads/UploadStarterTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class UploadStarterTest : BaseUnitTest() {
116116

117117
private val pageStore = mock<PageStore> {
118118
sites.forEach {
119-
onBlocking { getPagesWithLocalChanges(eq(it)) } doReturn sitesAndDraftPages.getValue(it)
119+
on { getPagesWithLocalChanges(eq(it)) } doReturn sitesAndDraftPages.getValue(it)
120120
}
121121
}
122122

WordPress/src/test/java/org/wordpress/android/workers/weeklyroundup/WeeklyRoundupNotifierTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class WeeklyRoundupNotifierTest : BaseUnitTest() {
5959
private val notificationsTracker: SystemNotificationsTracker = mock()
6060
private val siteUtils: SiteUtilsWrapper = mock()
6161
private val weeklyRoundupRepository: WeeklyRoundupRepository = mock {
62-
onBlocking { fetchWeeklyRoundupData(any()) }.then(buildMockData())
62+
on { fetchWeeklyRoundupData(any()) }.then(buildMockData())
6363
}
6464
private val appPrefs: AppPrefsWrapper = mock {
6565
on { shouldShowWeeklyRoundupNotification(any()) }.thenReturn(true)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ kotlinx-coroutines = '1.10.2'
8989
kotlinx-kover = '0.9.4'
9090
ksp = '2.2.10-2.0.2'
9191
mockito-android = '5.21.0'
92-
mockito-kotlin = '6.1.0'
92+
mockito-kotlin = '6.2.0'
9393
mpandroidchart = 'v3.1.0'
9494
photoview = '2.3.0'
9595
robolectric = '4.16'

0 commit comments

Comments
 (0)