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

Tests: move more diagnostic tests to testsWithJvmBackend

Browse Source 
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
2024-03-12 12:25:42 +01:00
committed by Space Team
parent 56a1a3153b
commit d986e0ee9c
43 changed files with 296 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
-54
View File
@@ -22447,12 +22447,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
}
@Test
@TestMetadata("charAtAndOverload.kt")
public void testCharAtAndOverload() {
runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt");
}
@Test
@TestMetadata("charAtAndOverloadWithoutExplicitOverride.kt")
public void testCharAtAndOverloadWithoutExplicitOverride() {
@@ -22561,12 +22555,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
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() {
@@ -25956,12 +25944,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
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() {
@@ -42456,24 +42438,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
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")
@@ -42483,24 +42447,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
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() {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
-54
View File
@@ -22453,12 +22453,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
}
@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 FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
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() {
@@ -25962,12 +25950,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
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() {
@@ -42594,24 +42576,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
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")
@@ -42621,24 +42585,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
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() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+74
View File
@@ -288,6 +288,12 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra
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() {
@@ -538,6 +544,12 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("charAtAndOverload.kt")
public void testCharAtAndOverload() {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.kt");
}
@Test
@TestMetadata("inheritFromJavaCollectionSubclassWithContainsOverload.kt")
public void testInheritFromJavaCollectionSubclassWithContainsOverload() {
@@ -550,6 +562,12 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra
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() {
@@ -573,6 +591,62 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra
}
}
@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("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), 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("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), 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")
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+74
View File
@@ -288,6 +288,12 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP
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() {
@@ -538,6 +544,12 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("charAtAndOverload.kt")
public void testCharAtAndOverload() {
runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.kt");
}
@Test
@TestMetadata("inheritFromJavaCollectionSubclassWithContainsOverload.kt")
public void testInheritFromJavaCollectionSubclassWithContainsOverload() {
@@ -550,6 +562,12 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP
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() {
@@ -573,6 +591,62 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP
}
}
@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("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), 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("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), 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")