From 9c786a9cd987e0a111a4fcce480efb0d66f7865f Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 5 Feb 2021 13:28:11 +0100 Subject: [PATCH] [minor] uncomment 2 scripting tests: Tests were failing before, but now fixed, most likely by switching to default target 1.8 and some changes in scripting IR support. #KT-44471 fixed --- .../kotlin/cli/LauncherScriptTest.kt | 20 +++++++++---------- .../jsr223/test/KotlinJsr223ScriptEngineIT.kt | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt index e0f00358cc6..e03fe18d607 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt @@ -239,16 +239,16 @@ class LauncherScriptTest : TestCaseWithTmpdir() { } fun testScriptWithXArguments() { -// runProcess( -// "kotlin", "$testDataDirectory/funWithResultReturn.kts", -// expectedExitCode = 1, -// expectedStderr = """error: 'kotlin.Result' cannot be used as a return type (funWithResultReturn.kts:2:11) -//compiler/testData/launcher/funWithResultReturn.kts:2:11: error: 'kotlin.Result' cannot be used as a return type -//fun f() : Result = Result.success(42) -// ^ -//""" -// ) -// runProcess("kotlin", "-Xallow-result-return-type", "$testDataDirectory/funWithResultReturn.kts", expectedStdout = "42\n") + runProcess( + "kotlin", "$testDataDirectory/funWithResultReturn.kts", + expectedExitCode = 1, + expectedStderr = """error: 'kotlin.Result' cannot be used as a return type (funWithResultReturn.kts:2:11) +compiler/testData/launcher/funWithResultReturn.kts:2:11: error: 'kotlin.Result' cannot be used as a return type +fun f() : Result = Result.success(42) + ^ +""" + ) + runProcess("kotlin", "-Xallow-result-return-type", "$testDataDirectory/funWithResultReturn.kts", expectedStdout = "42\n") } fun testNoStdLib() { diff --git a/libraries/scripting/jsr223-test/test/kotlin/script/experimental/jsr223/test/KotlinJsr223ScriptEngineIT.kt b/libraries/scripting/jsr223-test/test/kotlin/script/experimental/jsr223/test/KotlinJsr223ScriptEngineIT.kt index c79dc4bbab1..9ed9afbb973 100644 --- a/libraries/scripting/jsr223-test/test/kotlin/script/experimental/jsr223/test/KotlinJsr223ScriptEngineIT.kt +++ b/libraries/scripting/jsr223-test/test/kotlin/script/experimental/jsr223/test/KotlinJsr223ScriptEngineIT.kt @@ -321,10 +321,10 @@ obj scriptEngine.put("aValue", 3) -// val res1 = scriptEngine.eval(script1) -// Assert.assertEquals(1, res1) -// val res2 = scriptEngine.eval(script2) -// Assert.assertEquals(2, res2) + val res1 = scriptEngine.eval(script1) + Assert.assertEquals(1, res1) + val res2 = scriptEngine.eval(script2) + Assert.assertEquals(2, res2) } @Test