diff --git a/compiler/testData/codegen/boxWithJava/annotatedSamFunExpression.kt b/compiler/testData/codegen/box/annotations/annotatedLambda/samFunExpression.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotatedSamFunExpression.kt rename to compiler/testData/codegen/box/annotations/annotatedLambda/samFunExpression.kt diff --git a/compiler/testData/codegen/boxWithJava/annotatedSamLambda.kt b/compiler/testData/codegen/box/annotations/annotatedLambda/samLambda.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotatedSamLambda.kt rename to compiler/testData/codegen/box/annotations/annotatedLambda/samLambda.kt diff --git a/compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinProperty.kt b/compiler/testData/codegen/box/annotations/annotationWithKotlinProperty.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinProperty.kt rename to compiler/testData/codegen/box/annotations/annotationWithKotlinProperty.kt diff --git a/compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinPropertyFromInterfaceCompanion.kt b/compiler/testData/codegen/box/annotations/annotationWithKotlinPropertyFromInterfaceCompanion.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinPropertyFromInterfaceCompanion.kt rename to compiler/testData/codegen/box/annotations/annotationWithKotlinPropertyFromInterfaceCompanion.kt diff --git a/compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/mapEntry.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections.kt rename to compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/mapEntry.kt diff --git a/compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedIterable.kt b/compiler/testData/codegen/box/builtinStubMethods/substitutedIterable.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedIterable.kt rename to compiler/testData/codegen/box/builtinStubMethods/substitutedIterable.kt diff --git a/compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedList.kt b/compiler/testData/codegen/box/builtinStubMethods/substitutedListWithExtraSuperInterface.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedList.kt rename to compiler/testData/codegen/box/builtinStubMethods/substitutedListWithExtraSuperInterface.kt diff --git a/compiler/testData/codegen/boxWithJava/casts/javaTypeIsFunK.kt b/compiler/testData/codegen/box/casts/functions/javaTypeIsFunK.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/casts/javaTypeIsFunK.kt rename to compiler/testData/codegen/box/casts/functions/javaTypeIsFunK.kt diff --git a/compiler/testData/codegen/boxWithJava/casts/literalExpressionAsGenericArgument.kt b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/javaBox.kt similarity index 88% rename from compiler/testData/codegen/boxWithJava/casts/literalExpressionAsGenericArgument.kt rename to compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/javaBox.kt index e459ee256ed..7ccc0c2ad76 100644 --- a/compiler/testData/codegen/boxWithJava/casts/literalExpressionAsGenericArgument.kt +++ b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/javaBox.kt @@ -17,6 +17,7 @@ public class Box { } // FILE: test.kt +// See KT-10313: ClassCastException with Generics fun box(): String { val sub = Box(-1) diff --git a/compiler/testData/codegen/boxWithJava/classCompanion.kt b/compiler/testData/codegen/box/classes/classCompanionInitializationWithJava.kt similarity index 96% rename from compiler/testData/codegen/boxWithJava/classCompanion.kt rename to compiler/testData/codegen/box/classes/classCompanionInitializationWithJava.kt index 4b03c59c52f..814f87dbdb5 100644 --- a/compiler/testData/codegen/boxWithJava/classCompanion.kt +++ b/compiler/testData/codegen/box/classes/classCompanionInitializationWithJava.kt @@ -1,3 +1,4 @@ +// TARGET_BACKEND: JVM // FILE: CompanionInitialization.java public class CompanionInitialization { diff --git a/compiler/testData/codegen/boxWithJava/interfaceCompanion.kt b/compiler/testData/codegen/box/classes/interfaceCompanionInitializationWithJava.kt similarity index 96% rename from compiler/testData/codegen/boxWithJava/interfaceCompanion.kt rename to compiler/testData/codegen/box/classes/interfaceCompanionInitializationWithJava.kt index 58bdad5fe98..0db5f2d4372 100644 --- a/compiler/testData/codegen/boxWithJava/interfaceCompanion.kt +++ b/compiler/testData/codegen/box/classes/interfaceCompanionInitializationWithJava.kt @@ -1,3 +1,4 @@ +// TARGET_BACKEND: JVM // WITH_RUNTIME // FILE: CompanionInitialization.java diff --git a/compiler/testData/codegen/boxWithJava/collections/charSequence.kt b/compiler/testData/codegen/box/collections/charSequence.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/charSequence.kt rename to compiler/testData/codegen/box/collections/charSequence.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/implementCollectionThroughKotlin.kt b/compiler/testData/codegen/box/collections/implementCollectionThroughKotlin.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/implementCollectionThroughKotlin.kt rename to compiler/testData/codegen/box/collections/implementCollectionThroughKotlin.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequence.kt b/compiler/testData/codegen/box/collections/irrelevantImplCharSequence.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequence.kt rename to compiler/testData/codegen/box/collections/irrelevantImplCharSequence.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequenceKotlin.kt b/compiler/testData/codegen/box/collections/irrelevantImplCharSequenceKotlin.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequenceKotlin.kt rename to compiler/testData/codegen/box/collections/irrelevantImplCharSequenceKotlin.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableList.kt b/compiler/testData/codegen/box/collections/irrelevantImplMutableList.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableList.kt rename to compiler/testData/codegen/box/collections/irrelevantImplMutableList.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListKotlin.kt b/compiler/testData/codegen/box/collections/irrelevantImplMutableListKotlin.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListKotlin.kt rename to compiler/testData/codegen/box/collections/irrelevantImplMutableListKotlin.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListSubstitution.kt b/compiler/testData/codegen/box/collections/irrelevantImplMutableListSubstitution.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListSubstitution.kt rename to compiler/testData/codegen/box/collections/irrelevantImplMutableListSubstitution.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/irrelevantRemoveAtOverrideInJava.kt b/compiler/testData/codegen/box/collections/irrelevantRemoveAtOverrideInJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/irrelevantRemoveAtOverrideInJava.kt rename to compiler/testData/codegen/box/collections/irrelevantRemoveAtOverrideInJava.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/irrelevantSizeOverrideInJava.kt b/compiler/testData/codegen/box/collections/irrelevantSizeOverrideInJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/irrelevantSizeOverrideInJava.kt rename to compiler/testData/codegen/box/collections/irrelevantSizeOverrideInJava.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/mutableList.kt b/compiler/testData/codegen/box/collections/mutableList.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/mutableList.kt rename to compiler/testData/codegen/box/collections/mutableList.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/platformValueContains.kt b/compiler/testData/codegen/box/collections/platformValueContains.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/platformValueContains.kt rename to compiler/testData/codegen/box/collections/platformValueContains.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/readOnlyList.kt b/compiler/testData/codegen/box/collections/readOnlyList.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/readOnlyList.kt rename to compiler/testData/codegen/box/collections/readOnlyList.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/readOnlyMap.kt b/compiler/testData/codegen/box/collections/readOnlyMap.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/readOnlyMap.kt rename to compiler/testData/codegen/box/collections/readOnlyMap.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/removeAtInt.kt b/compiler/testData/codegen/box/collections/removeAtInt.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/removeAtInt.kt rename to compiler/testData/codegen/box/collections/removeAtInt.kt diff --git a/compiler/testData/codegen/boxWithJava/collections/strList.kt b/compiler/testData/codegen/box/collections/strList.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/collections/strList.kt rename to compiler/testData/codegen/box/collections/strList.kt diff --git a/compiler/testData/codegen/boxWithJava/invokeOnSyntheticProperty.kt b/compiler/testData/codegen/box/functions/invoke/invokeOnSyntheticProperty.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/invokeOnSyntheticProperty.kt rename to compiler/testData/codegen/box/functions/invoke/invokeOnSyntheticProperty.kt diff --git a/compiler/testData/codegen/boxWithJava/innerGenericClass.kt b/compiler/testData/codegen/box/innerNested/innerGenericClassFromJava.kt similarity index 95% rename from compiler/testData/codegen/boxWithJava/innerGenericClass.kt rename to compiler/testData/codegen/box/innerNested/innerGenericClassFromJava.kt index de22812b35f..3490ee65894 100644 --- a/compiler/testData/codegen/boxWithJava/innerGenericClass.kt +++ b/compiler/testData/codegen/box/innerNested/innerGenericClassFromJava.kt @@ -1,3 +1,4 @@ +// TARGET_BACKEND: JVM // FILE: JavaClass.java public abstract class JavaClass { diff --git a/compiler/testData/codegen/boxWithJava/innerClass.kt b/compiler/testData/codegen/box/innerNested/innerJavaClass.kt similarity index 95% rename from compiler/testData/codegen/boxWithJava/innerClass.kt rename to compiler/testData/codegen/box/innerNested/innerJavaClass.kt index 2e80b2bc847..da291521d05 100644 --- a/compiler/testData/codegen/boxWithJava/innerClass.kt +++ b/compiler/testData/codegen/box/innerNested/innerJavaClass.kt @@ -1,3 +1,4 @@ +// TARGET_BACKEND: JVM // FILE: JavaClass.java public abstract class JavaClass { diff --git a/compiler/testData/codegen/boxWithJava/allWildcardsOnClass.kt b/compiler/testData/codegen/box/javaInterop/generics/allWildcardsOnClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/allWildcardsOnClass.kt rename to compiler/testData/codegen/box/javaInterop/generics/allWildcardsOnClass.kt diff --git a/compiler/testData/codegen/boxWithJava/covariantOverrideWithDeclarationSiteProjection.kt b/compiler/testData/codegen/box/javaInterop/generics/covariantOverrideWithDeclarationSiteProjection.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/covariantOverrideWithDeclarationSiteProjection.kt rename to compiler/testData/codegen/box/javaInterop/generics/covariantOverrideWithDeclarationSiteProjection.kt diff --git a/compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard.kt b/compiler/testData/codegen/box/javaInterop/generics/invariantArgumentsNoWildcard.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard.kt rename to compiler/testData/codegen/box/javaInterop/generics/invariantArgumentsNoWildcard.kt diff --git a/compiler/testData/codegen/boxWithJava/notNullAssertions/extensionReceiverParameter.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/extensionReceiverParameter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/notNullAssertions/extensionReceiverParameter.kt rename to compiler/testData/codegen/box/javaInterop/notNullAssertions/extensionReceiverParameter.kt diff --git a/compiler/testData/codegen/boxWithJava/jvmField/constructorProperty.kt b/compiler/testData/codegen/box/jvmField/constructorProperty.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/jvmField/constructorProperty.kt rename to compiler/testData/codegen/box/jvmField/constructorProperty.kt diff --git a/compiler/testData/codegen/boxWithJava/jvmField/simple.kt b/compiler/testData/codegen/box/jvmField/simpleMemberProperty.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/jvmField/simple.kt rename to compiler/testData/codegen/box/jvmField/simpleMemberProperty.kt diff --git a/compiler/testData/codegen/boxWithJava/jvmName.kt b/compiler/testData/codegen/box/jvmName/fakeJvmNameInJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/jvmName.kt rename to compiler/testData/codegen/box/jvmName/fakeJvmNameInJava.kt diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/differentFiles.kt b/compiler/testData/codegen/box/jvmName/fileFacades/differentFiles.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/fileClasses/differentFiles.kt rename to compiler/testData/codegen/box/jvmName/fileFacades/differentFiles.kt diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/javaAnnotationOnFileFacade.kt b/compiler/testData/codegen/box/jvmName/fileFacades/javaAnnotationOnFileFacade.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/fileClasses/javaAnnotationOnFileFacade.kt rename to compiler/testData/codegen/box/jvmName/fileFacades/javaAnnotationOnFileFacade.kt diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/simple.kt b/compiler/testData/codegen/box/jvmName/fileFacades/simple.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/fileClasses/simple.kt rename to compiler/testData/codegen/box/jvmName/fileFacades/simple.kt diff --git a/compiler/testData/codegen/boxWithJava/jvmOverloads/generics.kt b/compiler/testData/codegen/box/jvmOverloads/generics.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/jvmOverloads/generics.kt rename to compiler/testData/codegen/box/jvmOverloads/generics.kt diff --git a/compiler/testData/codegen/boxWithJava/jvmOverloads/simple.kt b/compiler/testData/codegen/box/jvmOverloads/simpleJavaCall.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/jvmOverloads/simple.kt rename to compiler/testData/codegen/box/jvmOverloads/simpleJavaCall.kt diff --git a/compiler/testData/codegen/boxWithJava/jvmStatic/annotations.kt b/compiler/testData/codegen/box/jvmStatic/annotations.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/jvmStatic/annotations.kt rename to compiler/testData/codegen/box/jvmStatic/annotations.kt diff --git a/compiler/testData/codegen/boxWithJava/jvmStatic/companionObject.kt b/compiler/testData/codegen/box/jvmStatic/companionObject.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/jvmStatic/companionObject.kt rename to compiler/testData/codegen/box/jvmStatic/companionObject.kt diff --git a/compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion.kt b/compiler/testData/codegen/box/jvmStatic/enumCompanion.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion.kt rename to compiler/testData/codegen/box/jvmStatic/enumCompanion.kt diff --git a/compiler/testData/codegen/boxWithJava/jvmStatic/object.kt b/compiler/testData/codegen/box/jvmStatic/object.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/jvmStatic/object.kt rename to compiler/testData/codegen/box/jvmStatic/object.kt diff --git a/compiler/testData/codegen/boxWithJava/mangling.kt b/compiler/testData/codegen/box/mangling/noOverrideWithJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/mangling.kt rename to compiler/testData/codegen/box/mangling/noOverrideWithJava.kt diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWith2Files.kt b/compiler/testData/codegen/box/multifileClasses/multifileClassWith2Files.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWith2Files.kt rename to compiler/testData/codegen/box/multifileClasses/multifileClassWith2Files.kt diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall.kt b/compiler/testData/codegen/box/multifileClasses/multifileClassWithCrossCall.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall.kt rename to compiler/testData/codegen/box/multifileClasses/multifileClassWithCrossCall.kt diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithPrivate.kt b/compiler/testData/codegen/box/multifileClasses/multifileClassWithPrivate.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithPrivate.kt rename to compiler/testData/codegen/box/multifileClasses/multifileClassWithPrivate.kt diff --git a/compiler/testData/codegen/boxWithJava/number.kt b/compiler/testData/codegen/box/primitiveTypes/number.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/number.kt rename to compiler/testData/codegen/box/primitiveTypes/number.kt diff --git a/compiler/testData/codegen/boxWithJava/properties/collectionSize.kt b/compiler/testData/codegen/box/properties/collectionSize.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/properties/collectionSize.kt rename to compiler/testData/codegen/box/properties/collectionSize.kt diff --git a/compiler/testData/codegen/boxWithJava/properties/commonProperties.kt b/compiler/testData/codegen/box/properties/commonPropertiesKJK.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/properties/commonProperties.kt rename to compiler/testData/codegen/box/properties/commonPropertiesKJK.kt diff --git a/compiler/testData/codegen/boxWithJava/companionObjectAccessor.kt b/compiler/testData/codegen/box/properties/companionObjectAccessor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/companionObjectAccessor.kt rename to compiler/testData/codegen/box/properties/companionObjectAccessor.kt diff --git a/compiler/testData/codegen/boxWithJava/properties/companionObjectProperties.kt b/compiler/testData/codegen/box/properties/companionObjectPropertiesFromJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/properties/companionObjectProperties.kt rename to compiler/testData/codegen/box/properties/companionObjectPropertiesFromJava.kt diff --git a/compiler/testData/codegen/boxWithJava/javaProperty/boxedGetter.kt b/compiler/testData/codegen/box/properties/javaPropertyBoxedGetter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/javaProperty/boxedGetter.kt rename to compiler/testData/codegen/box/properties/javaPropertyBoxedGetter.kt diff --git a/compiler/testData/codegen/boxWithJava/javaProperty/boxedSetter.kt b/compiler/testData/codegen/box/properties/javaPropertyBoxedSetter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/javaProperty/boxedSetter.kt rename to compiler/testData/codegen/box/properties/javaPropertyBoxedSetter.kt diff --git a/compiler/testData/codegen/boxWithJava/protectedInInline.kt b/compiler/testData/codegen/box/properties/protectedJavaFieldInInline.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/protectedInInline.kt rename to compiler/testData/codegen/box/properties/protectedJavaFieldInInline.kt diff --git a/compiler/testData/codegen/boxWithJava/properties/protectedJavaProperty.kt b/compiler/testData/codegen/box/properties/protectedJavaProperty.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/properties/protectedJavaProperty.kt rename to compiler/testData/codegen/box/properties/protectedJavaProperty.kt diff --git a/compiler/testData/codegen/boxWithJava/properties/protectedJavaPropertyInCompanion.kt b/compiler/testData/codegen/box/properties/protectedJavaPropertyInCompanion.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/properties/protectedJavaPropertyInCompanion.kt rename to compiler/testData/codegen/box/properties/protectedJavaPropertyInCompanion.kt diff --git a/compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField.kt b/compiler/testData/codegen/box/properties/substituteJavaSuperField.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField.kt rename to compiler/testData/codegen/box/properties/substituteJavaSuperField.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/annotationsOnJavaMembers.kt b/compiler/testData/codegen/box/reflection/annotations/annotationsOnJavaMembers.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/annotationsOnJavaMembers.kt rename to compiler/testData/codegen/box/reflection/annotations/annotationsOnJavaMembers.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod.kt b/compiler/testData/codegen/box/reflection/call/callInstanceJavaMethod.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod.kt rename to compiler/testData/codegen/box/reflection/call/callInstanceJavaMethod.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod.kt b/compiler/testData/codegen/box/reflection/call/callPrivateJavaMethod.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod.kt rename to compiler/testData/codegen/box/reflection/call/callPrivateJavaMethod.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod.kt b/compiler/testData/codegen/box/reflection/call/callStaticJavaMethod.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod.kt rename to compiler/testData/codegen/box/reflection/call/callStaticJavaMethod.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/nestedClasses.kt b/compiler/testData/codegen/box/reflection/classes/nestedClassesJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/nestedClasses.kt rename to compiler/testData/codegen/box/reflection/classes/nestedClassesJava.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedFunctions.kt b/compiler/testData/codegen/box/reflection/functions/declaredVsInheritedFunctions.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedFunctions.kt rename to compiler/testData/codegen/box/reflection/functions/declaredVsInheritedFunctions.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/functionReferenceErasedToKFunction.kt b/compiler/testData/codegen/box/reflection/functions/functionReferenceErasedToKFunction.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/functionReferenceErasedToKFunction.kt rename to compiler/testData/codegen/box/reflection/functions/functionReferenceErasedToKFunction.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions.kt b/compiler/testData/codegen/box/reflection/functions/javaClassGetFunctions.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions.kt rename to compiler/testData/codegen/box/reflection/functions/javaClassGetFunctions.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/javaMethodsSmokeTest.kt b/compiler/testData/codegen/box/reflection/functions/javaMethodsSmokeTest.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/javaMethodsSmokeTest.kt rename to compiler/testData/codegen/box/reflection/functions/javaMethodsSmokeTest.kt diff --git a/compiler/testData/codegen/boxWithJava/annotationsWithKClass/array.kt b/compiler/testData/codegen/box/reflection/kClassInAnnotation/arrayInJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotationsWithKClass/array.kt rename to compiler/testData/codegen/box/reflection/kClassInAnnotation/arrayInJava.kt diff --git a/compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic.kt b/compiler/testData/codegen/box/reflection/kClassInAnnotation/basicInJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic.kt rename to compiler/testData/codegen/box/reflection/kClassInAnnotation/basicInJava.kt diff --git a/compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg.kt b/compiler/testData/codegen/box/reflection/kClassInAnnotation/varargInJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg.kt rename to compiler/testData/codegen/box/reflection/kClassInAnnotation/varargInJava.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/parametersHaveNoNames.kt b/compiler/testData/codegen/box/reflection/parameters/javaParametersHaveNoNames.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/parametersHaveNoNames.kt rename to compiler/testData/codegen/box/reflection/parameters/javaParametersHaveNoNames.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedProperties.kt b/compiler/testData/codegen/box/reflection/properties/declaredVsInheritedProperties.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedProperties.kt rename to compiler/testData/codegen/box/reflection/properties/declaredVsInheritedProperties.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/javaPropertyInheritedInKotlin.kt b/compiler/testData/codegen/box/reflection/properties/javaPropertyInheritedInKotlin.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/javaPropertyInheritedInKotlin.kt rename to compiler/testData/codegen/box/reflection/properties/javaPropertyInheritedInKotlin.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/javaStaticField.kt b/compiler/testData/codegen/box/reflection/properties/javaStaticField.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/javaStaticField.kt rename to compiler/testData/codegen/box/reflection/properties/javaStaticField.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava.kt b/compiler/testData/codegen/box/reflection/properties/kotlinPropertyInheritedInJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava.kt rename to compiler/testData/codegen/box/reflection/properties/kotlinPropertyInheritedInJava.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaInstanceField.kt b/compiler/testData/codegen/box/reflection/properties/mutatePrivateJavaInstanceField.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaInstanceField.kt rename to compiler/testData/codegen/box/reflection/properties/mutatePrivateJavaInstanceField.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaStaticField.kt b/compiler/testData/codegen/box/reflection/properties/mutatePrivateJavaStaticField.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaStaticField.kt rename to compiler/testData/codegen/box/reflection/properties/mutatePrivateJavaStaticField.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/noConflictOnKotlinGetterAndJavaField.kt b/compiler/testData/codegen/box/reflection/properties/noConflictOnKotlinGetterAndJavaField.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/noConflictOnKotlinGetterAndJavaField.kt rename to compiler/testData/codegen/box/reflection/properties/noConflictOnKotlinGetterAndJavaField.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/overrideKotlinPropertyByJavaMethod.kt b/compiler/testData/codegen/box/reflection/properties/overrideKotlinPropertyByJavaMethod.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/overrideKotlinPropertyByJavaMethod.kt rename to compiler/testData/codegen/box/reflection/properties/overrideKotlinPropertyByJavaMethod.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/referenceToJavaFieldOfKotlinSubclass.kt b/compiler/testData/codegen/box/reflection/properties/referenceToJavaFieldOfKotlinSubclass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/referenceToJavaFieldOfKotlinSubclass.kt rename to compiler/testData/codegen/box/reflection/properties/referenceToJavaFieldOfKotlinSubclass.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/platformTypeNotEqualToKotlinType.kt b/compiler/testData/codegen/box/reflection/types/platformTypeNotEqualToKotlinType.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/platformTypeNotEqualToKotlinType.kt rename to compiler/testData/codegen/box/reflection/types/platformTypeNotEqualToKotlinType.kt diff --git a/compiler/testData/codegen/boxWithJava/reflection/platformTypeToString.kt b/compiler/testData/codegen/box/reflection/types/platformTypeToString.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reflection/platformTypeToString.kt rename to compiler/testData/codegen/box/reflection/types/platformTypeToString.kt diff --git a/compiler/testData/codegen/boxWithJava/reified/asCheck.kt b/compiler/testData/codegen/box/reified/asOnPlatformType.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reified/asCheck.kt rename to compiler/testData/codegen/box/reified/asOnPlatformType.kt diff --git a/compiler/testData/codegen/boxWithJava/reified/isCheck.kt b/compiler/testData/codegen/box/reified/isOnPlatformType.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/reified/isCheck.kt rename to compiler/testData/codegen/box/reified/isOnPlatformType.kt diff --git a/compiler/testData/codegen/boxWithJava/secondaryConstructors/withGenerics.kt b/compiler/testData/codegen/box/secondaryConstructors/withGenerics.kt similarity index 96% rename from compiler/testData/codegen/boxWithJava/secondaryConstructors/withGenerics.kt rename to compiler/testData/codegen/box/secondaryConstructors/withGenerics.kt index acc8e92458e..20cd7ce3da7 100644 --- a/compiler/testData/codegen/boxWithJava/secondaryConstructors/withGenerics.kt +++ b/compiler/testData/codegen/box/secondaryConstructors/withGenerics.kt @@ -1,3 +1,4 @@ +// TARGET_BACKEND: JVM // FILE: WithGenerics.java class WithGenerics { diff --git a/compiler/testData/codegen/boxWithJava/secondaryConstructors/withPrimary.kt b/compiler/testData/codegen/box/secondaryConstructors/withPrimary.kt similarity index 97% rename from compiler/testData/codegen/boxWithJava/secondaryConstructors/withPrimary.kt rename to compiler/testData/codegen/box/secondaryConstructors/withPrimary.kt index a7d762aaa92..28080ec08d1 100644 --- a/compiler/testData/codegen/boxWithJava/secondaryConstructors/withPrimary.kt +++ b/compiler/testData/codegen/box/secondaryConstructors/withPrimary.kt @@ -1,3 +1,4 @@ +// TARGET_BACKEND: JVM // FILE: WithPrimary.java class WithPrimary { diff --git a/compiler/testData/codegen/boxWithJava/secondaryConstructors/withVarargs.kt b/compiler/testData/codegen/box/secondaryConstructors/withVarargs.kt similarity index 95% rename from compiler/testData/codegen/boxWithJava/secondaryConstructors/withVarargs.kt rename to compiler/testData/codegen/box/secondaryConstructors/withVarargs.kt index c5a79b8c0ee..84b0f3feba8 100644 --- a/compiler/testData/codegen/boxWithJava/secondaryConstructors/withVarargs.kt +++ b/compiler/testData/codegen/box/secondaryConstructors/withVarargs.kt @@ -1,3 +1,4 @@ +// TARGET_BACKEND: JVM // FILE: WithVarargs.java public class WithVarargs { diff --git a/compiler/testData/codegen/boxWithJava/secondaryConstructors/withoutPrimary.kt b/compiler/testData/codegen/box/secondaryConstructors/withoutPrimary.kt similarity index 97% rename from compiler/testData/codegen/boxWithJava/secondaryConstructors/withoutPrimary.kt rename to compiler/testData/codegen/box/secondaryConstructors/withoutPrimary.kt index ba69f21ae6c..d455a57dba8 100644 --- a/compiler/testData/codegen/boxWithJava/secondaryConstructors/withoutPrimary.kt +++ b/compiler/testData/codegen/box/secondaryConstructors/withoutPrimary.kt @@ -1,3 +1,4 @@ +// TARGET_BACKEND: JVM // FILE: WithoutPrimary.java class WithoutPrimary { diff --git a/compiler/testData/codegen/box/staticFields/anonymousInitializerIObject.kt b/compiler/testData/codegen/box/statics/anonymousInitializerIObject.kt similarity index 100% rename from compiler/testData/codegen/box/staticFields/anonymousInitializerIObject.kt rename to compiler/testData/codegen/box/statics/anonymousInitializerIObject.kt diff --git a/compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt b/compiler/testData/codegen/box/statics/anonymousInitializerInClassObject.kt similarity index 100% rename from compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt rename to compiler/testData/codegen/box/statics/anonymousInitializerInClassObject.kt diff --git a/compiler/testData/codegen/boxWithJava/statics/fields.kt b/compiler/testData/codegen/box/statics/fields.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/statics/fields.kt rename to compiler/testData/codegen/box/statics/fields.kt diff --git a/compiler/testData/codegen/boxWithJava/statics/functions.kt b/compiler/testData/codegen/box/statics/functions.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/statics/functions.kt rename to compiler/testData/codegen/box/statics/functions.kt diff --git a/compiler/testData/codegen/boxWithJava/statics/hidePrivateByPublic.kt b/compiler/testData/codegen/box/statics/hidePrivateByPublic.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/statics/hidePrivateByPublic.kt rename to compiler/testData/codegen/box/statics/hidePrivateByPublic.kt diff --git a/compiler/testData/codegen/box/staticFields/incInClassObject.kt b/compiler/testData/codegen/box/statics/incInClassObject.kt similarity index 100% rename from compiler/testData/codegen/box/staticFields/incInClassObject.kt rename to compiler/testData/codegen/box/statics/incInClassObject.kt diff --git a/compiler/testData/codegen/box/staticFields/incInObject.kt b/compiler/testData/codegen/box/statics/incInObject.kt similarity index 100% rename from compiler/testData/codegen/box/staticFields/incInObject.kt rename to compiler/testData/codegen/box/statics/incInObject.kt diff --git a/compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt b/compiler/testData/codegen/box/statics/inheritedPropertyInClassObject.kt similarity index 100% rename from compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt rename to compiler/testData/codegen/box/statics/inheritedPropertyInClassObject.kt diff --git a/compiler/testData/codegen/box/staticFields/inheritedPropertyInObject.kt b/compiler/testData/codegen/box/statics/inheritedPropertyInObject.kt similarity index 100% rename from compiler/testData/codegen/box/staticFields/inheritedPropertyInObject.kt rename to compiler/testData/codegen/box/statics/inheritedPropertyInObject.kt diff --git a/compiler/testData/codegen/boxWithJava/inline.kt b/compiler/testData/codegen/box/statics/inlineCallsStaticMethod.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/inline.kt rename to compiler/testData/codegen/box/statics/inlineCallsStaticMethod.kt diff --git a/compiler/testData/codegen/box/staticFields/kt8089.kt b/compiler/testData/codegen/box/statics/kt8089.kt similarity index 100% rename from compiler/testData/codegen/box/staticFields/kt8089.kt rename to compiler/testData/codegen/box/statics/kt8089.kt diff --git a/compiler/testData/codegen/boxWithJava/statics/protectedSamConstructor.kt b/compiler/testData/codegen/box/statics/protectedSamConstructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/statics/protectedSamConstructor.kt rename to compiler/testData/codegen/box/statics/protectedSamConstructor.kt diff --git a/compiler/testData/codegen/boxWithJava/statics/protectedStatic.kt b/compiler/testData/codegen/box/statics/protectedStatic.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/statics/protectedStatic.kt rename to compiler/testData/codegen/box/statics/protectedStatic.kt diff --git a/compiler/testData/codegen/boxWithJava/statics/protectedStatic2.kt b/compiler/testData/codegen/box/statics/protectedStatic2.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/statics/protectedStatic2.kt rename to compiler/testData/codegen/box/statics/protectedStatic2.kt diff --git a/compiler/testData/codegen/boxWithJava/statics/protectedStaticAndInline.kt b/compiler/testData/codegen/box/statics/protectedStaticAndInline.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/statics/protectedStaticAndInline.kt rename to compiler/testData/codegen/box/statics/protectedStaticAndInline.kt diff --git a/compiler/testData/codegen/box/staticFields/syntheticAccessor.kt b/compiler/testData/codegen/box/statics/syntheticAccessor.kt similarity index 100% rename from compiler/testData/codegen/box/staticFields/syntheticAccessor.kt rename to compiler/testData/codegen/box/statics/syntheticAccessor.kt diff --git a/compiler/testData/codegen/boxWithJava/interfaces/abstractClassInheritsFromInterface.kt b/compiler/testData/codegen/box/traits/abstractClassInheritsFromInterface.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/interfaces/abstractClassInheritsFromInterface.kt rename to compiler/testData/codegen/box/traits/abstractClassInheritsFromInterface.kt diff --git a/compiler/testData/codegen/boxWithJava/interfaces/inheritJavaInterface.kt b/compiler/testData/codegen/box/traits/inheritJavaInterface.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/interfaces/inheritJavaInterface.kt rename to compiler/testData/codegen/box/traits/inheritJavaInterface.kt diff --git a/compiler/testData/codegen/boxWithJava/interfaceDefaultImpls.kt b/compiler/testData/codegen/box/traits/interfaceDefaultImpls.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/interfaceDefaultImpls.kt rename to compiler/testData/codegen/box/traits/interfaceDefaultImpls.kt diff --git a/compiler/testData/codegen/boxWithJava/enhancedPrimitives.kt b/compiler/testData/codegen/box/typeMapping/enhancedPrimitives.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/enhancedPrimitives.kt rename to compiler/testData/codegen/box/typeMapping/enhancedPrimitives.kt diff --git a/compiler/testData/codegen/boxWithJava/varargs.kt b/compiler/testData/codegen/box/vararg/varargInJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/varargs.kt rename to compiler/testData/codegen/box/vararg/varargInJava.kt diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 2c2591c6b2e..96303e970e0 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -55,6 +55,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("annotationWithKotlinProperty.kt") + public void testAnnotationWithKotlinProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/annotations/annotationWithKotlinProperty.kt"); + doTest(fileName); + } + + @TestMetadata("annotationWithKotlinPropertyFromInterfaceCompanion.kt") + public void testAnnotationWithKotlinPropertyFromInterfaceCompanion() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/annotations/annotationWithKotlinPropertyFromInterfaceCompanion.kt"); + doTest(fileName); + } + @TestMetadata("annotationsOnDefault.kt") public void testAnnotationsOnDefault() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/annotations/annotationsOnDefault.kt"); @@ -152,6 +164,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/annotations/annotatedLambda/lambda.kt"); doTest(fileName); } + + @TestMetadata("samFunExpression.kt") + public void testSamFunExpression() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/annotations/annotatedLambda/samFunExpression.kt"); + doTest(fileName); + } + + @TestMetadata("samLambda.kt") + public void testSamLambda() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/annotations/annotatedLambda/samLambda.kt"); + doTest(fileName); + } } } @@ -1324,12 +1348,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("substitutedIterable.kt") + public void testSubstitutedIterable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/substitutedIterable.kt"); + doTest(fileName); + } + @TestMetadata("SubstitutedList.kt") public void testSubstitutedList() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/SubstitutedList.kt"); doTest(fileName); } + @TestMetadata("substitutedListWithExtraSuperInterface.kt") + public void testSubstitutedListWithExtraSuperInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/substitutedListWithExtraSuperInterface.kt"); + doTest(fileName); + } + @TestMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -1373,6 +1409,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt"); doTest(fileName); } + + @TestMetadata("mapEntry.kt") + public void testMapEntry() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/mapEntry.kt"); + doTest(fileName); + } } } @@ -2028,6 +2070,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("javaTypeIsFunK.kt") + public void testJavaTypeIsFunK() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/functions/javaTypeIsFunK.kt"); + doTest(fileName); + } + @TestMetadata("reifiedAsFunKBig.kt") public void testReifiedAsFunKBig() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/functions/reifiedAsFunKBig.kt"); @@ -2091,6 +2139,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("javaBox.kt") + public void testJavaBox() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/javaBox.kt"); + doTest(fileName); + } + @TestMetadata("labeledExpressionCast.kt") public void testLabeledExpressionCast() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/labeledExpressionCast.kt"); @@ -2194,6 +2248,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("classCompanionInitializationWithJava.kt") + public void testClassCompanionInitializationWithJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classCompanionInitializationWithJava.kt"); + doTest(fileName); + } + @TestMetadata("classNamedAsOldPackageFacade.kt") public void testClassNamedAsOldPackageFacade() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classNamedAsOldPackageFacade.kt"); @@ -2368,6 +2428,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("interfaceCompanionInitializationWithJava.kt") + public void testInterfaceCompanionInitializationWithJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/interfaceCompanionInitializationWithJava.kt"); + doTest(fileName); + } + @TestMetadata("kt1018.kt") public void testKt1018() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1018.kt"); @@ -3185,6 +3251,105 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } + @TestMetadata("compiler/testData/codegen/box/collections") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Collections extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInCollections() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/collections"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("charSequence.kt") + public void testCharSequence() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/charSequence.kt"); + doTest(fileName); + } + + @TestMetadata("implementCollectionThroughKotlin.kt") + public void testImplementCollectionThroughKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/implementCollectionThroughKotlin.kt"); + doTest(fileName); + } + + @TestMetadata("irrelevantImplCharSequence.kt") + public void testIrrelevantImplCharSequence() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/irrelevantImplCharSequence.kt"); + doTest(fileName); + } + + @TestMetadata("irrelevantImplCharSequenceKotlin.kt") + public void testIrrelevantImplCharSequenceKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/irrelevantImplCharSequenceKotlin.kt"); + doTest(fileName); + } + + @TestMetadata("irrelevantImplMutableList.kt") + public void testIrrelevantImplMutableList() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/irrelevantImplMutableList.kt"); + doTest(fileName); + } + + @TestMetadata("irrelevantImplMutableListKotlin.kt") + public void testIrrelevantImplMutableListKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/irrelevantImplMutableListKotlin.kt"); + doTest(fileName); + } + + @TestMetadata("irrelevantImplMutableListSubstitution.kt") + public void testIrrelevantImplMutableListSubstitution() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/irrelevantImplMutableListSubstitution.kt"); + doTest(fileName); + } + + @TestMetadata("irrelevantRemoveAtOverrideInJava.kt") + public void testIrrelevantRemoveAtOverrideInJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/irrelevantRemoveAtOverrideInJava.kt"); + doTest(fileName); + } + + @TestMetadata("irrelevantSizeOverrideInJava.kt") + public void testIrrelevantSizeOverrideInJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/irrelevantSizeOverrideInJava.kt"); + doTest(fileName); + } + + @TestMetadata("mutableList.kt") + public void testMutableList() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/mutableList.kt"); + doTest(fileName); + } + + @TestMetadata("platformValueContains.kt") + public void testPlatformValueContains() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/platformValueContains.kt"); + doTest(fileName); + } + + @TestMetadata("readOnlyList.kt") + public void testReadOnlyList() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/readOnlyList.kt"); + doTest(fileName); + } + + @TestMetadata("readOnlyMap.kt") + public void testReadOnlyMap() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/readOnlyMap.kt"); + doTest(fileName); + } + + @TestMetadata("removeAtInt.kt") + public void testRemoveAtInt() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/removeAtInt.kt"); + doTest(fileName); + } + + @TestMetadata("strList.kt") + public void testStrList() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/collections/strList.kt"); + doTest(fileName); + } + } + @TestMetadata("compiler/testData/codegen/box/constants") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -6192,6 +6357,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("invokeOnSyntheticProperty.kt") + public void testInvokeOnSyntheticProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/invokeOnSyntheticProperty.kt"); + doTest(fileName); + } + @TestMetadata("kt3189.kt") public void testKt3189() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3189.kt"); @@ -6571,6 +6742,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("innerGenericClassFromJava.kt") + public void testInnerGenericClassFromJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerGenericClassFromJava.kt"); + doTest(fileName); + } + + @TestMetadata("innerJavaClass.kt") + public void testInnerJavaClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerJavaClass.kt"); + doTest(fileName); + } + @TestMetadata("innerLabeledThis.kt") public void testInnerLabeledThis() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerLabeledThis.kt"); @@ -6787,6 +6970,33 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("compiler/testData/codegen/box/javaInterop/generics") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Generics extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInGenerics() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/generics"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("allWildcardsOnClass.kt") + public void testAllWildcardsOnClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/generics/allWildcardsOnClass.kt"); + doTest(fileName); + } + + @TestMetadata("covariantOverrideWithDeclarationSiteProjection.kt") + public void testCovariantOverrideWithDeclarationSiteProjection() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/generics/covariantOverrideWithDeclarationSiteProjection.kt"); + doTest(fileName); + } + + @TestMetadata("invariantArgumentsNoWildcard.kt") + public void testInvariantArgumentsNoWildcard() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/generics/invariantArgumentsNoWildcard.kt"); + doTest(fileName); + } + } + @TestMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -6795,6 +7005,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("extensionReceiverParameter.kt") + public void testExtensionReceiverParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions/extensionReceiverParameter.kt"); + doTest(fileName); + } + @TestMetadata("mapPut.kt") public void testMapPut() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions/mapPut.kt"); @@ -6919,12 +7135,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("constructorProperty.kt") + public void testConstructorProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmField/constructorProperty.kt"); + doTest(fileName); + } + @TestMetadata("publicField.kt") public void testPublicField() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmField/publicField.kt"); doTest(fileName); } + @TestMetadata("simpleMemberProperty.kt") + public void testSimpleMemberProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmField/simpleMemberProperty.kt"); + doTest(fileName); + } + @TestMetadata("superCall.kt") public void testSuperCall() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmField/superCall.kt"); @@ -6988,6 +7216,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("fakeJvmNameInJava.kt") + public void testFakeJvmNameInJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmName/fakeJvmNameInJava.kt"); + doTest(fileName); + } + @TestMetadata("functionName.kt") public void testFunctionName() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmName/functionName.kt"); @@ -7029,6 +7263,33 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmName/renamedFileClass.kt"); doTest(fileName); } + + @TestMetadata("compiler/testData/codegen/box/jvmName/fileFacades") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class FileFacades extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInFileFacades() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/jvmName/fileFacades"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("differentFiles.kt") + public void testDifferentFiles() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmName/fileFacades/differentFiles.kt"); + doTest(fileName); + } + + @TestMetadata("javaAnnotationOnFileFacade.kt") + public void testJavaAnnotationOnFileFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmName/fileFacades/javaAnnotationOnFileFacade.kt"); + doTest(fileName); + } + + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmName/fileFacades/simple.kt"); + doTest(fileName); + } + } } @TestMetadata("compiler/testData/codegen/box/jvmOverloads") @@ -7063,6 +7324,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("generics.kt") + public void testGenerics() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmOverloads/generics.kt"); + doTest(fileName); + } + @TestMetadata("multipleDefaultParameters.kt") public void testMultipleDefaultParameters() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmOverloads/multipleDefaultParameters.kt"); @@ -7092,6 +7359,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmOverloads/simple.kt"); doTest(fileName); } + + @TestMetadata("simpleJavaCall.kt") + public void testSimpleJavaCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmOverloads/simpleJavaCall.kt"); + doTest(fileName); + } } @TestMetadata("compiler/testData/codegen/box/jvmStatic") @@ -7102,12 +7375,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("annotations.kt") + public void testAnnotations() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/annotations.kt"); + doTest(fileName); + } + @TestMetadata("closure.kt") public void testClosure() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/closure.kt"); doTest(fileName); } + @TestMetadata("companionObject.kt") + public void testCompanionObject() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/companionObject.kt"); + doTest(fileName); + } + @TestMetadata("convention.kt") public void testConvention() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/convention.kt"); @@ -7120,6 +7405,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("enumCompanion.kt") + public void testEnumCompanion() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/enumCompanion.kt"); + doTest(fileName); + } + @TestMetadata("explicitObject.kt") public void testExplicitObject() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/explicitObject.kt"); @@ -7150,6 +7441,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("object.kt") + public void testObject() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/object.kt"); + doTest(fileName); + } + @TestMetadata("postfixInc.kt") public void testPostfixInc() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmStatic/postfixInc.kt"); @@ -7537,6 +7834,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("noOverrideWithJava.kt") + public void testNoOverrideWithJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/noOverrideWithJava.kt"); + doTest(fileName); + } + @TestMetadata("publicOverride.kt") public void testPublicOverride() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/publicOverride.kt"); @@ -8062,6 +8365,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("multifileClassWith2Files.kt") + public void testMultifileClassWith2Files() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/multifileClassWith2Files.kt"); + doTest(fileName); + } + + @TestMetadata("multifileClassWithCrossCall.kt") + public void testMultifileClassWithCrossCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/multifileClassWithCrossCall.kt"); + doTest(fileName); + } + + @TestMetadata("multifileClassWithPrivate.kt") + public void testMultifileClassWithPrivate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/multifileClassWithPrivate.kt"); + doTest(fileName); + } + @TestMetadata("samePartNameDifferentFacades.kt") public void testSamePartNameDifferentFacades() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/samePartNameDifferentFacades.kt"); @@ -8995,6 +9316,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("number.kt") + public void testNumber() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/number.kt"); + doTest(fileName); + } + @TestMetadata("rangeTo.kt") public void testRangeTo() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/rangeTo.kt"); @@ -9178,12 +9505,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("collectionSize.kt") + public void testCollectionSize() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/collectionSize.kt"); + doTest(fileName); + } + + @TestMetadata("commonPropertiesKJK.kt") + public void testCommonPropertiesKJK() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/commonPropertiesKJK.kt"); + doTest(fileName); + } + @TestMetadata("companionFieldInsideLambda.kt") public void testCompanionFieldInsideLambda() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/companionFieldInsideLambda.kt"); doTest(fileName); } + @TestMetadata("companionObjectAccessor.kt") + public void testCompanionObjectAccessor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/companionObjectAccessor.kt"); + doTest(fileName); + } + + @TestMetadata("companionObjectPropertiesFromJava.kt") + public void testCompanionObjectPropertiesFromJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/companionObjectPropertiesFromJava.kt"); + doTest(fileName); + } + @TestMetadata("companionPrivateField.kt") public void testCompanionPrivateField() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/companionPrivateField.kt"); @@ -9238,6 +9589,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("javaPropertyBoxedGetter.kt") + public void testJavaPropertyBoxedGetter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/javaPropertyBoxedGetter.kt"); + doTest(fileName); + } + + @TestMetadata("javaPropertyBoxedSetter.kt") + public void testJavaPropertyBoxedSetter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/javaPropertyBoxedSetter.kt"); + doTest(fileName); + } + @TestMetadata("kt10715.kt") public void testKt10715() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt10715.kt"); @@ -9448,6 +9811,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("protectedJavaFieldInInline.kt") + public void testProtectedJavaFieldInInline() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/protectedJavaFieldInInline.kt"); + doTest(fileName); + } + + @TestMetadata("protectedJavaProperty.kt") + public void testProtectedJavaProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/protectedJavaProperty.kt"); + doTest(fileName); + } + + @TestMetadata("protectedJavaPropertyInCompanion.kt") + public void testProtectedJavaPropertyInCompanion() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/protectedJavaPropertyInCompanion.kt"); + doTest(fileName); + } + + @TestMetadata("substituteJavaSuperField.kt") + public void testSubstituteJavaSuperField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/substituteJavaSuperField.kt"); + doTest(fileName); + } + @TestMetadata("twoAnnotatedExtensionPropertiesWithoutBackingFields.kt") public void testTwoAnnotatedExtensionPropertiesWithoutBackingFields() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.kt"); @@ -9966,6 +10353,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("annotationsOnJavaMembers.kt") + public void testAnnotationsOnJavaMembers() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/annotations/annotationsOnJavaMembers.kt"); + doTest(fileName); + } + @TestMetadata("propertyAccessors.kt") public void testPropertyAccessors() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/annotations/propertyAccessors.kt"); @@ -10023,6 +10416,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/call"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("callInstanceJavaMethod.kt") + public void testCallInstanceJavaMethod() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/call/callInstanceJavaMethod.kt"); + doTest(fileName); + } + + @TestMetadata("callPrivateJavaMethod.kt") + public void testCallPrivateJavaMethod() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/call/callPrivateJavaMethod.kt"); + doTest(fileName); + } + + @TestMetadata("callStaticJavaMethod.kt") + public void testCallStaticJavaMethod() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/call/callStaticJavaMethod.kt"); + doTest(fileName); + } + @TestMetadata("cannotCallEnumConstructor.kt") public void testCannotCallEnumConstructor() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/call/cannotCallEnumConstructor.kt"); @@ -10314,6 +10725,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("nestedClassesJava.kt") + public void testNestedClassesJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/classes/nestedClassesJava.kt"); + doTest(fileName); + } + @TestMetadata("objectInstance.kt") public void testObjectInstance() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/classes/objectInstance.kt"); @@ -10515,12 +10932,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/functions"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("declaredVsInheritedFunctions.kt") + public void testDeclaredVsInheritedFunctions() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/functions/declaredVsInheritedFunctions.kt"); + doTest(fileName); + } + @TestMetadata("functionFromStdlib.kt") public void testFunctionFromStdlib() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/functions/functionFromStdlib.kt"); doTest(fileName); } + @TestMetadata("functionReferenceErasedToKFunction.kt") + public void testFunctionReferenceErasedToKFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/functions/functionReferenceErasedToKFunction.kt"); + doTest(fileName); + } + + @TestMetadata("javaClassGetFunctions.kt") + public void testJavaClassGetFunctions() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/functions/javaClassGetFunctions.kt"); + doTest(fileName); + } + + @TestMetadata("javaMethodsSmokeTest.kt") + public void testJavaMethodsSmokeTest() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/functions/javaMethodsSmokeTest.kt"); + doTest(fileName); + } + @TestMetadata("platformName.kt") public void testPlatformName() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/functions/platformName.kt"); @@ -10662,12 +11103,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("arrayInJava.kt") + public void testArrayInJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/kClassInAnnotation/arrayInJava.kt"); + doTest(fileName); + } + @TestMetadata("basic.kt") public void testBasic() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/kClassInAnnotation/basic.kt"); doTest(fileName); } + @TestMetadata("basicInJava.kt") + public void testBasicInJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/kClassInAnnotation/basicInJava.kt"); + doTest(fileName); + } + @TestMetadata("checkcast.kt") public void testCheckcast() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/kClassInAnnotation/checkcast.kt"); @@ -10679,6 +11132,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/kClassInAnnotation/vararg.kt"); doTest(fileName); } + + @TestMetadata("varargInJava.kt") + public void testVarargInJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/kClassInAnnotation/varargInJava.kt"); + doTest(fileName); + } } @TestMetadata("compiler/testData/codegen/box/reflection/lambdaClasses") @@ -11043,6 +11502,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("javaParametersHaveNoNames.kt") + public void testJavaParametersHaveNoNames() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/parameters/javaParametersHaveNoNames.kt"); + doTest(fileName); + } + @TestMetadata("kinds.kt") public void testKinds() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/parameters/kinds.kt"); @@ -11076,6 +11541,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("declaredVsInheritedProperties.kt") + public void testDeclaredVsInheritedProperties() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/declaredVsInheritedProperties.kt"); + doTest(fileName); + } + @TestMetadata("fakeOverridesInSubclass.kt") public void testFakeOverridesInSubclass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/fakeOverridesInSubclass.kt"); @@ -11106,12 +11577,54 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("javaPropertyInheritedInKotlin.kt") + public void testJavaPropertyInheritedInKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/javaPropertyInheritedInKotlin.kt"); + doTest(fileName); + } + + @TestMetadata("javaStaticField.kt") + public void testJavaStaticField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/javaStaticField.kt"); + doTest(fileName); + } + + @TestMetadata("kotlinPropertyInheritedInJava.kt") + public void testKotlinPropertyInheritedInJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/kotlinPropertyInheritedInJava.kt"); + doTest(fileName); + } + @TestMetadata("memberAndMemberExtensionWithSameName.kt") public void testMemberAndMemberExtensionWithSameName() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/memberAndMemberExtensionWithSameName.kt"); doTest(fileName); } + @TestMetadata("mutatePrivateJavaInstanceField.kt") + public void testMutatePrivateJavaInstanceField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/mutatePrivateJavaInstanceField.kt"); + doTest(fileName); + } + + @TestMetadata("mutatePrivateJavaStaticField.kt") + public void testMutatePrivateJavaStaticField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/mutatePrivateJavaStaticField.kt"); + doTest(fileName); + } + + @TestMetadata("noConflictOnKotlinGetterAndJavaField.kt") + public void testNoConflictOnKotlinGetterAndJavaField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/noConflictOnKotlinGetterAndJavaField.kt"); + doTest(fileName); + } + + @TestMetadata("overrideKotlinPropertyByJavaMethod.kt") + public void testOverrideKotlinPropertyByJavaMethod() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/overrideKotlinPropertyByJavaMethod.kt"); + doTest(fileName); + } + @TestMetadata("privateClassVal.kt") public void testPrivateClassVal() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/privateClassVal.kt"); @@ -11166,6 +11679,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("referenceToJavaFieldOfKotlinSubclass.kt") + public void testReferenceToJavaFieldOfKotlinSubclass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/referenceToJavaFieldOfKotlinSubclass.kt"); + doTest(fileName); + } + @TestMetadata("simpleGetProperties.kt") public void testSimpleGetProperties() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/properties/simpleGetProperties.kt"); @@ -11226,6 +11745,27 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } } + + @TestMetadata("compiler/testData/codegen/box/reflection/types") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Types extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInTypes() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/types"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("platformTypeNotEqualToKotlinType.kt") + public void testPlatformTypeNotEqualToKotlinType() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/types/platformTypeNotEqualToKotlinType.kt"); + doTest(fileName); + } + + @TestMetadata("platformTypeToString.kt") + public void testPlatformTypeToString() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/types/platformTypeToString.kt"); + doTest(fileName); + } + } } @TestMetadata("compiler/testData/codegen/box/regressions") @@ -11647,6 +12187,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("asOnPlatformType.kt") + public void testAsOnPlatformType() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reified/asOnPlatformType.kt"); + doTest(fileName); + } + @TestMetadata("checkcast.kt") public void testCheckcast() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reified/checkcast.kt"); @@ -11689,6 +12235,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("isOnPlatformType.kt") + public void testIsOnPlatformType() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reified/isOnPlatformType.kt"); + doTest(fileName); + } + @TestMetadata("javaClass.kt") public void testJavaClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reified/javaClass.kt"); @@ -12109,12 +12661,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("withGenerics.kt") + public void testWithGenerics() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withGenerics.kt"); + doTest(fileName); + } + @TestMetadata("withNonLocalReturn.kt") public void testWithNonLocalReturn() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt"); doTest(fileName); } + @TestMetadata("withPrimary.kt") + public void testWithPrimary() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withPrimary.kt"); + doTest(fileName); + } + @TestMetadata("withReturn.kt") public void testWithReturn() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturn.kt"); @@ -12126,6 +12690,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt"); doTest(fileName); } + + @TestMetadata("withVarargs.kt") + public void testWithVarargs() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withVarargs.kt"); + doTest(fileName); + } + + @TestMetadata("withoutPrimary.kt") + public void testWithoutPrimary() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withoutPrimary.kt"); + doTest(fileName); + } } @TestMetadata("compiler/testData/codegen/box/smap") @@ -12353,59 +12929,107 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @TestMetadata("compiler/testData/codegen/box/staticFields") + @TestMetadata("compiler/testData/codegen/box/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class StaticFields extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInStaticFields() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/staticFields"), Pattern.compile("^(.+)\\.kt$"), true); + public static class Statics extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInStatics() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/statics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousInitializerIObject.kt") public void testAnonymousInitializerIObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/anonymousInitializerIObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/anonymousInitializerIObject.kt"); doTest(fileName); } @TestMetadata("anonymousInitializerInClassObject.kt") public void testAnonymousInitializerInClassObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/anonymousInitializerInClassObject.kt"); + doTest(fileName); + } + + @TestMetadata("fields.kt") + public void testFields() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/fields.kt"); + doTest(fileName); + } + + @TestMetadata("functions.kt") + public void testFunctions() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/functions.kt"); + doTest(fileName); + } + + @TestMetadata("hidePrivateByPublic.kt") + public void testHidePrivateByPublic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/hidePrivateByPublic.kt"); doTest(fileName); } @TestMetadata("incInClassObject.kt") public void testIncInClassObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/incInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/incInClassObject.kt"); doTest(fileName); } @TestMetadata("incInObject.kt") public void testIncInObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/incInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/incInObject.kt"); doTest(fileName); } @TestMetadata("inheritedPropertyInClassObject.kt") public void testInheritedPropertyInClassObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/inheritedPropertyInClassObject.kt"); doTest(fileName); } @TestMetadata("inheritedPropertyInObject.kt") public void testInheritedPropertyInObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/inheritedPropertyInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/inheritedPropertyInObject.kt"); + doTest(fileName); + } + + @TestMetadata("inlineCallsStaticMethod.kt") + public void testInlineCallsStaticMethod() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/inlineCallsStaticMethod.kt"); doTest(fileName); } @TestMetadata("kt8089.kt") public void testKt8089() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/kt8089.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/kt8089.kt"); + doTest(fileName); + } + + @TestMetadata("protectedSamConstructor.kt") + public void testProtectedSamConstructor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/protectedSamConstructor.kt"); + doTest(fileName); + } + + @TestMetadata("protectedStatic.kt") + public void testProtectedStatic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/protectedStatic.kt"); + doTest(fileName); + } + + @TestMetadata("protectedStatic2.kt") + public void testProtectedStatic2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/protectedStatic2.kt"); + doTest(fileName); + } + + @TestMetadata("protectedStaticAndInline.kt") + public void testProtectedStaticAndInline() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/protectedStaticAndInline.kt"); doTest(fileName); } @TestMetadata("syntheticAccessor.kt") public void testSyntheticAccessor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/syntheticAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/statics/syntheticAccessor.kt"); doTest(fileName); } } @@ -13032,6 +13656,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Traits extends AbstractBlackBoxCodegenTest { + @TestMetadata("abstractClassInheritsFromInterface.kt") + public void testAbstractClassInheritsFromInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/abstractClassInheritsFromInterface.kt"); + doTest(fileName); + } + public void testAllFilesPresentInTraits() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), true); } @@ -13054,6 +13684,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("inheritJavaInterface.kt") + public void testInheritJavaInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/inheritJavaInterface.kt"); + doTest(fileName); + } + @TestMetadata("inheritedFun.kt") public void testInheritedFun() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/inheritedFun.kt"); @@ -13066,6 +13702,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("interfaceDefaultImpls.kt") + public void testInterfaceDefaultImpls() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/interfaceDefaultImpls.kt"); + doTest(fileName); + } + @TestMetadata("kt1936.kt") public void testKt1936() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt1936.kt"); @@ -13246,6 +13888,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/typeMapping"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("enhancedPrimitives.kt") + public void testEnhancedPrimitives() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/enhancedPrimitives.kt"); + doTest(fileName); + } + @TestMetadata("genericTypeWithNothing.kt") public void testGenericTypeWithNothing() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/genericTypeWithNothing.kt"); @@ -13459,6 +14107,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("varargInJava.kt") + public void testVarargInJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/varargInJava.kt"); + doTest(fileName); + } + @TestMetadata("varargsAndFunctionLiterals.kt") public void testVarargsAndFunctionLiterals() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJavaCodegenTestGenerated.java deleted file mode 100644 index e9d7fa1f6a1..00000000000 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJavaCodegenTestGenerated.java +++ /dev/null @@ -1,799 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.codegen; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/codegen/boxWithJava") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInBoxWithJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("allWildcardsOnClass.kt") - public void testAllWildcardsOnClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/allWildcardsOnClass.kt"); - doTest(fileName); - } - - @TestMetadata("annotatedSamFunExpression.kt") - public void testAnnotatedSamFunExpression() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotatedSamFunExpression.kt"); - doTest(fileName); - } - - @TestMetadata("annotatedSamLambda.kt") - public void testAnnotatedSamLambda() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotatedSamLambda.kt"); - doTest(fileName); - } - - @TestMetadata("classCompanion.kt") - public void testClassCompanion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/classCompanion.kt"); - doTest(fileName); - } - - @TestMetadata("companionObjectAccessor.kt") - public void testCompanionObjectAccessor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/companionObjectAccessor.kt"); - doTest(fileName); - } - - @TestMetadata("covariantOverrideWithDeclarationSiteProjection.kt") - public void testCovariantOverrideWithDeclarationSiteProjection() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/covariantOverrideWithDeclarationSiteProjection.kt"); - doTest(fileName); - } - - @TestMetadata("enhancedPrimitives.kt") - public void testEnhancedPrimitives() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/enhancedPrimitives.kt"); - doTest(fileName); - } - - @TestMetadata("inline.kt") - public void testInline() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/inline.kt"); - doTest(fileName); - } - - @TestMetadata("innerClass.kt") - public void testInnerClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/innerClass.kt"); - doTest(fileName); - } - - @TestMetadata("innerGenericClass.kt") - public void testInnerGenericClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/innerGenericClass.kt"); - doTest(fileName); - } - - @TestMetadata("interfaceCompanion.kt") - public void testInterfaceCompanion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaceCompanion.kt"); - doTest(fileName); - } - - @TestMetadata("interfaceDefaultImpls.kt") - public void testInterfaceDefaultImpls() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaceDefaultImpls.kt"); - doTest(fileName); - } - - @TestMetadata("invariantArgumentsNoWildcard.kt") - public void testInvariantArgumentsNoWildcard() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/invariantArgumentsNoWildcard.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnSyntheticProperty.kt") - public void testInvokeOnSyntheticProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/invokeOnSyntheticProperty.kt"); - doTest(fileName); - } - - @TestMetadata("jvmName.kt") - public void testJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmName.kt"); - doTest(fileName); - } - - @TestMetadata("mangling.kt") - public void testMangling() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/mangling.kt"); - doTest(fileName); - } - - @TestMetadata("number.kt") - public void testNumber() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/number.kt"); - doTest(fileName); - } - - @TestMetadata("protectedInInline.kt") - public void testProtectedInInline() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/protectedInInline.kt"); - doTest(fileName); - } - - @TestMetadata("varargs.kt") - public void testVarargs() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/varargs.kt"); - doTest(fileName); - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class AnnotationsWithKClass extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInAnnotationsWithKClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/annotationsWithKClass"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("array.kt") - public void testArray() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass/array.kt"); - doTest(fileName); - } - - @TestMetadata("basic.kt") - public void testBasic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic.kt"); - doTest(fileName); - } - - @TestMetadata("vararg.kt") - public void testVararg() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class BuiltinStubMethods extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInBuiltinStubMethods() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/builtinStubMethods"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("extendJavaCollections.kt") - public void testExtendJavaCollections() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections.kt"); - doTest(fileName); - } - - @TestMetadata("substitutedIterable.kt") - public void testSubstitutedIterable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedIterable.kt"); - doTest(fileName); - } - - @TestMetadata("substitutedList.kt") - public void testSubstitutedList() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedList.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/casts") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Casts extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInCasts() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/casts"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("javaTypeIsFunK.kt") - public void testJavaTypeIsFunK() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/casts/javaTypeIsFunK.kt"); - doTest(fileName); - } - - @TestMetadata("literalExpressionAsGenericArgument.kt") - public void testLiteralExpressionAsGenericArgument() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/casts/literalExpressionAsGenericArgument.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/collections") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Collections extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInCollections() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/collections"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("charSequence.kt") - public void testCharSequence() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/charSequence.kt"); - doTest(fileName); - } - - @TestMetadata("implementCollectionThroughKotlin.kt") - public void testImplementCollectionThroughKotlin() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/implementCollectionThroughKotlin.kt"); - doTest(fileName); - } - - @TestMetadata("irrelevantImplCharSequence.kt") - public void testIrrelevantImplCharSequence() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequence.kt"); - doTest(fileName); - } - - @TestMetadata("irrelevantImplCharSequenceKotlin.kt") - public void testIrrelevantImplCharSequenceKotlin() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequenceKotlin.kt"); - doTest(fileName); - } - - @TestMetadata("irrelevantImplMutableList.kt") - public void testIrrelevantImplMutableList() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableList.kt"); - doTest(fileName); - } - - @TestMetadata("irrelevantImplMutableListKotlin.kt") - public void testIrrelevantImplMutableListKotlin() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListKotlin.kt"); - doTest(fileName); - } - - @TestMetadata("irrelevantImplMutableListSubstitution.kt") - public void testIrrelevantImplMutableListSubstitution() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListSubstitution.kt"); - doTest(fileName); - } - - @TestMetadata("irrelevantRemoveAtOverrideInJava.kt") - public void testIrrelevantRemoveAtOverrideInJava() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantRemoveAtOverrideInJava.kt"); - doTest(fileName); - } - - @TestMetadata("irrelevantSizeOverrideInJava.kt") - public void testIrrelevantSizeOverrideInJava() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantSizeOverrideInJava.kt"); - doTest(fileName); - } - - @TestMetadata("mutableList.kt") - public void testMutableList() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/mutableList.kt"); - doTest(fileName); - } - - @TestMetadata("platformValueContains.kt") - public void testPlatformValueContains() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/platformValueContains.kt"); - doTest(fileName); - } - - @TestMetadata("readOnlyList.kt") - public void testReadOnlyList() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/readOnlyList.kt"); - doTest(fileName); - } - - @TestMetadata("readOnlyMap.kt") - public void testReadOnlyMap() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/readOnlyMap.kt"); - doTest(fileName); - } - - @TestMetadata("removeAtInt.kt") - public void testRemoveAtInt() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/removeAtInt.kt"); - doTest(fileName); - } - - @TestMetadata("strList.kt") - public void testStrList() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/strList.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/fileClasses") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class FileClasses extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInFileClasses() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/fileClasses"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("differentFiles.kt") - public void testDifferentFiles() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/differentFiles.kt"); - doTest(fileName); - } - - @TestMetadata("javaAnnotationOnFileFacade.kt") - public void testJavaAnnotationOnFileFacade() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/javaAnnotationOnFileFacade.kt"); - doTest(fileName); - } - - @TestMetadata("multifileClassWith2Files.kt") - public void testMultifileClassWith2Files() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWith2Files.kt"); - doTest(fileName); - } - - @TestMetadata("multifileClassWithCrossCall.kt") - public void testMultifileClassWithCrossCall() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall.kt"); - doTest(fileName); - } - - @TestMetadata("multifileClassWithPrivate.kt") - public void testMultifileClassWithPrivate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithPrivate.kt"); - doTest(fileName); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/simple.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/interfaces") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Interfaces extends AbstractBlackBoxCodegenTest { - @TestMetadata("abstractClassInheritsFromInterface.kt") - public void testAbstractClassInheritsFromInterface() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaces/abstractClassInheritsFromInterface.kt"); - doTest(fileName); - } - - public void testAllFilesPresentInInterfaces() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/interfaces"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("inheritJavaInterface.kt") - public void testInheritJavaInterface() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaces/inheritJavaInterface.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/javaProperty") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JavaProperty extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInJavaProperty() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/javaProperty"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("boxedGetter.kt") - public void testBoxedGetter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/javaProperty/boxedGetter.kt"); - doTest(fileName); - } - - @TestMetadata("boxedSetter.kt") - public void testBoxedSetter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/javaProperty/boxedSetter.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/jvmField") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmField extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInJvmField() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmField"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("constructorProperty.kt") - public void testConstructorProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmField/constructorProperty.kt"); - doTest(fileName); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmField/simple.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/jvmOverloads") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmOverloads extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInJvmOverloads() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmOverloads"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("generics.kt") - public void testGenerics() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmOverloads/generics.kt"); - doTest(fileName); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmOverloads/simple.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/jvmStatic") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmStatic extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInJvmStatic() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("annotations.kt") - public void testAnnotations() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/annotations.kt"); - doTest(fileName); - } - - @TestMetadata("companionObject.kt") - public void testCompanionObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/companionObject.kt"); - doTest(fileName); - } - - @TestMetadata("enumCompanion.kt") - public void testEnumCompanion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion.kt"); - doTest(fileName); - } - - @TestMetadata("object.kt") - public void testObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/object.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/notNullAssertions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class NotNullAssertions extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInNotNullAssertions() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("extensionReceiverParameter.kt") - public void testExtensionReceiverParameter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/notNullAssertions/extensionReceiverParameter.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/properties") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Properties extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInProperties() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/properties"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("annotationWithKotlinProperty.kt") - public void testAnnotationWithKotlinProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinProperty.kt"); - doTest(fileName); - } - - @TestMetadata("annotationWithKotlinPropertyFromInterfaceCompanion.kt") - public void testAnnotationWithKotlinPropertyFromInterfaceCompanion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinPropertyFromInterfaceCompanion.kt"); - doTest(fileName); - } - - @TestMetadata("collectionSize.kt") - public void testCollectionSize() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/collectionSize.kt"); - doTest(fileName); - } - - @TestMetadata("commonProperties.kt") - public void testCommonProperties() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/commonProperties.kt"); - doTest(fileName); - } - - @TestMetadata("companionObjectProperties.kt") - public void testCompanionObjectProperties() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/companionObjectProperties.kt"); - doTest(fileName); - } - - @TestMetadata("protectedJavaProperty.kt") - public void testProtectedJavaProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/protectedJavaProperty.kt"); - doTest(fileName); - } - - @TestMetadata("protectedJavaPropertyInCompanion.kt") - public void testProtectedJavaPropertyInCompanion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/protectedJavaPropertyInCompanion.kt"); - doTest(fileName); - } - - @TestMetadata("substituteJavaSuperField.kt") - public void testSubstituteJavaSuperField() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/reflection") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Reflection extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInReflection() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/reflection"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("annotationsOnJavaMembers.kt") - public void testAnnotationsOnJavaMembers() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/annotationsOnJavaMembers.kt"); - doTest(fileName); - } - - @TestMetadata("callInstanceJavaMethod.kt") - public void testCallInstanceJavaMethod() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod.kt"); - doTest(fileName); - } - - @TestMetadata("callPrivateJavaMethod.kt") - public void testCallPrivateJavaMethod() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod.kt"); - doTest(fileName); - } - - @TestMetadata("callStaticJavaMethod.kt") - public void testCallStaticJavaMethod() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod.kt"); - doTest(fileName); - } - - @TestMetadata("declaredVsInheritedFunctions.kt") - public void testDeclaredVsInheritedFunctions() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedFunctions.kt"); - doTest(fileName); - } - - @TestMetadata("declaredVsInheritedProperties.kt") - public void testDeclaredVsInheritedProperties() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedProperties.kt"); - doTest(fileName); - } - - @TestMetadata("functionReferenceErasedToKFunction.kt") - public void testFunctionReferenceErasedToKFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/functionReferenceErasedToKFunction.kt"); - doTest(fileName); - } - - @TestMetadata("javaClassGetFunctions.kt") - public void testJavaClassGetFunctions() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions.kt"); - doTest(fileName); - } - - @TestMetadata("javaMethodsSmokeTest.kt") - public void testJavaMethodsSmokeTest() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaMethodsSmokeTest.kt"); - doTest(fileName); - } - - @TestMetadata("javaPropertyInheritedInKotlin.kt") - public void testJavaPropertyInheritedInKotlin() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaPropertyInheritedInKotlin.kt"); - doTest(fileName); - } - - @TestMetadata("javaStaticField.kt") - public void testJavaStaticField() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaStaticField.kt"); - doTest(fileName); - } - - @TestMetadata("kotlinPropertyInheritedInJava.kt") - public void testKotlinPropertyInheritedInJava() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava.kt"); - doTest(fileName); - } - - @TestMetadata("mutatePrivateJavaInstanceField.kt") - public void testMutatePrivateJavaInstanceField() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaInstanceField.kt"); - doTest(fileName); - } - - @TestMetadata("mutatePrivateJavaStaticField.kt") - public void testMutatePrivateJavaStaticField() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaStaticField.kt"); - doTest(fileName); - } - - @TestMetadata("nestedClasses.kt") - public void testNestedClasses() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/nestedClasses.kt"); - doTest(fileName); - } - - @TestMetadata("noConflictOnKotlinGetterAndJavaField.kt") - public void testNoConflictOnKotlinGetterAndJavaField() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/noConflictOnKotlinGetterAndJavaField.kt"); - doTest(fileName); - } - - @TestMetadata("overrideKotlinPropertyByJavaMethod.kt") - public void testOverrideKotlinPropertyByJavaMethod() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/overrideKotlinPropertyByJavaMethod.kt"); - doTest(fileName); - } - - @TestMetadata("parametersHaveNoNames.kt") - public void testParametersHaveNoNames() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/parametersHaveNoNames.kt"); - doTest(fileName); - } - - @TestMetadata("platformTypeNotEqualToKotlinType.kt") - public void testPlatformTypeNotEqualToKotlinType() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/platformTypeNotEqualToKotlinType.kt"); - doTest(fileName); - } - - @TestMetadata("platformTypeToString.kt") - public void testPlatformTypeToString() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/platformTypeToString.kt"); - doTest(fileName); - } - - @TestMetadata("referenceToJavaFieldOfKotlinSubclass.kt") - public void testReferenceToJavaFieldOfKotlinSubclass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/referenceToJavaFieldOfKotlinSubclass.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/reified") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Reified extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInReified() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/reified"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("asCheck.kt") - public void testAsCheck() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reified/asCheck.kt"); - doTest(fileName); - } - - @TestMetadata("isCheck.kt") - public void testIsCheck() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reified/isCheck.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class SecondaryConstructors extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInSecondaryConstructors() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("withGenerics.kt") - public void testWithGenerics() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withGenerics.kt"); - doTest(fileName); - } - - @TestMetadata("withPrimary.kt") - public void testWithPrimary() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withPrimary.kt"); - doTest(fileName); - } - - @TestMetadata("withVarargs.kt") - public void testWithVarargs() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withVarargs.kt"); - doTest(fileName); - } - - @TestMetadata("withoutPrimary.kt") - public void testWithoutPrimary() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withoutPrimary.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/statics") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Statics extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInStatics() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/statics"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("fields.kt") - public void testFields() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/fields.kt"); - doTest(fileName); - } - - @TestMetadata("functions.kt") - public void testFunctions() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/functions.kt"); - doTest(fileName); - } - - @TestMetadata("hidePrivateByPublic.kt") - public void testHidePrivateByPublic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/hidePrivateByPublic.kt"); - doTest(fileName); - } - - @TestMetadata("protectedSamConstructor.kt") - public void testProtectedSamConstructor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedSamConstructor.kt"); - doTest(fileName); - } - - @TestMetadata("protectedStatic.kt") - public void testProtectedStatic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedStatic.kt"); - doTest(fileName); - } - - @TestMetadata("protectedStatic2.kt") - public void testProtectedStatic2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedStatic2.kt"); - doTest(fileName); - } - - @TestMetadata("protectedStaticAndInline.kt") - public void testProtectedStaticAndInline() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedStaticAndInline.kt"); - doTest(fileName); - } - } -} diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index a0c2cf0cc80..d390ee8bac0 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -208,10 +208,6 @@ fun main(args: Array) { model("codegen/boxAgainstJava") } - testClass("BlackBoxWithJavaCodegenTestGenerated") { - model("codegen/boxWithJava") - } - testClass() { model("codegen/script", extension = "kts") } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java index 9b122abadce..30594f2896d 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassesTestGenerated.java @@ -31,6 +31,12 @@ import java.util.regex.Pattern; @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class ClassesTestGenerated extends AbstractClassesTest { + @TestMetadata("classCompanionInitializationWithJava.kt") + public void ignoredClassCompanionInitializationWithJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classCompanionInitializationWithJava.kt"); + doTest(fileName); + } + @TestMetadata("classObjectAsStaticInitializer.kt") public void ignoredClassObjectAsStaticInitializer() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt"); @@ -49,6 +55,12 @@ public class ClassesTestGenerated extends AbstractClassesTest { doTest(fileName); } + @TestMetadata("interfaceCompanionInitializationWithJava.kt") + public void ignoredInterfaceCompanionInitializationWithJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/interfaceCompanionInitializationWithJava.kt"); + doTest(fileName); + } + @TestMetadata("kt1120.kt") public void ignoredKt1120() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1120.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java index b394789f1e6..4df2f74e968 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java @@ -31,6 +31,18 @@ import java.util.regex.Pattern; @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class InnerNestedTestGenerated extends AbstractInnerNestedTest { + @TestMetadata("innerGenericClassFromJava.kt") + public void ignoredInnerGenericClassFromJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerGenericClassFromJava.kt"); + doTest(fileName); + } + + @TestMetadata("innerJavaClass.kt") + public void ignoredInnerJavaClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerJavaClass.kt"); + doTest(fileName); + } + public void testAllFilesPresentInInnerNested() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/innerNested"), Pattern.compile("^(.+)\\.kt$"), true); } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SecondaryConstructorTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SecondaryConstructorTestGenerated.java index b50534e9119..c64132e4a32 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SecondaryConstructorTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SecondaryConstructorTestGenerated.java @@ -55,12 +55,36 @@ public class SecondaryConstructorTestGenerated extends AbstractSecondaryConstruc doTest(fileName); } + @TestMetadata("withGenerics.kt") + public void ignoredWithGenerics() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withGenerics.kt"); + doTest(fileName); + } + @TestMetadata("withNonLocalReturn.kt") public void ignoredWithNonLocalReturn() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt"); doTest(fileName); } + @TestMetadata("withPrimary.kt") + public void ignoredWithPrimary() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withPrimary.kt"); + doTest(fileName); + } + + @TestMetadata("withVarargs.kt") + public void ignoredWithVarargs() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withVarargs.kt"); + doTest(fileName); + } + + @TestMetadata("withoutPrimary.kt") + public void ignoredWithoutPrimary() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withoutPrimary.kt"); + doTest(fileName); + } + @TestMetadata("accessToCompanion.kt") public void testAccessToCompanion() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/accessToCompanion.kt");