From 32c8664f716ed974041657a99810877369f1dbe8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 12 Mar 2024 16:27:08 +0100 Subject: [PATCH] Tests: remove JVM diagnostics from AbstractDiagnosticsTest There's no behavior specific for JVM backend diagnostics in any of the affected tests, and this code is using an incorrect way to obtain those diagnostics, so it should be removed anyway. --- .../checkers/AbstractDiagnosticsTest.kt | 5 ---- .../kotlin/checkers/BaseDiagnosticsTest.kt | 26 +------------------ ...hNonStableParameterNamesDiagnosticsTest.kt | 3 --- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt index c0e7aa4f2cd..580807aad65 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt @@ -74,7 +74,6 @@ import org.junit.Assert import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream -import java.util.* import java.util.function.Predicate import java.util.regex.Pattern @@ -206,7 +205,6 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { moduleBindingContext, implementingModulesBindings, actualText, - shouldSkipJvmSignatureDiagnostics(groupedByModule) || isCommonModule, languageVersionSettingsByModule[module]!!, moduleDescriptor ) @@ -353,9 +351,6 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { } } - protected open fun shouldSkipJvmSignatureDiagnostics(groupedByModule: Map>): Boolean = - groupedByModule.size > 1 - private fun checkLazyResolveLog(lazyOperationsLog: LazyOperationsLog, testDataFile: File): Throwable? = try { val expectedFile = getLazyLogFile(testDataFile) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt index 4200b841cce..26ecf17fefe 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt @@ -9,7 +9,6 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.Condition import com.intellij.openapi.util.Conditions import com.intellij.openapi.util.TextRange -import com.intellij.psi.util.PsiTreeUtil import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest.TestFile import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest.TestModule @@ -21,7 +20,6 @@ import org.jetbrains.kotlin.checkers.diagnostics.factories.SyntaxErrorDiagnostic 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.cli.jvm.compiler.getJvmSignatureDiagnostics import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl @@ -33,7 +31,6 @@ import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.platform.konan.NativePlatforms -import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactoryImpl @@ -234,7 +231,6 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava>, actualText: StringBuilder, - skipJvmSignatureDiagnostics: Boolean, languageVersionSettings: LanguageVersionSettings, moduleDescriptor: ModuleDescriptorImpl ): Boolean { @@ -247,12 +243,6 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava() - else - computeJvmSignatureDiagnostics(bindingContext) - val ok = booleanArrayOf(true) val withNewInference = newInferenceEnabled && withNewInferenceDirective && !USE_OLD_INFERENCE_DIAGNOSTICS_FOR_NI val diagnostics = CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors( @@ -272,7 +262,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava { - val jvmSignatureDiagnostics = HashSet() - val declarations = PsiTreeUtil.findChildrenOfType(ktFile, KtDeclaration::class.java) - for (declaration in declarations) { - val diagnostics = getJvmSignatureDiagnostics( - declaration, - bindingContext.diagnostics, - ) ?: continue - - jvmSignatureDiagnostics.addAll(diagnostics.forElement(declaration).map { ActualDiagnostic(it, null, newInferenceEnabled) }) - } - return jvmSignatureDiagnostics - } - override fun toString(): String = ktFile?.name ?: "Java file" } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/InteropFunctionsWithNonStableParameterNamesDiagnosticsTest.kt b/compiler/tests/org/jetbrains/kotlin/checkers/InteropFunctionsWithNonStableParameterNamesDiagnosticsTest.kt index e0f2e3f9baf..9d66b6c7636 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/InteropFunctionsWithNonStableParameterNamesDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/InteropFunctionsWithNonStableParameterNamesDiagnosticsTest.kt @@ -43,8 +43,6 @@ class InteropFunctionsWithNonStableParameterNamesDiagnosticsTest : AbstractDiagn klibFile = prepareKlibWithNonStableParameterNames(tmpDir) } - override fun shouldSkipJvmSignatureDiagnostics(groupedByModule: Map>) = true - override fun getEnvironmentConfigFiles(): EnvironmentConfigFiles = EnvironmentConfigFiles.METADATA_CONFIG_FILES override fun createModule(moduleName: String, storageManager: StorageManager): ModuleDescriptorImpl = @@ -129,4 +127,3 @@ class InteropFunctionsWithNonStableParameterNamesDiagnosticsTest : AbstractDiagn } } -