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

Move 'extractConfigurationKind' to base class, use it in KotlinMultiFileTestWithJava

Browse Source
This commit is contained in:
Mikhael Bogdanov
2020-02-27 14:34:10 +01:00
parent 7040857d77
commit dbdc4d9ee0
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
+1 -1
View File
@@ -45,7 +45,7 @@ abstract class KotlinMultiFileTestWithJava<M : KotlinBaseTest.TestModule, F : Ko
files: List<F>
): KotlinCoreEnvironment {
val configuration = KotlinTestUtils.newConfiguration(
getConfigurationKind(),
extractConfigurationKind(files),
getTestJdkKind(files),
getClasspath(file),
if (isJavaSourceRootNeeded()) listOf(javaFilesDir) else emptyList()
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
-18
View File
@@ -727,24 +727,6 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
}
}
protected ConfigurationKind extractConfigurationKind(@NotNull List<TestFile> files) {
boolean addRuntime = false;
boolean addReflect = false;
for (TestFile file : files) {
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_RUNTIME")) {
addRuntime = true;
}
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_REFLECT")) {
addReflect = true;
}
}
return addReflect ? ConfigurationKind.ALL :
addRuntime ? ConfigurationKind.NO_KOTLIN_REFLECT :
ConfigurationKind.JDK_ONLY;
}
@NotNull
protected static List<String> extractJavacOptions(@NotNull List<TestFile> files) {
List<String> javacOptions = new ArrayList<>(0);
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt
+15
View File
@@ -55,6 +55,21 @@ abstract class KotlinBaseTest<F : KotlinBaseTest.TestFile> : KtUsefulTestCase()
return TestJdkKind.MOCK_JDK
}
protected open fun extractConfigurationKind(files: List<F>): ConfigurationKind {
var addRuntime = false
var addReflect = false
for (file in files) {
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_RUNTIME")) {
addRuntime = true
}
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_REFLECT")) {
addReflect = true
}
}
return if (addReflect) ConfigurationKind.ALL else if (addRuntime) ConfigurationKind.NO_KOTLIN_REFLECT else ConfigurationKind.JDK_ONLY
}
open class TestFile(@JvmField val name: String, @JvmField val content: String) : Comparable<TestFile> {
override operator fun compareTo(other: TestFile): Int {
return name.compareTo(other.name)