From 403e2ab4ea969da44b1bd818d5b5876994a29e56 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 11 Aug 2016 21:36:37 +0300 Subject: [PATCH] Redefine configuration kinds, so that the most of test dependent on JDK_ONLY now use mock kotlin runtime: MOCK_RUNTIME -> JDK_ONLY JDK_ONLY -> JDK_NO_RUNTIME --- .../org/jetbrains/kotlin/test/ConfigurationKind.kt | 8 ++++++-- .../kotlin/checkers/KotlinMultiFileTestWithJava.java | 2 +- .../kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt | 2 +- .../kotlin/serialization/builtins/LoadBuiltinsTest.java | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/ConfigurationKind.kt b/compiler/tests-common/org/jetbrains/kotlin/test/ConfigurationKind.kt index fc4d6e19ff7..8cefeaabdbf 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/ConfigurationKind.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/test/ConfigurationKind.kt @@ -21,8 +21,12 @@ enum class ConfigurationKind( val withMockRuntime: Boolean = false, val withReflection: Boolean = false ) { - JDK_ONLY(), - MOCK_RUNTIME(withMockRuntime = true), + /** JDK without any kotlin runtime */ + JDK_NO_RUNTIME(), + /** JDK + light mock kotlin runtime */ + JDK_ONLY(withMockRuntime = true), + /** JDK + kotlin runtime but without reflection */ NO_KOTLIN_REFLECT(withRuntime = true), + /** JDK + kotlin runtime + kotlin reflection */ ALL(withRuntime = true, withReflection = true), } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java index f6cc2f27e96..d17c2669532 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java @@ -79,7 +79,7 @@ public abstract class KotlinMultiFileTestWithJava extends KotlinTestWithEn @NotNull protected ConfigurationKind getConfigurationKind() { - return ConfigurationKind.MOCK_RUNTIME; + return ConfigurationKind.JDK_ONLY; } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt index 6b00bf03b21..8bcb824bf82 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt @@ -179,7 +179,7 @@ class KotlinCliJavaFileManagerTest : KotlinTestWithEnvironment() { javaFilesDir = KotlinTestUtils.tmpDir("java-file-manager-test") val configuration = KotlinTestUtils.newConfiguration( - ConfigurationKind.MOCK_RUNTIME, TestJdkKind.MOCK_JDK, emptyList(), listOf(javaFilesDir!!) + ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, emptyList(), listOf(javaFilesDir!!) ) return KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index 1a66ba06fb5..969a0885a42 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -60,7 +60,7 @@ import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.*; public class LoadBuiltinsTest extends KotlinTestWithEnvironment { @Override protected KotlinCoreEnvironment createEnvironment() { - return createEnvironmentWithJdk(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK); + return createEnvironmentWithJdk(ConfigurationKind.JDK_NO_RUNTIME, TestJdkKind.MOCK_JDK); } public void testBuiltIns() throws Exception {