From c48bb9c98163870072b12540901421df372ea397 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 2 May 2018 16:04:04 +0200
Subject: [PATCH] Minor, drop unused parameter in CodegenTestCase, add
 testJdkKind

---
 .../jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt    | 3 ++-
 .../tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt
index 22d710c8878..1c203d3b5cf 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt
@@ -9,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
+import org.jetbrains.kotlin.test.TestJdkKind
 import org.jetbrains.kotlin.utils.rethrow
 import org.junit.Assert
 import java.io.File
@@ -20,7 +21,7 @@ abstract class AbstractBytecodeTextTest : CodegenTestCase() {
 
     @Throws(Exception::class)
     override fun doMultiFileTest(wholeFile: File, files: List<CodegenTestCase.TestFile>, javaFilesDir: File?) {
-        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL, files, coroutinesPackage, javaFilesDir)
+        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL, files, TestJdkKind.MOCK_JDK, javaFilesDir)
         loadMultiFiles(files)
 
         if (isMultiFileTest(files) && !InTextDirectivesUtils.isDirectiveDefined(wholeFile.readText(), "TREAT_AS_ONE_FILE")) {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
index 0a553e1ebaf..b1cbc9fff50 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
@@ -99,7 +99,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
             @NotNull ConfigurationKind configurationKind,
             @Nullable File... javaSourceRoots
     ) {
-        createEnvironmentWithMockJdkAndIdeaAnnotations(configurationKind, Collections.emptyList(), "" , javaSourceRoots);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(configurationKind, Collections.emptyList(), TestJdkKind.MOCK_JDK, javaSourceRoots);
     }
 
     @NotNull
@@ -115,7 +115,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
     protected final void createEnvironmentWithMockJdkAndIdeaAnnotations(
             @NotNull ConfigurationKind configurationKind,
             @NotNull List<TestFile> testFilesWithConfigurationDirectives,
-            @NotNull String coroutinesPackage,
+            @NotNull TestJdkKind testJdkKind,
             @Nullable File... javaSourceRoots
     ) {
         if (myEnvironment != null) {
@@ -124,7 +124,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
 
         CompilerConfiguration configuration = createConfiguration(
                 configurationKind,
-                TestJdkKind.MOCK_JDK,
+                testJdkKind,
                 Collections.singletonList(getAnnotationsJar()),
                 ArraysKt.filterNotNull(javaSourceRoots),
                 testFilesWithConfigurationDirectives