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

Fix merging errors

Browse Source
This commit is contained in:
Ilya Chernikov
2017-02-12 10:58:07 +01:00
parent d3682b7f7d
commit 1ae95853e7
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/GenericReplTest.kt
+4 -2
View File
@@ -91,8 +91,10 @@ class GenericReplTest : TestCase() {
listOf(File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-runtime.jar")), listOf(File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-runtime.jar")),
"kotlin.script.templates.standard.ScriptTemplateWithArgs") "kotlin.script.templates.standard.ScriptTemplateWithArgs")
val codeLine0 = ReplCodeLine(0, "val l1 = 1\r\nl1\r\n") val state = repl.createState()
val res0 = repl.replCompiler?.check(codeLine0)
val codeLine0 = ReplCodeLine(0, 0, "val l1 = 1\r\nl1\r\n")
val res0 = repl.replCompiler?.check(state, codeLine0)
val res0c = res0 as? ReplCheckResult.Ok val res0c = res0 as? ReplCheckResult.Ok
TestCase.assertNotNull("Unexpected compile result: $res0", res0c) TestCase.assertNotNull("Unexpected compile result: $res0", res0c)
compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
+10 -12
View File
@@ -534,12 +534,11 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
fun testDaemonReplLocalEvalNoParams() { fun testDaemonReplLocalEvalNoParams() {
withDaemon { daemon -> withDaemon { daemon ->
withDisposable { disposable -> val repl = KotlinRemoteReplCompilerClient(daemon!!, null, CompileService.TargetPlatform.JVM,
val repl = KotlinRemoteReplCompilerClient(daemon!!, null, CompileService.TargetPlatform.JVM, emptyArray(),
emptyArray(), TestMessageCollector(),
TestMessageCollector(), classpathFromClassloader(),
classpathFromClassloader(), ScriptWithNoParam::class.qualifiedName!!)
ScriptWithNoParam::class.qualifiedName!!)
val localEvaluator = GenericReplEvaluator(emptyList(), Thread.currentThread().contextClassLoader) val localEvaluator = GenericReplEvaluator(emptyList(), Thread.currentThread().contextClassLoader)
@@ -550,11 +549,10 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
fun testDaemonReplLocalEvalStandardTemplate() { fun testDaemonReplLocalEvalStandardTemplate() {
withDaemon { daemon -> withDaemon { daemon ->
withDisposable { disposable -> val repl = KotlinRemoteReplCompilerClient(daemon!!, null, CompileService.TargetPlatform.JVM, emptyArray(),
val repl = KotlinRemoteReplCompilerClient(daemon!!, null, CompileService.TargetPlatform.JVM, emptyArray(), TestMessageCollector(),
TestMessageCollector(), classpathFromClassloader(),
classpathFromClassloader(), "kotlin.script.templates.standard.ScriptTemplateWithArgs")
"kotlin.script.templates.standard.ScriptTemplateWithArgs")
val localEvaluator = GenericReplEvaluator(emptyList(), Thread.currentThread().contextClassLoader, val localEvaluator = GenericReplEvaluator(emptyList(), Thread.currentThread().contextClassLoader,
ScriptArgsWithTypes(arrayOf(emptyArray<String>()), arrayOf(Array<String>::class))) ScriptArgsWithTypes(arrayOf(emptyArray<String>()), arrayOf(Array<String>::class)))
@@ -627,7 +625,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
if (logFile.isLogContainsSequence("Idle timeout exceeded 1s")) break if (logFile.isLogContainsSequence("Idle timeout exceeded 1s")) break
Thread.sleep(200) Thread.sleep(200)
} }
repl.dispose() replCompiler.dispose()
Thread.sleep(200) Thread.sleep(200)
logFile.assertLogContainsSequence("Idle timeout exceeded 1s", logFile.assertLogContainsSequence("Idle timeout exceeded 1s",
libraries/examples/kotlin-jsr223-daemon-local-eval-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt
+2 -2
View File
@@ -117,9 +117,9 @@ obj
val engine = ScriptEngineManager().getEngineByExtension("kts")!! val engine = ScriptEngineManager().getEngineByExtension("kts")!!
val res1 = engine.eval("val x = 3") val res1 = engine.eval("val x = 3")
Assert.assertNull(res1) Assert.assertNull(res1)
val res2 = engine.eval("eval(\"\$x + 2\")") val res2 = engine.eval("val y = eval(\"\$x + 2\")\ny")
Assert.assertEquals(5, res2) Assert.assertEquals(5, res2)
val res3 = engine.eval("x + 4") val res3 = engine.eval("y + 2")
Assert.assertEquals(7, res3) Assert.assertEquals(7, res3)
} }
} }