Skip to content

Commit 6867394

Browse files
authored
Merge pull request #50 from Zoltu/patch-1
Makes `mock` return non-null types.
2 parents 25fb19c + e1de1f6 commit 6867394

File tree

1 file changed

+5
-5
lines changed
  • mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ inline fun <reified T : Any> isA() = Mockito.isA(T::class.java)
6969
inline fun <reified T : Any> isNotNull() = Mockito.isNotNull(T::class.java)
7070
inline fun <reified T : Any> isNull(): T? = Mockito.isNull(T::class.java)
7171

72-
inline fun <reified T : Any> mock() = Mockito.mock(T::class.java)
73-
inline fun <reified T : Any> mock(defaultAnswer: Answer<Any>) = Mockito.mock(T::class.java, defaultAnswer)
74-
inline fun <reified T : Any> mock(s: MockSettings) = Mockito.mock(T::class.java, s)
75-
inline fun <reified T : Any> mock(s: String) = Mockito.mock(T::class.java, s)
72+
inline fun <reified T : Any> mock(): T = Mockito.mock(T::class.java)!!
73+
inline fun <reified T : Any> mock(defaultAnswer: Answer<Any>): T = Mockito.mock(T::class.java, defaultAnswer)!!
74+
inline fun <reified T : Any> mock(s: MockSettings): T = Mockito.mock(T::class.java, s)!!
75+
inline fun <reified T : Any> mock(s: String): T = Mockito.mock(T::class.java, s)!!
7676

7777
fun mockingDetails(toInspect: Any) = Mockito.mockingDetails(toInspect)
7878
fun never() = Mockito.never()
@@ -99,4 +99,4 @@ fun <T> verifyNoMoreInteractions(vararg mocks: T) = Mockito.verifyNoMoreInteract
9999
fun verifyZeroInteractions(vararg mocks: Any) = Mockito.verifyZeroInteractions(*mocks)
100100

101101
fun <T> whenever(methodCall: T) = Mockito.`when`(methodCall)
102-
fun withSettings() = Mockito.withSettings()
102+
fun withSettings() = Mockito.withSettings()

0 commit comments

Comments
 (0)