From 4ad594a3cd80d4cc30508e413ff9efd437e50bc5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 8 Feb 2023 23:32:00 +0100 Subject: [PATCH] Minor, move tests about Java field and Kotlin property Because the `fieldRename` directory was originally about cases when private fields are renamed because of clashes. --- .../FirBlackBoxCodegenTestGenerated.java | 274 +++++++++--------- .../FirPsiBlackBoxCodegenTestGenerated.java | 274 +++++++++--------- .../javaCloseFieldAndKotlinProperty.kt | 0 .../javaFieldAndCompanionProperty.kt | 0 .../javaFieldAndKotlinInvisibleProperty.kt | 0 ...KotlinInvisiblePropertyViaTypeParameter.kt | 0 ...eldAndKotlinInvisiblePropertyWithGetter.kt | 0 .../javaFieldAndKotlinLateinitProperty.kt | 0 .../javaFieldAndKotlinPrivateProperty.kt | 0 .../javaFieldAndKotlinProperty.fir.ir.txt | 0 .../javaFieldAndKotlinProperty.ir.txt | 0 .../javaFieldAndKotlinProperty.kt | 0 ...FieldAndKotlinPropertyReference.fir.ir.txt | 0 ...javaFieldAndKotlinPropertyReference.ir.txt | 0 .../javaFieldAndKotlinPropertyReference.kt | 0 ...ieldAndKotlinPropertyReferenceFromInner.kt | 0 .../javaFieldAndKotlinPropertySuperAccess.kt | 0 ...eldAndKotlinPropertyWithComplexReceiver.kt | 0 ...javaFieldAndKotlinPropertyWithSmartcast.kt | 0 .../javaFieldKotlinPropertyJavaField.kt | 0 ...vaFieldKotlinPropertyJavaPackagePrivate.kt | 0 .../javaInvisibleFieldAndKotlinProperty.kt | 0 ...nvisibleFieldAndKotlinPropertyReference.kt | 0 ...rotectedFieldAndKotlinInvisibleProperty.kt | 0 ...ieldAndKotlinInvisiblePropertyReference.kt | 0 ...tedFieldAndKotlinInvisiblePropertyWrite.kt | 0 ...rotectedFieldAndKotlinPropertyReference.kt | 0 ...vaProtectedFieldAnotherPackageReference.kt | 0 .../codegen/BlackBoxCodegenTestGenerated.java | 10 + .../IrBlackBoxCodegenTestGenerated.java | 274 +++++++++--------- .../LightAnalysisModeTestGenerated.java | 13 + .../js/test/JsCodegenBoxTestGenerated.java | 10 + .../fir/FirJsCodegenBoxTestGenerated.java | 10 + .../test/ir/IrJsCodegenBoxTestGenerated.java | 10 + .../ir/IrJsES6CodegenBoxTestGenerated.java | 10 + .../K2NativeCodegenBoxTestGenerated.java | 13 + .../NativeCodegenBoxTestGenerated.java | 12 + .../test/IrCodegenBoxWasmTestGenerated.java | 13 + 38 files changed, 527 insertions(+), 396 deletions(-) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaCloseFieldAndKotlinProperty.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndCompanionProperty.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinInvisibleProperty.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinInvisiblePropertyWithGetter.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinLateinitProperty.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinPrivateProperty.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinProperty.fir.ir.txt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinProperty.ir.txt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinProperty.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinPropertyReference.fir.ir.txt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinPropertyReference.ir.txt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinPropertyReference.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinPropertyReferenceFromInner.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinPropertySuperAccess.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinPropertyWithComplexReceiver.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldAndKotlinPropertyWithSmartcast.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldKotlinPropertyJavaField.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaFieldKotlinPropertyJavaPackagePrivate.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaInvisibleFieldAndKotlinProperty.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaInvisibleFieldAndKotlinPropertyReference.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaProtectedFieldAndKotlinInvisibleProperty.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaProtectedFieldAndKotlinPropertyReference.kt (100%) rename compiler/testData/codegen/box/{fieldRename => javaFieldAndKotlinProperty}/javaProtectedFieldAnotherPackageReference.kt (100%) diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java index 81661153005..c779e7a5c1f 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java @@ -18023,138 +18023,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt"); } - @Test - @TestMetadata("javaCloseFieldAndKotlinProperty.kt") - public void testJavaCloseFieldAndKotlinProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaCloseFieldAndKotlinProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndCompanionProperty.kt") - public void testJavaFieldAndCompanionProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinInvisibleProperty.kt") - public void testJavaFieldAndKotlinInvisibleProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisibleProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt") - public void testJavaFieldAndKotlinInvisiblePropertyViaTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinInvisiblePropertyWithGetter.kt") - public void testJavaFieldAndKotlinInvisiblePropertyWithGetter() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyWithGetter.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinLateinitProperty.kt") - public void testJavaFieldAndKotlinLateinitProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinLateinitProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPrivateProperty.kt") - public void testJavaFieldAndKotlinPrivateProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPrivateProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinProperty.kt") - public void testJavaFieldAndKotlinProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyReference.kt") - public void testJavaFieldAndKotlinPropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReference.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyReferenceFromInner.kt") - public void testJavaFieldAndKotlinPropertyReferenceFromInner() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReferenceFromInner.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertySuperAccess.kt") - public void testJavaFieldAndKotlinPropertySuperAccess() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertySuperAccess.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyWithComplexReceiver.kt") - public void testJavaFieldAndKotlinPropertyWithComplexReceiver() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithComplexReceiver.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyWithSmartcast.kt") - public void testJavaFieldAndKotlinPropertyWithSmartcast() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithSmartcast.kt"); - } - - @Test - @TestMetadata("javaFieldKotlinPropertyJavaField.kt") - public void testJavaFieldKotlinPropertyJavaField() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaField.kt"); - } - - @Test - @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivate.kt") - public void testJavaFieldKotlinPropertyJavaPackagePrivate() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaPackagePrivate.kt"); - } - - @Test - @TestMetadata("javaInvisibleFieldAndKotlinProperty.kt") - public void testJavaInvisibleFieldAndKotlinProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinProperty.kt"); - } - - @Test - @TestMetadata("javaInvisibleFieldAndKotlinPropertyReference.kt") - public void testJavaInvisibleFieldAndKotlinPropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinPropertyReference.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinInvisibleProperty.kt") - public void testJavaProtectedFieldAndKotlinInvisibleProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisibleProperty.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt") - public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt") - public void testJavaProtectedFieldAndKotlinInvisiblePropertyWrite() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinPropertyReference.kt") - public void testJavaProtectedFieldAndKotlinPropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinPropertyReference.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAnotherPackageReference.kt") - public void testJavaProtectedFieldAnotherPackageReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAnotherPackageReference.kt"); - } - @Test @TestMetadata("jvmFieldNoClash1.kt") public void testJvmFieldNoClash1() throws Exception { @@ -28758,6 +28626,148 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("javaCloseFieldAndKotlinProperty.kt") + public void testJavaCloseFieldAndKotlinProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaCloseFieldAndKotlinProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndCompanionProperty.kt") + public void testJavaFieldAndCompanionProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndCompanionProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinInvisibleProperty.kt") + public void testJavaFieldAndKotlinInvisibleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisibleProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt") + public void testJavaFieldAndKotlinInvisiblePropertyViaTypeParameter() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinInvisiblePropertyWithGetter.kt") + public void testJavaFieldAndKotlinInvisiblePropertyWithGetter() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyWithGetter.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinLateinitProperty.kt") + public void testJavaFieldAndKotlinLateinitProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinLateinitProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPrivateProperty.kt") + public void testJavaFieldAndKotlinPrivateProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPrivateProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinProperty.kt") + public void testJavaFieldAndKotlinProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyReference.kt") + public void testJavaFieldAndKotlinPropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReference.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyReferenceFromInner.kt") + public void testJavaFieldAndKotlinPropertyReferenceFromInner() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReferenceFromInner.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertySuperAccess.kt") + public void testJavaFieldAndKotlinPropertySuperAccess() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertySuperAccess.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyWithComplexReceiver.kt") + public void testJavaFieldAndKotlinPropertyWithComplexReceiver() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithComplexReceiver.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyWithSmartcast.kt") + public void testJavaFieldAndKotlinPropertyWithSmartcast() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithSmartcast.kt"); + } + + @Test + @TestMetadata("javaFieldKotlinPropertyJavaField.kt") + public void testJavaFieldKotlinPropertyJavaField() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaField.kt"); + } + + @Test + @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivate.kt") + public void testJavaFieldKotlinPropertyJavaPackagePrivate() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaPackagePrivate.kt"); + } + + @Test + @TestMetadata("javaInvisibleFieldAndKotlinProperty.kt") + public void testJavaInvisibleFieldAndKotlinProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinProperty.kt"); + } + + @Test + @TestMetadata("javaInvisibleFieldAndKotlinPropertyReference.kt") + public void testJavaInvisibleFieldAndKotlinPropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinPropertyReference.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinInvisibleProperty.kt") + public void testJavaProtectedFieldAndKotlinInvisibleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisibleProperty.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt") + public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt") + public void testJavaProtectedFieldAndKotlinInvisiblePropertyWrite() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinPropertyReference.kt") + public void testJavaProtectedFieldAndKotlinPropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinPropertyReference.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAnotherPackageReference.kt") + public void testJavaProtectedFieldAnotherPackageReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAnotherPackageReference.kt"); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index 8d4ed3c63cb..6e2ba5701b7 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -18023,138 +18023,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt"); } - @Test - @TestMetadata("javaCloseFieldAndKotlinProperty.kt") - public void testJavaCloseFieldAndKotlinProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaCloseFieldAndKotlinProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndCompanionProperty.kt") - public void testJavaFieldAndCompanionProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinInvisibleProperty.kt") - public void testJavaFieldAndKotlinInvisibleProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisibleProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt") - public void testJavaFieldAndKotlinInvisiblePropertyViaTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinInvisiblePropertyWithGetter.kt") - public void testJavaFieldAndKotlinInvisiblePropertyWithGetter() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyWithGetter.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinLateinitProperty.kt") - public void testJavaFieldAndKotlinLateinitProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinLateinitProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPrivateProperty.kt") - public void testJavaFieldAndKotlinPrivateProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPrivateProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinProperty.kt") - public void testJavaFieldAndKotlinProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyReference.kt") - public void testJavaFieldAndKotlinPropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReference.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyReferenceFromInner.kt") - public void testJavaFieldAndKotlinPropertyReferenceFromInner() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReferenceFromInner.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertySuperAccess.kt") - public void testJavaFieldAndKotlinPropertySuperAccess() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertySuperAccess.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyWithComplexReceiver.kt") - public void testJavaFieldAndKotlinPropertyWithComplexReceiver() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithComplexReceiver.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyWithSmartcast.kt") - public void testJavaFieldAndKotlinPropertyWithSmartcast() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithSmartcast.kt"); - } - - @Test - @TestMetadata("javaFieldKotlinPropertyJavaField.kt") - public void testJavaFieldKotlinPropertyJavaField() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaField.kt"); - } - - @Test - @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivate.kt") - public void testJavaFieldKotlinPropertyJavaPackagePrivate() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaPackagePrivate.kt"); - } - - @Test - @TestMetadata("javaInvisibleFieldAndKotlinProperty.kt") - public void testJavaInvisibleFieldAndKotlinProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinProperty.kt"); - } - - @Test - @TestMetadata("javaInvisibleFieldAndKotlinPropertyReference.kt") - public void testJavaInvisibleFieldAndKotlinPropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinPropertyReference.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinInvisibleProperty.kt") - public void testJavaProtectedFieldAndKotlinInvisibleProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisibleProperty.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt") - public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt") - public void testJavaProtectedFieldAndKotlinInvisiblePropertyWrite() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinPropertyReference.kt") - public void testJavaProtectedFieldAndKotlinPropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinPropertyReference.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAnotherPackageReference.kt") - public void testJavaProtectedFieldAnotherPackageReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAnotherPackageReference.kt"); - } - @Test @TestMetadata("jvmFieldNoClash1.kt") public void testJvmFieldNoClash1() throws Exception { @@ -28758,6 +28626,148 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("javaCloseFieldAndKotlinProperty.kt") + public void testJavaCloseFieldAndKotlinProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaCloseFieldAndKotlinProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndCompanionProperty.kt") + public void testJavaFieldAndCompanionProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndCompanionProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinInvisibleProperty.kt") + public void testJavaFieldAndKotlinInvisibleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisibleProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt") + public void testJavaFieldAndKotlinInvisiblePropertyViaTypeParameter() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinInvisiblePropertyWithGetter.kt") + public void testJavaFieldAndKotlinInvisiblePropertyWithGetter() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyWithGetter.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinLateinitProperty.kt") + public void testJavaFieldAndKotlinLateinitProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinLateinitProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPrivateProperty.kt") + public void testJavaFieldAndKotlinPrivateProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPrivateProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinProperty.kt") + public void testJavaFieldAndKotlinProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyReference.kt") + public void testJavaFieldAndKotlinPropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReference.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyReferenceFromInner.kt") + public void testJavaFieldAndKotlinPropertyReferenceFromInner() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReferenceFromInner.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertySuperAccess.kt") + public void testJavaFieldAndKotlinPropertySuperAccess() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertySuperAccess.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyWithComplexReceiver.kt") + public void testJavaFieldAndKotlinPropertyWithComplexReceiver() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithComplexReceiver.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyWithSmartcast.kt") + public void testJavaFieldAndKotlinPropertyWithSmartcast() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithSmartcast.kt"); + } + + @Test + @TestMetadata("javaFieldKotlinPropertyJavaField.kt") + public void testJavaFieldKotlinPropertyJavaField() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaField.kt"); + } + + @Test + @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivate.kt") + public void testJavaFieldKotlinPropertyJavaPackagePrivate() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaPackagePrivate.kt"); + } + + @Test + @TestMetadata("javaInvisibleFieldAndKotlinProperty.kt") + public void testJavaInvisibleFieldAndKotlinProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinProperty.kt"); + } + + @Test + @TestMetadata("javaInvisibleFieldAndKotlinPropertyReference.kt") + public void testJavaInvisibleFieldAndKotlinPropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinPropertyReference.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinInvisibleProperty.kt") + public void testJavaProtectedFieldAndKotlinInvisibleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisibleProperty.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt") + public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt") + public void testJavaProtectedFieldAndKotlinInvisiblePropertyWrite() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinPropertyReference.kt") + public void testJavaProtectedFieldAndKotlinPropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinPropertyReference.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAnotherPackageReference.kt") + public void testJavaProtectedFieldAnotherPackageReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAnotherPackageReference.kt"); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/testData/codegen/box/fieldRename/javaCloseFieldAndKotlinProperty.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaCloseFieldAndKotlinProperty.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaCloseFieldAndKotlinProperty.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaCloseFieldAndKotlinProperty.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndCompanionProperty.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndCompanionProperty.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisibleProperty.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisibleProperty.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisibleProperty.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisibleProperty.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyWithGetter.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyWithGetter.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyWithGetter.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyWithGetter.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinLateinitProperty.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinLateinitProperty.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinLateinitProperty.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinLateinitProperty.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPrivateProperty.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPrivateProperty.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPrivateProperty.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPrivateProperty.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinProperty.fir.ir.txt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.fir.ir.txt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinProperty.fir.ir.txt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.fir.ir.txt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinProperty.ir.txt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.ir.txt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinProperty.ir.txt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.ir.txt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinProperty.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinProperty.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReference.fir.ir.txt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReference.fir.ir.txt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReference.fir.ir.txt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReference.fir.ir.txt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReference.ir.txt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReference.ir.txt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReference.ir.txt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReference.ir.txt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReference.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReference.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReference.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReference.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReferenceFromInner.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReferenceFromInner.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReferenceFromInner.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReferenceFromInner.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertySuperAccess.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertySuperAccess.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertySuperAccess.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertySuperAccess.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithComplexReceiver.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithComplexReceiver.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithComplexReceiver.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithComplexReceiver.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithSmartcast.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithSmartcast.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithSmartcast.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithSmartcast.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaField.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaField.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaField.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaField.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaPackagePrivate.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaPackagePrivate.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaPackagePrivate.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaPackagePrivate.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinProperty.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinProperty.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinProperty.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinProperty.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinPropertyReference.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinPropertyReference.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinPropertyReference.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinPropertyReference.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisibleProperty.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisibleProperty.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisibleProperty.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisibleProperty.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinPropertyReference.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinPropertyReference.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinPropertyReference.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinPropertyReference.kt diff --git a/compiler/testData/codegen/box/fieldRename/javaProtectedFieldAnotherPackageReference.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAnotherPackageReference.kt similarity index 100% rename from compiler/testData/codegen/box/fieldRename/javaProtectedFieldAnotherPackageReference.kt rename to compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAnotherPackageReference.kt diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index 045f3c73b74..207ab888ce9 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -27504,6 +27504,16 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 267a2e73403..e6aa1f113df 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -18023,138 +18023,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt"); } - @Test - @TestMetadata("javaCloseFieldAndKotlinProperty.kt") - public void testJavaCloseFieldAndKotlinProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaCloseFieldAndKotlinProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndCompanionProperty.kt") - public void testJavaFieldAndCompanionProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndCompanionProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinInvisibleProperty.kt") - public void testJavaFieldAndKotlinInvisibleProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisibleProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt") - public void testJavaFieldAndKotlinInvisiblePropertyViaTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinInvisiblePropertyWithGetter.kt") - public void testJavaFieldAndKotlinInvisiblePropertyWithGetter() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinInvisiblePropertyWithGetter.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinLateinitProperty.kt") - public void testJavaFieldAndKotlinLateinitProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinLateinitProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPrivateProperty.kt") - public void testJavaFieldAndKotlinPrivateProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPrivateProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinProperty.kt") - public void testJavaFieldAndKotlinProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinProperty.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyReference.kt") - public void testJavaFieldAndKotlinPropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReference.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyReferenceFromInner.kt") - public void testJavaFieldAndKotlinPropertyReferenceFromInner() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyReferenceFromInner.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertySuperAccess.kt") - public void testJavaFieldAndKotlinPropertySuperAccess() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertySuperAccess.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyWithComplexReceiver.kt") - public void testJavaFieldAndKotlinPropertyWithComplexReceiver() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithComplexReceiver.kt"); - } - - @Test - @TestMetadata("javaFieldAndKotlinPropertyWithSmartcast.kt") - public void testJavaFieldAndKotlinPropertyWithSmartcast() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldAndKotlinPropertyWithSmartcast.kt"); - } - - @Test - @TestMetadata("javaFieldKotlinPropertyJavaField.kt") - public void testJavaFieldKotlinPropertyJavaField() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaField.kt"); - } - - @Test - @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivate.kt") - public void testJavaFieldKotlinPropertyJavaPackagePrivate() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaFieldKotlinPropertyJavaPackagePrivate.kt"); - } - - @Test - @TestMetadata("javaInvisibleFieldAndKotlinProperty.kt") - public void testJavaInvisibleFieldAndKotlinProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinProperty.kt"); - } - - @Test - @TestMetadata("javaInvisibleFieldAndKotlinPropertyReference.kt") - public void testJavaInvisibleFieldAndKotlinPropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaInvisibleFieldAndKotlinPropertyReference.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinInvisibleProperty.kt") - public void testJavaProtectedFieldAndKotlinInvisibleProperty() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisibleProperty.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt") - public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt") - public void testJavaProtectedFieldAndKotlinInvisiblePropertyWrite() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAndKotlinPropertyReference.kt") - public void testJavaProtectedFieldAndKotlinPropertyReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAndKotlinPropertyReference.kt"); - } - - @Test - @TestMetadata("javaProtectedFieldAnotherPackageReference.kt") - public void testJavaProtectedFieldAnotherPackageReference() throws Exception { - runTest("compiler/testData/codegen/box/fieldRename/javaProtectedFieldAnotherPackageReference.kt"); - } - @Test @TestMetadata("jvmFieldNoClash1.kt") public void testJvmFieldNoClash1() throws Exception { @@ -28758,6 +28626,148 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("javaCloseFieldAndKotlinProperty.kt") + public void testJavaCloseFieldAndKotlinProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaCloseFieldAndKotlinProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndCompanionProperty.kt") + public void testJavaFieldAndCompanionProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndCompanionProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinInvisibleProperty.kt") + public void testJavaFieldAndKotlinInvisibleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisibleProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt") + public void testJavaFieldAndKotlinInvisiblePropertyViaTypeParameter() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyViaTypeParameter.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinInvisiblePropertyWithGetter.kt") + public void testJavaFieldAndKotlinInvisiblePropertyWithGetter() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinInvisiblePropertyWithGetter.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinLateinitProperty.kt") + public void testJavaFieldAndKotlinLateinitProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinLateinitProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPrivateProperty.kt") + public void testJavaFieldAndKotlinPrivateProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPrivateProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinProperty.kt") + public void testJavaFieldAndKotlinProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyReference.kt") + public void testJavaFieldAndKotlinPropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReference.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyReferenceFromInner.kt") + public void testJavaFieldAndKotlinPropertyReferenceFromInner() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyReferenceFromInner.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertySuperAccess.kt") + public void testJavaFieldAndKotlinPropertySuperAccess() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertySuperAccess.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyWithComplexReceiver.kt") + public void testJavaFieldAndKotlinPropertyWithComplexReceiver() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithComplexReceiver.kt"); + } + + @Test + @TestMetadata("javaFieldAndKotlinPropertyWithSmartcast.kt") + public void testJavaFieldAndKotlinPropertyWithSmartcast() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinPropertyWithSmartcast.kt"); + } + + @Test + @TestMetadata("javaFieldKotlinPropertyJavaField.kt") + public void testJavaFieldKotlinPropertyJavaField() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaField.kt"); + } + + @Test + @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivate.kt") + public void testJavaFieldKotlinPropertyJavaPackagePrivate() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldKotlinPropertyJavaPackagePrivate.kt"); + } + + @Test + @TestMetadata("javaInvisibleFieldAndKotlinProperty.kt") + public void testJavaInvisibleFieldAndKotlinProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinProperty.kt"); + } + + @Test + @TestMetadata("javaInvisibleFieldAndKotlinPropertyReference.kt") + public void testJavaInvisibleFieldAndKotlinPropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinPropertyReference.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinInvisibleProperty.kt") + public void testJavaProtectedFieldAndKotlinInvisibleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisibleProperty.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt") + public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt") + public void testJavaProtectedFieldAndKotlinInvisiblePropertyWrite() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAndKotlinPropertyReference.kt") + public void testJavaProtectedFieldAndKotlinPropertyReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinPropertyReference.kt"); + } + + @Test + @TestMetadata("javaProtectedFieldAnotherPackageReference.kt") + public void testJavaProtectedFieldAnotherPackageReference() throws Exception { + runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAnotherPackageReference.kt"); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index ed83514f264..ded7628916b 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -23211,6 +23211,19 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class JavaFieldAndKotlinProperty extends AbstractLightAnalysisModeTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + } + @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java index 105c9d4ad3e..283ad995b09 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java @@ -21350,6 +21350,16 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index 05b7d03f60a..1245fe29c3c 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -21368,6 +21368,16 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index 0b5c55e7c17..411e1830592 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -21368,6 +21368,16 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index 36f5f4f5453..7f172fbaecb 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -21368,6 +21368,16 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java index 5d00e2a4b01..7157bef3bb0 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java @@ -24309,6 +24309,19 @@ public class K2NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + @Tag("codegenK2") + @UseExtTestCaseGroupProvider() + @K2Pipeline() + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index 84027e65885..c4043ec546f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -24069,6 +24069,18 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + @Tag("codegen") + @UseExtTestCaseGroupProvider() + public class JavaFieldAndKotlinProperty { + @Test + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java index fe3a3cfe863..b884a3a90fd 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java @@ -18944,6 +18944,19 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest } } + @TestMetadata("compiler/testData/codegen/box/javaFieldAndKotlinProperty") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class JavaFieldAndKotlinProperty extends AbstractIrCodegenBoxWasmTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); + } + + public void testAllFilesPresentInJavaFieldAndKotlinProperty() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaFieldAndKotlinProperty"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); + } + } + @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)