mockito#478 Upgrade Mockito

lukas-krecan · May 19, 2023 · 093ceca · 093ceca
1 parent 1ab7540
commit 093ceca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
 
-    compile "org.mockito:mockito-core:4.5.1"
+    compile "org.mockito:mockito-core:5.3.1"
 
     testCompile 'junit:junit:4.13.2'
     testCompile 'com.nhaarman:expect.kt:1.0.1'

diff --git a/tests/build.gradle b/tests/build.gradle
@@ -21,8 +21,8 @@ dependencies {
     compile files("${rootProject.projectDir}/mockito-kotlin/build/libs/mockito-kotlin-${version}.jar")
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "org.mockito:mockito-core:4.5.1"
+    compile "org.mockito:mockito-core:5.3.1"
 
     testCompile 'junit:junit:4.13.2'
     testCompile "com.nhaarman:expect.kt:1.0.1"
-}
+}
diff --git a/tests/src/test/kotlin/test/MatchersTest.kt b/tests/src/test/kotlin/test/MatchersTest.kt
@@ -4,12 +4,10 @@ import com.nhaarman.expect.expect
 import com.nhaarman.expect.expectErrorWithMessage
 import org.junit.Test
 import org.mockito.ArgumentMatcher
-import org.mockito.internal.matchers.VarargMatcher
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.kotlin.*
 import org.mockito.stubbing.Answer
 import java.io.IOException
-import kotlin.check
 
 class MatchersTest : TestBase() {
 
@@ -321,14 +319,17 @@ class MatchersTest : TestBase() {
         private val match: ((T) -> Boolean),
         private val success: R,
         private val failure: R
-    ) : ArgumentMatcher<T>, VarargMatcher, Answer<R> {
+    ) : ArgumentMatcher<T>, Answer<R> {
         private var anyMatched = false
 
         override fun matches(t: T): Boolean {
             anyMatched = anyMatched or match(t)
             return true
         }
 
-        override fun answer(i: InvocationOnMock) = if (anyMatched) success else failure
+        override fun answer(i: InvocationOnMock) = if (anyMatched)
+            success
+        else
+            failure
     }
-}
+}