X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftest%2FMockotlin.kt;h=dcd139bf3cca6a9591818e18853d5fc7d8f325a0;hb=0c10757cf47fb6cff802eb138c44d5537b2ab87c;hp=38625ead493dea971395618c436f167cc4c9c47b;hpb=9824d45ada252d673a259029052f5ac4eecc5420;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt b/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt
index 38625ea..dcd139b 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt
@@ -8,14 +8,17 @@ import org.mockito.stubbing.OngoingStubbing
 inline fun <reified T : Any> mock(): T = Mockito.mock<T>(T::class.java)!!
 inline fun <reified T : Any> mockBuilder(): T = Mockito.mock<T>(T::class.java, Mockito.RETURNS_SELF)!!
 inline fun <reified T : Any> deepMock(): T = Mockito.mock<T>(T::class.java, Mockito.RETURNS_DEEP_STUBS)!!
+inline fun <reified T : Any> selfMock(): T = Mockito.mock<T>(T::class.java, Mockito.RETURNS_SELF)!!
 inline fun <reified T : Any> capture(): ArgumentCaptor<T> = ArgumentCaptor.forClass(T::class.java)
 
+inline fun <reified E: Throwable> OngoingStubbing<*>.doThrow(): OngoingStubbing<*> = thenThrow(E::class.java)
+
 inline fun <reified T : Any> bind(implementation: T): Module =
 		Module { it!!.bind(T::class.java).toInstance(implementation) }
 
 inline fun <reified T : Any> bindMock(): Module =
 		Module { it!!.bind(T::class.java).toInstance(mock<T>()) }
 
-inline fun <reified T: Any> whenever(methodCall: T) = Mockito.`when`(methodCall)
+inline fun <reified T: Any?> whenever(methodCall: T) = Mockito.`when`(methodCall)!!
 
 inline fun <reified T : Any> OngoingStubbing<T>.thenReturnMock(): OngoingStubbing<T> = this.thenReturn(mock<T>())