Skip to content
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.

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

Fix capture using mutable list of value class #1209

Merged
merged 1 commit into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/mockk-dsl/src/commonMain/kotlin/io/mockk/Matchers.kt
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,10 @@ data class CaptureMatcher<T : Any>(
) : Matcher<T>, CapturingMatcher, TypedMatcher, EquivalentMatcher {
override fun equivalent(): Matcher<Any> = ConstantMatcher(true)

@Suppress("UNCHECKED_CAST")
override fun capture(arg: Any?) {
captureList.add(arg as T)
if (arg != null) {
captureList.add(InternalPlatformDsl.boxCast(argumentType, arg))
}
}

override fun match(arg: T?): Boolean = true
Expand Down
16 changes: 16 additions & 0 deletions modules/mockk/src/commonTest/kotlin/io/mockk/it/ValueClassTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,22 @@ class ValueClassTest {
verify { mock.argValueClassReturnValueClass(dummyValueClassArg) }
}

@Test
fun `arg is MutableList(ValueClass), returns ValueClass`() {
val slot = mutableListOf<DummyValue>()
val mock = mockk<DummyService> {
every { argValueClassReturnValueClass(capture(slot)) } returns dummyValueClassReturn
}

val result = mock.argValueClassReturnValueClass(dummyValueClassArg)

assertEquals(dummyValueClassReturn, result)

assertEquals(dummyValueClassArg, slot.single())

verify { mock.argValueClassReturnValueClass(dummyValueClassArg) }
}

@Test
fun `arg is ValueClass, answers ValueClass`() {
val mock = mockk<DummyService> {
Expand Down