Fix issue mockito#480 by widening the allowed types for lenient().whe…

…never()
hunterwerlla · Jul 10, 2023 · c8b840a · c8b840a
1 parent b1d5e79
commit c8b840a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/LenientStubber.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/LenientStubber.kt
@@ -28,11 +28,11 @@ package org.mockito.kotlin
 import org.mockito.stubbing.LenientStubber
 import org.mockito.stubbing.OngoingStubbing
 
-inline fun <reified T : Any> LenientStubber.whenever(methodCall: T): OngoingStubbing<T> {
+inline fun <reified T> LenientStubber.whenever(methodCall: T): OngoingStubbing<T> {
     return `when`(methodCall)
 }
 
-inline fun <reified T : Any> LenientStubber.whenever(methodCall: () -> T): OngoingStubbing<T> {
+inline fun <reified T> LenientStubber.whenever(methodCall: () -> T): OngoingStubbing<T> {
     return whenever(methodCall())
 }
 
diff --git a/tests/src/test/kotlin/test/LenientStubberTest.kt b/tests/src/test/kotlin/test/LenientStubberTest.kt
@@ -34,4 +34,18 @@ open class LenientStubberTest {
 
         Assert.assertEquals("List should contain hello", "hello", mock[1])
     }
+
+    @Test
+    fun unused_and_lenient_stubbings_with_nullable() {
+        val mock = mock<NullableToString>()
+        lenient().whenever(mock.returnsNullableString()).doReturn(null)
+        whenever(mock.returnsNonNullableString()).doReturn("hello")
+
+        Assert.assertEquals("Should return hello", "hello", mock.returnsNonNullableString())
+    }
+
+    private class NullableToString {
+        fun returnsNullableString(): String? = ""
+        fun returnsNonNullableString(): String = ""
+    }
 }