From 4266ffa27440a7df92c3c47157a03923b5802c6d Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Sat, 23 Oct 2021 23:22:31 -0700 Subject: [PATCH] FIR IDE: fix typo in test directory (overridden) --- ...iddenDeclarationProviderTestGenerated.java | 26 +++++++++---------- ...iddenDeclarationProviderTestGenerated.java | 26 +++++++++---------- .../backingField.kt | 0 .../backingField.txt | 0 .../inAnonymousClass.kt | 0 .../inAnonymousClass.txt | 0 .../inLocalClass.kt | 0 .../inLocalClass.txt | 0 .../inOtherFile.kt | 0 .../inOtherFile.txt | 0 .../intersectionOverride.kt | 0 .../intersectionOverride.txt | 0 .../intersectionOverride2.kt | 0 .../intersectionOverride2.txt | 0 .../javaAccessors.kt | 0 .../javaAccessors.txt | 0 .../multipleInterfaces.kt | 0 .../multipleInterfaces.txt | 0 .../onEnumEntry.kt | 0 .../onEnumEntry.txt | 0 .../sequenceOfOverrides.kt | 0 .../sequenceOfOverrides.txt | 0 .../analysis/api/GenerateAnalysisApiTests.kt | 4 +-- 23 files changed, 28 insertions(+), 28 deletions(-) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/backingField.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/backingField.txt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/inAnonymousClass.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/inAnonymousClass.txt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/inLocalClass.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/inLocalClass.txt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/inOtherFile.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/inOtherFile.txt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/intersectionOverride.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/intersectionOverride.txt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/intersectionOverride2.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/intersectionOverride2.txt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/javaAccessors.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/javaAccessors.txt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/multipleInterfaces.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/multipleInterfaces.txt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/onEnumEntry.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/onEnumEntry.txt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/sequenceOfOverrides.kt (100%) rename analysis/analysis-api/testData/components/{overridenDeclarations => overriddenDeclarations}/sequenceOfOverrides.txt (100%) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10OverriddenDeclarationProviderTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10OverriddenDeclarationProviderTestGenerated.java index 4ab1d6c7d89..bf43d54ec8c 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10OverriddenDeclarationProviderTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10OverriddenDeclarationProviderTestGenerated.java @@ -16,71 +16,71 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/overridenDeclarations") +@TestMetadata("analysis/analysis-api/testData/components/overriddenDeclarations") @TestDataPath("$PROJECT_ROOT") public class KtFe10OverriddenDeclarationProviderTestGenerated extends AbstractKtFe10OverriddenDeclarationProviderTest { @Test - public void testAllFilesPresentInOverridenDeclarations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/overridenDeclarations"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInOverriddenDeclarations() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/overriddenDeclarations"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("backingField.kt") public void testBackingField() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/backingField.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/backingField.kt"); } @Test @TestMetadata("inAnonymousClass.kt") public void testInAnonymousClass() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/inAnonymousClass.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inAnonymousClass.kt"); } @Test @TestMetadata("inLocalClass.kt") public void testInLocalClass() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/inLocalClass.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inLocalClass.kt"); } @Test @TestMetadata("inOtherFile.kt") public void testInOtherFile() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/inOtherFile.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inOtherFile.kt"); } @Test @TestMetadata("intersectionOverride.kt") public void testIntersectionOverride() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride.kt"); } @Test @TestMetadata("intersectionOverride2.kt") public void testIntersectionOverride2() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride2.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride2.kt"); } @Test @TestMetadata("javaAccessors.kt") public void testJavaAccessors() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/javaAccessors.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/javaAccessors.kt"); } @Test @TestMetadata("multipleInterfaces.kt") public void testMultipleInterfaces() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/multipleInterfaces.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/multipleInterfaces.kt"); } @Test @TestMetadata("onEnumEntry.kt") public void testOnEnumEntry() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/onEnumEntry.kt"); } @Test @TestMetadata("sequenceOfOverrides.kt") public void testSequenceOfOverrides() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/sequenceOfOverrides.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/sequenceOfOverrides.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirOverriddenDeclarationProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirOverriddenDeclarationProviderTestGenerated.java index 996fe883ed1..c41b90fdd61 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirOverriddenDeclarationProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirOverriddenDeclarationProviderTestGenerated.java @@ -16,71 +16,71 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/overridenDeclarations") +@TestMetadata("analysis/analysis-api/testData/components/overriddenDeclarations") @TestDataPath("$PROJECT_ROOT") public class FirOverriddenDeclarationProviderTestGenerated extends AbstractFirOverriddenDeclarationProviderTest { @Test - public void testAllFilesPresentInOverridenDeclarations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/overridenDeclarations"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInOverriddenDeclarations() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/overriddenDeclarations"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("backingField.kt") public void testBackingField() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/backingField.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/backingField.kt"); } @Test @TestMetadata("inAnonymousClass.kt") public void testInAnonymousClass() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/inAnonymousClass.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inAnonymousClass.kt"); } @Test @TestMetadata("inLocalClass.kt") public void testInLocalClass() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/inLocalClass.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inLocalClass.kt"); } @Test @TestMetadata("inOtherFile.kt") public void testInOtherFile() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/inOtherFile.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inOtherFile.kt"); } @Test @TestMetadata("intersectionOverride.kt") public void testIntersectionOverride() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride.kt"); } @Test @TestMetadata("intersectionOverride2.kt") public void testIntersectionOverride2() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride2.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride2.kt"); } @Test @TestMetadata("javaAccessors.kt") public void testJavaAccessors() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/javaAccessors.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/javaAccessors.kt"); } @Test @TestMetadata("multipleInterfaces.kt") public void testMultipleInterfaces() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/multipleInterfaces.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/multipleInterfaces.kt"); } @Test @TestMetadata("onEnumEntry.kt") public void testOnEnumEntry() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/onEnumEntry.kt"); } @Test @TestMetadata("sequenceOfOverrides.kt") public void testSequenceOfOverrides() throws Exception { - runTest("analysis/analysis-api/testData/components/overridenDeclarations/sequenceOfOverrides.kt"); + runTest("analysis/analysis-api/testData/components/overriddenDeclarations/sequenceOfOverrides.kt"); } } diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/backingField.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/backingField.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/backingField.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/backingField.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/backingField.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/backingField.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/backingField.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/backingField.txt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/inAnonymousClass.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/inAnonymousClass.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/inAnonymousClass.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/inAnonymousClass.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/inAnonymousClass.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/inAnonymousClass.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/inAnonymousClass.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/inAnonymousClass.txt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/inLocalClass.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/inLocalClass.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/inLocalClass.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/inLocalClass.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/inLocalClass.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/inLocalClass.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/inLocalClass.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/inLocalClass.txt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/inOtherFile.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/inOtherFile.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/inOtherFile.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/inOtherFile.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/inOtherFile.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/inOtherFile.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/inOtherFile.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/inOtherFile.txt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride.txt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride2.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride2.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride2.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride2.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride2.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride2.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/intersectionOverride2.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride2.txt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/javaAccessors.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/javaAccessors.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/javaAccessors.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/javaAccessors.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/javaAccessors.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/javaAccessors.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/javaAccessors.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/javaAccessors.txt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/multipleInterfaces.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/multipleInterfaces.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/multipleInterfaces.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/multipleInterfaces.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/multipleInterfaces.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/multipleInterfaces.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/multipleInterfaces.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/multipleInterfaces.txt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/onEnumEntry.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/onEnumEntry.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/onEnumEntry.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/onEnumEntry.txt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/sequenceOfOverrides.kt b/analysis/analysis-api/testData/components/overriddenDeclarations/sequenceOfOverrides.kt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/sequenceOfOverrides.kt rename to analysis/analysis-api/testData/components/overriddenDeclarations/sequenceOfOverrides.kt diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/sequenceOfOverrides.txt b/analysis/analysis-api/testData/components/overriddenDeclarations/sequenceOfOverrides.txt similarity index 100% rename from analysis/analysis-api/testData/components/overridenDeclarations/sequenceOfOverrides.txt rename to analysis/analysis-api/testData/components/overriddenDeclarations/sequenceOfOverrides.txt diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt index 3e9b9696b74..7ff5a1e5c0a 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt @@ -73,7 +73,7 @@ fun main(args: Array) { } testClass { - model("components/overridenDeclarations") + model("components/overriddenDeclarations") } testClass { @@ -139,7 +139,7 @@ fun main(args: Array) { } testClass { - model("components/overridenDeclarations") + model("components/overriddenDeclarations") } testClass {