Skip to content

Commit 400b1cc

Browse files
committed
Deprecate methods that are deprecated in Mockito.
1 parent c06d37f commit 400b1cc

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/Mockito.kt

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,7 @@ fun after(millis: Long) = Mockito.after(millis)
4141

4242
inline fun <reified T : Any> any() = Mockito.any(T::class.java) ?: createInstance<T>()
4343
inline fun <reified T : Any> anyArray(): Array<T> = Mockito.any(Array<T>::class.java) ?: arrayOf()
44-
inline fun <reified T : Any> anyCollection(): Collection<T> = Mockito.anyCollectionOf(T::class.java)
45-
inline fun <reified T : Any> anyList(): List<T> = Mockito.anyListOf(T::class.java)
46-
inline fun <reified T : Any> anySet(): Set<T> = Mockito.anySetOf(T::class.java)
47-
inline fun <reified K : Any, reified V : Any> anyMap(): Map<K, V> = Mockito.anyMapOf(K::class.java, V::class.java)
48-
inline fun <reified T : Any> anyVararg() = Mockito.anyVararg<T>() ?: createInstance<T>()
49-
44+
inline fun <reified T : Any> anyVararg(): T = Mockito.any<T>() ?: createInstance<T>()
5045
inline fun <reified T : Any> argThat(noinline predicate: T.() -> Boolean) = Mockito.argThat<T> { it -> (it as T).predicate() } ?: createInstance(T::class)
5146

5247
fun atLeast(numInvocations: Int): VerificationMode = Mockito.atLeast(numInvocations)!!
@@ -71,8 +66,8 @@ fun ignoreStubs(vararg mocks: Any): Array<out Any> = Mockito.ignoreStubs(*mocks)
7166
fun inOrder(vararg mocks: Any): InOrder = Mockito.inOrder(*mocks)!!
7267

7368
inline fun <reified T : Any> isA(): T? = Mockito.isA(T::class.java)
74-
inline fun <reified T : Any> isNotNull(): T? = Mockito.isNotNull(T::class.java)
75-
inline fun <reified T : Any> isNull(): T? = Mockito.isNull(T::class.java)
69+
fun <T : Any> isNotNull(): T? = Mockito.isNotNull()
70+
fun <T : Any> isNull(): T? = Mockito.isNull()
7671

7772
inline fun <reified T : Any> mock(): T = Mockito.mock(T::class.java)!!
7873
inline fun <reified T : Any> mock(defaultAnswer: Answer<Any>): T = Mockito.mock(T::class.java, defaultAnswer)!!
@@ -93,7 +88,7 @@ inline infix fun <reified T> OngoingStubbing<T>.doReturn(ts: List<T>): OngoingSt
9388

9489
fun mockingDetails(toInspect: Any): MockingDetails = Mockito.mockingDetails(toInspect)!!
9590
fun never(): VerificationMode = Mockito.never()!!
96-
inline fun <reified T : Any> notNull(): T? = Mockito.notNull(T::class.java)
91+
fun <T : Any> notNull(): T? = Mockito.notNull()
9792
fun only(): VerificationMode = Mockito.only()!!
9893
fun <T> refEq(value: T, vararg excludeFields: String): T? = Mockito.refEq(value, *excludeFields)
9994

@@ -115,3 +110,15 @@ fun verifyZeroInteractions(vararg mocks: Any) = Mockito.verifyZeroInteractions(*
115110

116111
fun <T> whenever(methodCall: T): OngoingStubbing<T> = Mockito.`when`(methodCall)!!
117112
fun withSettings(): MockSettings = Mockito.withSettings()!!
113+
114+
@Deprecated("Use any() instead.", ReplaceWith("any()"))
115+
inline fun <reified T : Any> anyCollection(): Collection<T> = any()
116+
117+
@Deprecated("Use any() instead.", ReplaceWith("any()"))
118+
inline fun <reified T : Any> anyList(): List<T> = any()
119+
120+
@Deprecated("Use any() instead.", ReplaceWith("any()"))
121+
inline fun <reified T : Any> anySet(): Set<T> = any()
122+
123+
@Deprecated("Use any() instead.", ReplaceWith("any()"))
124+
inline fun <reified K : Any, reified V : Any> anyMap(): Map<K, V> = any()

mockito-kotlin/src/test/kotlin/MockitoKotlinTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ class MockitoKotlinTest {
5454
val result = createInstance<Closed>()
5555

5656
/* Then */
57-
expect(result).toNotBeReferentially(closed)
57+
expect(result).toNotBeTheSameAs(closed)
5858
}
5959
}

0 commit comments

Comments
 (0)