azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[minor] fix reflection usage in scripting tests

Browse Source
This commit is contained in:
Ilya Chernikov
2020-10-15 17:08:24 +02:00
parent 94f2813a8a
commit 4cb0437145
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/CachingTest.kt
+11 -1
View File
@@ -13,6 +13,7 @@ import java.io.File
import java.io.ObjectInputStream import java.io.ObjectInputStream
import java.io.ObjectOutputStream import java.io.ObjectOutputStream
import java.security.MessageDigest import java.security.MessageDigest
import java.util.ArrayList
import kotlin.script.experimental.api.* import kotlin.script.experimental.api.*
import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.host.toScriptSource
import kotlin.script.experimental.host.with import kotlin.script.experimental.host.with
@@ -172,7 +173,7 @@ class CachingTest : TestCase() {
val cachedScriptClass = cachedScriptClassRes.valueOrThrow() val cachedScriptClass = cachedScriptClassRes.valueOrThrow()
Assert.assertEquals(compiledScriptClass.qualifiedName, cachedScriptClass.qualifiedName) Assert.assertEquals(compiledScriptClass.qualifiedName, cachedScriptClass.qualifiedName)
Assert.assertEquals(compiledScriptClass.supertypes, cachedScriptClass.supertypes) Assert.assertEquals(compiledScriptClass.java.supertypes(), cachedScriptClass.java.supertypes())
val output2 = captureOut { val output2 = captureOut {
runBlocking { runBlocking {
@@ -299,3 +300,12 @@ private fun File.readCompiledScript(): CompiledScript {
private fun ByteArray.toHexString(): String = joinToString("", transform = { "%02x".format(it) }) private fun ByteArray.toHexString(): String = joinToString("", transform = { "%02x".format(it) })
private fun Class<*>.supertypes(): MutableList<Class<*>> = when {
superclass == null -> interfaces.toMutableList() ?: mutableListOf()
interfaces.isEmpty() -> mutableListOf(superclass)
else -> ArrayList<Class<*>>(interfaces.size + 1).apply {
interfaces.toCollection(this@apply)
add(superclass)
}
}