Merge pull request #117 from nhaarman/nullable-eq

Return passed value instead of trying to create an instance

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

@@ -72,7 +72,7 @@ fun doReturn(toBeReturned: Any?, vararg toBeReturnedNext: Any?): Stubber = Mocki
 fun doThrow(toBeThrown: KClass<out Throwable>): Stubber = Mockito.doThrow(toBeThrown.java)!!
 fun doThrow(vararg toBeThrown: Throwable): Stubber = Mockito.doThrow(*toBeThrown)!!
 
-inline fun <reified T : Any> eq(value: T): T = Mockito.eq(value) ?: createInstance<T>()
+fun <T> eq(value: T): T = Mockito.eq(value) ?: value
 fun ignoreStubs(vararg mocks: Any): Array<out Any> = Mockito.ignoreStubs(*mocks)!!
 fun inOrder(vararg mocks: Any): InOrder = Mockito.inOrder(*mocks)!!
 
@@ -138,7 +138,7 @@ fun <T> refEq(value: T, vararg excludeFields: String): T? = Mockito.refEq(value,
 
 fun <T> reset(vararg mocks: T) = Mockito.reset(*mocks)
 
-fun <T> same(value: T): T? = Mockito.same(value)
+fun <T> same(value: T): T? = Mockito.same(value) ?: value
 
 inline fun <reified T : Any> spy(): T = Mockito.spy(T::class.java)!!
 fun <T> spy(value: T): T = Mockito.spy(value)!!

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

@@ -78,6 +78,18 @@ class EqTest {
         expect(result).toNotBeNull()
     }
 
+    @Test
+    fun nullArgument() {
+        /* Given */
+        val s: String? = null
+
+        /* When */
+        val result = eq(s)
+
+        /* Then */
+        expect(result).toBeNull()
+    }
+
     private interface MyInterface
     private open class MyClass : MyInterface
     class ClosedClass