Merge pull request #72 from nhaarman/any-or-null

Include `anyOrNull()`

Author: nhaarman

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

@@ -39,9 +39,14 @@ import kotlin.reflect.KClass
 
 fun after(millis: Long) = Mockito.after(millis)
 
+/** Matches any object, excluding nulls. */
 inline fun <reified T : Any> any() = Mockito.any(T::class.java) ?: createInstance<T>()
-inline fun <reified T : Any?> anyArray(): Array<T> = Mockito.any(Array<T>::class.java) ?: arrayOf()
+/** Matches anything, including nulls. */
+inline fun <reified T : Any> anyOrNull(): T = Mockito.any<T>() ?: createInstance<T>()
+/** Matches any vararg object, including nulls. */
 inline fun <reified T : Any> anyVararg(): T = Mockito.any<T>() ?: createInstance<T>()
+/** Matches any array of type T. */
+inline fun <reified T : Any?> anyArray(): Array<T> = Mockito.any(Array<T>::class.java) ?: arrayOf()
 inline fun <reified T : Any> argThat(noinline predicate: T.() -> Boolean) = Mockito.argThat<T> { it -> (it as T).predicate() } ?: createInstance(T::class)
 inline fun <reified T : Any> argForWhich(noinline predicate: T.() -> Boolean) = argThat(predicate)
 

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

@@ -51,6 +51,7 @@ interface Methods {
     fun string(s: String)
     fun closedVararg(vararg c: Closed)
     fun throwableClass(t: ThrowableClass)
+    fun nullableString(s: String?)
 
     fun stringResult(): String
 }

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

@@ -116,6 +116,22 @@ class MockitoTest {
         }
     }
 
+    @Test
+    fun anyNull_neverVerifiesAny() {
+        mock<Methods>().apply {
+            nullableString(null)
+            verify(this, never()).nullableString(any())
+        }
+    }
+
+    @Test
+    fun anyNull_verifiesAnyOrNull() {
+        mock<Methods>().apply {
+            nullableString(null)
+            verify(this).nullableString(anyOrNull())
+        }
+    }
+
     @Test
     fun anyThrowableWithSingleThrowableConstructor() {
         mock<Methods>().apply {
@@ -133,6 +149,7 @@ class MockitoTest {
             })
         }
     }
+
     @Test
     fun listArgForWhich() {
         mock<Methods>().apply {