diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index f25abf4e6f7..53de6a3f377 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -26801,72 +26801,108 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia } @Nested - @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated") + @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden") @TestDataPath("$PROJECT_ROOT") - public class NoConflictingOverloadsWithDeprecated { + public class NoConflictingOverloadsWithDeprecatedHidden { @Test - public void testAllFilesPresentInNoConflictingOverloadsWithDeprecated() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt") - public void testConflictingOverloadsFunsDifferentReturnInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInPackage.kt") - public void testConflictingOverloadsFunsDifferentReturnInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsGenericFunctions.kt") - public void testConflictingOverloadsGenericFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalExtFunsInPackage.kt") - public void testConflictingOverloadsIdenticalExtFunsInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsInClass.kt") - public void testConflictingOverloadsIdenticalFunsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.kt"); + public void testAllFilesPresentInNoConflictingOverloadsWithDeprecatedHidden() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalValsInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsIdenticalValsInClass.kt"); } @Test @TestMetadata("ConflictingOverloadsValsDifferentTypeInClass.kt") public void testConflictingOverloadsValsDifferentTypeInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsValsDifferentTypeInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsValsDifferentTypeInClass.kt"); } @Test @TestMetadata("ConstructorVsFunOverload.kt") public void testConstructorVsFunOverload() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConstructorVsFunOverload.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorVsFunOverload.kt"); + } + + @Test + @TestMetadata("ConstructorsInMemberScope.kt") + public void testConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("ConstructorsInPackage.kt") + public void testConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("ConstructorsOnTopLevel.kt") + public void testConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("DifferentDeprecationLevels.kt") + public void testDifferentDeprecationLevels() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/DifferentDeprecationLevels.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInMemberScope.kt") + public void testFunctionsAndConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInPackage.kt") + public void testFunctionsAndConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsOnTopLevel.kt") + public void testFunctionsAndConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("FunctionsInMemberScope.kt") + public void testFunctionsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsInPackage.kt") + public void testFunctionsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsOnTopLevel.kt") + public void testFunctionsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsOnTopLevel.kt"); } @Test @TestMetadata("LocalFunctions.kt") public void testLocalFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/LocalFunctions.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/LocalFunctions.kt"); + } + + @Test + @TestMetadata("NoHiddenTransitivityFromClassifierToConstructor.kt") + public void testNoHiddenTransitivityFromClassifierToConstructor() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/NoHiddenTransitivityFromClassifierToConstructor.kt"); } @Test @TestMetadata("TypeParameterMultipleBounds.kt") public void testTypeParameterMultipleBounds() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/TypeParameterMultipleBounds.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/TypeParameterMultipleBounds.kt"); } } } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index 2afc8ccc625..4c8c5c2bf2e 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -26801,72 +26801,108 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated } @Nested - @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated") + @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden") @TestDataPath("$PROJECT_ROOT") - public class NoConflictingOverloadsWithDeprecated { + public class NoConflictingOverloadsWithDeprecatedHidden { @Test - public void testAllFilesPresentInNoConflictingOverloadsWithDeprecated() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt") - public void testConflictingOverloadsFunsDifferentReturnInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInPackage.kt") - public void testConflictingOverloadsFunsDifferentReturnInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsGenericFunctions.kt") - public void testConflictingOverloadsGenericFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalExtFunsInPackage.kt") - public void testConflictingOverloadsIdenticalExtFunsInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsInClass.kt") - public void testConflictingOverloadsIdenticalFunsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.kt"); + public void testAllFilesPresentInNoConflictingOverloadsWithDeprecatedHidden() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalValsInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsIdenticalValsInClass.kt"); } @Test @TestMetadata("ConflictingOverloadsValsDifferentTypeInClass.kt") public void testConflictingOverloadsValsDifferentTypeInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsValsDifferentTypeInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsValsDifferentTypeInClass.kt"); } @Test @TestMetadata("ConstructorVsFunOverload.kt") public void testConstructorVsFunOverload() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConstructorVsFunOverload.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorVsFunOverload.kt"); + } + + @Test + @TestMetadata("ConstructorsInMemberScope.kt") + public void testConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("ConstructorsInPackage.kt") + public void testConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("ConstructorsOnTopLevel.kt") + public void testConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("DifferentDeprecationLevels.kt") + public void testDifferentDeprecationLevels() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/DifferentDeprecationLevels.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInMemberScope.kt") + public void testFunctionsAndConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInPackage.kt") + public void testFunctionsAndConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsOnTopLevel.kt") + public void testFunctionsAndConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("FunctionsInMemberScope.kt") + public void testFunctionsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsInPackage.kt") + public void testFunctionsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsOnTopLevel.kt") + public void testFunctionsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsOnTopLevel.kt"); } @Test @TestMetadata("LocalFunctions.kt") public void testLocalFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/LocalFunctions.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/LocalFunctions.kt"); + } + + @Test + @TestMetadata("NoHiddenTransitivityFromClassifierToConstructor.kt") + public void testNoHiddenTransitivityFromClassifierToConstructor() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/NoHiddenTransitivityFromClassifierToConstructor.kt"); } @Test @TestMetadata("TypeParameterMultipleBounds.kt") public void testTypeParameterMultipleBounds() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/TypeParameterMultipleBounds.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/TypeParameterMultipleBounds.kt"); } } } diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 16ded5c931c..84a65d70a1e 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -24801,72 +24801,108 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir } @Nested - @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated") + @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden") @TestDataPath("$PROJECT_ROOT") - public class NoConflictingOverloadsWithDeprecated { + public class NoConflictingOverloadsWithDeprecatedHidden { @Test - public void testAllFilesPresentInNoConflictingOverloadsWithDeprecated() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt") - public void testConflictingOverloadsFunsDifferentReturnInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInPackage.kt") - public void testConflictingOverloadsFunsDifferentReturnInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsGenericFunctions.kt") - public void testConflictingOverloadsGenericFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalExtFunsInPackage.kt") - public void testConflictingOverloadsIdenticalExtFunsInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsInClass.kt") - public void testConflictingOverloadsIdenticalFunsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.kt"); + public void testAllFilesPresentInNoConflictingOverloadsWithDeprecatedHidden() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); } @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalValsInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsIdenticalValsInClass.kt"); } @Test @TestMetadata("ConflictingOverloadsValsDifferentTypeInClass.kt") public void testConflictingOverloadsValsDifferentTypeInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsValsDifferentTypeInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsValsDifferentTypeInClass.kt"); } @Test @TestMetadata("ConstructorVsFunOverload.kt") public void testConstructorVsFunOverload() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConstructorVsFunOverload.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorVsFunOverload.kt"); + } + + @Test + @TestMetadata("ConstructorsInMemberScope.kt") + public void testConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("ConstructorsInPackage.kt") + public void testConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("ConstructorsOnTopLevel.kt") + public void testConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("DifferentDeprecationLevels.kt") + public void testDifferentDeprecationLevels() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/DifferentDeprecationLevels.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInMemberScope.kt") + public void testFunctionsAndConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInPackage.kt") + public void testFunctionsAndConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsOnTopLevel.kt") + public void testFunctionsAndConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("FunctionsInMemberScope.kt") + public void testFunctionsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsInPackage.kt") + public void testFunctionsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsOnTopLevel.kt") + public void testFunctionsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsOnTopLevel.kt"); } @Test @TestMetadata("LocalFunctions.kt") public void testLocalFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/LocalFunctions.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/LocalFunctions.kt"); + } + + @Test + @TestMetadata("NoHiddenTransitivityFromClassifierToConstructor.kt") + public void testNoHiddenTransitivityFromClassifierToConstructor() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/NoHiddenTransitivityFromClassifierToConstructor.kt"); } @Test @TestMetadata("TypeParameterMultipleBounds.kt") public void testTypeParameterMultipleBounds() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/TypeParameterMultipleBounds.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/TypeParameterMultipleBounds.kt"); } } } diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index 3927b54919d..a00de8f5580 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -24807,72 +24807,108 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia } @Nested - @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated") + @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden") @TestDataPath("$PROJECT_ROOT") - public class NoConflictingOverloadsWithDeprecated { + public class NoConflictingOverloadsWithDeprecatedHidden { @Test - public void testAllFilesPresentInNoConflictingOverloadsWithDeprecated() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt") - public void testConflictingOverloadsFunsDifferentReturnInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInPackage.kt") - public void testConflictingOverloadsFunsDifferentReturnInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsGenericFunctions.kt") - public void testConflictingOverloadsGenericFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalExtFunsInPackage.kt") - public void testConflictingOverloadsIdenticalExtFunsInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsInClass.kt") - public void testConflictingOverloadsIdenticalFunsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.kt"); + public void testAllFilesPresentInNoConflictingOverloadsWithDeprecatedHidden() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); } @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalValsInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsIdenticalValsInClass.kt"); } @Test @TestMetadata("ConflictingOverloadsValsDifferentTypeInClass.kt") public void testConflictingOverloadsValsDifferentTypeInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsValsDifferentTypeInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsValsDifferentTypeInClass.kt"); } @Test @TestMetadata("ConstructorVsFunOverload.kt") public void testConstructorVsFunOverload() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConstructorVsFunOverload.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorVsFunOverload.kt"); + } + + @Test + @TestMetadata("ConstructorsInMemberScope.kt") + public void testConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("ConstructorsInPackage.kt") + public void testConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("ConstructorsOnTopLevel.kt") + public void testConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("DifferentDeprecationLevels.kt") + public void testDifferentDeprecationLevels() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/DifferentDeprecationLevels.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInMemberScope.kt") + public void testFunctionsAndConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInPackage.kt") + public void testFunctionsAndConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsOnTopLevel.kt") + public void testFunctionsAndConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("FunctionsInMemberScope.kt") + public void testFunctionsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsInPackage.kt") + public void testFunctionsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsOnTopLevel.kt") + public void testFunctionsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsOnTopLevel.kt"); } @Test @TestMetadata("LocalFunctions.kt") public void testLocalFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/LocalFunctions.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/LocalFunctions.kt"); + } + + @Test + @TestMetadata("NoHiddenTransitivityFromClassifierToConstructor.kt") + public void testNoHiddenTransitivityFromClassifierToConstructor() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/NoHiddenTransitivityFromClassifierToConstructor.kt"); } @Test @TestMetadata("TypeParameterMultipleBounds.kt") public void testTypeParameterMultipleBounds() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/TypeParameterMultipleBounds.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/TypeParameterMultipleBounds.kt"); } } } diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 61b44b57724..157da9d04a9 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -26801,72 +26801,108 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { } @Nested - @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated") + @TestMetadata("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden") @TestDataPath("$PROJECT_ROOT") - public class NoConflictingOverloadsWithDeprecated { + public class NoConflictingOverloadsWithDeprecatedHidden { @Test - public void testAllFilesPresentInNoConflictingOverloadsWithDeprecated() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt") - public void testConflictingOverloadsFunsDifferentReturnInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsFunsDifferentReturnInPackage.kt") - public void testConflictingOverloadsFunsDifferentReturnInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsGenericFunctions.kt") - public void testConflictingOverloadsGenericFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalExtFunsInPackage.kt") - public void testConflictingOverloadsIdenticalExtFunsInPackage() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.kt"); - } - - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsInClass.kt") - public void testConflictingOverloadsIdenticalFunsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.kt"); + public void testAllFilesPresentInNoConflictingOverloadsWithDeprecatedHidden() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalValsInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsIdenticalValsInClass.kt"); } @Test @TestMetadata("ConflictingOverloadsValsDifferentTypeInClass.kt") public void testConflictingOverloadsValsDifferentTypeInClass() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsValsDifferentTypeInClass.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsValsDifferentTypeInClass.kt"); } @Test @TestMetadata("ConstructorVsFunOverload.kt") public void testConstructorVsFunOverload() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConstructorVsFunOverload.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorVsFunOverload.kt"); + } + + @Test + @TestMetadata("ConstructorsInMemberScope.kt") + public void testConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("ConstructorsInPackage.kt") + public void testConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("ConstructorsOnTopLevel.kt") + public void testConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("DifferentDeprecationLevels.kt") + public void testDifferentDeprecationLevels() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/DifferentDeprecationLevels.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInMemberScope.kt") + public void testFunctionsAndConstructorsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsInPackage.kt") + public void testFunctionsAndConstructorsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsAndConstructorsOnTopLevel.kt") + public void testFunctionsAndConstructorsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsAndConstructorsOnTopLevel.kt"); + } + + @Test + @TestMetadata("FunctionsInMemberScope.kt") + public void testFunctionsInMemberScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInMemberScope.kt"); + } + + @Test + @TestMetadata("FunctionsInPackage.kt") + public void testFunctionsInPackage() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsInPackage.kt"); + } + + @Test + @TestMetadata("FunctionsOnTopLevel.kt") + public void testFunctionsOnTopLevel() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/FunctionsOnTopLevel.kt"); } @Test @TestMetadata("LocalFunctions.kt") public void testLocalFunctions() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/LocalFunctions.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/LocalFunctions.kt"); + } + + @Test + @TestMetadata("NoHiddenTransitivityFromClassifierToConstructor.kt") + public void testNoHiddenTransitivityFromClassifierToConstructor() throws Exception { + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/NoHiddenTransitivityFromClassifierToConstructor.kt"); } @Test @TestMetadata("TypeParameterMultipleBounds.kt") public void testTypeParameterMultipleBounds() throws Exception { - runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/TypeParameterMultipleBounds.kt"); + runTest("compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/TypeParameterMultipleBounds.kt"); } } }