Skip to content

Commit b554df3

Browse files
ianlevesquetschuchortdev
authored andcommitted
Update to mockito-kotlin 4.1.0
Summary: Update import namespace and update dep in gradle file Differential Revision: D43414954
1 parent a0a1097 commit b554df3

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ subprojects {
151151

152152
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
153153
testImplementation "org.mockito:mockito-core:4.7.0"
154-
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
154+
testImplementation "org.mockito.kotlin:mockito-kotlin:4.1.0"
155155
testImplementation "org.assertj:assertj-core:3.23.1"
156156
}
157157

core/src/test/kotlin/com/tschuchort/compiletesting/CompilerPluginsTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.tschuchort.compiletesting
22

3-
import com.nhaarman.mockitokotlin2.any
4-
import com.nhaarman.mockitokotlin2.atLeastOnce
5-
import com.nhaarman.mockitokotlin2.verify
63
import org.assertj.core.api.Assertions
74
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
85
import org.junit.Assert
@@ -11,6 +8,9 @@ import org.mockito.Mockito
118
import javax.annotation.processing.AbstractProcessor
129
import javax.annotation.processing.RoundEnvironment
1310
import javax.lang.model.element.TypeElement
11+
import org.mockito.kotlin.any
12+
import org.mockito.kotlin.atLeastOnce
13+
import org.mockito.kotlin.verify
1414

1515
@Suppress("DEPRECATION")
1616
class CompilerPluginsTest {

core/src/test/kotlin/com/tschuchort/compiletesting/KotlinCompilationTests.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.tschuchort.compiletesting
22

3-
import com.nhaarman.mockitokotlin2.*
43
import com.tschuchort.compiletesting.KotlinCompilation.ExitCode
54
import com.tschuchort.compiletesting.MockitoAdditionalMatchersKotlin.Companion.not
65
import org.assertj.core.api.Assertions.assertThat
@@ -17,6 +16,7 @@ import java.nio.file.Files
1716
import javax.annotation.processing.AbstractProcessor
1817
import javax.annotation.processing.RoundEnvironment
1918
import javax.lang.model.element.TypeElement
19+
import org.mockito.kotlin.*
2020

2121
@Suppress("MemberVisibilityCanBePrivate", "RemoveEmptyClassBody", "RedundantSemicolon", "RemoveEmptyPrimaryConstructor")
2222
class KotlinCompilationTests {
@@ -881,7 +881,6 @@ class KotlinCompilationTests {
881881
interface KSource1
882882
"""
883883
)
884-
885884
val result = defaultCompilerConfig()
886885
.apply {
887886
sources = listOf(kSource1)

core/src/test/kotlin/com/tschuchort/compiletesting/KotlinJsCompilationTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.tschuchort.compiletesting
22

3-
import com.nhaarman.mockitokotlin2.*
43
import com.tschuchort.compiletesting.KotlinCompilation.ExitCode
54
import com.tschuchort.compiletesting.MockitoAdditionalMatchersKotlin.Companion.not
65
import org.assertj.core.api.Assertions.assertThat
@@ -11,6 +10,7 @@ import org.junit.Rule
1110
import org.junit.Test
1211
import org.junit.rules.TemporaryFolder
1312
import java.io.File
13+
import org.mockito.kotlin.*
1414

1515
@Suppress("MemberVisibilityCanBePrivate")
1616
class KotlinJsCompilationTests {

core/src/test/kotlin/com/tschuchort/compiletesting/Mockito.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.tschuchort.compiletesting
22

3-
import com.nhaarman.mockitokotlin2.internal.createInstance
43
import org.mockito.AdditionalMatchers
4+
import org.mockito.kotlin.internal.createInstance
55

66
class MockitoAdditionalMatchersKotlin {
77
companion object {

core/src/test/kotlin/com/tschuchort/compiletesting/StreamUtilTests.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.tschuchort.compiletesting
22

3-
import com.nhaarman.mockitokotlin2.mock
4-
import com.nhaarman.mockitokotlin2.verify
53
import okio.Buffer
64
import org.assertj.core.api.Assertions
75
import org.junit.Test
86
import java.io.OutputStream
97
import java.io.PrintStream
8+
import org.mockito.kotlin.mock
9+
import org.mockito.kotlin.verify
1010

1111
class StreamUtilTests {
1212

@@ -49,4 +49,4 @@ class StreamUtilTests {
4949
verify(str1).close()
5050
verify(str2).close()
5151
}
52-
}
52+
}

ksp/src/test/kotlin/com/tschuchort/compiletesting/KspTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ package com.tschuchort.compiletesting
33
import com.google.devtools.ksp.processing.*
44
import com.google.devtools.ksp.symbol.KSAnnotated
55
import com.google.devtools.ksp.symbol.KSClassDeclaration
6-
import com.nhaarman.mockitokotlin2.any
7-
import com.nhaarman.mockitokotlin2.inOrder
8-
import com.nhaarman.mockitokotlin2.mock
96
import com.tschuchort.compiletesting.KotlinCompilation.ExitCode
107
import org.assertj.core.api.Assertions.assertThat
118
import org.junit.Test
129
import org.junit.runner.RunWith
1310
import org.junit.runners.JUnit4
1411
import org.mockito.Mockito.`when`
1512
import java.util.concurrent.atomic.AtomicInteger
13+
import org.mockito.kotlin.any
14+
import org.mockito.kotlin.inOrder
15+
import org.mockito.kotlin.mock
1616

1717
@RunWith(JUnit4::class)
1818
class KspTest {

0 commit comments

Comments
 (0)