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

Tests: accept TargetBackend in KotlinBaseTest.createConfiguration

Browse Source
This commit is contained in:
Alexander Udalov
2020-08-28 20:43:07 +02:00
parent 0dea6b94c6
commit e324733b01
8 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
+1
View File
@@ -46,6 +46,7 @@ abstract class KotlinMultiFileTestWithJava<M : KotlinBaseTest.TestModule, F : Ko
val configuration = createConfiguration(
extractConfigurationKind(files),
getTestJdkKind(files),
backend,
getClasspath(file),
if (isJavaSourceRootNeeded()) listOf(javaFilesDir) else emptyList(),
files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java
+5 -4
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.codegen;
import com.google.common.collect.Lists;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer;
import kotlin.Pair;
@@ -104,7 +103,8 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends CodegenTest
private ClassFileFactory compileA(@NotNull TestFile testFile, List<TestFile> files) {
Disposable compileDisposable = createDisposable("compileA");
CompilerConfiguration configuration = createConfiguration(
ConfigurationKind.ALL, getTestJdkKind(files), Collections.singletonList(KotlinTestUtils.getAnnotationsJar()),
ConfigurationKind.ALL, getTestJdkKind(files), getBackend(),
Collections.singletonList(KotlinTestUtils.getAnnotationsJar()),
Collections.emptyList(), Collections.singletonList(testFile)
);
@@ -126,8 +126,9 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends CodegenTest
private ClassFileFactory compileB(@NotNull TestFile testFile, List<TestFile> files) {
String commonHeader = StringsKt.substringBefore(files.get(0).content, "FILE:", "");
CompilerConfiguration configuration = createConfiguration(
ConfigurationKind.ALL, getTestJdkKind(files), Lists.newArrayList(KotlinTestUtils.getAnnotationsJar(), aDir),
Collections.emptyList(), Lists.newArrayList(testFile, new TestFile("header", commonHeader))
ConfigurationKind.ALL, getTestJdkKind(files), getBackend(),
Arrays.asList(KotlinTestUtils.getAnnotationsJar(), aDir),
Collections.emptyList(), Arrays.asList(testFile, new TestFile("header", commonHeader))
);
configuration.put(CommonConfigurationKeys.MODULE_NAME, "b");
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt
+1 -1
View File
@@ -53,7 +53,7 @@ abstract class AbstractLightAnalysisModeTest : CodegenTestCase() {
assert(!relativePath.startsWith(".."))
val configuration = createConfiguration(
configurationKind, getTestJdkKind(files), listOf(getAnnotationsJar()), listOfNotNull(writeJavaFiles(files)), files
configurationKind, getTestJdkKind(files), backend, listOf(getAnnotationsJar()), listOfNotNull(writeJavaFiles(files)), files
)
val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
AnalysisHandlerExtension.registerExtension(environment.project, PartialAnalysisHandlerExtension())
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+2 -1
View File
@@ -101,6 +101,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
CompilerConfiguration configuration = createConfiguration(
configurationKind,
testJdkKind,
getBackend(),
Collections.singletonList(getAnnotationsJar()),
ArraysKt.filterNotNull(javaSourceRoots),
testFilesWithConfigurationDirectives
@@ -494,7 +495,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
}
CompilerConfiguration configuration = createConfiguration(
configurationKind, getTestJdkKind(files),
configurationKind, getTestJdkKind(files), getBackend(),
classpath,
ArraysKt.filterNotNull(new File[] {javaSourceDir}),
files
compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt
+2 -1
View File
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar
import org.jetbrains.kotlin.test.TargetBackend
import java.io.File
import java.util.*
@@ -75,7 +76,7 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() {
}
val configuration = createConfiguration(
configurationKind, jdkKind,
configurationKind, jdkKind, backend,
listOf<File>(getAnnotationsJar()),
listOfNotNull(writeJavaFiles(files)),
files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt
+2 -1
View File
@@ -82,9 +82,10 @@ abstract class KotlinBaseTest<F : KotlinBaseTest.TestFile> : KtUsefulTestCase()
protected open fun configureTestSpecific(configuration: CompilerConfiguration, testFiles: List<TestFile>) {}
protected open fun createConfiguration(
protected fun createConfiguration(
kind: ConfigurationKind,
jdkKind: TestJdkKind,
backend: TargetBackend,
classpath: List<File?>,
javaSource: List<File?>,
testFilesWithConfigurationDirectives: List<TestFile>