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 99380fa7f8e..6a6f0ae2fb3 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 @@ -11863,562 +11863,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia } } - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature") - @TestDataPath("$PROJECT_ROOT") - public class DuplicateJvmSignature { - @Test - public void testAllFilesPresentInDuplicateJvmSignature() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("caseInProperties.kt") - public void testCaseInProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt"); - } - - @Test - @TestMetadata("vararg.kt") - public void testVararg() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt"); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides") - @TestDataPath("$PROJECT_ROOT") - public class AccidentalOverrides { - @Test - @TestMetadata("accidentalOverrideFromGrandparent.kt") - public void testAccidentalOverrideFromGrandparent() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt"); - } - - @Test - public void testAllFilesPresentInAccidentalOverrides() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("classFunctionOverriddenByProperty.kt") - public void testClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyInConstructor.kt") - public void testClassFunctionOverriddenByPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyNoGetter.kt") - public void testClassFunctionOverriddenByPropertyNoGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt"); - } - - @Test - @TestMetadata("classPropertyOverriddenByFunction.kt") - public void testClassPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("defaultFunction.kt") - public void testDefaultFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt"); - } - - @Test - @TestMetadata("delegatedFunctionOverriddenByProperty.kt") - public void testDelegatedFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("genericClassFunction.kt") - public void testGenericClassFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt"); - } - - @Test - @TestMetadata("overridesNothing.kt") - public void testOverridesNothing() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt"); - } - - @Test - @TestMetadata("privateClassFunctionOverriddenByProperty.kt") - public void testPrivateClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByProperty.kt") - public void testTraitFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyNoImpl.kt") - public void testTraitFunctionOverriddenByPropertyNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunction.kt") - public void testTraitPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionNoImpl.kt") - public void testTraitPropertyOverriddenByFunctionNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges") - @TestDataPath("$PROJECT_ROOT") - public class Bridges { - @Test - public void testAllFilesPresentInBridges() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt"); - } - - @Test - @TestMetadata("fakeOverrideTrait.kt") - public void testFakeOverrideTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure") - @TestDataPath("$PROJECT_ROOT") - public class Erasure { - @Test - public void testAllFilesPresentInErasure() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("clashFromInterfaceAndSuperClass.kt") - public void testClashFromInterfaceAndSuperClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt"); - } - - @Test - @TestMetadata("collections.kt") - public void testCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt"); - } - - @Test - @TestMetadata("delegateToTwoTraits.kt") - public void testDelegateToTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt"); - } - - @Test - @TestMetadata("delegationAndOwnMethod.kt") - public void testDelegationAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt"); - } - - @Test - @TestMetadata("delegationToTraitImplAndOwnMethod.kt") - public void testDelegationToTraitImplAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); - } - - @Test - @TestMetadata("extensionProperties.kt") - public void testExtensionProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt"); - } - - @Test - @TestMetadata("genericType.kt") - public void testGenericType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt"); - } - - @Test - @TestMetadata("inheritFromTwoTraits.kt") - public void testInheritFromTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt"); - } - - @Test - @TestMetadata("kotlinAndJavaCollections.kt") - public void testKotlinAndJavaCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt"); - } - - @Test - @TestMetadata("nullableType.kt") - public void testNullableType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt"); - } - - @Test - @TestMetadata("superTraitAndDelegationToTraitImpl.kt") - public void testSuperTraitAndDelegationToTraitImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt"); - } - - @Test - @TestMetadata("twoTraitsAndOwnFunction.kt") - public void testTwoTraitsAndOwnFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt"); - } - - @Test - @TestMetadata("typeMappedToJava.kt") - public void testTypeMappedToJava() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt"); - } - - @Test - @TestMetadata("typeParameter.kt") - public void testTypeParameter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt"); - } - - @Test - @TestMetadata("typeParameterWithBound.kt") - public void testTypeParameterWithBound() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBounds.kt") - public void testTypeParameterWithTwoBounds() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBoundsInWhere.kt") - public void testTypeParameterWithTwoBoundsInWhere() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns") - @TestDataPath("$PROJECT_ROOT") - public class FinalMembersFromBuiltIns { - @Test - public void testAllFilesPresentInFinalMembersFromBuiltIns() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("enumMembers.kt") - public void testEnumMembers() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt"); - } - - @Test - @TestMetadata("waitNotifyGetClass.kt") - public void testWaitNotifyGetClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty") - @TestDataPath("$PROJECT_ROOT") - public class FunctionAndProperty { - @Test - public void testAllFilesPresentInFunctionAndProperty() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt"); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt"); - } - - @Test - @TestMetadata("classPropertyInConstructor.kt") - public void testClassPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("extensionFunctionAndNormalFunction.kt") - public void testExtensionFunctionAndNormalFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt"); - } - - @Test - @TestMetadata("extensionPropertyAndFunction.kt") - public void testExtensionPropertyAndFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt"); - } - - @Test - @TestMetadata("functionAndSetter.kt") - public void testFunctionAndSetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt"); - } - - @Test - @TestMetadata("functionAndVar.kt") - public void testFunctionAndVar() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt"); - } - - @Test - @TestMetadata("localClass.kt") - public void testLocalClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt"); - } - - @Test - @TestMetadata("localClassInClass.kt") - public void testLocalClassInClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt"); - } - - @Test - @TestMetadata("nestedClass.kt") - public void testNestedClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); - } - - @Test - @TestMetadata("object.kt") - public void testObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt"); - } - - @Test - @TestMetadata("objectExpression.kt") - public void testObjectExpression() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); - } - - @Test - @TestMetadata("objectExpressionInConstructor.kt") - public void testObjectExpressionInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt"); - } - - @Test - @TestMetadata("privateClassPropertyNoClash.kt") - public void testPrivateClassPropertyNoClash() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt"); - } - - @Test - @TestMetadata("topLevel.kt") - public void testTopLevel() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt"); - } - - @Test - @TestMetadata("topLevelDifferentFiles.kt") - public void testTopLevelDifferentFiles() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt"); - } - - @Test - @TestMetadata("topLevelGetter.kt") - public void testTopLevelGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames") - @TestDataPath("$PROJECT_ROOT") - public class SpecialNames { - @Test - public void testAllFilesPresentInSpecialNames() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt"); - } - - @Test - @TestMetadata("classObjectCopiedField.kt") - public void testClassObjectCopiedField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt"); - } - - @Test - @TestMetadata("classObjectCopiedFieldObject.kt") - public void testClassObjectCopiedFieldObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt"); - } - - @Test - @TestMetadata("dataClassCopy.kt") - public void testDataClassCopy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt"); - } - - @Test - @TestMetadata("delegationBy.kt") - public void testDelegationBy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt"); - } - - @Test - @TestMetadata("enum.kt") - public void testEnum() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt"); - } - - @Test - @TestMetadata("innerClassField.kt") - public void testInnerClassField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt"); - } - - @Test - @TestMetadata("instance.kt") - public void testInstance() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt"); - } - - @Test - @TestMetadata("propertyMetadataCache.kt") - public void testPropertyMetadataCache() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics") - @TestDataPath("$PROJECT_ROOT") - public class Statics { - @Test - public void testAllFilesPresentInStatics() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterface.kt") - public void testKotlinClassImplementsJavaInterface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt") - public void testKotlinClassImplementsJavaInterfaceExtendsJavaInteface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt"); - } - - @Test - @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") - public void testKotlinMembersVsJavaNonVisibleStatics() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized") - @TestDataPath("$PROJECT_ROOT") - public class Synthesized { - @Test - public void testAllFilesPresentInSynthesized() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("enumValuesValueOf.kt") - public void testEnumValuesValueOf() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl") - @TestDataPath("$PROJECT_ROOT") - public class TraitImpl { - @Test - public void testAllFilesPresentInTraitImpl() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("oneTrait.kt") - public void testOneTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyInTrait.kt") - public void testTraitFunctionOverriddenByPropertyInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionInTrait.kt") - public void testTraitPropertyOverriddenByFunctionInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt"); - } - - @Test - @TestMetadata("twoTraits.kt") - public void testTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/tests/dynamicTypes") @TestDataPath("$PROJECT_ROOT") 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 d01373c27be..6162edb3d58 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 @@ -11863,562 +11863,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated } } - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature") - @TestDataPath("$PROJECT_ROOT") - public class DuplicateJvmSignature { - @Test - public void testAllFilesPresentInDuplicateJvmSignature() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("caseInProperties.kt") - public void testCaseInProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt"); - } - - @Test - @TestMetadata("vararg.kt") - public void testVararg() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt"); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides") - @TestDataPath("$PROJECT_ROOT") - public class AccidentalOverrides { - @Test - @TestMetadata("accidentalOverrideFromGrandparent.kt") - public void testAccidentalOverrideFromGrandparent() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt"); - } - - @Test - public void testAllFilesPresentInAccidentalOverrides() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("classFunctionOverriddenByProperty.kt") - public void testClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyInConstructor.kt") - public void testClassFunctionOverriddenByPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyNoGetter.kt") - public void testClassFunctionOverriddenByPropertyNoGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt"); - } - - @Test - @TestMetadata("classPropertyOverriddenByFunction.kt") - public void testClassPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("defaultFunction.kt") - public void testDefaultFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt"); - } - - @Test - @TestMetadata("delegatedFunctionOverriddenByProperty.kt") - public void testDelegatedFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("genericClassFunction.kt") - public void testGenericClassFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt"); - } - - @Test - @TestMetadata("overridesNothing.kt") - public void testOverridesNothing() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt"); - } - - @Test - @TestMetadata("privateClassFunctionOverriddenByProperty.kt") - public void testPrivateClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByProperty.kt") - public void testTraitFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyNoImpl.kt") - public void testTraitFunctionOverriddenByPropertyNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunction.kt") - public void testTraitPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionNoImpl.kt") - public void testTraitPropertyOverriddenByFunctionNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges") - @TestDataPath("$PROJECT_ROOT") - public class Bridges { - @Test - public void testAllFilesPresentInBridges() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt"); - } - - @Test - @TestMetadata("fakeOverrideTrait.kt") - public void testFakeOverrideTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure") - @TestDataPath("$PROJECT_ROOT") - public class Erasure { - @Test - public void testAllFilesPresentInErasure() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("clashFromInterfaceAndSuperClass.kt") - public void testClashFromInterfaceAndSuperClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt"); - } - - @Test - @TestMetadata("collections.kt") - public void testCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt"); - } - - @Test - @TestMetadata("delegateToTwoTraits.kt") - public void testDelegateToTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt"); - } - - @Test - @TestMetadata("delegationAndOwnMethod.kt") - public void testDelegationAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt"); - } - - @Test - @TestMetadata("delegationToTraitImplAndOwnMethod.kt") - public void testDelegationToTraitImplAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); - } - - @Test - @TestMetadata("extensionProperties.kt") - public void testExtensionProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt"); - } - - @Test - @TestMetadata("genericType.kt") - public void testGenericType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt"); - } - - @Test - @TestMetadata("inheritFromTwoTraits.kt") - public void testInheritFromTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt"); - } - - @Test - @TestMetadata("kotlinAndJavaCollections.kt") - public void testKotlinAndJavaCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt"); - } - - @Test - @TestMetadata("nullableType.kt") - public void testNullableType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt"); - } - - @Test - @TestMetadata("superTraitAndDelegationToTraitImpl.kt") - public void testSuperTraitAndDelegationToTraitImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt"); - } - - @Test - @TestMetadata("twoTraitsAndOwnFunction.kt") - public void testTwoTraitsAndOwnFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt"); - } - - @Test - @TestMetadata("typeMappedToJava.kt") - public void testTypeMappedToJava() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt"); - } - - @Test - @TestMetadata("typeParameter.kt") - public void testTypeParameter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt"); - } - - @Test - @TestMetadata("typeParameterWithBound.kt") - public void testTypeParameterWithBound() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBounds.kt") - public void testTypeParameterWithTwoBounds() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBoundsInWhere.kt") - public void testTypeParameterWithTwoBoundsInWhere() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns") - @TestDataPath("$PROJECT_ROOT") - public class FinalMembersFromBuiltIns { - @Test - public void testAllFilesPresentInFinalMembersFromBuiltIns() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("enumMembers.kt") - public void testEnumMembers() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt"); - } - - @Test - @TestMetadata("waitNotifyGetClass.kt") - public void testWaitNotifyGetClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty") - @TestDataPath("$PROJECT_ROOT") - public class FunctionAndProperty { - @Test - public void testAllFilesPresentInFunctionAndProperty() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt"); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt"); - } - - @Test - @TestMetadata("classPropertyInConstructor.kt") - public void testClassPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("extensionFunctionAndNormalFunction.kt") - public void testExtensionFunctionAndNormalFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt"); - } - - @Test - @TestMetadata("extensionPropertyAndFunction.kt") - public void testExtensionPropertyAndFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt"); - } - - @Test - @TestMetadata("functionAndSetter.kt") - public void testFunctionAndSetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt"); - } - - @Test - @TestMetadata("functionAndVar.kt") - public void testFunctionAndVar() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt"); - } - - @Test - @TestMetadata("localClass.kt") - public void testLocalClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt"); - } - - @Test - @TestMetadata("localClassInClass.kt") - public void testLocalClassInClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt"); - } - - @Test - @TestMetadata("nestedClass.kt") - public void testNestedClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); - } - - @Test - @TestMetadata("object.kt") - public void testObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt"); - } - - @Test - @TestMetadata("objectExpression.kt") - public void testObjectExpression() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); - } - - @Test - @TestMetadata("objectExpressionInConstructor.kt") - public void testObjectExpressionInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt"); - } - - @Test - @TestMetadata("privateClassPropertyNoClash.kt") - public void testPrivateClassPropertyNoClash() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt"); - } - - @Test - @TestMetadata("topLevel.kt") - public void testTopLevel() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt"); - } - - @Test - @TestMetadata("topLevelDifferentFiles.kt") - public void testTopLevelDifferentFiles() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt"); - } - - @Test - @TestMetadata("topLevelGetter.kt") - public void testTopLevelGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames") - @TestDataPath("$PROJECT_ROOT") - public class SpecialNames { - @Test - public void testAllFilesPresentInSpecialNames() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt"); - } - - @Test - @TestMetadata("classObjectCopiedField.kt") - public void testClassObjectCopiedField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt"); - } - - @Test - @TestMetadata("classObjectCopiedFieldObject.kt") - public void testClassObjectCopiedFieldObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt"); - } - - @Test - @TestMetadata("dataClassCopy.kt") - public void testDataClassCopy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt"); - } - - @Test - @TestMetadata("delegationBy.kt") - public void testDelegationBy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt"); - } - - @Test - @TestMetadata("enum.kt") - public void testEnum() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt"); - } - - @Test - @TestMetadata("innerClassField.kt") - public void testInnerClassField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt"); - } - - @Test - @TestMetadata("instance.kt") - public void testInstance() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt"); - } - - @Test - @TestMetadata("propertyMetadataCache.kt") - public void testPropertyMetadataCache() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics") - @TestDataPath("$PROJECT_ROOT") - public class Statics { - @Test - public void testAllFilesPresentInStatics() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterface.kt") - public void testKotlinClassImplementsJavaInterface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt") - public void testKotlinClassImplementsJavaInterfaceExtendsJavaInteface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt"); - } - - @Test - @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") - public void testKotlinMembersVsJavaNonVisibleStatics() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized") - @TestDataPath("$PROJECT_ROOT") - public class Synthesized { - @Test - public void testAllFilesPresentInSynthesized() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("enumValuesValueOf.kt") - public void testEnumValuesValueOf() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl") - @TestDataPath("$PROJECT_ROOT") - public class TraitImpl { - @Test - public void testAllFilesPresentInTraitImpl() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("oneTrait.kt") - public void testOneTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyInTrait.kt") - public void testTraitFunctionOverriddenByPropertyInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionInTrait.kt") - public void testTraitPropertyOverriddenByFunctionInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt"); - } - - @Test - @TestMetadata("twoTraits.kt") - public void testTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/tests/dynamicTypes") @TestDataPath("$PROJECT_ROOT") 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 fe4d27aec08..954fc71eab1 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 @@ -11857,562 +11857,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir } } - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature") - @TestDataPath("$PROJECT_ROOT") - public class DuplicateJvmSignature { - @Test - public void testAllFilesPresentInDuplicateJvmSignature() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("caseInProperties.kt") - public void testCaseInProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt"); - } - - @Test - @TestMetadata("vararg.kt") - public void testVararg() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt"); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides") - @TestDataPath("$PROJECT_ROOT") - public class AccidentalOverrides { - @Test - @TestMetadata("accidentalOverrideFromGrandparent.kt") - public void testAccidentalOverrideFromGrandparent() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt"); - } - - @Test - public void testAllFilesPresentInAccidentalOverrides() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("classFunctionOverriddenByProperty.kt") - public void testClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyInConstructor.kt") - public void testClassFunctionOverriddenByPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyNoGetter.kt") - public void testClassFunctionOverriddenByPropertyNoGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt"); - } - - @Test - @TestMetadata("classPropertyOverriddenByFunction.kt") - public void testClassPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("defaultFunction.kt") - public void testDefaultFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt"); - } - - @Test - @TestMetadata("delegatedFunctionOverriddenByProperty.kt") - public void testDelegatedFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("genericClassFunction.kt") - public void testGenericClassFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt"); - } - - @Test - @TestMetadata("overridesNothing.kt") - public void testOverridesNothing() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt"); - } - - @Test - @TestMetadata("privateClassFunctionOverriddenByProperty.kt") - public void testPrivateClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByProperty.kt") - public void testTraitFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyNoImpl.kt") - public void testTraitFunctionOverriddenByPropertyNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunction.kt") - public void testTraitPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionNoImpl.kt") - public void testTraitPropertyOverriddenByFunctionNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges") - @TestDataPath("$PROJECT_ROOT") - public class Bridges { - @Test - public void testAllFilesPresentInBridges() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt"); - } - - @Test - @TestMetadata("fakeOverrideTrait.kt") - public void testFakeOverrideTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure") - @TestDataPath("$PROJECT_ROOT") - public class Erasure { - @Test - public void testAllFilesPresentInErasure() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("clashFromInterfaceAndSuperClass.kt") - public void testClashFromInterfaceAndSuperClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt"); - } - - @Test - @TestMetadata("collections.kt") - public void testCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt"); - } - - @Test - @TestMetadata("delegateToTwoTraits.kt") - public void testDelegateToTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt"); - } - - @Test - @TestMetadata("delegationAndOwnMethod.kt") - public void testDelegationAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt"); - } - - @Test - @TestMetadata("delegationToTraitImplAndOwnMethod.kt") - public void testDelegationToTraitImplAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); - } - - @Test - @TestMetadata("extensionProperties.kt") - public void testExtensionProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt"); - } - - @Test - @TestMetadata("genericType.kt") - public void testGenericType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt"); - } - - @Test - @TestMetadata("inheritFromTwoTraits.kt") - public void testInheritFromTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt"); - } - - @Test - @TestMetadata("kotlinAndJavaCollections.kt") - public void testKotlinAndJavaCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt"); - } - - @Test - @TestMetadata("nullableType.kt") - public void testNullableType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt"); - } - - @Test - @TestMetadata("superTraitAndDelegationToTraitImpl.kt") - public void testSuperTraitAndDelegationToTraitImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt"); - } - - @Test - @TestMetadata("twoTraitsAndOwnFunction.kt") - public void testTwoTraitsAndOwnFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt"); - } - - @Test - @TestMetadata("typeMappedToJava.kt") - public void testTypeMappedToJava() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt"); - } - - @Test - @TestMetadata("typeParameter.kt") - public void testTypeParameter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt"); - } - - @Test - @TestMetadata("typeParameterWithBound.kt") - public void testTypeParameterWithBound() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBounds.kt") - public void testTypeParameterWithTwoBounds() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBoundsInWhere.kt") - public void testTypeParameterWithTwoBoundsInWhere() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns") - @TestDataPath("$PROJECT_ROOT") - public class FinalMembersFromBuiltIns { - @Test - public void testAllFilesPresentInFinalMembersFromBuiltIns() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("enumMembers.kt") - public void testEnumMembers() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt"); - } - - @Test - @TestMetadata("waitNotifyGetClass.kt") - public void testWaitNotifyGetClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty") - @TestDataPath("$PROJECT_ROOT") - public class FunctionAndProperty { - @Test - public void testAllFilesPresentInFunctionAndProperty() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt"); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt"); - } - - @Test - @TestMetadata("classPropertyInConstructor.kt") - public void testClassPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("extensionFunctionAndNormalFunction.kt") - public void testExtensionFunctionAndNormalFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt"); - } - - @Test - @TestMetadata("extensionPropertyAndFunction.kt") - public void testExtensionPropertyAndFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt"); - } - - @Test - @TestMetadata("functionAndSetter.kt") - public void testFunctionAndSetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt"); - } - - @Test - @TestMetadata("functionAndVar.kt") - public void testFunctionAndVar() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt"); - } - - @Test - @TestMetadata("localClass.kt") - public void testLocalClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt"); - } - - @Test - @TestMetadata("localClassInClass.kt") - public void testLocalClassInClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt"); - } - - @Test - @TestMetadata("nestedClass.kt") - public void testNestedClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); - } - - @Test - @TestMetadata("object.kt") - public void testObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt"); - } - - @Test - @TestMetadata("objectExpression.kt") - public void testObjectExpression() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); - } - - @Test - @TestMetadata("objectExpressionInConstructor.kt") - public void testObjectExpressionInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt"); - } - - @Test - @TestMetadata("privateClassPropertyNoClash.kt") - public void testPrivateClassPropertyNoClash() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt"); - } - - @Test - @TestMetadata("topLevel.kt") - public void testTopLevel() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt"); - } - - @Test - @TestMetadata("topLevelDifferentFiles.kt") - public void testTopLevelDifferentFiles() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt"); - } - - @Test - @TestMetadata("topLevelGetter.kt") - public void testTopLevelGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames") - @TestDataPath("$PROJECT_ROOT") - public class SpecialNames { - @Test - public void testAllFilesPresentInSpecialNames() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt"); - } - - @Test - @TestMetadata("classObjectCopiedField.kt") - public void testClassObjectCopiedField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt"); - } - - @Test - @TestMetadata("classObjectCopiedFieldObject.kt") - public void testClassObjectCopiedFieldObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt"); - } - - @Test - @TestMetadata("dataClassCopy.kt") - public void testDataClassCopy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt"); - } - - @Test - @TestMetadata("delegationBy.kt") - public void testDelegationBy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt"); - } - - @Test - @TestMetadata("enum.kt") - public void testEnum() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt"); - } - - @Test - @TestMetadata("innerClassField.kt") - public void testInnerClassField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt"); - } - - @Test - @TestMetadata("instance.kt") - public void testInstance() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt"); - } - - @Test - @TestMetadata("propertyMetadataCache.kt") - public void testPropertyMetadataCache() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics") - @TestDataPath("$PROJECT_ROOT") - public class Statics { - @Test - public void testAllFilesPresentInStatics() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterface.kt") - public void testKotlinClassImplementsJavaInterface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt") - public void testKotlinClassImplementsJavaInterfaceExtendsJavaInteface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt"); - } - - @Test - @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") - public void testKotlinMembersVsJavaNonVisibleStatics() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized") - @TestDataPath("$PROJECT_ROOT") - public class Synthesized { - @Test - public void testAllFilesPresentInSynthesized() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("enumValuesValueOf.kt") - public void testEnumValuesValueOf() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl") - @TestDataPath("$PROJECT_ROOT") - public class TraitImpl { - @Test - public void testAllFilesPresentInTraitImpl() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("oneTrait.kt") - public void testOneTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyInTrait.kt") - public void testTraitFunctionOverriddenByPropertyInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionInTrait.kt") - public void testTraitPropertyOverriddenByFunctionInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt"); - } - - @Test - @TestMetadata("twoTraits.kt") - public void testTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/tests/dynamicTypes") @TestDataPath("$PROJECT_ROOT") 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 8d055f2d597..c7ce56e974f 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 @@ -11863,562 +11863,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia } } - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature") - @TestDataPath("$PROJECT_ROOT") - public class DuplicateJvmSignature { - @Test - public void testAllFilesPresentInDuplicateJvmSignature() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("caseInProperties.kt") - public void testCaseInProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt"); - } - - @Test - @TestMetadata("vararg.kt") - public void testVararg() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt"); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides") - @TestDataPath("$PROJECT_ROOT") - public class AccidentalOverrides { - @Test - @TestMetadata("accidentalOverrideFromGrandparent.kt") - public void testAccidentalOverrideFromGrandparent() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt"); - } - - @Test - public void testAllFilesPresentInAccidentalOverrides() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("classFunctionOverriddenByProperty.kt") - public void testClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyInConstructor.kt") - public void testClassFunctionOverriddenByPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyNoGetter.kt") - public void testClassFunctionOverriddenByPropertyNoGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt"); - } - - @Test - @TestMetadata("classPropertyOverriddenByFunction.kt") - public void testClassPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("defaultFunction.kt") - public void testDefaultFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt"); - } - - @Test - @TestMetadata("delegatedFunctionOverriddenByProperty.kt") - public void testDelegatedFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("genericClassFunction.kt") - public void testGenericClassFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt"); - } - - @Test - @TestMetadata("overridesNothing.kt") - public void testOverridesNothing() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt"); - } - - @Test - @TestMetadata("privateClassFunctionOverriddenByProperty.kt") - public void testPrivateClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByProperty.kt") - public void testTraitFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyNoImpl.kt") - public void testTraitFunctionOverriddenByPropertyNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunction.kt") - public void testTraitPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionNoImpl.kt") - public void testTraitPropertyOverriddenByFunctionNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges") - @TestDataPath("$PROJECT_ROOT") - public class Bridges { - @Test - public void testAllFilesPresentInBridges() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt"); - } - - @Test - @TestMetadata("fakeOverrideTrait.kt") - public void testFakeOverrideTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure") - @TestDataPath("$PROJECT_ROOT") - public class Erasure { - @Test - public void testAllFilesPresentInErasure() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("clashFromInterfaceAndSuperClass.kt") - public void testClashFromInterfaceAndSuperClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt"); - } - - @Test - @TestMetadata("collections.kt") - public void testCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt"); - } - - @Test - @TestMetadata("delegateToTwoTraits.kt") - public void testDelegateToTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt"); - } - - @Test - @TestMetadata("delegationAndOwnMethod.kt") - public void testDelegationAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt"); - } - - @Test - @TestMetadata("delegationToTraitImplAndOwnMethod.kt") - public void testDelegationToTraitImplAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); - } - - @Test - @TestMetadata("extensionProperties.kt") - public void testExtensionProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt"); - } - - @Test - @TestMetadata("genericType.kt") - public void testGenericType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt"); - } - - @Test - @TestMetadata("inheritFromTwoTraits.kt") - public void testInheritFromTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt"); - } - - @Test - @TestMetadata("kotlinAndJavaCollections.kt") - public void testKotlinAndJavaCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt"); - } - - @Test - @TestMetadata("nullableType.kt") - public void testNullableType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt"); - } - - @Test - @TestMetadata("superTraitAndDelegationToTraitImpl.kt") - public void testSuperTraitAndDelegationToTraitImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt"); - } - - @Test - @TestMetadata("twoTraitsAndOwnFunction.kt") - public void testTwoTraitsAndOwnFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt"); - } - - @Test - @TestMetadata("typeMappedToJava.kt") - public void testTypeMappedToJava() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt"); - } - - @Test - @TestMetadata("typeParameter.kt") - public void testTypeParameter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt"); - } - - @Test - @TestMetadata("typeParameterWithBound.kt") - public void testTypeParameterWithBound() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBounds.kt") - public void testTypeParameterWithTwoBounds() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBoundsInWhere.kt") - public void testTypeParameterWithTwoBoundsInWhere() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns") - @TestDataPath("$PROJECT_ROOT") - public class FinalMembersFromBuiltIns { - @Test - public void testAllFilesPresentInFinalMembersFromBuiltIns() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("enumMembers.kt") - public void testEnumMembers() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt"); - } - - @Test - @TestMetadata("waitNotifyGetClass.kt") - public void testWaitNotifyGetClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty") - @TestDataPath("$PROJECT_ROOT") - public class FunctionAndProperty { - @Test - public void testAllFilesPresentInFunctionAndProperty() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt"); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt"); - } - - @Test - @TestMetadata("classPropertyInConstructor.kt") - public void testClassPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("extensionFunctionAndNormalFunction.kt") - public void testExtensionFunctionAndNormalFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt"); - } - - @Test - @TestMetadata("extensionPropertyAndFunction.kt") - public void testExtensionPropertyAndFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt"); - } - - @Test - @TestMetadata("functionAndSetter.kt") - public void testFunctionAndSetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt"); - } - - @Test - @TestMetadata("functionAndVar.kt") - public void testFunctionAndVar() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt"); - } - - @Test - @TestMetadata("localClass.kt") - public void testLocalClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt"); - } - - @Test - @TestMetadata("localClassInClass.kt") - public void testLocalClassInClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt"); - } - - @Test - @TestMetadata("nestedClass.kt") - public void testNestedClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); - } - - @Test - @TestMetadata("object.kt") - public void testObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt"); - } - - @Test - @TestMetadata("objectExpression.kt") - public void testObjectExpression() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); - } - - @Test - @TestMetadata("objectExpressionInConstructor.kt") - public void testObjectExpressionInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt"); - } - - @Test - @TestMetadata("privateClassPropertyNoClash.kt") - public void testPrivateClassPropertyNoClash() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt"); - } - - @Test - @TestMetadata("topLevel.kt") - public void testTopLevel() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt"); - } - - @Test - @TestMetadata("topLevelDifferentFiles.kt") - public void testTopLevelDifferentFiles() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt"); - } - - @Test - @TestMetadata("topLevelGetter.kt") - public void testTopLevelGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames") - @TestDataPath("$PROJECT_ROOT") - public class SpecialNames { - @Test - public void testAllFilesPresentInSpecialNames() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt"); - } - - @Test - @TestMetadata("classObjectCopiedField.kt") - public void testClassObjectCopiedField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt"); - } - - @Test - @TestMetadata("classObjectCopiedFieldObject.kt") - public void testClassObjectCopiedFieldObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt"); - } - - @Test - @TestMetadata("dataClassCopy.kt") - public void testDataClassCopy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt"); - } - - @Test - @TestMetadata("delegationBy.kt") - public void testDelegationBy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt"); - } - - @Test - @TestMetadata("enum.kt") - public void testEnum() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt"); - } - - @Test - @TestMetadata("innerClassField.kt") - public void testInnerClassField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt"); - } - - @Test - @TestMetadata("instance.kt") - public void testInstance() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt"); - } - - @Test - @TestMetadata("propertyMetadataCache.kt") - public void testPropertyMetadataCache() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics") - @TestDataPath("$PROJECT_ROOT") - public class Statics { - @Test - public void testAllFilesPresentInStatics() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterface.kt") - public void testKotlinClassImplementsJavaInterface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt") - public void testKotlinClassImplementsJavaInterfaceExtendsJavaInteface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt"); - } - - @Test - @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") - public void testKotlinMembersVsJavaNonVisibleStatics() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized") - @TestDataPath("$PROJECT_ROOT") - public class Synthesized { - @Test - public void testAllFilesPresentInSynthesized() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("enumValuesValueOf.kt") - public void testEnumValuesValueOf() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl") - @TestDataPath("$PROJECT_ROOT") - public class TraitImpl { - @Test - public void testAllFilesPresentInTraitImpl() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); - } - - @Test - @TestMetadata("oneTrait.kt") - public void testOneTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyInTrait.kt") - public void testTraitFunctionOverriddenByPropertyInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionInTrait.kt") - public void testTraitPropertyOverriddenByFunctionInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt"); - } - - @Test - @TestMetadata("twoTraits.kt") - public void testTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/tests/dynamicTypes") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.fir.kt deleted file mode 100644 index 6ed1c87836d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.fir.kt +++ /dev/null @@ -1,14 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -interface Foo { - fun foo(x: X) -} - -open class FooImpl : Foo { - override fun foo(x: String) { - } -} - -open class FooImpl2 : FooImpl() { - fun foo(x: Any) { - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt deleted file mode 100644 index 01aa3594e94..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt +++ /dev/null @@ -1,14 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -interface Foo { - fun foo(x: X) -} - -open class FooImpl : Foo { - override fun foo(x: String) { - } -} - -open class FooImpl2 : FooImpl() { - fun foo(x: Any) { - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.txt deleted file mode 100644 index 57c1fe704bf..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.txt +++ /dev/null @@ -1,25 +0,0 @@ -package - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ x: X): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public open class FooImpl : Foo { - public constructor FooImpl() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ fun foo(/*0*/ x: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public open class FooImpl2 : FooImpl { - public constructor FooImpl2() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ x: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.fir.kt deleted file mode 100644 index 1b31212ede8..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -open class B { - fun getX() = 1 -} - -class C : B() { - val x: Int - get() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt deleted file mode 100644 index cb114398459..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt +++ /dev/null @@ -1,8 +0,0 @@ -open class B { - fun getX() = 1 -} - -class C : B() { - val x: Int - get() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.txt deleted file mode 100644 index 39df01db41a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class B { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C() - public final val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.fir.kt deleted file mode 100644 index 06b6b65787a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -open class B { - fun getX() = 1 -} - -class C(val x: Int) : B() \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt deleted file mode 100644 index 817968437b5..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt +++ /dev/null @@ -1,5 +0,0 @@ -open class B { - fun getX() = 1 -} - -class C(val x: Int) : B() \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.txt deleted file mode 100644 index bbfc085da52..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class B { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C(/*0*/ x: kotlin.Int) - public final val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.fir.kt deleted file mode 100644 index ad7d1ce6e01..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -open class B { - fun getX() = 1 -} - -class C : B() { - val x: Int = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt deleted file mode 100644 index 03374ec515a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt +++ /dev/null @@ -1,7 +0,0 @@ -open class B { - fun getX() = 1 -} - -class C : B() { - val x: Int = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.txt deleted file mode 100644 index ab1573905cc..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class B { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C() - public final val x: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.fir.kt deleted file mode 100644 index 672f4f7f5d3..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -open class B { - val x: Int - get() = 1 -} - -class C : B() { - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt deleted file mode 100644 index 8b75df8f99e..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt +++ /dev/null @@ -1,8 +0,0 @@ -open class B { - val x: Int - get() = 1 -} - -class C : B() { - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.txt deleted file mode 100644 index 999e5cc1f9d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class B { - public constructor B() - public final val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C() - public final override /*1*/ /*fake_override*/ val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.fir.kt deleted file mode 100644 index 2f56836984a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -open class Base { - open fun `foo$default`(d: Derived, i: Int, mask: Int, mh: Any) {} -} - -class Derived : Base() { - fun foo(i: Int = 0) {} -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt deleted file mode 100644 index ed43af21a90..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt +++ /dev/null @@ -1,9 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -open class Base { - open fun `foo$default`(d: Derived, i: Int, mask: Int, mh: Any) {} -} - -class Derived : Base() { - fun foo(i: Int = 0) {} -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.txt deleted file mode 100644 index 9d23e55ff9f..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class Base { - public constructor Base() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun `foo$default`(/*0*/ d: Derived, /*1*/ i: kotlin.Int, /*2*/ mask: kotlin.Int, /*3*/ mh: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class Derived : Base { - public constructor Derived() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun `foo$default`(/*0*/ d: Derived, /*1*/ i: kotlin.Int, /*2*/ mask: kotlin.Int, /*3*/ mh: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.fir.kt deleted file mode 100644 index e4319933d85..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -interface B { - fun getX() = 1 -} - -interface D { - val x: Int -} - -class C(d: D) : D by d, B { -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt deleted file mode 100644 index c0f7cfff409..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt +++ /dev/null @@ -1,10 +0,0 @@ -interface B { - fun getX() = 1 -} - -interface D { - val x: Int -} - -class C(d: D) : D by d, B { -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.txt deleted file mode 100644 index f3586d9c184..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.txt +++ /dev/null @@ -1,24 +0,0 @@ -package - -public interface B { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : D, B { - public constructor C(/*0*/ d: D) - public open override /*1*/ /*delegation*/ val x: kotlin.Int - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface D { - public abstract val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.fir.kt deleted file mode 100644 index ca3514cd1e8..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -open class B { - fun foo(l: List) {} -} - -class C : B() { - fun foo(l: List) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt deleted file mode 100644 index 53be1d192d1..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt +++ /dev/null @@ -1,9 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -open class B { - fun foo(l: List) {} -} - -class C : B() { - fun foo(l: List) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.txt deleted file mode 100644 index 955553dfe8a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class B { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public final override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.fir.kt deleted file mode 100644 index df44e409b58..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -interface B { - fun getX() = 1 -} - -class C : B { - override val x = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt deleted file mode 100644 index a40245e86d7..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt +++ /dev/null @@ -1,7 +0,0 @@ -interface B { - fun getX() = 1 -} - -class C : B { - override val x = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.txt deleted file mode 100644 index 6aca9466bb4..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public interface B { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C() - public open val x: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt deleted file mode 100644 index 3a74eb201bd..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt +++ /dev/null @@ -1,9 +0,0 @@ -// FIR_IDENTICAL -open class B { - private fun getX() = 1 -} - -class C : B() { - val x: Int - get() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.txt deleted file mode 100644 index 5299e98d3c0..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class B { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - private final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C() - public final val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - invisible_fake final override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt deleted file mode 100644 index edcd5abff9c..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - fun getX() = 1 -} - -class C : T { - val x: Int - get() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt deleted file mode 100644 index 64fc7a27d37..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - fun getX() = 1 -} - -class C : T { - val x: Int - get() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.txt deleted file mode 100644 index 536c273b003..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public final class C : T { - public constructor C() - public final val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface T { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.fir.kt deleted file mode 100644 index d78dd659bb0..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - fun getX(): Int -} - -abstract class C : T { - val x: Int - get() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt deleted file mode 100644 index 428eaedd188..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - fun getX(): Int -} - -abstract class C : T { - val x: Int - get() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.txt deleted file mode 100644 index 719ddf0401a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public abstract class C : T { - public constructor C() - public final val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface T { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.fir.kt deleted file mode 100644 index ff9451649a8..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - val x: Int - get() = 1 -} - -class C : T { - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt deleted file mode 100644 index c5be4f32551..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - val x: Int - get() = 1 -} - -class C : T { - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.txt deleted file mode 100644 index 508433fca43..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public final class C : T { - public constructor C() - public open override /*1*/ /*fake_override*/ val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface T { - public open val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.fir.kt deleted file mode 100644 index 002e8217385..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -interface T { - val x: Int -} - -abstract class C : T { - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt deleted file mode 100644 index de87b96c878..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt +++ /dev/null @@ -1,7 +0,0 @@ -interface T { - val x: Int -} - -abstract class C : T { - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.txt deleted file mode 100644 index 5a0c5f03911..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public abstract class C : T { - public constructor C() - public abstract override /*1*/ /*fake_override*/ val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface T { - public abstract val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.fir.kt deleted file mode 100644 index b6a7692433a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.fir.kt +++ /dev/null @@ -1,11 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -open class B { - open fun foo(t: T) {} -} - -class C : B() { - override fun foo(t: String) {} - - fun foo(o: Any) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt deleted file mode 100644 index 60324a9398b..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt +++ /dev/null @@ -1,11 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -open class B { - open fun foo(t: T) {} -} - -class C : B() { - override fun foo(t: String) {} - - fun foo(o: Any) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.txt deleted file mode 100644 index bad111f7b69..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class B { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ t: T): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ o: kotlin.Any): kotlin.Unit - public open override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.fir.kt deleted file mode 100644 index 817b75ed780..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface B { - fun foo(t: T) {} -} - -class C : B { - fun foo(o: Any) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt deleted file mode 100644 index 8dfae66af87..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt +++ /dev/null @@ -1,9 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface B { - fun foo(t: T) {} -} - -class C : B { - fun foo(o: Any) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.txt deleted file mode 100644 index cf6f2700ff9..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public interface B { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ t: T): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ o: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.fir.kt deleted file mode 100644 index c931a0413e7..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.fir.kt +++ /dev/null @@ -1,11 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface B { - fun foo(t: T) {} -} - -class C : B { - override fun foo(t: String) {} - - fun foo(o: Any) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt deleted file mode 100644 index d9f9b35cab0..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt +++ /dev/null @@ -1,11 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface B { - fun foo(t: T) {} -} - -class C : B { - override fun foo(t: String) {} - - fun foo(o: Any) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.txt deleted file mode 100644 index 7ce46d1e02a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public interface B { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ t: T): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : B { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ o: kotlin.Any): kotlin.Unit - public open override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.fir.kt deleted file mode 100644 index 8bf6f093521..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.fir.kt +++ /dev/null @@ -1,2 +0,0 @@ -val aa = 1 -val Aa = 1 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt deleted file mode 100644 index 5218804cb89..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt +++ /dev/null @@ -1,2 +0,0 @@ -val aa = 1 -val Aa = 1 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.txt deleted file mode 100644 index ad8d0c85f84..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public val Aa: kotlin.Int = 1 -public val aa: kotlin.Int = 1 diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.fir.kt deleted file mode 100644 index e5730dcdd4e..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.fir.kt +++ /dev/null @@ -1,19 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -public open class A { - fun foo(x: T) = "O" - fun foo(x: A) = "K" -} - -interface C { - fun foo(x: E): String - fun foo(x: A): String -} - -interface D { - fun foo(x: A): String -} - -class B1 : A>(), D - -interface B2 : C>, D diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt deleted file mode 100644 index 369943f3553..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt +++ /dev/null @@ -1,19 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -public open class A { - fun foo(x: T) = "O" - fun foo(x: A) = "K" -} - -interface C { - fun foo(x: E): String - fun foo(x: A): String -} - -interface D { - fun foo(x: A): String -} - -class B1 : A>(), D - -interface B2 : C>, D diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.txt deleted file mode 100644 index 64017b281bd..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.txt +++ /dev/null @@ -1,42 +0,0 @@ -package - -public open class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ x: A): kotlin.String - public final fun foo(/*0*/ x: T): kotlin.String - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class B1 : A>, D { - public constructor B1() - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun foo(/*0*/ x: A>): kotlin.String - public final override /*2*/ /*fake_override*/ fun foo(/*0*/ x: A): kotlin.String - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface B2 : C>, D { - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ x: A>): kotlin.String - public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ x: A): kotlin.String - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface C { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ x: A): kotlin.String - public abstract fun foo(/*0*/ x: E): kotlin.String - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface D { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ x: A): kotlin.String - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.fir.kt deleted file mode 100644 index ad06df1d2bc..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(s: List) {} -fun foo(s: MutableList) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt deleted file mode 100644 index e299e8accaf..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(s: List) {} -fun foo(s: MutableList) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.txt deleted file mode 100644 index 0d94bbd13d8..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public fun foo(/*0*/ s: kotlin.collections.List): kotlin.Unit -public fun foo(/*0*/ s: kotlin.collections.MutableList): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.fir.kt deleted file mode 100644 index cd117843562..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.fir.kt +++ /dev/null @@ -1,12 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) -} - -interface Bar { - fun foo(l: List) -} - -class Baz(f: Foo, b: Bar): Foo by f, Bar by b { -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt deleted file mode 100644 index aac2ee72029..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt +++ /dev/null @@ -1,12 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) -} - -interface Bar { - fun foo(l: List) -} - -class Baz(f: Foo, b: Bar): Foo by f, Bar by b { -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt deleted file mode 100644 index 5464b583585..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt +++ /dev/null @@ -1,24 +0,0 @@ -package - -public interface Bar { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class Baz : Foo, Bar { - public constructor Baz(/*0*/ f: Foo, /*1*/ b: Bar) - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.fir.kt deleted file mode 100644 index febee25b6b3..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) -} - -class Bar(f: Foo): Foo by f { - fun foo(l: List) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt deleted file mode 100644 index 6191d8ff095..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt +++ /dev/null @@ -1,9 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) -} - -class Bar(f: Foo): Foo by f { - fun foo(l: List) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt deleted file mode 100644 index f68841dd916..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public final class Bar : Foo { - public constructor Bar(/*0*/ f: Foo) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.fir.kt deleted file mode 100644 index 74fe8e60254..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.fir.kt +++ /dev/null @@ -1,15 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) { - - } -} - -class Bar(f: Foo): Foo by f { - fun foo(l: List) {} -} - -class BarOther(f: Foo): Foo by f { - override fun foo(l: List) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt deleted file mode 100644 index 7e6b4cec1b5..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt +++ /dev/null @@ -1,15 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) { - - } -} - -class Bar(f: Foo): Foo by f { - fun foo(l: List) {} -} - -class BarOther(f: Foo): Foo by f { - override fun foo(l: List) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt deleted file mode 100644 index fefea99f460..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt +++ /dev/null @@ -1,25 +0,0 @@ -package - -public final class Bar : Foo { - public constructor Bar(/*0*/ f: Foo) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class BarOther : Foo { - public constructor BarOther(/*0*/ f: Foo) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.fir.kt deleted file mode 100644 index a609f1a780a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -class G - -val G.foo: Int - get() = 1 - -val G.foo: Int - get() = 1 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt deleted file mode 100644 index fa4f8a0a017..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt +++ /dev/null @@ -1,7 +0,0 @@ -class G - -val G.foo: Int - get() = 1 - -val G.foo: Int - get() = 1 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.txt deleted file mode 100644 index 9ccc143a4c9..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.txt +++ /dev/null @@ -1,11 +0,0 @@ -package - -public val G.foo: kotlin.Int -public val G.foo: kotlin.Int - -public final class G { - public constructor G() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.fir.kt deleted file mode 100644 index d1ba83124eb..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class G - -fun foo(x: G): G {null!!} -fun foo(x: G): G {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt deleted file mode 100644 index 4666b7d13d3..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt +++ /dev/null @@ -1,6 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class G - -fun foo(x: G): G {null!!} -fun foo(x: G): G {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.txt deleted file mode 100644 index c4ec606ed5d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.txt +++ /dev/null @@ -1,11 +0,0 @@ -package - -public fun foo(/*0*/ x: G): G -public fun foo(/*0*/ x: G): G - -public final class G { - public constructor G() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.fir.kt deleted file mode 100644 index 65473004235..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.fir.kt +++ /dev/null @@ -1,12 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) {} -} - -interface Bar { - fun foo(l: List) {} -} - -class Baz(): Foo, Bar { -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt deleted file mode 100644 index a71a6f68d2e..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt +++ /dev/null @@ -1,12 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) {} -} - -interface Bar { - fun foo(l: List) {} -} - -class Baz(): Foo, Bar { -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt deleted file mode 100644 index 3ce36d5b257..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt +++ /dev/null @@ -1,24 +0,0 @@ -package - -public interface Bar { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class Baz : Foo, Bar { - public constructor Baz() - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.fir.kt deleted file mode 100644 index 4d292586540..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN - -fun foo(s: List) {} -fun foo(s: java.util.List) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt deleted file mode 100644 index 397a3f868b9..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN - -fun foo(s: List) {} -fun foo(s: java.util.List) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.txt deleted file mode 100644 index 336a4ddafba..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public fun foo(/*0*/ s: java.util.List): kotlin.Unit -public fun foo(/*0*/ s: kotlin.collections.List): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.fir.kt deleted file mode 100644 index be18b4cef95..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(x: String) {} -fun foo(x: String?) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt deleted file mode 100644 index 971d990c904..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(x: String) {} -fun foo(x: String?) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.txt deleted file mode 100644 index 4934b6be33b..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public fun foo(/*0*/ x: kotlin.String): kotlin.Unit -public fun foo(/*0*/ x: kotlin.String?): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.fir.kt deleted file mode 100644 index 63f03c7c2b2..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.fir.kt +++ /dev/null @@ -1,13 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface A { - fun foo(l: List) -} - -interface B { - fun foo(l: List) {} -} - -class C(f: A): A by f, B - -class D(f: A): A by f, B diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt deleted file mode 100644 index bac555779d3..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt +++ /dev/null @@ -1,13 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface A { - fun foo(l: List) -} - -interface B { - fun foo(l: List) {} -} - -class C(f: A): A by f, B - -class D(f: A): A by f, B \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt deleted file mode 100644 index b4d51300d53..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt +++ /dev/null @@ -1,32 +0,0 @@ -package - -public interface A { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface B { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class C : A, B { - public constructor C(/*0*/ f: A) - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class D : A, B { - public constructor D(/*0*/ f: A) - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.fir.kt deleted file mode 100644 index 77563b2f25d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.fir.kt +++ /dev/null @@ -1,13 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) {} -} - -interface Bar { - fun foo(l: List) {} -} - -class Baz(): Foo, Bar { - fun foo(l: List) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt deleted file mode 100644 index 9c29e9fc29a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt +++ /dev/null @@ -1,13 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) {} -} - -interface Bar { - fun foo(l: List) {} -} - -class Baz(): Foo, Bar { - fun foo(l: List) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt deleted file mode 100644 index aa6a96f3df2..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt +++ /dev/null @@ -1,25 +0,0 @@ -package - -public interface Bar { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class Baz : Foo, Bar { - public constructor Baz() - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public final fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ l: kotlin.collections.List): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.fir.kt deleted file mode 100644 index 1db144a121c..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN - -fun foo(s: java.lang.String) {} -fun foo(s: String) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt deleted file mode 100644 index e9420cadc60..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN - -fun foo(s: java.lang.String) {} -fun foo(s: String) {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.txt deleted file mode 100644 index ed9fafbe4e6..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public fun foo(/*0*/ s: java.lang.String): kotlin.Unit -public fun foo(/*0*/ s: kotlin.String): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.fir.kt deleted file mode 100644 index 16fc6848222..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(x: T): T {null!!} -fun foo(x: Any): Any {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt deleted file mode 100644 index 2d39c8d4a9b..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt +++ /dev/null @@ -1,4 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(x: T): T {null!!} -fun foo(x: Any): Any {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.txt deleted file mode 100644 index fa3c4843a96..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public fun foo(/*0*/ x: T): T -public fun foo(/*0*/ x: kotlin.Any): kotlin.Any diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.fir.kt deleted file mode 100644 index d8a12296201..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo - -fun foo(x: T): T {null!!} -fun foo(x: Foo): Foo {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt deleted file mode 100644 index 71c3d36df23..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt +++ /dev/null @@ -1,6 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo - -fun foo(x: T): T {null!!} -fun foo(x: Foo): Foo {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.txt deleted file mode 100644 index d833b80583a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public fun foo(/*0*/ x: Foo): Foo -public fun foo(/*0*/ x: T): T - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.fir.kt deleted file mode 100644 index 92c1825fd8a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo -interface Bar - -fun foo(x: T): T where T: Foo, T: Bar {null!!} -fun foo(x: Foo): Foo {null!!} -fun foo(x: Bar): Bar {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt deleted file mode 100644 index 426fa852797..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt +++ /dev/null @@ -1,8 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo -interface Bar - -fun foo(x: T): T where T: Foo, T: Bar {null!!} -fun foo(x: Foo): Foo {null!!} -fun foo(x: Bar): Bar {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.txt deleted file mode 100644 index da840e7e020..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public fun foo(/*0*/ x: Bar): Bar -public fun foo(/*0*/ x: Foo): Foo -public fun foo(/*0*/ x: T): T where T : Bar - -public interface Bar { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.fir.kt deleted file mode 100644 index 92c1825fd8a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo -interface Bar - -fun foo(x: T): T where T: Foo, T: Bar {null!!} -fun foo(x: Foo): Foo {null!!} -fun foo(x: Bar): Bar {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt deleted file mode 100644 index 426fa852797..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt +++ /dev/null @@ -1,8 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo -interface Bar - -fun foo(x: T): T where T: Foo, T: Bar {null!!} -fun foo(x: Foo): Foo {null!!} -fun foo(x: Bar): Bar {null!!} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.txt deleted file mode 100644 index da840e7e020..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public fun foo(/*0*/ x: Bar): Bar -public fun foo(/*0*/ x: Foo): Foo -public fun foo(/*0*/ x: T): T where T : Bar - -public interface Bar { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt deleted file mode 100644 index 609ba57c374..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt +++ /dev/null @@ -1,7 +0,0 @@ -// FIR_IDENTICAL -enum class E { - ENTRY; - - fun getDeclaringClass() {} - fun finalize() {} -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.txt deleted file mode 100644 index 3f7affbbc51..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.txt +++ /dev/null @@ -1,21 +0,0 @@ -package - -public final enum class E : kotlin.Enum { - enum entry ENTRY - - private constructor E() - @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String - public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any - public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int - public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final override /*1*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit - public final override /*1*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): kotlin.Unit - public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public final /*synthesized*/ val entries: kotlin.enums.EnumEntries - public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E - public final /*synthesized*/ fun values(): kotlin.Array -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.fir.kt deleted file mode 100644 index 434e35c0703..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.fir.kt +++ /dev/null @@ -1,19 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// KT-7174 Report error on members with the same signature as non-overridable methods from mapped Java types (like Object.wait/notify) - -class A { - fun notify() {} - fun notifyAll() {} - fun wait() {} - fun wait(l: Long) {} - fun wait(l: Long, i: Int) {} - fun getClass(): Class = null!! -} - -fun notify() {} -fun notifyAll() {} -fun wait() {} -fun wait(l: Long) {} -fun wait(l: Long, i: Int) {} -fun getClass(): Class = null!! diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt deleted file mode 100644 index 05da2a833b0..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt +++ /dev/null @@ -1,19 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// KT-7174 Report error on members with the same signature as non-overridable methods from mapped Java types (like Object.wait/notify) - -class A { - fun notify() {} - fun notifyAll() {} - fun wait() {} - fun wait(l: Long) {} - fun wait(l: Long, i: Int) {} - fun getClass(): Class = null!! -} - -fun notify() {} -fun notifyAll() {} -fun wait() {} -fun wait(l: Long) {} -fun wait(l: Long, i: Int) {} -fun getClass(): Class = null!! diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.txt deleted file mode 100644 index 411fa6c2287..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.txt +++ /dev/null @@ -1,21 +0,0 @@ -package - -public fun getClass(): java.lang.Class -public fun notify(): kotlin.Unit -public fun notifyAll(): kotlin.Unit -public fun wait(): kotlin.Unit -public fun wait(/*0*/ l: kotlin.Long): kotlin.Unit -public fun wait(/*0*/ l: kotlin.Long, /*1*/ i: kotlin.Int): kotlin.Unit - -public final class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getClass(): java.lang.Class - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final fun notify(): kotlin.Unit - public final fun notifyAll(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public final fun wait(): kotlin.Unit - public final fun wait(/*0*/ l: kotlin.Long): kotlin.Unit - public final fun wait(/*0*/ l: kotlin.Long, /*1*/ i: kotlin.Int): kotlin.Unit -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.fir.kt deleted file mode 100644 index 9cd7beedbcf..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -class C { - val x = 1 - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt deleted file mode 100644 index 87a989d6184..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt +++ /dev/null @@ -1,4 +0,0 @@ -class C { - val x = 1 - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.txt deleted file mode 100644 index b5d6a4ca367..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class C { - public constructor C() - public final val x: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.fir.kt deleted file mode 100644 index 5cbee7e1f34..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -class C { - companion object { - val x = 1 - fun getX() = 1 - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt deleted file mode 100644 index dc8d5d4ed08..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt +++ /dev/null @@ -1,6 +0,0 @@ -class C { - companion object { - val x = 1 - fun getX() = 1 - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt deleted file mode 100644 index 20459bdd754..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public final class C { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public final val x: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.fir.kt deleted file mode 100644 index c3ae39cecab..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.fir.kt +++ /dev/null @@ -1,3 +0,0 @@ -class C(val x: Int) { - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt deleted file mode 100644 index 363cc3b8728..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt +++ /dev/null @@ -1,3 +0,0 @@ -class C(val x: Int) { - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.txt deleted file mode 100644 index 33e1e7b8a2d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class C { - public constructor C(/*0*/ x: kotlin.Int) - public final val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.fir.kt deleted file mode 100644 index a58a20fe15d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun foo(x: Any) {} - fun Any.foo() {} -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt deleted file mode 100644 index 8de127f438a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt +++ /dev/null @@ -1,6 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun foo(x: Any) {} - fun Any.foo() {} -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.txt deleted file mode 100644 index 9f3842a14c7..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class C { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ x: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public final fun kotlin.Any.foo(): kotlin.Unit -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.fir.kt deleted file mode 100644 index e615b559530..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun getX(t: Any) = 1 - val Any.x: Int - get() = 1 -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt deleted file mode 100644 index eec16d6f66a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt +++ /dev/null @@ -1,7 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun getX(t: Any) = 1 - val Any.x: Int - get() = 1 -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.txt deleted file mode 100644 index a0142127136..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class C { - public constructor C() - public final val kotlin.Any.x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(/*0*/ t: kotlin.Any): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.fir.kt deleted file mode 100644 index b0f82f15b14..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun setX(x: Int) {} - - var x: Int = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt deleted file mode 100644 index f1eb3528012..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt +++ /dev/null @@ -1,7 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun setX(x: Int) {} - - var x: Int = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.txt deleted file mode 100644 index 4c0a4643c73..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class C { - public constructor C() - public final var x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final fun setX(/*0*/ x: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.fir.kt deleted file mode 100644 index 14c42f4056e..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun setX(x: Int) {} - - var x: Int = 1 - set(v) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt deleted file mode 100644 index 16c335a3207..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt +++ /dev/null @@ -1,8 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun setX(x: Int) {} - - var x: Int = 1 - set(v) {} -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.txt deleted file mode 100644 index 4c0a4643c73..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class C { - public constructor C() - public final var x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final fun setX(/*0*/ x: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.fir.kt deleted file mode 100644 index eea8020a118..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -fun foo() { - class C { - val x = 1 - fun getX() = 1 - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt deleted file mode 100644 index 8bc6f35ce07..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt +++ /dev/null @@ -1,6 +0,0 @@ -fun foo() { - class C { - val x = 1 - fun getX() = 1 - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.txt deleted file mode 100644 index 65a6ac47e1f..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.txt +++ /dev/null @@ -1,3 +0,0 @@ -package - -public fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.fir.kt deleted file mode 100644 index c341cf3acfc..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -class Outer { - fun foo() { - class C { - val x = 1 - fun getX() = 1 - } - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt deleted file mode 100644 index 0b0fcb9755c..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt +++ /dev/null @@ -1,8 +0,0 @@ -class Outer { - fun foo() { - class C { - val x = 1 - fun getX() = 1 - } - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.txt deleted file mode 100644 index fbc18391d4d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.txt +++ /dev/null @@ -1,9 +0,0 @@ -package - -public final class Outer { - public constructor Outer() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.fir.kt deleted file mode 100644 index 1bbfa664537..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -class B { - class C { - val x = 1 - fun getX() = 1 - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt deleted file mode 100644 index 42626e2a0b4..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt +++ /dev/null @@ -1,6 +0,0 @@ -class B { - class C { - val x = 1 - fun getX() = 1 - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.txt deleted file mode 100644 index ae742986004..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public final class B { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public final class C { - public constructor C() - public final val x: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.fir.kt deleted file mode 100644 index fbd894a67f1..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -object C { - val x = 1 - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt deleted file mode 100644 index 78ca971afb9..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt +++ /dev/null @@ -1,4 +0,0 @@ -object C { - val x = 1 - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.txt deleted file mode 100644 index ba608d540f1..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public object C { - private constructor C() - public final val x: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.fir.kt deleted file mode 100644 index 01d6b6959c4..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -fun foo() = - object { - val x = 1 - fun getX() = 1 - } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt deleted file mode 100644 index d58ab0edf12..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt +++ /dev/null @@ -1,5 +0,0 @@ -fun foo() = - object { - val x = 1 - fun getX() = 1 - } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.txt deleted file mode 100644 index 12d9abe4cea..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.txt +++ /dev/null @@ -1,3 +0,0 @@ -package - -public fun foo(): kotlin.Any diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.fir.kt deleted file mode 100644 index 262025fbeff..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -class Outer { - val x = object { - val x = 1 - fun getX() = 1 - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt deleted file mode 100644 index 04c43b4528f..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt +++ /dev/null @@ -1,6 +0,0 @@ -class Outer { - val x = object { - val x = 1 - fun getX() = 1 - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.txt deleted file mode 100644 index 536a9c0714b..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.txt +++ /dev/null @@ -1,9 +0,0 @@ -package - -public final class Outer { - public constructor Outer() - public final val x: kotlin.Any - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt deleted file mode 100644 index 613b6057300..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt +++ /dev/null @@ -1,14 +0,0 @@ -// FIR_IDENTICAL -// FILE: A.java - -public class A { - public String getFoo() { - return "Foo"; - } -} - -// FILE: B.kt - -class B(private val foo: String) : A() { - override fun getFoo(): String = foo -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.txt deleted file mode 100644 index 542a309b085..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun getFoo(): kotlin.String! - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class B : A { - public constructor B(/*0*/ foo: kotlin.String) - private final val foo: kotlin.String - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ fun getFoo(): kotlin.String - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.fir.kt deleted file mode 100644 index 5d0ee3abfc2..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.fir.kt +++ /dev/null @@ -1,2 +0,0 @@ -val x = 1 -fun getX() = 1 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt deleted file mode 100644 index 98820d88018..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt +++ /dev/null @@ -1,2 +0,0 @@ -val x = 1 -fun getX() = 1 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.txt deleted file mode 100644 index 455b094ee23..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public val x: kotlin.Int = 1 -public fun getX(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt deleted file mode 100644 index 837d89a5598..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt +++ /dev/null @@ -1,6 +0,0 @@ -// FIR_IDENTICAL -// FILE: a.kt -val x = 1 - -// FILE: b.kt -fun getX() = 1 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.txt deleted file mode 100644 index 455b094ee23..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public val x: kotlin.Int = 1 -public fun getX(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.fir.kt deleted file mode 100644 index 29a9e2a007a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.fir.kt +++ /dev/null @@ -1,3 +0,0 @@ -val x: Int - get() = 1 -fun getX() = 1 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt deleted file mode 100644 index 8a2aced6a29..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt +++ /dev/null @@ -1,3 +0,0 @@ -val x: Int - get() = 1 -fun getX() = 1 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.txt deleted file mode 100644 index a7240bf9595..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public val x: kotlin.Int -public fun getX(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.fir.kt deleted file mode 100644 index 57cd160985c..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -interface T { - val x: Int - get() = 1 - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt deleted file mode 100644 index 81fca7ab9c5..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt +++ /dev/null @@ -1,5 +0,0 @@ -interface T { - val x: Int - get() = 1 - fun getX() = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.txt deleted file mode 100644 index da24c65ca68..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.txt +++ /dev/null @@ -1,9 +0,0 @@ -package - -public interface T { - public open val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt deleted file mode 100644 index 172d1a17778..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt +++ /dev/null @@ -1,6 +0,0 @@ -// FIR_IDENTICAL -class C { - companion object {} - - val Companion = C -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt deleted file mode 100644 index 4130443ba43..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt +++ /dev/null @@ -1,16 +0,0 @@ -package - -public final class C { - public constructor C() - public final val Companion: C.Companion - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.fir.kt deleted file mode 100644 index 88105c1b936..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -class C { - companion object { - val X = 1 - val `X$1` = 1 - } - - val X = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt deleted file mode 100644 index a22a0719636..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt +++ /dev/null @@ -1,8 +0,0 @@ -class C { - companion object { - val X = 1 - val `X$1` = 1 - } - - val X = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt deleted file mode 100644 index 2a2bff3898f..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public final class C { - public constructor C() - public final val X: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public final val X: kotlin.Int = 1 - public final val `X$1`: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.fir.kt deleted file mode 100644 index 96a551dc0ef..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.fir.kt +++ /dev/null @@ -1,13 +0,0 @@ -class B { - companion object A { - } - - val A = this -} - -class C { - companion object A { - val A = this - } - -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt deleted file mode 100644 index 244da9b5eeb..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt +++ /dev/null @@ -1,13 +0,0 @@ -class B { - companion object A { - } - - val A = this -} - -class C { - companion object A { - val A = this - } - -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt deleted file mode 100644 index f880c529e16..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt +++ /dev/null @@ -1,31 +0,0 @@ -package - -public final class B { - public constructor B() - public final val A: B - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object A { - private constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} - -public final class C { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object A { - private constructor A() - public final val A: C.A - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.fir.kt deleted file mode 100644 index d92de0478f4..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -data class C(val c: Int) { - fun `copy$default`(c: C, x: Int, m: Int, mh: Any) = C(this.c) -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt deleted file mode 100644 index 4159e7a9680..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt +++ /dev/null @@ -1,5 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -data class C(val c: Int) { - fun `copy$default`(c: C, x: Int, m: Int, mh: Any) = C(this.c) -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.txt deleted file mode 100644 index 9b2a5ede18a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.txt +++ /dev/null @@ -1,12 +0,0 @@ -package - -public final data class C { - public constructor C(/*0*/ c: kotlin.Int) - public final val c: kotlin.Int - public final operator /*synthesized*/ fun component1(): kotlin.Int - public final /*synthesized*/ fun copy(/*0*/ c: kotlin.Int = ...): C - public final fun `copy$default`(/*0*/ c: C, /*1*/ x: kotlin.Int, /*2*/ m: kotlin.Int, /*3*/ mh: kotlin.Any): C - public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.fir.kt deleted file mode 100644 index abfad6e56b3..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -interface Foo - -class Bar(f: Foo) : Foo by f { - val `$$delegate_0`: Foo? = null -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt deleted file mode 100644 index 7d2e5082b32..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt +++ /dev/null @@ -1,5 +0,0 @@ -interface Foo - -class Bar(f: Foo) : Foo by f { - val `$$delegate_0`: Foo? = null -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.txt deleted file mode 100644 index f04fe51ca4e..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.txt +++ /dev/null @@ -1,15 +0,0 @@ -package - -public final class Bar : Foo { - public constructor Bar(/*0*/ f: Foo) - public final val `$$delegate_0`: Foo? = null - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface Foo { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.fir.kt deleted file mode 100644 index e7673b24547..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -enum class E { - A; - - fun values(): Array = null!! - fun valueOf(s: String): E = null!! -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt deleted file mode 100644 index 6b778c9d2f9..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt +++ /dev/null @@ -1,7 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -enum class E { - A; - - fun values(): Array = null!! - fun valueOf(s: String): E = null!! -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt deleted file mode 100644 index 39631f48ed9..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt +++ /dev/null @@ -1,23 +0,0 @@ -package - -public final enum class E : kotlin.Enum { - enum entry A - - private constructor E() - @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String - public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any - public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int - public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit - public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! - public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public final fun valueOf(/*0*/ s: kotlin.String): E - public final fun values(): kotlin.Array - - // Static members - public final /*synthesized*/ val entries: kotlin.enums.EnumEntries - public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E - public final /*synthesized*/ fun values(): kotlin.Array -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.fir.kt deleted file mode 100644 index e12fd85dd65..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - inner class D { - val `this$0`: C? = null - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt deleted file mode 100644 index 7716c2409c9..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt +++ /dev/null @@ -1,7 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - inner class D { - val `this$0`: C? = null - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.txt deleted file mode 100644 index 9174fe5c34d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.txt +++ /dev/null @@ -1,16 +0,0 @@ -package - -public final class C { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public final inner class D { - public constructor D() - public final val `this$0`: C? = null - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.fir.kt deleted file mode 100644 index 89a99a64881..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.fir.kt +++ /dev/null @@ -1,3 +0,0 @@ -object O { - val INSTANCE: O = null!! -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt deleted file mode 100644 index ab982631af5..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt +++ /dev/null @@ -1,3 +0,0 @@ -object O { - val INSTANCE: O = null!! -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.txt deleted file mode 100644 index b65a258f35a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.txt +++ /dev/null @@ -1,9 +0,0 @@ -package - -public object O { - private constructor O() - public final val INSTANCE: O - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.fir.kt deleted file mode 100644 index 55e41e660c7..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.fir.kt +++ /dev/null @@ -1,13 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -import kotlin.reflect.KProperty - -operator fun Any.getValue(x: Any?, y: Any): Any = null!! - -class C { - val x by 1 - val `$$delegatedProperties`: Array> = null!! -} - -val x by 1 -val `$$delegatedProperties`: Array> = null!! diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt deleted file mode 100644 index 5665a113107..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt +++ /dev/null @@ -1,13 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -import kotlin.reflect.KProperty - -operator fun Any.getValue(x: Any?, y: Any): Any = null!! - -class C { - val x by 1 - val `$$delegatedProperties`: Array> = null!! -} - -val x by 1 -val `$$delegatedProperties`: Array> = null!! diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.txt deleted file mode 100644 index 93ef9448f6a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.txt +++ /dev/null @@ -1,14 +0,0 @@ -package - -public val `$$delegatedProperties`: kotlin.Array> -public val x: kotlin.Any -public operator fun kotlin.Any.getValue(/*0*/ x: kotlin.Any?, /*1*/ y: kotlin.Any): kotlin.Any - -public final class C { - public constructor C() - public final val `$$delegatedProperties`: kotlin.Array> - public final val x: kotlin.Any - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.fir.kt deleted file mode 100644 index 76dccc40ce7..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.fir.kt +++ /dev/null @@ -1,34 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public class A { - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: B.kt - -open class B : A() { -} - -// FILE: C.java - -public class C extends B { - public static void bar(int i) {} -} - -// FILE: K.kt - -open class K : C() { - fun foo() {} - fun foo(a: Any) {} - fun bar(i: Int) {} - fun bar(i: String) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - fun bar(i: Int) {} - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt deleted file mode 100644 index b7705e58fd1..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt +++ /dev/null @@ -1,34 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public class A { - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: B.kt - -open class B : A() { -} - -// FILE: C.java - -public class C extends B { - public static void bar(int i) {} -} - -// FILE: K.kt - -open class K : C() { - fun foo() {} - fun foo(a: Any) {} - fun bar(i: Int) {} - fun bar(i: String) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - fun bar(i: Int) {} - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.txt deleted file mode 100644 index be03ae7242f..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.txt +++ /dev/null @@ -1,52 +0,0 @@ -package - -public open class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open fun foo(): kotlin.Unit -} - -public open class B : A { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public open class C : B { - public constructor C() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public open fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit -} - -public open class K : C { - public constructor K() - public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit - public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.fir.kt deleted file mode 100644 index 2935e2a02e3..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.fir.kt +++ /dev/null @@ -1,22 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public class A { - public static int a = 1; - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: K.kt - -open class K : A() { - val a = 1 - fun foo() {} - fun foo(i: Int) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt deleted file mode 100644 index 2a98cec122b..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt +++ /dev/null @@ -1,22 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public class A { - public static int a = 1; - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: K.kt - -open class K : A() { - val a = 1 - fun foo() {} - fun foo(i: Int) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.txt deleted file mode 100644 index 090d4d93738..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.txt +++ /dev/null @@ -1,32 +0,0 @@ -package - -public open class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public final var a: kotlin.Int - public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open fun foo(): kotlin.Unit -} - -public open class K : A { - public constructor K() - public final val a: kotlin.Int = 1 - public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public final fun foo(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.fir.kt deleted file mode 100644 index cdeb98655d3..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.fir.kt +++ /dev/null @@ -1,29 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public class A { - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: B.java - -public class B extends A { - public static void bar(int i) {} -} - -// FILE: K.kt - -open class K : B() { - fun foo() {} - fun foo(a: Any) {} - fun bar(i: Int) {} - fun bar(i: String) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - fun bar(i: Int) {} - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt deleted file mode 100644 index 31bf50861c9..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt +++ /dev/null @@ -1,29 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public class A { - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: B.java - -public class B extends A { - public static void bar(int i) {} -} - -// FILE: K.kt - -open class K : B() { - fun foo() {} - fun foo(a: Any) {} - fun bar(i: Int) {} - fun bar(i: String) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - fun bar(i: Int) {} - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.txt deleted file mode 100644 index 0e8448ee59b..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.txt +++ /dev/null @@ -1,45 +0,0 @@ -package - -public open class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open fun foo(): kotlin.Unit -} - -public open class B : A { - public constructor B() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public open fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit -} - -public open class K : B { - public constructor K() - public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit - public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt deleted file mode 100644 index 2c6cf65f20a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt +++ /dev/null @@ -1,23 +0,0 @@ -// FIR_IDENTICAL -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public interface A { - public String a = ""; - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: K.kt - -open class K : A { - val a = "" - fun foo() {} - fun foo(i: Int) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.txt deleted file mode 100644 index fa7470d9a57..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.txt +++ /dev/null @@ -1,31 +0,0 @@ -package - -public interface A { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public const final val a: kotlin.String = "" - public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open fun foo(): kotlin.Unit -} - -public open class K : A { - public constructor K() - public final val a: kotlin.String = "" - public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public final fun foo(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt deleted file mode 100644 index a74cc38e666..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt +++ /dev/null @@ -1,30 +0,0 @@ -// FIR_IDENTICAL -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public interface A { - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: B.java - -public interface B extends A { - public static void bar(int i) {} -} - -// FILE: K.kt - -open class K : B { - fun foo() {} - fun foo(a: Any) {} - fun bar(i: Int) {} - fun bar(i: String) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - fun bar(i: Int) {} - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.txt deleted file mode 100644 index 5750f92af0d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.txt +++ /dev/null @@ -1,41 +0,0 @@ -package - -public interface A { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open fun foo(): kotlin.Unit -} - -public interface B : A { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public open fun bar(/*0*/ i: kotlin.Int): kotlin.Unit -} - -public open class K : B { - public constructor K() - public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit - public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt deleted file mode 100644 index ba878edd940..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt +++ /dev/null @@ -1,25 +0,0 @@ -// FIR_IDENTICAL -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: foo/A.java - -package foo; - -public class A { - private static void foo(int s) {} - static void bar(double s) {} -} - -// FILE: K.kt -import foo.A - -open class K : A() { - fun foo(i: Int) {} - fun bar(d: Double) {} - fun baz(i: Int) {} - - companion object { - fun foo(i: Int) {} - fun bar(d: Double) {} - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.txt deleted file mode 100644 index ab9eaf23907..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.txt +++ /dev/null @@ -1,34 +0,0 @@ -package - -public open class K : foo.A { - public constructor K() - public final fun bar(/*0*/ d: kotlin.Double): kotlin.Unit - public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public final fun bar(/*0*/ d: kotlin.Double): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} - -package foo { - - public open class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - // Static members - public/*package*/ open fun bar(/*0*/ s: kotlin.Double): kotlin.Unit - private open fun foo(/*0*/ s: kotlin.Int): kotlin.Unit - } -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.fir.kt deleted file mode 100644 index 6fcbe5814f9..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.fir.kt +++ /dev/null @@ -1,12 +0,0 @@ -enum class A { - A1, - A2; - - fun valueOf(s: String): A = valueOf(s) - - fun valueOf() = "OK" - - fun values(): Array = null!! - - fun values(x: String) = x -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt deleted file mode 100644 index b432ca7abe7..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt +++ /dev/null @@ -1,12 +0,0 @@ -enum class A { - A1, - A2; - - fun valueOf(s: String): A = valueOf(s) - - fun valueOf() = "OK" - - fun values(): Array = null!! - - fun values(x: String) = x -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt deleted file mode 100644 index 6bf796092ee..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt +++ /dev/null @@ -1,27 +0,0 @@ -package - -public final enum class A : kotlin.Enum { - enum entry A1 - - enum entry A2 - - private constructor A() - @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String - public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any - public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int - public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit - public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! - public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public final fun valueOf(): kotlin.String - public final fun valueOf(/*0*/ s: kotlin.String): A - public final fun values(): kotlin.Array - public final fun values(/*0*/ x: kotlin.String): kotlin.String - - // Static members - public final /*synthesized*/ val entries: kotlin.enums.EnumEntries - public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A - public final /*synthesized*/ fun values(): kotlin.Array -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.fir.kt deleted file mode 100644 index eee1418b21a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -interface T { - fun getX() = 1 -} - -class C : T { - val x = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt deleted file mode 100644 index 171fa6ce100..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt +++ /dev/null @@ -1,7 +0,0 @@ -interface T { - fun getX() = 1 -} - -class C : T { - val x = 1 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.txt deleted file mode 100644 index c951f60228a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.txt +++ /dev/null @@ -1,17 +0,0 @@ -package - -public final class C : T { - public constructor C() - public final val x: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface T { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt deleted file mode 100644 index 20e46f71270..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - fun getX() = 1 -} - -interface C : T { - val x: Int - get() = 1 -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt deleted file mode 100644 index ad59f3be327..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - fun getX() = 1 -} - -interface C : T { - val x: Int - get() = 1 -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.txt deleted file mode 100644 index 64bdfcc5f3c..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.txt +++ /dev/null @@ -1,16 +0,0 @@ -package - -public interface C : T { - public open val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface T { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.fir.kt deleted file mode 100644 index 9f4368ce1ac..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - val x: Int - get() = 1 -} - -interface C : T { - fun getX() = 1 -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt deleted file mode 100644 index f2e4efdac56..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt +++ /dev/null @@ -1,8 +0,0 @@ -interface T { - val x: Int - get() = 1 -} - -interface C : T { - fun getX() = 1 -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.txt deleted file mode 100644 index ca3ff66ebb5..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.txt +++ /dev/null @@ -1,16 +0,0 @@ -package - -public interface C : T { - public open override /*1*/ /*fake_override*/ val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface T { - public open val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.fir.kt deleted file mode 100644 index 88080b65dc3..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.fir.kt +++ /dev/null @@ -1,11 +0,0 @@ -interface T1 { - fun getX() = 1 -} - -interface T2 { - val x: Int - get() = 1 -} - -class C : T1, T2 { -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt deleted file mode 100644 index a1f17330267..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt +++ /dev/null @@ -1,11 +0,0 @@ -interface T1 { - fun getX() = 1 -} - -interface T2 { - val x: Int - get() = 1 -} - -class C : T1, T2 { -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.txt deleted file mode 100644 index ba1c334d65d..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.txt +++ /dev/null @@ -1,24 +0,0 @@ -package - -public final class C : T1, T2 { - public constructor C() - public open override /*1*/ /*fake_override*/ val x: kotlin.Int - public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface T1 { - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun getX(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public interface T2 { - public open val x: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.fir.kt deleted file mode 100644 index 481498c275a..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -fun foo(vararg x: Int) {} -fun foo(x: IntArray) {} - -fun foo(vararg x: Int?) {} -fun foo(x: Array) {} - -fun foo(vararg nn: Number) {} -fun foo(nn: Array) {} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt deleted file mode 100644 index 1acdc531a68..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt +++ /dev/null @@ -1,8 +0,0 @@ -fun foo(vararg x: Int) {} -fun foo(x: IntArray) {} - -fun foo(vararg x: Int?) {} -fun foo(x: Array) {} - -fun foo(vararg nn: Number) {} -fun foo(nn: Array) {} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.txt deleted file mode 100644 index ba4b302ad5f..00000000000 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.txt +++ /dev/null @@ -1,8 +0,0 @@ -package - -public fun foo(/*0*/ x: kotlin.Array): kotlin.Unit -public fun foo(/*0*/ vararg x: kotlin.Int? /*kotlin.Array*/): kotlin.Unit -public fun foo(/*0*/ nn: kotlin.Array): kotlin.Unit -public fun foo(/*0*/ vararg nn: kotlin.Number /*kotlin.Array*/): kotlin.Unit -public fun foo(/*0*/ vararg x: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit -public fun foo(/*0*/ x: kotlin.IntArray): kotlin.Unit 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 87ce79107b5..a2561221a89 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 @@ -11863,562 +11863,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { } } - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature") - @TestDataPath("$PROJECT_ROOT") - public class DuplicateJvmSignature { - @Test - public void testAllFilesPresentInDuplicateJvmSignature() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("caseInProperties.kt") - public void testCaseInProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt"); - } - - @Test - @TestMetadata("vararg.kt") - public void testVararg() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt"); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides") - @TestDataPath("$PROJECT_ROOT") - public class AccidentalOverrides { - @Test - @TestMetadata("accidentalOverrideFromGrandparent.kt") - public void testAccidentalOverrideFromGrandparent() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt"); - } - - @Test - public void testAllFilesPresentInAccidentalOverrides() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("classFunctionOverriddenByProperty.kt") - public void testClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyInConstructor.kt") - public void testClassFunctionOverriddenByPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("classFunctionOverriddenByPropertyNoGetter.kt") - public void testClassFunctionOverriddenByPropertyNoGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt"); - } - - @Test - @TestMetadata("classPropertyOverriddenByFunction.kt") - public void testClassPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("defaultFunction.kt") - public void testDefaultFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt"); - } - - @Test - @TestMetadata("delegatedFunctionOverriddenByProperty.kt") - public void testDelegatedFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("genericClassFunction.kt") - public void testGenericClassFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt"); - } - - @Test - @TestMetadata("overridesNothing.kt") - public void testOverridesNothing() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt"); - } - - @Test - @TestMetadata("privateClassFunctionOverriddenByProperty.kt") - public void testPrivateClassFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByProperty.kt") - public void testTraitFunctionOverriddenByProperty() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyNoImpl.kt") - public void testTraitFunctionOverriddenByPropertyNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunction.kt") - public void testTraitPropertyOverriddenByFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionNoImpl.kt") - public void testTraitPropertyOverriddenByFunctionNoImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges") - @TestDataPath("$PROJECT_ROOT") - public class Bridges { - @Test - public void testAllFilesPresentInBridges() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt"); - } - - @Test - @TestMetadata("fakeOverrideTrait.kt") - public void testFakeOverrideTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure") - @TestDataPath("$PROJECT_ROOT") - public class Erasure { - @Test - public void testAllFilesPresentInErasure() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("clashFromInterfaceAndSuperClass.kt") - public void testClashFromInterfaceAndSuperClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt"); - } - - @Test - @TestMetadata("collections.kt") - public void testCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt"); - } - - @Test - @TestMetadata("delegateToTwoTraits.kt") - public void testDelegateToTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt"); - } - - @Test - @TestMetadata("delegationAndOwnMethod.kt") - public void testDelegationAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt"); - } - - @Test - @TestMetadata("delegationToTraitImplAndOwnMethod.kt") - public void testDelegationToTraitImplAndOwnMethod() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); - } - - @Test - @TestMetadata("extensionProperties.kt") - public void testExtensionProperties() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt"); - } - - @Test - @TestMetadata("genericType.kt") - public void testGenericType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt"); - } - - @Test - @TestMetadata("inheritFromTwoTraits.kt") - public void testInheritFromTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt"); - } - - @Test - @TestMetadata("kotlinAndJavaCollections.kt") - public void testKotlinAndJavaCollections() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt"); - } - - @Test - @TestMetadata("nullableType.kt") - public void testNullableType() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt"); - } - - @Test - @TestMetadata("superTraitAndDelegationToTraitImpl.kt") - public void testSuperTraitAndDelegationToTraitImpl() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt"); - } - - @Test - @TestMetadata("twoTraitsAndOwnFunction.kt") - public void testTwoTraitsAndOwnFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt"); - } - - @Test - @TestMetadata("typeMappedToJava.kt") - public void testTypeMappedToJava() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt"); - } - - @Test - @TestMetadata("typeParameter.kt") - public void testTypeParameter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt"); - } - - @Test - @TestMetadata("typeParameterWithBound.kt") - public void testTypeParameterWithBound() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBounds.kt") - public void testTypeParameterWithTwoBounds() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt"); - } - - @Test - @TestMetadata("typeParameterWithTwoBoundsInWhere.kt") - public void testTypeParameterWithTwoBoundsInWhere() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns") - @TestDataPath("$PROJECT_ROOT") - public class FinalMembersFromBuiltIns { - @Test - public void testAllFilesPresentInFinalMembersFromBuiltIns() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("enumMembers.kt") - public void testEnumMembers() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt"); - } - - @Test - @TestMetadata("waitNotifyGetClass.kt") - public void testWaitNotifyGetClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty") - @TestDataPath("$PROJECT_ROOT") - public class FunctionAndProperty { - @Test - public void testAllFilesPresentInFunctionAndProperty() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("class.kt") - public void testClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt"); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt"); - } - - @Test - @TestMetadata("classPropertyInConstructor.kt") - public void testClassPropertyInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt"); - } - - @Test - @TestMetadata("extensionFunctionAndNormalFunction.kt") - public void testExtensionFunctionAndNormalFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt"); - } - - @Test - @TestMetadata("extensionPropertyAndFunction.kt") - public void testExtensionPropertyAndFunction() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt"); - } - - @Test - @TestMetadata("functionAndSetter.kt") - public void testFunctionAndSetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt"); - } - - @Test - @TestMetadata("functionAndVar.kt") - public void testFunctionAndVar() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt"); - } - - @Test - @TestMetadata("localClass.kt") - public void testLocalClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt"); - } - - @Test - @TestMetadata("localClassInClass.kt") - public void testLocalClassInClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt"); - } - - @Test - @TestMetadata("nestedClass.kt") - public void testNestedClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); - } - - @Test - @TestMetadata("object.kt") - public void testObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt"); - } - - @Test - @TestMetadata("objectExpression.kt") - public void testObjectExpression() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); - } - - @Test - @TestMetadata("objectExpressionInConstructor.kt") - public void testObjectExpressionInConstructor() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt"); - } - - @Test - @TestMetadata("privateClassPropertyNoClash.kt") - public void testPrivateClassPropertyNoClash() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt"); - } - - @Test - @TestMetadata("topLevel.kt") - public void testTopLevel() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt"); - } - - @Test - @TestMetadata("topLevelDifferentFiles.kt") - public void testTopLevelDifferentFiles() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt"); - } - - @Test - @TestMetadata("topLevelGetter.kt") - public void testTopLevelGetter() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt"); - } - - @Test - @TestMetadata("trait.kt") - public void testTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames") - @TestDataPath("$PROJECT_ROOT") - public class SpecialNames { - @Test - public void testAllFilesPresentInSpecialNames() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("classObject.kt") - public void testClassObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt"); - } - - @Test - @TestMetadata("classObjectCopiedField.kt") - public void testClassObjectCopiedField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt"); - } - - @Test - @TestMetadata("classObjectCopiedFieldObject.kt") - public void testClassObjectCopiedFieldObject() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt"); - } - - @Test - @TestMetadata("dataClassCopy.kt") - public void testDataClassCopy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt"); - } - - @Test - @TestMetadata("delegationBy.kt") - public void testDelegationBy() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt"); - } - - @Test - @TestMetadata("enum.kt") - public void testEnum() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt"); - } - - @Test - @TestMetadata("innerClassField.kt") - public void testInnerClassField() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt"); - } - - @Test - @TestMetadata("instance.kt") - public void testInstance() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt"); - } - - @Test - @TestMetadata("propertyMetadataCache.kt") - public void testPropertyMetadataCache() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics") - @TestDataPath("$PROJECT_ROOT") - public class Statics { - @Test - public void testAllFilesPresentInStatics() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassExtendsJavaClassExtendsJavaClass.kt") - public void testKotlinClassExtendsJavaClassExtendsJavaClass() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterface.kt") - public void testKotlinClassImplementsJavaInterface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterface.kt"); - } - - @Test - @TestMetadata("kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt") - public void testKotlinClassImplementsJavaInterfaceExtendsJavaInteface() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinClassImplementsJavaInterfaceExtendsJavaInteface.kt"); - } - - @Test - @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") - public void testKotlinMembersVsJavaNonVisibleStatics() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized") - @TestDataPath("$PROJECT_ROOT") - public class Synthesized { - @Test - public void testAllFilesPresentInSynthesized() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("enumValuesValueOf.kt") - public void testEnumValuesValueOf() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl") - @TestDataPath("$PROJECT_ROOT") - public class TraitImpl { - @Test - public void testAllFilesPresentInTraitImpl() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); - } - - @Test - @TestMetadata("oneTrait.kt") - public void testOneTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt"); - } - - @Test - @TestMetadata("traitFunctionOverriddenByPropertyInTrait.kt") - public void testTraitFunctionOverriddenByPropertyInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt"); - } - - @Test - @TestMetadata("traitPropertyOverriddenByFunctionInTrait.kt") - public void testTraitPropertyOverriddenByFunctionInTrait() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt"); - } - - @Test - @TestMetadata("twoTraits.kt") - public void testTwoTraits() { - runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/tests/dynamicTypes") @TestDataPath("$PROJECT_ROOT")