From 3ead2e9cd4d13d04f6a18b46d06d68f8a5fda037 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 2 Nov 2017 17:09:40 +0100 Subject: [PATCH] Use KotlinCoreEnvironment.createForTests in test code createForProduction creates and caches JavaCoreApplicationEnvironment instance, which can alter behavior of subsequent tests --- .../jetbrains/kotlin/jvm/repl/ReplCompilerJava8Test.kt | 3 +-- .../org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt | 2 +- compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt | 2 +- .../org/jetbrains/kotlin/script/util/ScriptUtilIT.kt | 8 +------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/repl/ReplCompilerJava8Test.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/repl/ReplCompilerJava8Test.kt index dd62bcc013d..f6a53f96472 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/repl/ReplCompilerJava8Test.kt +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/repl/ReplCompilerJava8Test.kt @@ -58,8 +58,7 @@ class ReplCompilerJava8Test : KtUsefulTestCase() { put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.JVM_1_8) } - val environment = - KotlinCoreEnvironment.createForProduction(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) + val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) val res = KotlinToJVMBytecodeCompiler.compileBunchOfSources(environment) Assert.assertTrue(res) diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt index b7e4c965b3c..f887cdd7311 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt @@ -356,7 +356,7 @@ class ScriptTemplateTest : KtUsefulTestCase() { configuration.add(JVMConfigurationKeys.SCRIPT_DEFINITIONS, scriptDefinition) configuration.put(JVMConfigurationKeys.RETAIN_OUTPUT_IN_MEMORY, true) - val environment = KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) + val environment = KotlinCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) try { return KotlinToJVMBytecodeCompiler.compileScript(environment, this::class.java.classLoader.takeUnless { runIsolated }) diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt index 4d8bb1ca6d3..c0fc0d90759 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt @@ -106,7 +106,7 @@ class ScriptTest : KtUsefulTestCase() { configuration.put(JVMConfigurationKeys.OUTPUT_DIRECTORY, saveClassesDir) } - val environment = KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) + val environment = KotlinCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) try { return KotlinToJVMBytecodeCompiler.compileScript(environment, this::class.java.classLoader.takeUnless { runIsolated }) 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 3dc1437ef55..f72e1e90b45 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 @@ -145,7 +145,7 @@ done put(JVMConfigurationKeys.RETAIN_OUTPUT_IN_MEMORY, true) } - val environment = KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) + val environment = KotlinCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) try { return KotlinToJVMBytecodeCompiler.compileScript(environment) @@ -166,12 +166,6 @@ done } } - private inline fun ifFailed(default: R, block: () -> R) = try { - block() - } catch (t: Throwable) { - default - } - private fun String.linesSplitTrim() = split('\n','\r').map(String::trim).filter(String::isNotBlank)