Tests: move more diagnostic tests to testsWithJvmBackend
In this commit, tests where backend diagnostics were reported correctly are being moved. FirScopeDumpHandler was added to FIR diagnostic tests with JVM backend to support `SCOPE_DUMP` in `overridesBuiltinNoMagic.kt` and `charAtAndOverload.kt`.
This commit is contained in:
Alexander Udalov
committed by
Space Team
Space Team
parent
56a1a3153b
commit
d986e0ee9c
Generated
-54
@@ -22453,12 +22453,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("charAtAndOverload.kt")
|
||||
public void testCharAtAndOverload() {
|
||||
runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("charAtAndOverloadWithoutExplicitOverride.kt")
|
||||
public void testCharAtAndOverloadWithoutExplicitOverride() {
|
||||
@@ -22567,12 +22561,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
|
||||
runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/nonDirectHiddenOverride.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("overridesBuiltinNoMagic.kt")
|
||||
public void testOverridesBuiltinNoMagic() {
|
||||
runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("removeAt.kt")
|
||||
public void testRemoveAt() {
|
||||
@@ -28258,12 +28246,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
|
||||
runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("ConflictingOverloadsIdenticalFunsTPInClass.kt")
|
||||
public void testConflictingOverloadsIdenticalFunsTPInClass() {
|
||||
runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt")
|
||||
public void testConflictingOverloadsIdenticalValsInClass() {
|
||||
@@ -44890,24 +44872,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
|
||||
runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jvmOverloads.kt")
|
||||
public void testJvmOverloads() {
|
||||
runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jvmStaticInClassObject.kt")
|
||||
public void testJvmStaticInClassObject() {
|
||||
runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jvmStaticInObject.kt")
|
||||
public void testJvmStaticInObject() {
|
||||
runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt");
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
@@ -44917,24 +44881,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jjk.kt")
|
||||
public void testJjk() {
|
||||
runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jk.kt")
|
||||
public void testJk() {
|
||||
runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jkjk.kt")
|
||||
public void testJkjk() {
|
||||
runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt")
|
||||
public void testKotlinMembersVsJavaNonVisibleStatics() {
|
||||
|
||||
+74
@@ -289,6 +289,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("differentTypeParameterLists.kt")
|
||||
public void testDifferentTypeParameterLists() {
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/differentTypeParameterLists.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("extensionProperties.kt")
|
||||
public void testExtensionProperties() {
|
||||
@@ -539,6 +545,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("charAtAndOverload.kt")
|
||||
public void testCharAtAndOverload() {
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("inheritFromJavaCollectionSubclassWithContainsOverload.kt")
|
||||
public void testInheritFromJavaCollectionSubclassWithContainsOverload() {
|
||||
@@ -551,6 +563,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("overridesBuiltinNoMagic.kt")
|
||||
public void testOverridesBuiltinNoMagic() {
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("supertypeDifferentParameterNullability.kt")
|
||||
public void testSupertypeDifferentParameterNullability() {
|
||||
@@ -574,6 +592,62 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class JvmOverloads {
|
||||
@Test
|
||||
public void testAllFilesPresentInJvmOverloads() {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jvmOverloads.kt")
|
||||
public void testJvmOverloads() {
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class JvmStatic {
|
||||
@Test
|
||||
public void testAllFilesPresentInJvmStatic() {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jjk.kt")
|
||||
public void testJjk() {
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jk.kt")
|
||||
public void testJk() {
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jkjk.kt")
|
||||
public void testJkjk() {
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jvmStaticInCompanionObject.kt")
|
||||
public void testJvmStaticInCompanionObject() {
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("jvmStaticInObject.kt")
|
||||
public void testJvmStaticInObject() {
|
||||
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
|
||||
+5
-2
@@ -22,13 +22,13 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter
|
||||
import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
|
||||
import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact
|
||||
import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler
|
||||
import org.jetbrains.kotlin.test.frontend.classic.handlers.DeclarationsDumpHandler
|
||||
import org.jetbrains.kotlin.test.frontend.classic.handlers.FirTestDataConsistencyHandler
|
||||
import org.jetbrains.kotlin.test.frontend.classic.handlers.OldNewInferenceMetaInfoProcessor
|
||||
import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter
|
||||
import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
|
||||
import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact
|
||||
import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler
|
||||
import org.jetbrains.kotlin.test.frontend.fir.handlers.FirScopeDumpHandler
|
||||
import org.jetbrains.kotlin.test.frontend.fir.handlers.PsiLightTreeMetaInfoProcessor
|
||||
import org.jetbrains.kotlin.test.model.*
|
||||
import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
|
||||
@@ -80,7 +80,10 @@ abstract class AbstractDiagnosticsTestWithJvmBackend<R : ResultingArtifact.Front
|
||||
} else {
|
||||
useMetaInfoProcessors(::PsiLightTreeMetaInfoProcessor)
|
||||
firHandlersStep {
|
||||
useHandlers(::FirDiagnosticsHandler)
|
||||
useHandlers(
|
||||
::FirDiagnosticsHandler,
|
||||
::FirScopeDumpHandler,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user