Skip to content

Fix issue #480 by widening the allowed types for lenient().whenever() #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TimvdLippe merged 1 commit into from
Jul 11, 2023
Merged

Fix issue #480 by widening the allowed types for lenient().whenever() #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mockito-kotlin/src/main/kotlin/org/mockito/kotlin/LenientStubber.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}

14 changes: 14 additions & 0 deletions tests/src/test/kotlin/test/LenientStubberTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
}
}