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.

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

Jump to bottom

Properly handle sealed classes with Kotlin 1.7 and JDK 17 #1

Closed
wants to merge 1 commit into from
Closed

Properly handle sealed classes with Kotlin 1.7 and JDK 17 #1

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions modules/mockk-agent/src/jvmMain/kotlin/io/mockk/proxy/jvm/ObjenesisInstantiator.kt
View file
Open in desktop
Expand Up @@ -24,6 +24,10 @@ class ObjenesisInstantiator(
if (cls == Any::class.java) {
@Suppress("UNCHECKED_CAST")
return Any() as T
} else if (cls.isSealedSafe()) {
cls.getPermittedSubclassesSafe().firstNotNullOfOrNull { subCls ->
runCatching { instance(subCls) }.getOrNull()
} ?: error("could not find subclass for sealed class $cls")
} else if (!Modifier.isFinal(cls.modifiers)) {
try {
val instance = instantiateViaProxy(cls)
Expand All @@ -42,6 +46,27 @@ class ObjenesisInstantiator(
return instanceViaObjenesis(cls)
}

/**
* `boolean Class.isSealed()` is only available with JDK 17+. Used via reflection to support
* builds with previous Java versions as well. This should be refactored to use the actual
* method once the minimum Java version is 17.
*/
private fun Class<*>.isSealedSafe(): Boolean =
javaClass.methods.firstOrNull { it.name == "isSealed" }?.invoke(this) == true

/**
* `Class<?>[] Class.getPermittedSubclasses` is only available with JDK 17+. Used via reflection
* to support builds with previous Java versions as well. This should be refactored to use the
* actual method once the minimum Java version is 17.
*/
private fun Class<*>.getPermittedSubclassesSafe(): Array<Class<*>> =
javaClass.methods.firstOrNull { it.name == "getPermittedSubclasses" }
?.let {
@Suppress("UNCHECKED_CAST")
it.invoke(this) as Array<Class<*>>
}
?: emptyArray()

private fun <T> instantiateViaProxy(cls: Class<T>): T? {
val proxyCls = if (!Modifier.isAbstract(cls.modifiers)) {
log.trace("Skipping instantiation subsclassing $cls because class is not abstract.")
Expand Down
3 changes: 0 additions & 3 deletions modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedClassTest.kt
View file
Open in desktop
Expand Up @@ -2,15 +2,13 @@ package io.mockk.it

import io.mockk.every
import io.mockk.mockk
import kotlin.test.Ignore
import kotlin.test.Test
import kotlin.test.assertEquals


class SealedClassTest {

@Test
@Ignore("Fails on JDK17+ https://github.com/mockk/mockk/issues/832")
fun serviceReturnsSealedClassImpl() {
val factory = mockk<Factory> {
every { create() } returns Leaf(1)
Expand All @@ -22,7 +20,6 @@ class SealedClassTest {
}

@Test
@Ignore("Fails on JDK17+ https://github.com/mockk/mockk/issues/832")
fun serviceAnswersSealedClassImpl() {
val factory = mockk<Factory> {
every { create() } answers { Leaf(1) }
Expand Down
3 changes: 0 additions & 3 deletions modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedInterfaceTest.kt
View file
Open in desktop
Expand Up @@ -3,14 +3,12 @@ package io.mockk.it
import io.mockk.every
import io.mockk.mockk
import kotlin.test.Test
import kotlin.test.Ignore
import kotlin.test.assertEquals


class SealedInterfaceTest {

@Test
@Ignore("Fails on JDK17+ https://github.com/mockk/mockk/issues/832")
fun serviceReturnsSealedClassImpl() {
val factory = mockk<Factory> {
every { create() } returns Leaf(1)
Expand All @@ -22,7 +20,6 @@ class SealedInterfaceTest {
}

@Test
@Ignore("Fails on JDK17+ https://github.com/mockk/mockk/issues/832")
fun serviceAnswersSealedClassImpl() {
val factory = mockk<Factory> {
every { create() } answers { Leaf(1) }
Expand Down