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

Always create test files, directive processing would be based on them

Browse Source 
This is required for extracted 'getTestJdkKind' in previous commits
This commit is contained in:
Mikhael Bogdanov
2020-02-25 15:05:00 +01:00
parent dbdc4d9ee0
commit 59679476f6
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.kt
+1 -1
View File
@@ -59,7 +59,7 @@ abstract class AbstractCompilerLightClassTest : KotlinMultiFileTestWithJava<Kotl
fileName: String, fileName: String,
text: String, text: String,
directives: Map<String, String> directives: Map<String, String>
): TestFile? = null ): TestFile = TestFile(fileName, text)
companion object { companion object {
fun findLightClass(allowFrontendExceptions: Boolean, environment: KotlinCoreEnvironment, fqname: String): PsiClass? { fun findLightClass(allowFrontendExceptions: Boolean, environment: KotlinCoreEnvironment, fqname: String): PsiClass? {
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
+1 -1
View File
@@ -121,7 +121,7 @@ abstract class KotlinMultiFileTestWithJava<M : KotlinBaseTest.TestModule, F : Ko
protected abstract fun createTestModule(name: String, dependencies: List<String>, friends: List<String>): M? protected abstract fun createTestModule(name: String, dependencies: List<String>, friends: List<String>): M?
protected abstract fun createTestFile(module: M?, fileName: String, text: String, directives: Map<String, String>): F? protected abstract fun createTestFile(module: M?, fileName: String, text: String, directives: Map<String, String>): F
protected open fun createTestFiles( protected open fun createTestFiles(
file: File, file: File,
compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizer.kt
+2 -6
View File
@@ -22,8 +22,8 @@ abstract class AbstractVisualizer : KotlinMultiFileTestWithJava<KotlinBaseTest.T
): TestModule? = null ): TestModule? = null
override fun createTestFile(module: TestModule?, fileName: String, text: String, directives: Map<String, String>): TestFile? = override fun createTestFile(module: TestModule?, fileName: String, text: String, directives: Map<String, String>): TestFile =
null TestFile(fileName, text)
override fun doMultiFileTest(wholeFile: File, files: List<TestFile>) { override fun doMultiFileTest(wholeFile: File, files: List<TestFile>) {
@@ -37,10 +37,6 @@ abstract class AbstractVisualizer : KotlinMultiFileTestWithJava<KotlinBaseTest.T
return true return true
} }
override fun getTestJdkKind(files: List<TestFile>): TestJdkKind {
return TestJdkKind.FULL_JDK
}
override fun getConfigurationKind(): ConfigurationKind { override fun getConfigurationKind(): ConfigurationKind {
return ConfigurationKind.ALL return ConfigurationKind.ALL
} }