Removes restriction to type Any on expect

ybonjour · Mar 13, 2018 · 5827e9f · 5827e9f
1 parent 7a08c07
commit 5827e9f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/src/main/kotlin/ch/yvu/rxpect/RXpect.kt b/src/main/kotlin/ch/yvu/rxpect/RXpect.kt
@@ -34,7 +34,7 @@ object RXpect {
             defaultValueGenerator("Please provide a return value as follows expectSubscribe(mock.foo()).thenReturn(returnValue)"))
             .build()
 
-    inline fun <reified T : Any> expect(methodCall: T): DefaultExpectation<T> =
+    inline fun <reified T> expect(methodCall: T): DefaultExpectation<T> =
         DefaultExpectationBuilderImpl(
             methodCall,
             defaultValueGenerator("Please provide a return value as follows expect(mock.foo()).thenReturn(returnValue)"))

diff --git a/src/main/kotlin/ch/yvu/rxpect/expect/DefaultExpectationBuilderImpl.kt b/src/main/kotlin/ch/yvu/rxpect/expect/DefaultExpectationBuilderImpl.kt
@@ -3,7 +3,7 @@ package ch.yvu.rxpect.expect
 import ch.yvu.rxpect.setupExpectation
 import com.nhaarman.mockitokotlin2.whenever
 
-class DefaultExpectationBuilderImpl<T : Any>(
+class DefaultExpectationBuilderImpl<T>(
     private val methodCall: T,
     private val defaultAnswer: () -> T
 ) : DefaultExpectationBuilder<T> {

diff --git a/src/main/kotlin/ch/yvu/rxpect/mockito/DefaultValueGenerator.kt b/src/main/kotlin/ch/yvu/rxpect/mockito/DefaultValueGenerator.kt
@@ -1,12 +1,12 @@
 package ch.yvu.rxpect.mockito
 
-inline fun <reified T : Any> defaultValueGenerator(messageIfNoDefaultValue: String): () -> T =
+inline fun <reified T> defaultValueGenerator(messageIfNoDefaultValue: String): () -> T =
     {
         defaultValue()
             ?: throw IllegalStateException(messageIfNoDefaultValue)
     }
 
-inline fun <reified T : Any> defaultValue(): T? =
+inline fun <reified T> defaultValue(): T? =
     when (T::class) {
         Unit::class -> {
             Unit as T

diff --git a/src/test/kotlin/ch/yvu/rxpect/expect/DefaultExpectationBuilderTest.kt b/src/test/kotlin/ch/yvu/rxpect/expect/DefaultExpectationBuilderTest.kt
@@ -27,6 +27,17 @@ class DefaultExpectationBuilderTest {
         expectation.verify()
     }
 
+    @Test
+    fun fulfilledExpectationWithReturnValueWithoutDefaultVAlue() {
+        val mock: TestClass = mock()
+        val foo: Foo = mock()
+        val expectation = expect(mock.foo2()).thenReturn(foo)
+
+        mock.foo2()
+
+        expectation.verify()
+    }
+
     @Test(expected = WantedButNotInvoked::class)
     fun unfulfilledExpectation() {
         val mock: TestClass = mock()
@@ -37,5 +48,8 @@ class DefaultExpectationBuilderTest {
 
     interface TestClass {
         fun foo(value: String): Int
+        fun foo2(): Foo
     }
+
+    interface Foo
 }