Merge branch 'matejdro-2.x' into 2.x

mockito · May 10, 2018 · fe1ddec · fe1ddec
2 parents f6e4390 + d247f07
commit fe1ddec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Verification.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Verification.kt
@@ -192,7 +192,7 @@ fun inOrder(vararg mocks: Any): InOrder {
  *
  * Alias for [Mockito.inOrder].
  */
-fun inOrder(
+inline fun inOrder(
     vararg mocks: Any,
     evaluation: InOrder.() -> Unit
 ) {

diff --git a/mockito-kotlin/src/test/kotlin/test/CoroutinesTest.kt b/mockito-kotlin/src/test/kotlin/test/CoroutinesTest.kt
@@ -3,10 +3,7 @@
 package test
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyBlocking
+import com.nhaarman.mockitokotlin2.*
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.delay
 import kotlinx.coroutines.experimental.runBlocking
@@ -139,6 +136,17 @@ class CoroutinesTest {
 
         verifyBlocking(m) { suspending() }
     }
+
+    @Test
+    fun verifySuspendMethod() = runBlocking {
+        val testSubject : SomeInterface = mock()
+
+        testSubject.suspending()
+
+        inOrder(testSubject) {
+            verify(testSubject).suspending()
+        }
+    }
 }
 
 interface SomeInterface {