From 0fe0e7afb85eb50b0813aaed3596040b79f78926 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 3 Aug 2022 11:47:55 +0800
Subject: [PATCH] [core] Fix `TestFactory` checks
---
mirai-core/src/jvmBaseTest/kotlin/test/AbstractTest.kt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mirai-core/src/jvmBaseTest/kotlin/test/AbstractTest.kt b/mirai-core/src/jvmBaseTest/kotlin/test/AbstractTest.kt
index 2abceb289..f460cf802 100644
--- a/mirai-core/src/jvmBaseTest/kotlin/test/AbstractTest.kt
+++ b/mirai-core/src/jvmBaseTest/kotlin/test/AbstractTest.kt
@@ -13,7 +13,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.debug.DebugProbes
import net.mamoe.mirai.IMirai
import net.mamoe.mirai.internal.network.framework.SynchronizedStdoutLogger
-import net.mamoe.mirai.internal.testFramework.DynamicTest
import net.mamoe.mirai.internal.testFramework.TestFactory
import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.setSystemProp
@@ -22,6 +21,7 @@ import org.junit.jupiter.api.TestInfo
import org.junit.jupiter.api.Timeout
import java.util.concurrent.TimeUnit
import kotlin.jvm.optionals.getOrNull
+import kotlin.reflect.KClass
import kotlin.reflect.full.functions
import kotlin.reflect.full.hasAnnotation
@@ -39,7 +39,7 @@ internal actual abstract class AbstractTest actual constructor() : CommonAbstrac
check(function.returnType.classifier == List::class) {
"Illegal TestFactory function. A such function must return DynamicTestsResult."
}
- check(function.returnType.arguments.singleOrNull()?.type?.classifier == DynamicTest::class) {
+ check((function.returnType.classifier as? KClass<*>)?.qualifiedName == List::class.qualifiedName) {
"Illegal TestFactory function. A such function must return DynamicTestsResult."
}
}