Merge pull request #218 from nhaarman/returns-self

Accept any `Answer<*>` in `OngoingStubbing<T>.doAnswer`

Author: nhaarman

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

@@ -230,7 +230,7 @@ infix fun <T> OngoingStubbing<T>.doThrow(t: KClass<out Throwable>): OngoingStubb
 fun <T> OngoingStubbing<T>.doThrow(t: KClass<out Throwable>, vararg ts: KClass<out Throwable>): OngoingStubbing<T> = thenThrow(t.java, *ts.map { it.java }.toTypedArray())
 
 infix fun <T> OngoingStubbing<T>.doAnswer(answer: (InvocationOnMock) -> T?): OngoingStubbing<T> = thenAnswer(answer)
-infix fun <T> OngoingStubbing<T>.doAnswer(answer: Answer<T>): OngoingStubbing<T> = thenAnswer(answer)
+infix fun <T> OngoingStubbing<T>.doAnswer(answer: Answer<*>): OngoingStubbing<T> = thenAnswer(answer)
 
 fun mockingDetails(toInspect: Any): MockingDetails = Mockito.mockingDetails(toInspect)!!
 fun never(): VerificationMode = Mockito.never()!!

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

@@ -513,6 +513,19 @@ class MockitoTest : TestBase() {
         expect(result).toBe("result")
     }
 
+    @Test
+    fun testMockStubbing_doAnswer_returnsSelf() {
+        /* Given */
+        val mock = mock<Methods> {
+            on { builderMethod() } doAnswer Mockito.RETURNS_SELF
+        }
+
+        /* When */
+        val result = mock.builderMethod()
+
+        /* Then */
+        expect(result).toBe(mock)
+    }
 
     @Test
     fun testMockStubbing_doAnswer_withArgument() {