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

Diagnostic tests: create fieldRename subDir and use it for related tests

Browse Source 
Related to: KT-55846, KT-50082, KT-55436, KT-55017
This commit is contained in:
Mikhail Glukhikh
2023-01-10 13:34:37 +01:00
committed by Space Team
parent 35c0a3d391
commit f6bd4d5e15
18 changed files with 160 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
Generated
+40 -30
View File
@@ -213,18 +213,6 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
runTest("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt");
}
@Test
@TestMetadata("derivedIntersectionPropertyShadowsBaseClassField.kt")
public void testDerivedIntersectionPropertyShadowsBaseClassField() throws Exception {
@@ -411,24 +399,6 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
@Test
@TestMetadata("kt11167.kt")
public void testKt11167() throws Exception {
@@ -11495,6 +11465,46 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/fieldRename")
@TestDataPath("$PROJECT_ROOT")
public class FieldRename {
@Test
public void testAllFilesPresentInFieldRename() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/fieldRename"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/funInterface")
@TestDataPath("$PROJECT_ROOT")
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+40 -30
View File
@@ -213,18 +213,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt");
}
@Test
@TestMetadata("derivedIntersectionPropertyShadowsBaseClassField.kt")
public void testDerivedIntersectionPropertyShadowsBaseClassField() throws Exception {
@@ -411,24 +399,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
@Test
@TestMetadata("kt11167.kt")
public void testKt11167() throws Exception {
@@ -11501,6 +11471,46 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/fieldRename")
@TestDataPath("$PROJECT_ROOT")
public class FieldRename {
@Test
public void testAllFilesPresentInFieldRename() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/fieldRename"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/funInterface")
@TestDataPath("$PROJECT_ROOT")
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+40 -30
View File
@@ -213,18 +213,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt");
}
@Test
@TestMetadata("derivedIntersectionPropertyShadowsBaseClassField.kt")
public void testDerivedIntersectionPropertyShadowsBaseClassField() throws Exception {
@@ -411,24 +399,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
@Test
@TestMetadata("kt11167.kt")
public void testKt11167() throws Exception {
@@ -11495,6 +11465,46 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/fieldRename")
@TestDataPath("$PROJECT_ROOT")
public class FieldRename {
@Test
public void testAllFilesPresentInFieldRename() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/fieldRename"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/funInterface")
@TestDataPath("$PROJECT_ROOT")
compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.fir.kt → compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.fir.kt
Vendored
View File
compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt → compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt
Vendored
View File
compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.txt → compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.txt
Vendored
View File
compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt → compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt
Vendored
View File
compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.txt → compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.txt
Vendored
View File
compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.fir.kt → compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.fir.kt
Vendored
View File
compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt → compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt
Vendored
View File
compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.txt → compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.txt
Vendored
View File
compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.fir.kt → compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.fir.kt
Vendored
View File
compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt → compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt
Vendored
View File
compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.txt → compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.txt
Vendored
View File
compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.fir.kt → compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.fir.kt
Vendored
View File
compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt → compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt
Vendored
View File
compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.txt → compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.txt
Vendored
View File
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+40 -30
View File
@@ -213,18 +213,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt");
}
@Test
@TestMetadata("derivedIntersectionPropertyShadowsBaseClassField.kt")
public void testDerivedIntersectionPropertyShadowsBaseClassField() throws Exception {
@@ -411,24 +399,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
@Test
@TestMetadata("kt11167.kt")
public void testKt11167() throws Exception {
@@ -11501,6 +11471,46 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/fieldRename")
@TestDataPath("$PROJECT_ROOT")
public class FieldRename {
@Test
public void testAllFilesPresentInFieldRename() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/fieldRename"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt");
}
@Test
@TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
}
@Test
@TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
runTest("compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/funInterface")
@TestDataPath("$PROJECT_ROOT")