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

Implement invokable/invoker interface on the generic repl evaluator, refactor reflection utils on the way

Browse Source
This commit is contained in:
Ilya Chernikov
2016-11-30 12:37:34 +01:00
parent 7a79fff9d6
commit fbd4c6eb61
8 changed files with 205 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt
+3 -3
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.scripts
import com.intellij.openapi.util.Disposer
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.*
import org.jetbrains.kotlin.cli.common.tryConstructScriptClass
import org.jetbrains.kotlin.cli.common.tryConstructClassFromStringArgs
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler
@@ -214,7 +214,7 @@ class ScriptTemplateTest {
val aClass = compileScript("fib.kts", ScriptWithIntParam::class)
Assert.assertNotNull(aClass)
captureOut {
val anObj = tryConstructScriptClass(aClass!!, listOf("4"))
val anObj = tryConstructClassFromStringArgs(aClass!!, listOf("4"))
Assert.assertNotNull(anObj)
}.let {
assertEqualsTrimmed(NUM_4_LINE + FIB_SCRIPT_OUTPUT_TAIL, it)
@@ -227,7 +227,7 @@ class ScriptTemplateTest {
Assert.assertNotNull(aClass)
var exceptionThrown = false
try {
tryConstructScriptClass(aClass!!, emptyList())
tryConstructClassFromStringArgs(aClass!!, emptyList())
}
catch (e: InvocationTargetException) {
Assert.assertTrue(e.cause is IllegalStateException)
compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt
+5 -5
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.scripts
import com.intellij.openapi.util.Disposer
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.*
import org.jetbrains.kotlin.cli.common.tryConstructScriptClass
import org.jetbrains.kotlin.cli.common.tryConstructClassFromStringArgs
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler
@@ -44,7 +44,7 @@ class ScriptTest : KtUsefulTestCase() {
val aClass = compileScript("fib_std.kts", StandardScriptDefinition)
Assert.assertNotNull(aClass)
val out = captureOut {
val anObj = tryConstructScriptClass(aClass!!, listOf("4", "comment"))
val anObj = tryConstructClassFromStringArgs(aClass!!, listOf("4", "comment"))
Assert.assertNotNull(anObj)
}
assertEqualsTrimmed(NUM_4_LINE + " (comment)" + FIB_SCRIPT_OUTPUT_TAIL, out)
@@ -55,7 +55,7 @@ class ScriptTest : KtUsefulTestCase() {
val aClass = compileScript("fib_std.kts", StandardScriptDefinition)
Assert.assertNotNull(aClass)
val out = captureOut {
val anObj = tryConstructScriptClass(aClass!!, emptyList())
val anObj = tryConstructClassFromStringArgs(aClass!!, emptyList())
Assert.assertNotNull(anObj)
}
assertEqualsTrimmed(NUM_4_LINE + " (none)" + FIB_SCRIPT_OUTPUT_TAIL, out)
@@ -68,7 +68,7 @@ class ScriptTest : KtUsefulTestCase() {
val aClass = compileScript("fib_std.kts", StandardScriptDefinition, saveClassesDir = tmpdir)
Assert.assertNotNull(aClass)
val out1 = captureOut {
val anObj = tryConstructScriptClass(aClass!!, emptyList())
val anObj = tryConstructClassFromStringArgs(aClass!!, emptyList())
Assert.assertNotNull(anObj)
}
assertEqualsTrimmed(NUM_4_LINE + " (none)" + FIB_SCRIPT_OUTPUT_TAIL, out1)
@@ -76,7 +76,7 @@ class ScriptTest : KtUsefulTestCase() {
val aClassSaved = savedClassLoader.loadClass(aClass.name)
Assert.assertNotNull(aClassSaved)
val out2 = captureOut {
val anObjSaved = tryConstructScriptClass(aClassSaved!!, emptyList())
val anObjSaved = tryConstructClassFromStringArgs(aClassSaved!!, emptyList())
Assert.assertNotNull(anObjSaved)
}
assertEqualsTrimmed(NUM_4_LINE + " (none)" + FIB_SCRIPT_OUTPUT_TAIL, out2)