diff options
author | Rashad Sookram <rashad@wattpad.com> | 2021-10-08 15:35:06 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-08 20:35:06 +0100 |
commit | 7f1d0946d02b4e7c5bb3e36808e2e6dcf50622b9 (patch) | |
tree | b2452ef55dd1fcaea06f65c4dc4e6b1a3aa47235 | |
parent | b96b5cee79c7201a60e2637701420695b015c3c0 (diff) | |
download | mockito-kotlin-7f1d0946d02b4e7c5bb3e36808e2e6dcf50622b9.tar.gz |
Update mockito-core to 4.0.0 (#447)
This also removes `verifyZeroInteractions`, which was removed in Mockito 4.
Fixes #446.
-rw-r--r-- | mockito-kotlin/build.gradle | 2 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Verification.kt | 13 | ||||
-rw-r--r-- | tests/build.gradle | 2 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/MockingTest.kt | 12 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/VerifyTest.kt | 4 |
5 files changed, 14 insertions, 19 deletions
diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle index 886fe42..786e334 100644 --- a/mockito-kotlin/build.gradle +++ b/mockito-kotlin/build.gradle @@ -25,7 +25,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:3.12.4" + compile "org.mockito:mockito-core:4.0.0" testCompile 'junit:junit:4.12' testCompile 'com.nhaarman:expect.kt:1.0.0' diff --git a/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Verification.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Verification.kt index 074e9b5..2a16d0c 100644 --- a/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Verification.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Verification.kt @@ -91,19 +91,6 @@ fun verifyNoInteractions(vararg mocks: Any) { } /** - * @deprecated - * - * Please migrate your code to [verifyNoInteractions]. - */ -@Deprecated( - "Use verifyNoInteractions() instead.", - ReplaceWith("verifyNoInteractions(vararg mocks: Any)") -) -fun verifyZeroInteractions(vararg mocks: Any) { - Mockito.verifyZeroInteractions(*mocks) -} - -/** * Allows verifying exact number of invocations. * * Alias for [Mockito.times]. diff --git a/tests/build.gradle b/tests/build.gradle index 24ab716..f263cb4 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -22,7 +22,7 @@ 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:2.23.0" + compile "org.mockito:mockito-core:4.0.0" testCompile "junit:junit:4.12" testCompile "com.nhaarman:expect.kt:1.0.0" diff --git a/tests/src/test/kotlin/test/MockingTest.kt b/tests/src/test/kotlin/test/MockingTest.kt index 43e6413..f0f9f64 100644 --- a/tests/src/test/kotlin/test/MockingTest.kt +++ b/tests/src/test/kotlin/test/MockingTest.kt @@ -12,6 +12,8 @@ import org.mockito.kotlin.whenever import org.junit.Test import org.mockito.Mockito import org.mockito.exceptions.verification.WantedButNotInvoked +import org.mockito.invocation.DescribedInvocation +import org.mockito.kotlin.argumentCaptor import org.mockito.listeners.InvocationListener import org.mockito.mock.SerializableMode.BASIC import java.io.PrintStream @@ -182,7 +184,10 @@ class MockingTest : TestBase() { fail("Expected an exception") } catch (e: WantedButNotInvoked) { /* Then */ - verify(out).println("methods.stringResult();") + argumentCaptor<DescribedInvocation>().apply { + verify(out).println(capture()) + expect(lastValue.toString()).toBe("methods.stringResult();") + } } } @@ -314,7 +319,10 @@ class MockingTest : TestBase() { fail("Expected an exception") } catch (e: WantedButNotInvoked) { /* Then */ - verify(out).println("methods.stringResult();") + argumentCaptor<DescribedInvocation>().apply { + verify(out).println(capture()) + expect(lastValue.toString()).toBe("methods.stringResult();") + } } } diff --git a/tests/src/test/kotlin/test/VerifyTest.kt b/tests/src/test/kotlin/test/VerifyTest.kt index 0a93832..1af73fd 100644 --- a/tests/src/test/kotlin/test/VerifyTest.kt +++ b/tests/src/test/kotlin/test/VerifyTest.kt @@ -4,7 +4,7 @@ import org.mockito.kotlin.any import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.junit.Test -import org.mockito.exceptions.verification.TooLittleActualInvocations +import org.mockito.exceptions.verification.TooFewActualInvocations import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent class VerifyTest : TestBase() { @@ -30,7 +30,7 @@ class VerifyTest : TestBase() { } } - @Test(expected = TooLittleActualInvocations::class) + @Test(expected = TooFewActualInvocations::class) fun verifyFailsWithWrongCount() { val iface = mock<TestInterface>() |