From ea93d23dca937e9ec6cb4c8d452814c8553a974f Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Thu, 30 Sep 2021 16:18:01 +0300 Subject: [PATCH] [FIR] Move fir plugin tests to `diagnostics` sub directory --- .../kotlin/generators/tests/GenerateTests.kt | 2 +- .../checkers/signedNumbersCheckers.fir.txt | 0 .../checkers/signedNumbersCheckers.kt | 0 .../{ => diagnostics}/checkers/simple.fir.txt | 0 .../{ => diagnostics}/checkers/simple.kt | 0 ...WithGeneratedMembersAndNestedClass.fir.txt | 0 ...classWithGeneratedMembersAndNestedClass.kt | 0 ...edClassWithMembersAndNestedClasses.fir.txt | 0 ...neratedClassWithMembersAndNestedClasses.kt | 0 .../memberGen/topLevelCallables.fir.txt | 0 .../memberGen/topLevelCallables.kt | 0 .../status/metaAnnotation.fir.txt | 0 .../status/metaAnnotation.kt | 0 .../status/simpleAnnotation.fir.txt | 0 .../status/simpleAnnotation.kt | 0 .../status/visibilityTransformation.fir.txt | 0 .../status/visibilityTransformation.kt | 0 .../supertypes/simple.fir.txt | 0 .../{ => diagnostics}/supertypes/simple.kt | 0 .../FirAllOpenDiagnosticTestGenerated.java | 40 +++++++++---------- 20 files changed, 21 insertions(+), 21 deletions(-) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/checkers/signedNumbersCheckers.fir.txt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/checkers/signedNumbersCheckers.kt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/checkers/simple.fir.txt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/checkers/simple.kt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/memberGen/classWithGeneratedMembersAndNestedClass.fir.txt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/memberGen/classWithGeneratedMembersAndNestedClass.kt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/memberGen/generatedClassWithMembersAndNestedClasses.fir.txt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/memberGen/generatedClassWithMembersAndNestedClasses.kt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/memberGen/topLevelCallables.fir.txt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/memberGen/topLevelCallables.kt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/status/metaAnnotation.fir.txt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/status/metaAnnotation.kt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/status/simpleAnnotation.fir.txt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/status/simpleAnnotation.kt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/status/visibilityTransformation.fir.txt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/status/visibilityTransformation.kt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/supertypes/simple.fir.txt (100%) rename plugins/fir/fir-plugin-prototype/testData/{ => diagnostics}/supertypes/simple.kt (100%) diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index ac70f94343c..68568c9df8b 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -371,7 +371,7 @@ fun main(args: Array) { testGroup("plugins/fir/fir-plugin-prototype/tests-gen", "plugins/fir/fir-plugin-prototype/testData") { testClass { - model("") + model("diagnostics") } } } diff --git a/plugins/fir/fir-plugin-prototype/testData/checkers/signedNumbersCheckers.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/signedNumbersCheckers.fir.txt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/checkers/signedNumbersCheckers.fir.txt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/signedNumbersCheckers.fir.txt diff --git a/plugins/fir/fir-plugin-prototype/testData/checkers/signedNumbersCheckers.kt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/signedNumbersCheckers.kt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/checkers/signedNumbersCheckers.kt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/signedNumbersCheckers.kt diff --git a/plugins/fir/fir-plugin-prototype/testData/checkers/simple.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/simple.fir.txt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/checkers/simple.fir.txt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/simple.fir.txt diff --git a/plugins/fir/fir-plugin-prototype/testData/checkers/simple.kt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/simple.kt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/checkers/simple.kt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/simple.kt diff --git a/plugins/fir/fir-plugin-prototype/testData/memberGen/classWithGeneratedMembersAndNestedClass.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.fir.txt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/memberGen/classWithGeneratedMembersAndNestedClass.fir.txt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.fir.txt diff --git a/plugins/fir/fir-plugin-prototype/testData/memberGen/classWithGeneratedMembersAndNestedClass.kt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.kt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/memberGen/classWithGeneratedMembersAndNestedClass.kt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.kt diff --git a/plugins/fir/fir-plugin-prototype/testData/memberGen/generatedClassWithMembersAndNestedClasses.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.fir.txt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/memberGen/generatedClassWithMembersAndNestedClasses.fir.txt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.fir.txt diff --git a/plugins/fir/fir-plugin-prototype/testData/memberGen/generatedClassWithMembersAndNestedClasses.kt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.kt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/memberGen/generatedClassWithMembersAndNestedClasses.kt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.kt diff --git a/plugins/fir/fir-plugin-prototype/testData/memberGen/topLevelCallables.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.fir.txt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/memberGen/topLevelCallables.fir.txt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.fir.txt diff --git a/plugins/fir/fir-plugin-prototype/testData/memberGen/topLevelCallables.kt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.kt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/memberGen/topLevelCallables.kt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.kt diff --git a/plugins/fir/fir-plugin-prototype/testData/status/metaAnnotation.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/status/metaAnnotation.fir.txt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/status/metaAnnotation.fir.txt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/status/metaAnnotation.fir.txt diff --git a/plugins/fir/fir-plugin-prototype/testData/status/metaAnnotation.kt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/status/metaAnnotation.kt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/status/metaAnnotation.kt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/status/metaAnnotation.kt diff --git a/plugins/fir/fir-plugin-prototype/testData/status/simpleAnnotation.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.fir.txt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/status/simpleAnnotation.fir.txt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.fir.txt diff --git a/plugins/fir/fir-plugin-prototype/testData/status/simpleAnnotation.kt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.kt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/status/simpleAnnotation.kt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.kt diff --git a/plugins/fir/fir-plugin-prototype/testData/status/visibilityTransformation.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.fir.txt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/status/visibilityTransformation.fir.txt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.fir.txt diff --git a/plugins/fir/fir-plugin-prototype/testData/status/visibilityTransformation.kt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.kt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/status/visibilityTransformation.kt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.kt diff --git a/plugins/fir/fir-plugin-prototype/testData/supertypes/simple.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes/simple.fir.txt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/supertypes/simple.fir.txt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes/simple.fir.txt diff --git a/plugins/fir/fir-plugin-prototype/testData/supertypes/simple.kt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes/simple.kt similarity index 100% rename from plugins/fir/fir-plugin-prototype/testData/supertypes/simple.kt rename to plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes/simple.kt diff --git a/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/FirAllOpenDiagnosticTestGenerated.java b/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/FirAllOpenDiagnosticTestGenerated.java index 9a2e95c099f..443d43d8175 100644 --- a/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/FirAllOpenDiagnosticTestGenerated.java +++ b/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/FirAllOpenDiagnosticTestGenerated.java @@ -16,105 +16,105 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("plugins/fir/fir-plugin-prototype/testData") +@TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") public class FirAllOpenDiagnosticTestGenerated extends AbstractFirAllOpenDiagnosticTest { @Test - public void testAllFilesPresentInTestData() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInDiagnostics() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Nested - @TestMetadata("plugins/fir/fir-plugin-prototype/testData/checkers") + @TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers") @TestDataPath("$PROJECT_ROOT") public class Checkers { @Test public void testAllFilesPresentInCheckers() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/checkers"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("signedNumbersCheckers.kt") public void testSignedNumbersCheckers() throws Exception { - runTest("plugins/fir/fir-plugin-prototype/testData/checkers/signedNumbersCheckers.kt"); + runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/signedNumbersCheckers.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("plugins/fir/fir-plugin-prototype/testData/checkers/simple.kt"); + runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/checkers/simple.kt"); } } @Nested - @TestMetadata("plugins/fir/fir-plugin-prototype/testData/memberGen") + @TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen") @TestDataPath("$PROJECT_ROOT") public class MemberGen { @Test public void testAllFilesPresentInMemberGen() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/memberGen"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("classWithGeneratedMembersAndNestedClass.kt") public void testClassWithGeneratedMembersAndNestedClass() throws Exception { - runTest("plugins/fir/fir-plugin-prototype/testData/memberGen/classWithGeneratedMembersAndNestedClass.kt"); + runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.kt"); } @Test @TestMetadata("generatedClassWithMembersAndNestedClasses.kt") public void testGeneratedClassWithMembersAndNestedClasses() throws Exception { - runTest("plugins/fir/fir-plugin-prototype/testData/memberGen/generatedClassWithMembersAndNestedClasses.kt"); + runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.kt"); } @Test @TestMetadata("topLevelCallables.kt") public void testTopLevelCallables() throws Exception { - runTest("plugins/fir/fir-plugin-prototype/testData/memberGen/topLevelCallables.kt"); + runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.kt"); } } @Nested - @TestMetadata("plugins/fir/fir-plugin-prototype/testData/status") + @TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics/status") @TestDataPath("$PROJECT_ROOT") public class Status { @Test public void testAllFilesPresentInStatus() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/status"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics/status"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("metaAnnotation.kt") public void testMetaAnnotation() throws Exception { - runTest("plugins/fir/fir-plugin-prototype/testData/status/metaAnnotation.kt"); + runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/status/metaAnnotation.kt"); } @Test @TestMetadata("simpleAnnotation.kt") public void testSimpleAnnotation() throws Exception { - runTest("plugins/fir/fir-plugin-prototype/testData/status/simpleAnnotation.kt"); + runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.kt"); } @Test @TestMetadata("visibilityTransformation.kt") public void testVisibilityTransformation() throws Exception { - runTest("plugins/fir/fir-plugin-prototype/testData/status/visibilityTransformation.kt"); + runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.kt"); } } @Nested - @TestMetadata("plugins/fir/fir-plugin-prototype/testData/supertypes") + @TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes") @TestDataPath("$PROJECT_ROOT") public class Supertypes { @Test public void testAllFilesPresentInSupertypes() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/supertypes"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("plugins/fir/fir-plugin-prototype/testData/supertypes/simple.kt"); + runTest("plugins/fir/fir-plugin-prototype/testData/diagnostics/supertypes/simple.kt"); } } }