Merge pull request #221 from nhaarman/Tapchicoma-improved-spy

Add dsl stubbing to spied classes.

Author: nhaarman

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

@@ -238,7 +238,11 @@ fun <T> reset(vararg mocks: T) = Mockito.reset(*mocks)
 fun <T> same(value: T): T = Mockito.same(value) ?: value
 
 inline fun <reified T : Any> spy(): T = Mockito.spy(T::class.java)!!
+inline fun <reified T : Any> spy(stubbing: KStubbing<T>.(T) -> Unit ): T = Mockito.spy(T::class.java)
+        .apply { KStubbing(this).stubbing(this) }!!
 fun <T> spy(value: T): T = Mockito.spy(value)!!
+inline fun <reified T> spy(value: T, stubbing: KStubbing<T>.(T) -> Unit): T = spy(value)
+        .apply { KStubbing(this).stubbing(this) }!!
 
 fun timeout(millis: Long): VerificationWithTimeout = Mockito.timeout(millis)!!
 fun times(numInvocations: Int): VerificationMode = Mockito.times(numInvocations)!!

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

@@ -71,7 +71,7 @@ class SpyTest : TestBase() {
     fun doNothingWithSpy() {
         val date = spy(Date(0))
         doNothing().whenever(date).time = 5L
-        date.time = 5L;
+        date.time = 5L
         expect(date.time).toBe(0L)
     }
 
@@ -90,6 +90,28 @@ class SpyTest : TestBase() {
         expect(date.time).toBe(0L)
     }
 
+    @Test
+    fun doReturnWithDefaultInstanceSpyStubbing() {
+        val timeVal = 12L
+        
+        val dateSpy = spy<Date> {
+            on { time } doReturn timeVal
+        }
+
+        expect(dateSpy.time).toBe(timeVal)
+    }
+
+    @Test
+    fun doReturnWithSpyStubbing() {
+        val timeVal = 15L
+        
+        val dateSpy = spy(Date(0)) {
+            on { time } doReturn timeVal
+        }
+
+        expect(dateSpy.time).toBe(timeVal)
+    }
+
     private interface MyInterface
     private open class MyClass : MyInterface
     private class ClosedClass