[Spec tests] Small clean-up CheckerTestUtil and around it

This commit is contained in:
Victor Petukhov
2020-03-27 16:55:06 +03:00
parent 90d1cdf2e1
commit a29385e758
8 changed files with 110 additions and 167 deletions
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.checkers.diagnostics.TextDiagnostic
import org.jetbrains.kotlin.checkers.diagnostics.factories.DebugInfoDiagnosticFactory0
import org.jetbrains.kotlin.checkers.diagnostics.factories.SyntaxErrorDiagnosticFactory
import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil
import org.jetbrains.kotlin.checkers.utils.DiagnosticsRenderingConfiguration
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.config.LanguageFeature
@@ -260,8 +261,11 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
ktFile,
markDynamicCalls,
dynamicCallDescriptors,
newInferenceEnabled,
languageVersionSettings,
DiagnosticsRenderingConfiguration(
platform = null,
withNewInference,
languageVersionSettings,
),
DataFlowValueFactoryImpl(languageVersionSettings),
moduleDescriptor,
this.diagnosedRangesToDiagnosticNames
@@ -11,8 +11,8 @@ import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.checkers.diagnostics.ActualDiagnostic
import org.jetbrains.kotlin.checkers.diagnostics.TextDiagnostic
import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil
import org.jetbrains.kotlin.checkers.utils.DiagnosticsRenderingConfiguration
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
import org.jetbrains.kotlin.test.ConfigurationKind
@@ -43,9 +43,7 @@ private abstract class Test(private vararg val expectedMessages: String) {
bindingContext, psiFile,
false,
mutableListOf(),
null,
false,
languageVersionSettings,
DiagnosticsRenderingConfiguration(null, false, languageVersionSettings),
dataFlowValueFactory,
emptyModule
)
@@ -59,9 +57,7 @@ private abstract class Test(private vararg val expectedMessages: String) {
psiFile,
false,
mutableListOf(),
null,
false,
languageVersionSettings,
DiagnosticsRenderingConfiguration(null, false, languageVersionSettings),
dataFlowValueFactory,
emptyModule
)