Skip to content

Commit fe1ddec

Browse files
committed
Merge branch 'matejdro-2.x' into 2.x
2 parents f6e4390 + d247f07 commit fe1ddec

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Verification.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ fun inOrder(vararg mocks: Any): InOrder {
192192
*
193193
* Alias for [Mockito.inOrder].
194194
*/
195-
fun inOrder(
195+
inline fun inOrder(
196196
vararg mocks: Any,
197197
evaluation: InOrder.() -> Unit
198198
) {

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
package test
44

55
import com.nhaarman.expect.expect
6-
import com.nhaarman.mockitokotlin2.doReturn
7-
import com.nhaarman.mockitokotlin2.mock
8-
import com.nhaarman.mockitokotlin2.verify
9-
import com.nhaarman.mockitokotlin2.verifyBlocking
6+
import com.nhaarman.mockitokotlin2.*
107
import kotlinx.coroutines.experimental.CommonPool
118
import kotlinx.coroutines.experimental.delay
129
import kotlinx.coroutines.experimental.runBlocking
@@ -139,6 +136,17 @@ class CoroutinesTest {
139136

140137
verifyBlocking(m) { suspending() }
141138
}
139+
140+
@Test
141+
fun verifySuspendMethod() = runBlocking {
142+
val testSubject : SomeInterface = mock()
143+
144+
testSubject.suspending()
145+
146+
inOrder(testSubject) {
147+
verify(testSubject).suspending()
148+
}
149+
}
142150
}
143151

144152
interface SomeInterface {

0 commit comments

Comments
 (0)