From 59679476f66f31f6499ff717d76b93e6c0f1b787 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Tue, 25 Feb 2020 15:05:00 +0100
Subject: [PATCH] Always create test files, directive processing would be based
 on them

 This is required for extracted 'getTestJdkKind' in previous commits
---
 .../kotlin/asJava/AbstractCompilerLightClassTest.kt       | 2 +-
 .../kotlin/checkers/KotlinMultiFileTestWithJava.kt        | 2 +-
 .../org/jetbrains/kotlin/visualizer/AbstractVisualizer.kt | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.kt
index 47626d379ad..6d2b3100d65 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.kt
@@ -59,7 +59,7 @@ abstract class AbstractCompilerLightClassTest : KotlinMultiFileTestWithJava<Kotl
         fileName: String,
         text: String,
         directives: Map<String, String>
-    ): TestFile? = null
+    ): TestFile = TestFile(fileName, text)
 
     companion object {
         fun findLightClass(allowFrontendExceptions: Boolean, environment: KotlinCoreEnvironment, fqname: String): PsiClass? {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
index e0117dd4ba8..65edf722fb7 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
@@ -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 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(
         file: File,
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizer.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizer.kt
index 56a6a5f6cbd..84371cb9cca 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizer.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizer.kt
@@ -22,8 +22,8 @@ abstract class AbstractVisualizer : KotlinMultiFileTestWithJava<KotlinBaseTest.T
     ): TestModule? = null
 
 
-    override fun createTestFile(module: TestModule?, fileName: String, text: String, directives: Map<String, String>): TestFile? =
-        null
+    override fun createTestFile(module: TestModule?, fileName: String, text: String, directives: Map<String, String>): TestFile =
+        TestFile(fileName, text)
 
 
     override fun doMultiFileTest(wholeFile: File, files: List<TestFile>) {
@@ -37,10 +37,6 @@ abstract class AbstractVisualizer : KotlinMultiFileTestWithJava<KotlinBaseTest.T
         return true
     }
 
-    override fun getTestJdkKind(files: List<TestFile>): TestJdkKind {
-        return TestJdkKind.FULL_JDK
-    }
-
     override fun getConfigurationKind(): ConfigurationKind {
         return ConfigurationKind.ALL
     }