Merge branch 'dpreussler-inorder' into 1.x

Author: nhaarman

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

@@ -116,6 +116,14 @@ fun ignoreStubs(vararg mocks: Any): Array<out Any> = Mockito.ignoreStubs(*mocks)
 fun inOrder(vararg mocks: Any): InOrder = Mockito.inOrder(*mocks)!!
 fun inOrder(vararg mocks: Any, evaluation: InOrder.() -> Unit) = Mockito.inOrder(*mocks).evaluation()
 
+inline fun <T> T.inOrder(block: InOrderOnType<T>.() -> Any) {
+    block.invoke(InOrderOnType(this))
+}
+
+class InOrderOnType<T>(private val t: T) : InOrder by inOrder(t as Any) {
+    fun verify() : T = verify(t)
+}
+
 inline fun <reified T : Any> isA(): T = Mockito.isA(T::class.java) ?: createInstance<T>()
 fun <T : Any> isNotNull(): T? = Mockito.isNotNull()
 fun <T : Any> isNull(): T? = Mockito.isNull()

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

@@ -225,6 +225,23 @@ class MockitoTest : TestBase() {
         }
     }
 
+    @Test
+    fun testInOrderWithReceiver() {
+        /* Given */
+        val mock = mock<Methods>()
+
+        /* When */
+        mock.string("")
+        mock.int(0)
+
+        /* Then */
+        mock.inOrder {
+            verify().string(any())
+            verify().int(any())
+            verifyNoMoreInteractions()
+        }
+    }
+
     @Test
     fun testClearInvocations() {
         val mock = mock<Methods>().apply {