azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, drop unused parameter in CodegenTestCase, add testJdkKind

Browse Source
This commit is contained in:
Alexander Udalov
2018-05-02 16:04:04 +02:00
committed by Ilya Chernikov
parent 48cf0bd949
commit c48bb9c981
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt
+2 -1
View File
@@ -9,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.utils.rethrow import org.jetbrains.kotlin.utils.rethrow
import org.junit.Assert import org.junit.Assert
import java.io.File import java.io.File
@@ -20,7 +21,7 @@ abstract class AbstractBytecodeTextTest : CodegenTestCase() {
@Throws(Exception::class) @Throws(Exception::class)
override fun doMultiFileTest(wholeFile: File, files: List<CodegenTestCase.TestFile>, javaFilesDir: File?) { 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) loadMultiFiles(files)
if (isMultiFileTest(files) && !InTextDirectivesUtils.isDirectiveDefined(wholeFile.readText(), "TREAT_AS_ONE_FILE")) { if (isMultiFileTest(files) && !InTextDirectivesUtils.isDirectiveDefined(wholeFile.readText(), "TREAT_AS_ONE_FILE")) {
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+3 -3
View File
@@ -99,7 +99,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
@NotNull ConfigurationKind configurationKind, @NotNull ConfigurationKind configurationKind,
@Nullable File... javaSourceRoots @Nullable File... javaSourceRoots
) { ) {
createEnvironmentWithMockJdkAndIdeaAnnotations(configurationKind, Collections.emptyList(), "" , javaSourceRoots); createEnvironmentWithMockJdkAndIdeaAnnotations(configurationKind, Collections.emptyList(), TestJdkKind.MOCK_JDK, javaSourceRoots);
} }
@NotNull @NotNull
@@ -115,7 +115,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
protected final void createEnvironmentWithMockJdkAndIdeaAnnotations( protected final void createEnvironmentWithMockJdkAndIdeaAnnotations(
@NotNull ConfigurationKind configurationKind, @NotNull ConfigurationKind configurationKind,
@NotNull List<TestFile> testFilesWithConfigurationDirectives, @NotNull List<TestFile> testFilesWithConfigurationDirectives,
@NotNull String coroutinesPackage, @NotNull TestJdkKind testJdkKind,
@Nullable File... javaSourceRoots @Nullable File... javaSourceRoots
) { ) {
if (myEnvironment != null) { if (myEnvironment != null) {
@@ -124,7 +124,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
CompilerConfiguration configuration = createConfiguration( CompilerConfiguration configuration = createConfiguration(
configurationKind, configurationKind,
TestJdkKind.MOCK_JDK, testJdkKind,
Collections.singletonList(getAnnotationsJar()), Collections.singletonList(getAnnotationsJar()),
ArraysKt.filterNotNull(javaSourceRoots), ArraysKt.filterNotNull(javaSourceRoots),
testFilesWithConfigurationDirectives testFilesWithConfigurationDirectives