Merge pull request #216 from nhaarman/doAnswer

Implement OngoingStubbing<T>.doAnswer(Answer<T>)

Author: nhaarman

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Nov 25 15:58:11 CET 2017
+#Sun Dec 03 21:34:47 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip

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

@@ -230,6 +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)
 
 fun mockingDetails(toInspect: Any): MockingDetails = Mockito.mockingDetails(toInspect)!!
 fun never(): VerificationMode = Mockito.never()!!

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

@@ -1,8 +1,6 @@
 package test
 
-import com.nhaarman.expect.expect
-import com.nhaarman.expect.expectErrorWithMessage
-import com.nhaarman.expect.fail
+import com.nhaarman.expect.*
 import com.nhaarman.mockitokotlin2.*
 import org.junit.Test
 import org.mockito.Mockito
@@ -11,9 +9,8 @@ import org.mockito.exceptions.base.MockitoAssertionError
 import org.mockito.exceptions.verification.WantedButNotInvoked
 import org.mockito.listeners.InvocationListener
 import org.mockito.mock.SerializableMode.BASIC
-import java.io.IOException
-import java.io.PrintStream
-import java.io.Serializable
+import org.mockito.stubbing.Answer
+import java.io.*
 
 
 /*
@@ -327,7 +324,7 @@ class MockitoTest : TestBase() {
         try {
             mock.go()
             throw AssertionError("Call should have thrown.")
-        } catch(e: IllegalStateException) {
+        } catch (e: IllegalStateException) {
         }
     }
 
@@ -425,7 +422,7 @@ class MockitoTest : TestBase() {
             /* When */
             mock.builderMethod()
             fail("No exception thrown")
-        } catch(e: IllegalArgumentException) {
+        } catch (e: IllegalArgumentException) {
         }
     }
 
@@ -440,7 +437,7 @@ class MockitoTest : TestBase() {
             /* When */
             mock.builderMethod()
             fail("No exception thrown")
-        } catch(e: IllegalArgumentException) {
+        } catch (e: IllegalArgumentException) {
         }
     }
 
@@ -455,14 +452,14 @@ class MockitoTest : TestBase() {
             /* When */
             mock.builderMethod()
             fail("No exception thrown")
-        } catch(e: IllegalArgumentException) {
+        } catch (e: IllegalArgumentException) {
         }
 
         try {
             /* When */
             mock.builderMethod()
             fail("No exception thrown")
-        } catch(e: UnsupportedOperationException) {
+        } catch (e: UnsupportedOperationException) {
         }
     }
 
@@ -477,19 +474,19 @@ class MockitoTest : TestBase() {
             /* When */
             mock.builderMethod()
             fail("No exception thrown")
-        } catch(e: IllegalArgumentException) {
+        } catch (e: IllegalArgumentException) {
         }
 
         try {
             /* When */
             mock.builderMethod()
             fail("No exception thrown")
-        } catch(e: UnsupportedOperationException) {
+        } catch (e: UnsupportedOperationException) {
         }
     }
 
     @Test
-    fun testMockStubbing_doAnswer() {
+    fun testMockStubbing_doAnswer_lambda() {
         /* Given */
         val mock = mock<Methods> {
             on { stringResult() } doAnswer { "result" }
@@ -502,6 +499,21 @@ class MockitoTest : TestBase() {
         expect(result).toBe("result")
     }
 
+    @Test
+    fun testMockStubbing_doAnswer_instance() {
+        /* Given */
+        val mock = mock<Methods> {
+            on { stringResult() } doAnswer Answer<String> { "result" }
+        }
+
+        /* When */
+        val result = mock.stringResult()
+
+        /* Then */
+        expect(result).toBe("result")
+    }
+
+
     @Test
     fun testMockStubbing_doAnswer_withArgument() {
         /* Given */
@@ -659,7 +671,7 @@ class MockitoTest : TestBase() {
             /* When */
             verify(mock).stringResult()
             fail("Expected an exception")
-        } catch(e: WantedButNotInvoked) {
+        } catch (e: WantedButNotInvoked) {
             /* Then */
             verify(out).println("methods.stringResult();")
         }
@@ -768,7 +780,7 @@ class MockitoTest : TestBase() {
             /* When */
             verify(mock).stringResult()
             fail("Expected an exception")
-        } catch(e: WantedButNotInvoked) {
+        } catch (e: WantedButNotInvoked) {
             /* Then */
             verify(out).println("methods.stringResult();")
         }
@@ -869,7 +881,7 @@ class MockitoTest : TestBase() {
             /* When */
             verify(mock).stringResult()
             fail("Expected an exception")
-        } catch(e: WantedButNotInvoked) {
+        } catch (e: WantedButNotInvoked) {
             /* Then */
             verify(out).println("methods.stringResult();")
         }