Merge pull request #254 from nhaarman/igorwojda-1.x

Simplified argument captor API (originally #242)

Author: nhaarman

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

@@ -36,13 +36,27 @@ inline fun <reified T : Any> argumentCaptor(): KArgumentCaptor<T> {
     return KArgumentCaptor(ArgumentCaptor.forClass(T::class.java), T::class)
 }
 
+/**
+ * Creates a [KArgumentCaptor] for given type, taking in a lambda to allow fast verification.
+ */
+inline fun <reified T : Any> argumentCaptor(f: KArgumentCaptor<T>.() -> Unit): KArgumentCaptor<T> {
+    return argumentCaptor<T>().apply(f)
+}
+
 /**
  * Creates a [KArgumentCaptor] for given nullable type.
  */
 inline fun <reified T : Any> nullableArgumentCaptor(): KArgumentCaptor<T?> {
     return KArgumentCaptor(ArgumentCaptor.forClass(T::class.java), T::class)
 }
 
+/**
+ * Creates a [KArgumentCaptor] for given nullable type, taking in a lambda to allow fast verification.
+ */
+inline fun <reified T : Any> nullableArgumentCaptor(f: KArgumentCaptor<T?>.() -> Unit): KArgumentCaptor<T?> {
+    return nullableArgumentCaptor<T>().apply(f)
+}
+
 /**
  * Alias for [ArgumentCaptor.capture].
  */

tests/src/test/kotlin/test/ArgumentCaptorTest.kt

@@ -1,6 +1,7 @@
 package test
 
 import com.nhaarman.expect.expect
+import com.nhaarman.expect.expectErrorWithMessage
 import com.nhaarman.mockitokotlin2.*
 import org.junit.Test
 import java.util.*
@@ -117,4 +118,36 @@ class ArgumentCaptorTest : TestBase() {
             expect(secondValue).toBe(2)
         }
     }
+
+    @Test
+    fun argumentCaptor_withSingleValue_lambda() {
+        /* Given */
+        val date: Date = mock()
+
+        /* When */
+        date.time = 5L
+
+        /* Then */
+        argumentCaptor<Long> {
+            verify(date).time = capture()
+            expect(lastValue).toBe(5L)
+        }
+    }
+
+    @Test
+    fun argumentCaptor_withSingleValue_lambda_properlyFails() {
+        /* Given */
+        val date: Date = mock()
+
+        /* When */
+        date.time = 5L
+
+        /* Then */
+        expectErrorWithMessage("Expected: 3 but was: 5") on {
+            argumentCaptor<Long> {
+                verify(date).time = capture()
+                expect(lastValue).toBe(3L)
+            }
+        }
+    }
 }