From af185ab87098f99451b5b688869ea897fb91563d Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 19 Nov 2021 00:38:17 +0300 Subject: [PATCH] Remove couple scripting tests commented for 2 years There're similiar tests: hello-resolve-junit-dynver.main.kts hello-resolve-junit-dynver-error.main.kts --- .../kotlin/script/util/ScriptUtilIT.kt | 35 ------------------- .../scripts/args-junit-dynver-error.kts | 9 ----- .../resources/scripts/args-junit-dynver.kts | 9 ----- 3 files changed, 53 deletions(-) delete mode 100644 libraries/tools/kotlin-script-util/src/test/resources/scripts/args-junit-dynver-error.kts delete mode 100644 libraries/tools/kotlin-script-util/src/test/resources/scripts/args-junit-dynver.kts diff --git a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt index 3b50de9054e..7ad2385fa54 100644 --- a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt +++ b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt @@ -101,41 +101,6 @@ done } } - @Ignore("Fails on TC for unclear reasons, rewrite to the new API") - @Test - fun testResolveStdJUnitHelloWorld() { - val savedErr = System.err - try { - System.setErr(PrintStream(NullOutputStream())) - Assert.assertNull(compileScript("args-junit-hello-world.kts", StandardArgsScriptTemplateWithLocalResolving::class)) - } finally { - System.setErr(savedErr) - } - - val scriptClass = compileScript("args-junit-hello-world.kts", StandardArgsScriptTemplateWithMavenResolving::class) - Assert.assertNotNull(scriptClass) - captureOut { - scriptClass!!.getConstructor(Array::class.java)!!.newInstance(arrayOf("a1")) - }.let { - Assert.assertEquals(argsHelloWorldOutput.linesSplitTrim(), it.linesSplitTrim()) - } - } - - @Ignore("Fails on TC for unclear reasons, rewrite to the new API") - @Test - fun testResolveStdJUnitDynVer() { - val (out, err) = captureOutAndErr { - Assert.assertNull(compileScript("args-junit-dynver-error.kts", StandardArgsScriptTemplateWithMavenResolving::class)) - } - Assert.assertTrue( - "Expecting error: unresolved reference: assertThrows, got:\nOUT:\n$out\nERR:\n$err", - err.contains("error: unresolved reference: assertThrows") - ) - - val scriptClass = compileScript("args-junit-dynver.kts", StandardArgsScriptTemplateWithMavenResolving::class) - Assert.assertNotNull(scriptClass) - } - private fun compileScript( scriptFileName: String, scriptTemplate: KClass, diff --git a/libraries/tools/kotlin-script-util/src/test/resources/scripts/args-junit-dynver-error.kts b/libraries/tools/kotlin-script-util/src/test/resources/scripts/args-junit-dynver-error.kts deleted file mode 100644 index 1ec699be1f7..00000000000 --- a/libraries/tools/kotlin-script-util/src/test/resources/scripts/args-junit-dynver-error.kts +++ /dev/null @@ -1,9 +0,0 @@ - -@file:DependsOn("junit:junit:(4.11,4.12]") - -org.junit.Assert.assertThrows(NullPointerException::class.java) { - throw null!! -} - -println("Hello, world!") - diff --git a/libraries/tools/kotlin-script-util/src/test/resources/scripts/args-junit-dynver.kts b/libraries/tools/kotlin-script-util/src/test/resources/scripts/args-junit-dynver.kts deleted file mode 100644 index e176b8b1cc0..00000000000 --- a/libraries/tools/kotlin-script-util/src/test/resources/scripts/args-junit-dynver.kts +++ /dev/null @@ -1,9 +0,0 @@ - -@file:DependsOn("junit:junit:(4.12,5.0)") - -org.junit.Assert.assertThrows(NullPointerException::class.java) { - throw null!! -} - -println("Hello, world!") -