From 2ab9e32a3c89fbf6773f96ea42e76a458c98ca57 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Dec 2025 03:01:38 +0000 Subject: [PATCH 1/2] fix(deps): update dependency org.mockito.kotlin:mockito-kotlin to v6 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index df8cd28ca116..9dc72ca82c18 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -60,7 +60,7 @@ markwonVersion = "4.6.2" materialIconsCoreVersion = "1.7.8" materialVersion = "1.13.0" media3 = "1.9.0" -mockitoKotlinVersion = "4.1.0" +mockitoKotlinVersion = "6.1.0" mockitoVersion = "4.11.0" mockkVersion = "1.14.7" nnioVersion = "0.3.1" From 1860c20f1bc30f03ac816b2e3a46baec766196bd Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 30 Dec 2025 13:31:49 +0100 Subject: [PATCH 2/2] Fix mockito Signed-off-by: tobiasKaminsky --- .../java/com/nextcloud/client/logger/ui/LogsViewModelTest.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/test/java/com/nextcloud/client/logger/ui/LogsViewModelTest.kt b/app/src/test/java/com/nextcloud/client/logger/ui/LogsViewModelTest.kt index 38ad3a6caf46..22695b7e216c 100644 --- a/app/src/test/java/com/nextcloud/client/logger/ui/LogsViewModelTest.kt +++ b/app/src/test/java/com/nextcloud/client/logger/ui/LogsViewModelTest.kt @@ -27,6 +27,7 @@ import org.junit.runner.RunWith import org.junit.runners.Suite import org.mockito.MockitoAnnotations import org.mockito.kotlin.any +import org.mockito.kotlin.anyVararg import org.mockito.kotlin.mock import org.mockito.kotlin.whenever import java.util.Date @@ -77,7 +78,7 @@ class LogsViewModelTest { @Before fun setUpFixture() { - MockitoAnnotations.initMocks(this) + MockitoAnnotations.openMocks(this) context = mock() clock = mock() repository = TestLogRepository() @@ -204,7 +205,7 @@ class LogsViewModelTest { @Test fun `filtered logs are displayed`() { var statusArgs: Array = emptyArray() - whenever(context.getString(any(), any())).thenAnswer { + whenever(context.getString(any(), anyVararg())).thenAnswer { statusArgs = it.arguments "${it.arguments}" }