Skip to content

Improve Result support in matchers and captors #582

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 2 commits into from
Jan 22, 2026
Merged

Improve Result support in matchers and captors #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5feed1
Simplify the unboxing of a failure from a Result
mkoops-simacan Jan 22, 2026
2677e5e
Improve Result support in matchers and captors
Jan 21, 2026
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
17 changes: 7 additions & 10 deletions mockito-kotlin/src/main/kotlin/org/mockito/kotlin/internal/CoroutineAwareAnswer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ package org.mockito.kotlin.internal
import kotlin.coroutines.Continuation
import kotlin.coroutines.intrinsics.startCoroutineUninterceptedOrReturn
import kotlin.reflect.KFunction
import kotlin.reflect.full.memberProperties
import kotlin.reflect.jvm.jvmErasure
import kotlin.reflect.jvm.kotlinFunction
import org.mockito.internal.invocation.InterceptedInvocation
Expand Down Expand Up @@ -88,15 +87,13 @@ internal class CoroutineAwareAnswer<T> private constructor(private val delegate:
return this
}

private fun Result<*>.unboxResult(): Any? {
if (isSuccess) return getOrNull()

// In case of failure, extract the nested Failure instance and pass that on
val valueProperty = this::class.memberProperties.single { it.name == "value" }
val failure /* : kotlin.Result.Failure */ = valueProperty.call(this)

return failure
}
private fun Result<*>.unboxResult(): Any? =
if (isSuccess) {
getOrNull()
} else {
// In case of failure, unbox the nested Failure instance and pass that on
this.unboxValueClass()
}

private val InvocationOnMock.invokedKotlinFunction: KFunction<*>?
get() =
Expand Down
4 changes: 0 additions & 4 deletions mockito-kotlin/src/main/kotlin/org/mockito/kotlin/internal/ValueClassSupport.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ import kotlin.reflect.KClass
fun <T : Any?> Any?.toKotlinType(clazz: KClass<*>): T {
if (this == null) return null as T

if (clazz == Result::class) {
return this as T
}

if (clazz.isValue && this::class != clazz) {
return this.boxAsValueClass(clazz) as T
}
Expand Down
Loading