Merge pull request #12 from codeborne/master

Better spy support + argumentCaptor + tests

Author: nhaarman

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

@@ -25,11 +25,15 @@
 
 package com.nhaarman.mockito_kotlin
 
+import org.mockito.ArgumentCaptor
 import org.mockito.Mockito
+import org.mockito.stubbing.Answer
+import org.mockito.stubbing.Stubber
 import org.mockito.verification.VerificationMode
 import kotlin.reflect.KClass
 
 inline fun <reified T : Any> mock() = Mockito.mock(T::class.java)
+inline fun <reified T : Any> mock(defaultAnswer: Answer<Any>) = Mockito.mock(T::class.java, defaultAnswer)
 fun <T : Any> spy(value: T) = Mockito.spy(value)
 
 fun <T> whenever(methodCall: T) = Mockito.`when`(methodCall)
@@ -40,6 +44,20 @@ fun <T> reset(mock: T) = Mockito.reset(mock)
 
 fun inOrder(vararg value: Any) = Mockito.inOrder(*value)
 fun never() = Mockito.never()
+fun times(numInvocations: Int) = Mockito.times(numInvocations)
+fun atLeast(numInvocations: Int) = Mockito.atLeast(numInvocations)
+fun atLeastOnce() = Mockito.atLeastOnce()
+
+fun doReturn(value: Any) = Mockito.doReturn(value)
+fun doThrow(throwable: Throwable) = Mockito.doThrow(throwable)
+fun <T> doAnswer(answer: Answer<T>) = Mockito.doAnswer(answer)
+fun doCallRealMethod() = Mockito.doCallRealMethod()
+fun doNothing() = Mockito.doNothing()
+
+fun <T> Stubber.whenever(mock: T) = `when`(mock)
+
+inline fun <reified T : Any> argumentCaptor() = ArgumentCaptor.forClass(T::class.java)
+inline fun <reified T : Any> capture(captor: ArgumentCaptor<T>): T = captor.capture() ?: createInstance<T>()
 
 inline fun <reified T : Any> eq(value: T) = Mockito.eq(value) ?: createInstance<T>()
 inline fun <reified T : Any> anyArray(): Array<T> = Mockito.any(Array<T>::class.java) ?: arrayOf()

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

@@ -0,0 +1,20 @@
+import com.nhaarman.mockito_kotlin.argumentCaptor
+import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockito_kotlin.verify
+import com.nhaarman.expect.expect
+import com.nhaarman.mockito_kotlin.capture
+import org.junit.Test
+import java.util.*
+
+class ArgumentCaptorTest {
+    @Test
+    fun captor() {
+        val date: Date = mock()
+        val time = argumentCaptor<Long>()
+
+        date.time = 5L
+
+        verify(date).time = capture(time)
+        expect(time.value).toBe(5L)
+    }
+}

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

@@ -25,8 +25,11 @@
 
 import com.nhaarman.expect.expect
 import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockito_kotlin.whenever
 import org.junit.Test
+import org.mockito.Mockito.RETURNS_DEEP_STUBS
 import org.mockito.exceptions.base.MockitoException
+import java.util.*
 
 class MockTest {
 
@@ -82,6 +85,13 @@ class MockTest {
         mock<ClosedClass>()
     }
 
+    @Test
+    fun deepStubs() {
+        val cal: Calendar = mock(RETURNS_DEEP_STUBS)
+        whenever(cal.time.time).thenReturn(123L)
+        expect(cal.time.time).toBe(123L)
+    }
+
     private interface MyInterface
     private open class MyClass
     private class ClosedClass

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

@@ -24,11 +24,12 @@
  */
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockito_kotlin.spy
+import com.nhaarman.mockito_kotlin.*
 import org.junit.After
 import org.junit.Test
 import org.mockito.Mockito
 import org.mockito.exceptions.base.MockitoException
+import java.util.*
 
 class SpyTest {
 
@@ -66,6 +67,36 @@ class SpyTest {
         spy(closedClassInstance)
     }
 
+    @Test
+    fun doReturnWithSpy() {
+        val date = spy(Date())
+        doReturn(123L).whenever(date).time
+        expect(date.time).toBe(123L)
+    }
+
+    @Test
+    fun doNothingWithSpy() {
+        val date = spy(Date(0))
+        doNothing().whenever(date).time = 5L
+        date.time = 5L;
+        expect(date.time).toBe(0L)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun doThrowWithSpy() {
+        val date = spy(Date(0))
+        doThrow(IllegalArgumentException()).whenever(date).time
+        date.time
+    }
+
+    @Test
+    fun doCallRealMethodWithSpy() {
+        val date = spy(Date(0))
+        doReturn(123L).whenever(date).time
+        doCallRealMethod().whenever(date).time
+        expect(date.time).toBe(0L)
+    }
+
     private interface MyInterface
     private open class MyClass : MyInterface
     private class ClosedClass