From 510b9e6f2ad4794acd2ccbf32df862b469defc70 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 10 Feb 2021 21:17:09 +0100 Subject: [PATCH] Move around some codegen box tests In tests merged from boxAgainstJava in 29b96aa1, some directories were named slightly differently compared to box, e.g. "property" vs "properties", "varargs" vs "vararg". This change renames these, moves some of the tests to more fitting directories, and also renames "visibility" to "javaVisibility" because it's about Java visibilities specifically. --- .../FirBlackBoxCodegenTestGenerated.java | 566 ++++++++---------- .../javaClassWithNestedEnum.kt} | 0 .../box/{innerClass => innerNested}/kt3532.kt | 0 .../box/{innerClass => innerNested}/kt3812.kt | 0 .../box/{innerClass => innerNested}/kt4036.kt | 0 .../package/kt2781.kt | 0 .../package/packageClass.kt | 0 .../package/packageFun.kt | 0 .../package/packageProperty.kt | 0 .../protectedAndPackage/kt42012.kt | 0 .../overrideProtectedFunInPackage.kt | 0 .../protectedAndPackage/protectedAccessor.kt | 0 .../protectedFunInPackage.kt | 0 .../protectedPropertyInPackage.kt | 0 ...otectedPropertyInPackageFromCrossinline.kt | 0 .../protectedStaticClass.kt | 0 .../protectedSuperField.kt | 0 .../protectedSuperMethod.kt | 0 .../protectedStatic/funCallInConstructor.kt | 0 .../protectedStatic/funClassObject.kt | 0 .../protectedStatic/funGenericClass.kt | 0 .../protectedStatic/funNestedStaticClass.kt | 0 .../protectedStatic/funNestedStaticClass2.kt | 0 .../funNestedStaticGenericClass.kt | 0 .../protectedStatic/funNotDirectSuperClass.kt | 0 .../protectedStatic/funObject.kt | 0 .../protectedStatic/simpleClass.kt | 0 .../protectedStatic/simpleClass2.kt | 0 .../protectedStatic/simpleFun.kt | 0 .../protectedStatic/simpleProperty.kt | 0 .../fieldAccessFromExtensionInTraitImpl.kt | 0 .../fieldAccessViaSubclass.kt | 0 .../referenceToJavaFieldViaBridge.kt | 0 .../codegen/box/{inline => sam}/kt19910.kt | 0 .../{interfaces => traits}/defaultMethod.kt | 0 .../inheritJavaInterface_AgainstCompiled.kt} | 0 .../{varargs => vararg}/varargsOverride.kt | 0 .../{varargs => vararg}/varargsOverride2.kt | 0 .../{varargs => vararg}/varargsOverride3.kt | 0 .../codegen/BlackBoxCodegenTestGenerated.java | 566 ++++++++---------- .../IrBlackBoxCodegenTestGenerated.java | 566 ++++++++---------- .../LightAnalysisModeTestGenerated.java | 538 +++++++---------- .../IrJsCodegenBoxES6TestGenerated.java | 182 ++---- .../IrJsCodegenBoxTestGenerated.java | 182 ++---- .../semantics/JsCodegenBoxTestGenerated.java | 182 ++---- .../IrCodegenBoxWasmTestGenerated.java | 182 ++---- 46 files changed, 1197 insertions(+), 1767 deletions(-) rename compiler/testData/codegen/box/{staticFun/classWithNestedEnum.kt => enum/javaClassWithNestedEnum.kt} (100%) rename compiler/testData/codegen/box/{innerClass => innerNested}/kt3532.kt (100%) rename compiler/testData/codegen/box/{innerClass => innerNested}/kt3812.kt (100%) rename compiler/testData/codegen/box/{innerClass => innerNested}/kt4036.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/package/kt2781.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/package/packageClass.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/package/packageFun.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/package/packageProperty.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedAndPackage/kt42012.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedAndPackage/overrideProtectedFunInPackage.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedAndPackage/protectedAccessor.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedAndPackage/protectedFunInPackage.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedAndPackage/protectedPropertyInPackage.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedAndPackage/protectedStaticClass.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedAndPackage/protectedSuperField.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedAndPackage/protectedSuperMethod.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/funCallInConstructor.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/funClassObject.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/funGenericClass.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/funNestedStaticClass.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/funNestedStaticClass2.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/funNestedStaticGenericClass.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/funNotDirectSuperClass.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/funObject.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/simpleClass.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/simpleClass2.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/simpleFun.kt (100%) rename compiler/testData/codegen/box/{visibility => javaVisibility}/protectedStatic/simpleProperty.kt (100%) rename compiler/testData/codegen/box/{property => properties}/fieldAccessFromExtensionInTraitImpl.kt (100%) rename compiler/testData/codegen/box/{property => properties}/fieldAccessViaSubclass.kt (100%) rename compiler/testData/codegen/box/{property => properties}/referenceToJavaFieldViaBridge.kt (100%) rename compiler/testData/codegen/box/{inline => sam}/kt19910.kt (100%) rename compiler/testData/codegen/box/{interfaces => traits}/defaultMethod.kt (100%) rename compiler/testData/codegen/box/{interfaces/inheritJavaInterface.kt => traits/inheritJavaInterface_AgainstCompiled.kt} (100%) rename compiler/testData/codegen/box/{varargs => vararg}/varargsOverride.kt (100%) rename compiler/testData/codegen/box/{varargs => vararg}/varargsOverride2.kt (100%) rename compiler/testData/codegen/box/{varargs => vararg}/varargsOverride3.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 6574c9ef1dd..3ec06a446bc 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 @@ -13900,6 +13900,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt"); } + @Test + @TestMetadata("javaClassWithNestedEnum.kt") + public void testJavaClassWithNestedEnum() throws Exception { + runTest("compiler/testData/codegen/box/enum/javaClassWithNestedEnum.kt"); + } + @Test @TestMetadata("kt1119.kt") public void testKt1119() throws Exception { @@ -16773,22 +16779,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } } - @Nested - @TestMetadata("compiler/testData/codegen/box/inline") - @TestDataPath("$PROJECT_ROOT") - public class Inline { - @Test - public void testAllFilesPresentInInline() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("kt19910.kt") - public void testKt19910() throws Exception { - runTest("compiler/testData/codegen/box/inline/kt19910.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/inlineClasses") @TestDataPath("$PROJECT_ROOT") @@ -19183,34 +19173,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } } - @Nested - @TestMetadata("compiler/testData/codegen/box/innerClass") - @TestDataPath("$PROJECT_ROOT") - public class InnerClass { - @Test - public void testAllFilesPresentInInnerClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("kt3532.kt") - public void testKt3532() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt3532.kt"); - } - - @Test - @TestMetadata("kt3812.kt") - public void testKt3812() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt3812.kt"); - } - - @Test - @TestMetadata("kt4036.kt") - public void testKt4036() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt4036.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/innerNested") @TestDataPath("$PROJECT_ROOT") @@ -19304,12 +19266,30 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/innerNested/kt3132.kt"); } + @Test + @TestMetadata("kt3532.kt") + public void testKt3532() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt3532.kt"); + } + + @Test + @TestMetadata("kt3812.kt") + public void testKt3812() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt3812.kt"); + } + @Test @TestMetadata("kt3927.kt") public void testKt3927() throws Exception { runTest("compiler/testData/codegen/box/innerNested/kt3927.kt"); } + @Test + @TestMetadata("kt4036.kt") + public void testKt4036() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt4036.kt"); + } + @Test @TestMetadata("kt5363.kt") public void testKt5363() throws Exception { @@ -19557,28 +19537,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } } - @Nested - @TestMetadata("compiler/testData/codegen/box/interfaces") - @TestDataPath("$PROJECT_ROOT") - public class Interfaces { - @Test - public void testAllFilesPresentInInterfaces() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/interfaces"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("defaultMethod.kt") - public void testDefaultMethod() throws Exception { - runTest("compiler/testData/codegen/box/interfaces/defaultMethod.kt"); - } - - @Test - @TestMetadata("inheritJavaInterface.kt") - public void testInheritJavaInterface() throws Exception { - runTest("compiler/testData/codegen/box/interfaces/inheritJavaInterface.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/intrinsics") @TestDataPath("$PROJECT_ROOT") @@ -20825,6 +20783,196 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility") + @TestDataPath("$PROJECT_ROOT") + public class JavaVisibility { + @Test + public void testAllFilesPresentInJavaVisibility() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility/package") + @TestDataPath("$PROJECT_ROOT") + public class Package { + @Test + public void testAllFilesPresentInPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("kt2781.kt") + public void testKt2781() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/kt2781.kt"); + } + + @Test + @TestMetadata("packageClass.kt") + public void testPackageClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageClass.kt"); + } + + @Test + @TestMetadata("packageFun.kt") + public void testPackageFun() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageFun.kt"); + } + + @Test + @TestMetadata("packageProperty.kt") + public void testPackageProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageProperty.kt"); + } + } + + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedAndPackage") + @TestDataPath("$PROJECT_ROOT") + public class ProtectedAndPackage { + @Test + public void testAllFilesPresentInProtectedAndPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("kt42012.kt") + public void testKt42012() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/kt42012.kt"); + } + + @Test + @TestMetadata("overrideProtectedFunInPackage.kt") + public void testOverrideProtectedFunInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); + } + + @Test + @TestMetadata("protectedAccessor.kt") + public void testProtectedAccessor() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedAccessor.kt"); + } + + @Test + @TestMetadata("protectedFunInPackage.kt") + public void testProtectedFunInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedFunInPackage.kt"); + } + + @Test + @TestMetadata("protectedPropertyInPackage.kt") + public void testProtectedPropertyInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackage.kt"); + } + + @Test + @TestMetadata("protectedPropertyInPackageFromCrossinline.kt") + public void testProtectedPropertyInPackageFromCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt"); + } + + @Test + @TestMetadata("protectedStaticClass.kt") + public void testProtectedStaticClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedStaticClass.kt"); + } + + @Test + @TestMetadata("protectedSuperField.kt") + public void testProtectedSuperField() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperField.kt"); + } + + @Test + @TestMetadata("protectedSuperMethod.kt") + public void testProtectedSuperMethod() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperMethod.kt"); + } + } + + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedStatic") + @TestDataPath("$PROJECT_ROOT") + public class ProtectedStatic { + @Test + public void testAllFilesPresentInProtectedStatic() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("funCallInConstructor.kt") + public void testFunCallInConstructor() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funCallInConstructor.kt"); + } + + @Test + @TestMetadata("funClassObject.kt") + public void testFunClassObject() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funClassObject.kt"); + } + + @Test + @TestMetadata("funGenericClass.kt") + public void testFunGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funGenericClass.kt"); + } + + @Test + @TestMetadata("funNestedStaticClass.kt") + public void testFunNestedStaticClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass.kt"); + } + + @Test + @TestMetadata("funNestedStaticClass2.kt") + public void testFunNestedStaticClass2() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass2.kt"); + } + + @Test + @TestMetadata("funNestedStaticGenericClass.kt") + public void testFunNestedStaticGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticGenericClass.kt"); + } + + @Test + @TestMetadata("funNotDirectSuperClass.kt") + public void testFunNotDirectSuperClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNotDirectSuperClass.kt"); + } + + @Test + @TestMetadata("funObject.kt") + public void testFunObject() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funObject.kt"); + } + + @Test + @TestMetadata("simpleClass.kt") + public void testSimpleClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass.kt"); + } + + @Test + @TestMetadata("simpleClass2.kt") + public void testSimpleClass2() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass2.kt"); + } + + @Test + @TestMetadata("simpleFun.kt") + public void testSimpleFun() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleFun.kt"); + } + + @Test + @TestMetadata("simpleProperty.kt") + public void testSimpleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleProperty.kt"); + } + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/jdk") @TestDataPath("$PROJECT_ROOT") @@ -26368,6 +26516,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/properties/field.kt"); } + @Test + @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") + public void testFieldAccessFromExtensionInTraitImpl() throws Exception { + runTest("compiler/testData/codegen/box/properties/fieldAccessFromExtensionInTraitImpl.kt"); + } + + @Test + @TestMetadata("fieldAccessViaSubclass.kt") + public void testFieldAccessViaSubclass() throws Exception { + runTest("compiler/testData/codegen/box/properties/fieldAccessViaSubclass.kt"); + } + @Test @TestMetadata("fieldInClass.kt") public void testFieldInClass() throws Exception { @@ -26710,6 +26870,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/properties/protectedJavaPropertyInCompanion.kt"); } + @Test + @TestMetadata("referenceToJavaFieldViaBridge.kt") + public void testReferenceToJavaFieldViaBridge() throws Exception { + runTest("compiler/testData/codegen/box/properties/referenceToJavaFieldViaBridge.kt"); + } + @Test @TestMetadata("sideEffectInTopLevelInitializerMultiModule.kt") public void testSideEffectInTopLevelInitializerMultiModule() throws Exception { @@ -27055,34 +27221,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } } - @Nested - @TestMetadata("compiler/testData/codegen/box/property") - @TestDataPath("$PROJECT_ROOT") - public class Property { - @Test - public void testAllFilesPresentInProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") - public void testFieldAccessFromExtensionInTraitImpl() throws Exception { - runTest("compiler/testData/codegen/box/property/fieldAccessFromExtensionInTraitImpl.kt"); - } - - @Test - @TestMetadata("fieldAccessViaSubclass.kt") - public void testFieldAccessViaSubclass() throws Exception { - runTest("compiler/testData/codegen/box/property/fieldAccessViaSubclass.kt"); - } - - @Test - @TestMetadata("referenceToJavaFieldViaBridge.kt") - public void testReferenceToJavaFieldViaBridge() throws Exception { - runTest("compiler/testData/codegen/box/property/referenceToJavaFieldViaBridge.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/publishedApi") @TestDataPath("$PROJECT_ROOT") @@ -36282,6 +36420,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/sam/kt17091_4.kt"); } + @Test + @TestMetadata("kt19910.kt") + public void testKt19910() throws Exception { + runTest("compiler/testData/codegen/box/sam/kt19910.kt"); + } + @Test @TestMetadata("kt22906.kt") public void testKt22906() throws Exception { @@ -37469,22 +37613,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } } - @Nested - @TestMetadata("compiler/testData/codegen/box/staticFun") - @TestDataPath("$PROJECT_ROOT") - public class StaticFun { - @Test - public void testAllFilesPresentInStaticFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/staticFun"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("classWithNestedEnum.kt") - public void testClassWithNestedEnum() throws Exception { - runTest("compiler/testData/codegen/box/staticFun/classWithNestedEnum.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/statics") @TestDataPath("$PROJECT_ROOT") @@ -38508,6 +38636,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/traits/defaultImplCall.kt"); } + @Test + @TestMetadata("defaultMethod.kt") + public void testDefaultMethod() throws Exception { + runTest("compiler/testData/codegen/box/traits/defaultMethod.kt"); + } + @Test @TestMetadata("diamondPropertyAccessors.kt") public void testDiamondPropertyAccessors() throws Exception { @@ -38544,6 +38678,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/traits/inheritJavaInterface.kt"); } + @Test + @TestMetadata("inheritJavaInterface_AgainstCompiled.kt") + public void testInheritJavaInterface_AgainstCompiled() throws Exception { + runTest("compiler/testData/codegen/box/traits/inheritJavaInterface_AgainstCompiled.kt"); + } + @Test @TestMetadata("inheritedFun.kt") public void testInheritedFun() throws Exception { @@ -39569,223 +39709,23 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT public void testVarargsAndFunctionLiterals() throws Exception { runTest("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt"); } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/varargs") - @TestDataPath("$PROJECT_ROOT") - public class Varargs { - @Test - public void testAllFilesPresentInVarargs() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/varargs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } @Test @TestMetadata("varargsOverride.kt") public void testVarargsOverride() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride.kt"); + runTest("compiler/testData/codegen/box/vararg/varargsOverride.kt"); } @Test @TestMetadata("varargsOverride2.kt") public void testVarargsOverride2() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride2.kt"); + runTest("compiler/testData/codegen/box/vararg/varargsOverride2.kt"); } @Test @TestMetadata("varargsOverride3.kt") public void testVarargsOverride3() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride3.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility") - @TestDataPath("$PROJECT_ROOT") - public class Visibility { - @Test - public void testAllFilesPresentInVisibility() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility/package") - @TestDataPath("$PROJECT_ROOT") - public class Package { - @Test - public void testAllFilesPresentInPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("kt2781.kt") - public void testKt2781() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/kt2781.kt"); - } - - @Test - @TestMetadata("packageClass.kt") - public void testPackageClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageClass.kt"); - } - - @Test - @TestMetadata("packageFun.kt") - public void testPackageFun() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageFun.kt"); - } - - @Test - @TestMetadata("packageProperty.kt") - public void testPackageProperty() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageProperty.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility/protectedAndPackage") - @TestDataPath("$PROJECT_ROOT") - public class ProtectedAndPackage { - @Test - public void testAllFilesPresentInProtectedAndPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("kt42012.kt") - public void testKt42012() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/kt42012.kt"); - } - - @Test - @TestMetadata("overrideProtectedFunInPackage.kt") - public void testOverrideProtectedFunInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); - } - - @Test - @TestMetadata("protectedAccessor.kt") - public void testProtectedAccessor() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedAccessor.kt"); - } - - @Test - @TestMetadata("protectedFunInPackage.kt") - public void testProtectedFunInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedFunInPackage.kt"); - } - - @Test - @TestMetadata("protectedPropertyInPackage.kt") - public void testProtectedPropertyInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackage.kt"); - } - - @Test - @TestMetadata("protectedPropertyInPackageFromCrossinline.kt") - public void testProtectedPropertyInPackageFromCrossinline() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt"); - } - - @Test - @TestMetadata("protectedStaticClass.kt") - public void testProtectedStaticClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedStaticClass.kt"); - } - - @Test - @TestMetadata("protectedSuperField.kt") - public void testProtectedSuperField() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperField.kt"); - } - - @Test - @TestMetadata("protectedSuperMethod.kt") - public void testProtectedSuperMethod() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperMethod.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility/protectedStatic") - @TestDataPath("$PROJECT_ROOT") - public class ProtectedStatic { - @Test - public void testAllFilesPresentInProtectedStatic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("funCallInConstructor.kt") - public void testFunCallInConstructor() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funCallInConstructor.kt"); - } - - @Test - @TestMetadata("funClassObject.kt") - public void testFunClassObject() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funClassObject.kt"); - } - - @Test - @TestMetadata("funGenericClass.kt") - public void testFunGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funGenericClass.kt"); - } - - @Test - @TestMetadata("funNestedStaticClass.kt") - public void testFunNestedStaticClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass.kt"); - } - - @Test - @TestMetadata("funNestedStaticClass2.kt") - public void testFunNestedStaticClass2() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass2.kt"); - } - - @Test - @TestMetadata("funNestedStaticGenericClass.kt") - public void testFunNestedStaticGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticGenericClass.kt"); - } - - @Test - @TestMetadata("funNotDirectSuperClass.kt") - public void testFunNotDirectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNotDirectSuperClass.kt"); - } - - @Test - @TestMetadata("funObject.kt") - public void testFunObject() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funObject.kt"); - } - - @Test - @TestMetadata("simpleClass.kt") - public void testSimpleClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleClass.kt"); - } - - @Test - @TestMetadata("simpleClass2.kt") - public void testSimpleClass2() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleClass2.kt"); - } - - @Test - @TestMetadata("simpleFun.kt") - public void testSimpleFun() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleFun.kt"); - } - - @Test - @TestMetadata("simpleProperty.kt") - public void testSimpleProperty() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleProperty.kt"); - } + runTest("compiler/testData/codegen/box/vararg/varargsOverride3.kt"); } } diff --git a/compiler/testData/codegen/box/staticFun/classWithNestedEnum.kt b/compiler/testData/codegen/box/enum/javaClassWithNestedEnum.kt similarity index 100% rename from compiler/testData/codegen/box/staticFun/classWithNestedEnum.kt rename to compiler/testData/codegen/box/enum/javaClassWithNestedEnum.kt diff --git a/compiler/testData/codegen/box/innerClass/kt3532.kt b/compiler/testData/codegen/box/innerNested/kt3532.kt similarity index 100% rename from compiler/testData/codegen/box/innerClass/kt3532.kt rename to compiler/testData/codegen/box/innerNested/kt3532.kt diff --git a/compiler/testData/codegen/box/innerClass/kt3812.kt b/compiler/testData/codegen/box/innerNested/kt3812.kt similarity index 100% rename from compiler/testData/codegen/box/innerClass/kt3812.kt rename to compiler/testData/codegen/box/innerNested/kt3812.kt diff --git a/compiler/testData/codegen/box/innerClass/kt4036.kt b/compiler/testData/codegen/box/innerNested/kt4036.kt similarity index 100% rename from compiler/testData/codegen/box/innerClass/kt4036.kt rename to compiler/testData/codegen/box/innerNested/kt4036.kt diff --git a/compiler/testData/codegen/box/visibility/package/kt2781.kt b/compiler/testData/codegen/box/javaVisibility/package/kt2781.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/package/kt2781.kt rename to compiler/testData/codegen/box/javaVisibility/package/kt2781.kt diff --git a/compiler/testData/codegen/box/visibility/package/packageClass.kt b/compiler/testData/codegen/box/javaVisibility/package/packageClass.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/package/packageClass.kt rename to compiler/testData/codegen/box/javaVisibility/package/packageClass.kt diff --git a/compiler/testData/codegen/box/visibility/package/packageFun.kt b/compiler/testData/codegen/box/javaVisibility/package/packageFun.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/package/packageFun.kt rename to compiler/testData/codegen/box/javaVisibility/package/packageFun.kt diff --git a/compiler/testData/codegen/box/visibility/package/packageProperty.kt b/compiler/testData/codegen/box/javaVisibility/package/packageProperty.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/package/packageProperty.kt rename to compiler/testData/codegen/box/javaVisibility/package/packageProperty.kt diff --git a/compiler/testData/codegen/box/visibility/protectedAndPackage/kt42012.kt b/compiler/testData/codegen/box/javaVisibility/protectedAndPackage/kt42012.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedAndPackage/kt42012.kt rename to compiler/testData/codegen/box/javaVisibility/protectedAndPackage/kt42012.kt diff --git a/compiler/testData/codegen/box/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt b/compiler/testData/codegen/box/javaVisibility/protectedAndPackage/overrideProtectedFunInPackage.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt rename to compiler/testData/codegen/box/javaVisibility/protectedAndPackage/overrideProtectedFunInPackage.kt diff --git a/compiler/testData/codegen/box/visibility/protectedAndPackage/protectedAccessor.kt b/compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedAccessor.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedAndPackage/protectedAccessor.kt rename to compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedAccessor.kt diff --git a/compiler/testData/codegen/box/visibility/protectedAndPackage/protectedFunInPackage.kt b/compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedFunInPackage.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedAndPackage/protectedFunInPackage.kt rename to compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedFunInPackage.kt diff --git a/compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackage.kt b/compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackage.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackage.kt rename to compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackage.kt diff --git a/compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt b/compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt rename to compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt diff --git a/compiler/testData/codegen/box/visibility/protectedAndPackage/protectedStaticClass.kt b/compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedStaticClass.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedAndPackage/protectedStaticClass.kt rename to compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedStaticClass.kt diff --git a/compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperField.kt b/compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperField.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperField.kt rename to compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperField.kt diff --git a/compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperMethod.kt b/compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperMethod.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperMethod.kt rename to compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperMethod.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/funCallInConstructor.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/funCallInConstructor.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/funCallInConstructor.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/funCallInConstructor.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/funClassObject.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/funClassObject.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/funClassObject.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/funClassObject.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/funGenericClass.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/funGenericClass.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/funGenericClass.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/funGenericClass.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass2.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass2.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass2.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass2.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticGenericClass.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticGenericClass.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticGenericClass.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticGenericClass.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/funNotDirectSuperClass.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/funNotDirectSuperClass.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/funNotDirectSuperClass.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/funNotDirectSuperClass.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/funObject.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/funObject.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/funObject.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/funObject.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/simpleClass.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/simpleClass.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/simpleClass2.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass2.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/simpleClass2.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass2.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/simpleFun.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleFun.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/simpleFun.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleFun.kt diff --git a/compiler/testData/codegen/box/visibility/protectedStatic/simpleProperty.kt b/compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleProperty.kt similarity index 100% rename from compiler/testData/codegen/box/visibility/protectedStatic/simpleProperty.kt rename to compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleProperty.kt diff --git a/compiler/testData/codegen/box/property/fieldAccessFromExtensionInTraitImpl.kt b/compiler/testData/codegen/box/properties/fieldAccessFromExtensionInTraitImpl.kt similarity index 100% rename from compiler/testData/codegen/box/property/fieldAccessFromExtensionInTraitImpl.kt rename to compiler/testData/codegen/box/properties/fieldAccessFromExtensionInTraitImpl.kt diff --git a/compiler/testData/codegen/box/property/fieldAccessViaSubclass.kt b/compiler/testData/codegen/box/properties/fieldAccessViaSubclass.kt similarity index 100% rename from compiler/testData/codegen/box/property/fieldAccessViaSubclass.kt rename to compiler/testData/codegen/box/properties/fieldAccessViaSubclass.kt diff --git a/compiler/testData/codegen/box/property/referenceToJavaFieldViaBridge.kt b/compiler/testData/codegen/box/properties/referenceToJavaFieldViaBridge.kt similarity index 100% rename from compiler/testData/codegen/box/property/referenceToJavaFieldViaBridge.kt rename to compiler/testData/codegen/box/properties/referenceToJavaFieldViaBridge.kt diff --git a/compiler/testData/codegen/box/inline/kt19910.kt b/compiler/testData/codegen/box/sam/kt19910.kt similarity index 100% rename from compiler/testData/codegen/box/inline/kt19910.kt rename to compiler/testData/codegen/box/sam/kt19910.kt diff --git a/compiler/testData/codegen/box/interfaces/defaultMethod.kt b/compiler/testData/codegen/box/traits/defaultMethod.kt similarity index 100% rename from compiler/testData/codegen/box/interfaces/defaultMethod.kt rename to compiler/testData/codegen/box/traits/defaultMethod.kt diff --git a/compiler/testData/codegen/box/interfaces/inheritJavaInterface.kt b/compiler/testData/codegen/box/traits/inheritJavaInterface_AgainstCompiled.kt similarity index 100% rename from compiler/testData/codegen/box/interfaces/inheritJavaInterface.kt rename to compiler/testData/codegen/box/traits/inheritJavaInterface_AgainstCompiled.kt diff --git a/compiler/testData/codegen/box/varargs/varargsOverride.kt b/compiler/testData/codegen/box/vararg/varargsOverride.kt similarity index 100% rename from compiler/testData/codegen/box/varargs/varargsOverride.kt rename to compiler/testData/codegen/box/vararg/varargsOverride.kt diff --git a/compiler/testData/codegen/box/varargs/varargsOverride2.kt b/compiler/testData/codegen/box/vararg/varargsOverride2.kt similarity index 100% rename from compiler/testData/codegen/box/varargs/varargsOverride2.kt rename to compiler/testData/codegen/box/vararg/varargsOverride2.kt diff --git a/compiler/testData/codegen/box/varargs/varargsOverride3.kt b/compiler/testData/codegen/box/vararg/varargsOverride3.kt similarity index 100% rename from compiler/testData/codegen/box/varargs/varargsOverride3.kt rename to compiler/testData/codegen/box/vararg/varargsOverride3.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 8884fc2aeb7..ae9e296f7eb 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 @@ -13900,6 +13900,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt"); } + @Test + @TestMetadata("javaClassWithNestedEnum.kt") + public void testJavaClassWithNestedEnum() throws Exception { + runTest("compiler/testData/codegen/box/enum/javaClassWithNestedEnum.kt"); + } + @Test @TestMetadata("kt1119.kt") public void testKt1119() throws Exception { @@ -16773,22 +16779,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @Nested - @TestMetadata("compiler/testData/codegen/box/inline") - @TestDataPath("$PROJECT_ROOT") - public class Inline { - @Test - public void testAllFilesPresentInInline() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("kt19910.kt") - public void testKt19910() throws Exception { - runTest("compiler/testData/codegen/box/inline/kt19910.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/inlineClasses") @TestDataPath("$PROJECT_ROOT") @@ -19183,34 +19173,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @Nested - @TestMetadata("compiler/testData/codegen/box/innerClass") - @TestDataPath("$PROJECT_ROOT") - public class InnerClass { - @Test - public void testAllFilesPresentInInnerClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("kt3532.kt") - public void testKt3532() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt3532.kt"); - } - - @Test - @TestMetadata("kt3812.kt") - public void testKt3812() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt3812.kt"); - } - - @Test - @TestMetadata("kt4036.kt") - public void testKt4036() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt4036.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/innerNested") @TestDataPath("$PROJECT_ROOT") @@ -19304,12 +19266,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/innerNested/kt3132.kt"); } + @Test + @TestMetadata("kt3532.kt") + public void testKt3532() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt3532.kt"); + } + + @Test + @TestMetadata("kt3812.kt") + public void testKt3812() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt3812.kt"); + } + @Test @TestMetadata("kt3927.kt") public void testKt3927() throws Exception { runTest("compiler/testData/codegen/box/innerNested/kt3927.kt"); } + @Test + @TestMetadata("kt4036.kt") + public void testKt4036() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt4036.kt"); + } + @Test @TestMetadata("kt5363.kt") public void testKt5363() throws Exception { @@ -19557,28 +19537,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @Nested - @TestMetadata("compiler/testData/codegen/box/interfaces") - @TestDataPath("$PROJECT_ROOT") - public class Interfaces { - @Test - public void testAllFilesPresentInInterfaces() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/interfaces"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("defaultMethod.kt") - public void testDefaultMethod() throws Exception { - runTest("compiler/testData/codegen/box/interfaces/defaultMethod.kt"); - } - - @Test - @TestMetadata("inheritJavaInterface.kt") - public void testInheritJavaInterface() throws Exception { - runTest("compiler/testData/codegen/box/interfaces/inheritJavaInterface.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/intrinsics") @TestDataPath("$PROJECT_ROOT") @@ -20825,6 +20783,196 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility") + @TestDataPath("$PROJECT_ROOT") + public class JavaVisibility { + @Test + public void testAllFilesPresentInJavaVisibility() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility/package") + @TestDataPath("$PROJECT_ROOT") + public class Package { + @Test + public void testAllFilesPresentInPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @Test + @TestMetadata("kt2781.kt") + public void testKt2781() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/kt2781.kt"); + } + + @Test + @TestMetadata("packageClass.kt") + public void testPackageClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageClass.kt"); + } + + @Test + @TestMetadata("packageFun.kt") + public void testPackageFun() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageFun.kt"); + } + + @Test + @TestMetadata("packageProperty.kt") + public void testPackageProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageProperty.kt"); + } + } + + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedAndPackage") + @TestDataPath("$PROJECT_ROOT") + public class ProtectedAndPackage { + @Test + public void testAllFilesPresentInProtectedAndPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @Test + @TestMetadata("kt42012.kt") + public void testKt42012() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/kt42012.kt"); + } + + @Test + @TestMetadata("overrideProtectedFunInPackage.kt") + public void testOverrideProtectedFunInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); + } + + @Test + @TestMetadata("protectedAccessor.kt") + public void testProtectedAccessor() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedAccessor.kt"); + } + + @Test + @TestMetadata("protectedFunInPackage.kt") + public void testProtectedFunInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedFunInPackage.kt"); + } + + @Test + @TestMetadata("protectedPropertyInPackage.kt") + public void testProtectedPropertyInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackage.kt"); + } + + @Test + @TestMetadata("protectedPropertyInPackageFromCrossinline.kt") + public void testProtectedPropertyInPackageFromCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt"); + } + + @Test + @TestMetadata("protectedStaticClass.kt") + public void testProtectedStaticClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedStaticClass.kt"); + } + + @Test + @TestMetadata("protectedSuperField.kt") + public void testProtectedSuperField() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperField.kt"); + } + + @Test + @TestMetadata("protectedSuperMethod.kt") + public void testProtectedSuperMethod() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperMethod.kt"); + } + } + + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedStatic") + @TestDataPath("$PROJECT_ROOT") + public class ProtectedStatic { + @Test + public void testAllFilesPresentInProtectedStatic() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @Test + @TestMetadata("funCallInConstructor.kt") + public void testFunCallInConstructor() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funCallInConstructor.kt"); + } + + @Test + @TestMetadata("funClassObject.kt") + public void testFunClassObject() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funClassObject.kt"); + } + + @Test + @TestMetadata("funGenericClass.kt") + public void testFunGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funGenericClass.kt"); + } + + @Test + @TestMetadata("funNestedStaticClass.kt") + public void testFunNestedStaticClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass.kt"); + } + + @Test + @TestMetadata("funNestedStaticClass2.kt") + public void testFunNestedStaticClass2() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass2.kt"); + } + + @Test + @TestMetadata("funNestedStaticGenericClass.kt") + public void testFunNestedStaticGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticGenericClass.kt"); + } + + @Test + @TestMetadata("funNotDirectSuperClass.kt") + public void testFunNotDirectSuperClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNotDirectSuperClass.kt"); + } + + @Test + @TestMetadata("funObject.kt") + public void testFunObject() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funObject.kt"); + } + + @Test + @TestMetadata("simpleClass.kt") + public void testSimpleClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass.kt"); + } + + @Test + @TestMetadata("simpleClass2.kt") + public void testSimpleClass2() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass2.kt"); + } + + @Test + @TestMetadata("simpleFun.kt") + public void testSimpleFun() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleFun.kt"); + } + + @Test + @TestMetadata("simpleProperty.kt") + public void testSimpleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleProperty.kt"); + } + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/jdk") @TestDataPath("$PROJECT_ROOT") @@ -26368,6 +26516,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/properties/field.kt"); } + @Test + @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") + public void testFieldAccessFromExtensionInTraitImpl() throws Exception { + runTest("compiler/testData/codegen/box/properties/fieldAccessFromExtensionInTraitImpl.kt"); + } + + @Test + @TestMetadata("fieldAccessViaSubclass.kt") + public void testFieldAccessViaSubclass() throws Exception { + runTest("compiler/testData/codegen/box/properties/fieldAccessViaSubclass.kt"); + } + @Test @TestMetadata("fieldInClass.kt") public void testFieldInClass() throws Exception { @@ -26710,6 +26870,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/properties/protectedJavaPropertyInCompanion.kt"); } + @Test + @TestMetadata("referenceToJavaFieldViaBridge.kt") + public void testReferenceToJavaFieldViaBridge() throws Exception { + runTest("compiler/testData/codegen/box/properties/referenceToJavaFieldViaBridge.kt"); + } + @Test @TestMetadata("sideEffectInTopLevelInitializerMultiModule.kt") public void testSideEffectInTopLevelInitializerMultiModule() throws Exception { @@ -27055,34 +27221,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @Nested - @TestMetadata("compiler/testData/codegen/box/property") - @TestDataPath("$PROJECT_ROOT") - public class Property { - @Test - public void testAllFilesPresentInProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") - public void testFieldAccessFromExtensionInTraitImpl() throws Exception { - runTest("compiler/testData/codegen/box/property/fieldAccessFromExtensionInTraitImpl.kt"); - } - - @Test - @TestMetadata("fieldAccessViaSubclass.kt") - public void testFieldAccessViaSubclass() throws Exception { - runTest("compiler/testData/codegen/box/property/fieldAccessViaSubclass.kt"); - } - - @Test - @TestMetadata("referenceToJavaFieldViaBridge.kt") - public void testReferenceToJavaFieldViaBridge() throws Exception { - runTest("compiler/testData/codegen/box/property/referenceToJavaFieldViaBridge.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/publishedApi") @TestDataPath("$PROJECT_ROOT") @@ -36282,6 +36420,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/sam/kt17091_4.kt"); } + @Test + @TestMetadata("kt19910.kt") + public void testKt19910() throws Exception { + runTest("compiler/testData/codegen/box/sam/kt19910.kt"); + } + @Test @TestMetadata("kt22906.kt") public void testKt22906() throws Exception { @@ -37469,22 +37613,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @Nested - @TestMetadata("compiler/testData/codegen/box/staticFun") - @TestDataPath("$PROJECT_ROOT") - public class StaticFun { - @Test - public void testAllFilesPresentInStaticFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/staticFun"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("classWithNestedEnum.kt") - public void testClassWithNestedEnum() throws Exception { - runTest("compiler/testData/codegen/box/staticFun/classWithNestedEnum.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/statics") @TestDataPath("$PROJECT_ROOT") @@ -38508,6 +38636,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/traits/defaultImplCall.kt"); } + @Test + @TestMetadata("defaultMethod.kt") + public void testDefaultMethod() throws Exception { + runTest("compiler/testData/codegen/box/traits/defaultMethod.kt"); + } + @Test @TestMetadata("diamondPropertyAccessors.kt") public void testDiamondPropertyAccessors() throws Exception { @@ -38544,6 +38678,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/traits/inheritJavaInterface.kt"); } + @Test + @TestMetadata("inheritJavaInterface_AgainstCompiled.kt") + public void testInheritJavaInterface_AgainstCompiled() throws Exception { + runTest("compiler/testData/codegen/box/traits/inheritJavaInterface_AgainstCompiled.kt"); + } + @Test @TestMetadata("inheritedFun.kt") public void testInheritedFun() throws Exception { @@ -39569,223 +39709,23 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testVarargsAndFunctionLiterals() throws Exception { runTest("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt"); } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/varargs") - @TestDataPath("$PROJECT_ROOT") - public class Varargs { - @Test - public void testAllFilesPresentInVarargs() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/varargs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } @Test @TestMetadata("varargsOverride.kt") public void testVarargsOverride() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride.kt"); + runTest("compiler/testData/codegen/box/vararg/varargsOverride.kt"); } @Test @TestMetadata("varargsOverride2.kt") public void testVarargsOverride2() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride2.kt"); + runTest("compiler/testData/codegen/box/vararg/varargsOverride2.kt"); } @Test @TestMetadata("varargsOverride3.kt") public void testVarargsOverride3() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride3.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility") - @TestDataPath("$PROJECT_ROOT") - public class Visibility { - @Test - public void testAllFilesPresentInVisibility() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility/package") - @TestDataPath("$PROJECT_ROOT") - public class Package { - @Test - public void testAllFilesPresentInPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("kt2781.kt") - public void testKt2781() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/kt2781.kt"); - } - - @Test - @TestMetadata("packageClass.kt") - public void testPackageClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageClass.kt"); - } - - @Test - @TestMetadata("packageFun.kt") - public void testPackageFun() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageFun.kt"); - } - - @Test - @TestMetadata("packageProperty.kt") - public void testPackageProperty() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageProperty.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility/protectedAndPackage") - @TestDataPath("$PROJECT_ROOT") - public class ProtectedAndPackage { - @Test - public void testAllFilesPresentInProtectedAndPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("kt42012.kt") - public void testKt42012() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/kt42012.kt"); - } - - @Test - @TestMetadata("overrideProtectedFunInPackage.kt") - public void testOverrideProtectedFunInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); - } - - @Test - @TestMetadata("protectedAccessor.kt") - public void testProtectedAccessor() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedAccessor.kt"); - } - - @Test - @TestMetadata("protectedFunInPackage.kt") - public void testProtectedFunInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedFunInPackage.kt"); - } - - @Test - @TestMetadata("protectedPropertyInPackage.kt") - public void testProtectedPropertyInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackage.kt"); - } - - @Test - @TestMetadata("protectedPropertyInPackageFromCrossinline.kt") - public void testProtectedPropertyInPackageFromCrossinline() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt"); - } - - @Test - @TestMetadata("protectedStaticClass.kt") - public void testProtectedStaticClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedStaticClass.kt"); - } - - @Test - @TestMetadata("protectedSuperField.kt") - public void testProtectedSuperField() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperField.kt"); - } - - @Test - @TestMetadata("protectedSuperMethod.kt") - public void testProtectedSuperMethod() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperMethod.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility/protectedStatic") - @TestDataPath("$PROJECT_ROOT") - public class ProtectedStatic { - @Test - public void testAllFilesPresentInProtectedStatic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("funCallInConstructor.kt") - public void testFunCallInConstructor() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funCallInConstructor.kt"); - } - - @Test - @TestMetadata("funClassObject.kt") - public void testFunClassObject() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funClassObject.kt"); - } - - @Test - @TestMetadata("funGenericClass.kt") - public void testFunGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funGenericClass.kt"); - } - - @Test - @TestMetadata("funNestedStaticClass.kt") - public void testFunNestedStaticClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass.kt"); - } - - @Test - @TestMetadata("funNestedStaticClass2.kt") - public void testFunNestedStaticClass2() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass2.kt"); - } - - @Test - @TestMetadata("funNestedStaticGenericClass.kt") - public void testFunNestedStaticGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticGenericClass.kt"); - } - - @Test - @TestMetadata("funNotDirectSuperClass.kt") - public void testFunNotDirectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNotDirectSuperClass.kt"); - } - - @Test - @TestMetadata("funObject.kt") - public void testFunObject() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funObject.kt"); - } - - @Test - @TestMetadata("simpleClass.kt") - public void testSimpleClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleClass.kt"); - } - - @Test - @TestMetadata("simpleClass2.kt") - public void testSimpleClass2() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleClass2.kt"); - } - - @Test - @TestMetadata("simpleFun.kt") - public void testSimpleFun() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleFun.kt"); - } - - @Test - @TestMetadata("simpleProperty.kt") - public void testSimpleProperty() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleProperty.kt"); - } + runTest("compiler/testData/codegen/box/vararg/varargsOverride3.kt"); } } 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 3d26247b4ba..cf4d445ac06 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 @@ -13900,6 +13900,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt"); } + @Test + @TestMetadata("javaClassWithNestedEnum.kt") + public void testJavaClassWithNestedEnum() throws Exception { + runTest("compiler/testData/codegen/box/enum/javaClassWithNestedEnum.kt"); + } + @Test @TestMetadata("kt1119.kt") public void testKt1119() throws Exception { @@ -16773,22 +16779,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } - @Nested - @TestMetadata("compiler/testData/codegen/box/inline") - @TestDataPath("$PROJECT_ROOT") - public class Inline { - @Test - public void testAllFilesPresentInInline() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("kt19910.kt") - public void testKt19910() throws Exception { - runTest("compiler/testData/codegen/box/inline/kt19910.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/inlineClasses") @TestDataPath("$PROJECT_ROOT") @@ -19183,34 +19173,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } - @Nested - @TestMetadata("compiler/testData/codegen/box/innerClass") - @TestDataPath("$PROJECT_ROOT") - public class InnerClass { - @Test - public void testAllFilesPresentInInnerClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("kt3532.kt") - public void testKt3532() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt3532.kt"); - } - - @Test - @TestMetadata("kt3812.kt") - public void testKt3812() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt3812.kt"); - } - - @Test - @TestMetadata("kt4036.kt") - public void testKt4036() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt4036.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/innerNested") @TestDataPath("$PROJECT_ROOT") @@ -19304,12 +19266,30 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/innerNested/kt3132.kt"); } + @Test + @TestMetadata("kt3532.kt") + public void testKt3532() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt3532.kt"); + } + + @Test + @TestMetadata("kt3812.kt") + public void testKt3812() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt3812.kt"); + } + @Test @TestMetadata("kt3927.kt") public void testKt3927() throws Exception { runTest("compiler/testData/codegen/box/innerNested/kt3927.kt"); } + @Test + @TestMetadata("kt4036.kt") + public void testKt4036() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt4036.kt"); + } + @Test @TestMetadata("kt5363.kt") public void testKt5363() throws Exception { @@ -19557,28 +19537,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } - @Nested - @TestMetadata("compiler/testData/codegen/box/interfaces") - @TestDataPath("$PROJECT_ROOT") - public class Interfaces { - @Test - public void testAllFilesPresentInInterfaces() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/interfaces"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("defaultMethod.kt") - public void testDefaultMethod() throws Exception { - runTest("compiler/testData/codegen/box/interfaces/defaultMethod.kt"); - } - - @Test - @TestMetadata("inheritJavaInterface.kt") - public void testInheritJavaInterface() throws Exception { - runTest("compiler/testData/codegen/box/interfaces/inheritJavaInterface.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/intrinsics") @TestDataPath("$PROJECT_ROOT") @@ -20825,6 +20783,196 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility") + @TestDataPath("$PROJECT_ROOT") + public class JavaVisibility { + @Test + public void testAllFilesPresentInJavaVisibility() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility/package") + @TestDataPath("$PROJECT_ROOT") + public class Package { + @Test + public void testAllFilesPresentInPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("kt2781.kt") + public void testKt2781() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/kt2781.kt"); + } + + @Test + @TestMetadata("packageClass.kt") + public void testPackageClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageClass.kt"); + } + + @Test + @TestMetadata("packageFun.kt") + public void testPackageFun() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageFun.kt"); + } + + @Test + @TestMetadata("packageProperty.kt") + public void testPackageProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageProperty.kt"); + } + } + + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedAndPackage") + @TestDataPath("$PROJECT_ROOT") + public class ProtectedAndPackage { + @Test + public void testAllFilesPresentInProtectedAndPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("kt42012.kt") + public void testKt42012() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/kt42012.kt"); + } + + @Test + @TestMetadata("overrideProtectedFunInPackage.kt") + public void testOverrideProtectedFunInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); + } + + @Test + @TestMetadata("protectedAccessor.kt") + public void testProtectedAccessor() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedAccessor.kt"); + } + + @Test + @TestMetadata("protectedFunInPackage.kt") + public void testProtectedFunInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedFunInPackage.kt"); + } + + @Test + @TestMetadata("protectedPropertyInPackage.kt") + public void testProtectedPropertyInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackage.kt"); + } + + @Test + @TestMetadata("protectedPropertyInPackageFromCrossinline.kt") + public void testProtectedPropertyInPackageFromCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt"); + } + + @Test + @TestMetadata("protectedStaticClass.kt") + public void testProtectedStaticClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedStaticClass.kt"); + } + + @Test + @TestMetadata("protectedSuperField.kt") + public void testProtectedSuperField() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperField.kt"); + } + + @Test + @TestMetadata("protectedSuperMethod.kt") + public void testProtectedSuperMethod() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperMethod.kt"); + } + } + + @Nested + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedStatic") + @TestDataPath("$PROJECT_ROOT") + public class ProtectedStatic { + @Test + public void testAllFilesPresentInProtectedStatic() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("funCallInConstructor.kt") + public void testFunCallInConstructor() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funCallInConstructor.kt"); + } + + @Test + @TestMetadata("funClassObject.kt") + public void testFunClassObject() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funClassObject.kt"); + } + + @Test + @TestMetadata("funGenericClass.kt") + public void testFunGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funGenericClass.kt"); + } + + @Test + @TestMetadata("funNestedStaticClass.kt") + public void testFunNestedStaticClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass.kt"); + } + + @Test + @TestMetadata("funNestedStaticClass2.kt") + public void testFunNestedStaticClass2() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass2.kt"); + } + + @Test + @TestMetadata("funNestedStaticGenericClass.kt") + public void testFunNestedStaticGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticGenericClass.kt"); + } + + @Test + @TestMetadata("funNotDirectSuperClass.kt") + public void testFunNotDirectSuperClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNotDirectSuperClass.kt"); + } + + @Test + @TestMetadata("funObject.kt") + public void testFunObject() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funObject.kt"); + } + + @Test + @TestMetadata("simpleClass.kt") + public void testSimpleClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass.kt"); + } + + @Test + @TestMetadata("simpleClass2.kt") + public void testSimpleClass2() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass2.kt"); + } + + @Test + @TestMetadata("simpleFun.kt") + public void testSimpleFun() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleFun.kt"); + } + + @Test + @TestMetadata("simpleProperty.kt") + public void testSimpleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleProperty.kt"); + } + } + } + @Nested @TestMetadata("compiler/testData/codegen/box/jdk") @TestDataPath("$PROJECT_ROOT") @@ -26368,6 +26516,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/properties/field.kt"); } + @Test + @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") + public void testFieldAccessFromExtensionInTraitImpl() throws Exception { + runTest("compiler/testData/codegen/box/properties/fieldAccessFromExtensionInTraitImpl.kt"); + } + + @Test + @TestMetadata("fieldAccessViaSubclass.kt") + public void testFieldAccessViaSubclass() throws Exception { + runTest("compiler/testData/codegen/box/properties/fieldAccessViaSubclass.kt"); + } + @Test @TestMetadata("fieldInClass.kt") public void testFieldInClass() throws Exception { @@ -26710,6 +26870,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/properties/protectedJavaPropertyInCompanion.kt"); } + @Test + @TestMetadata("referenceToJavaFieldViaBridge.kt") + public void testReferenceToJavaFieldViaBridge() throws Exception { + runTest("compiler/testData/codegen/box/properties/referenceToJavaFieldViaBridge.kt"); + } + @Test @TestMetadata("sideEffectInTopLevelInitializerMultiModule.kt") public void testSideEffectInTopLevelInitializerMultiModule() throws Exception { @@ -27055,34 +27221,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } - @Nested - @TestMetadata("compiler/testData/codegen/box/property") - @TestDataPath("$PROJECT_ROOT") - public class Property { - @Test - public void testAllFilesPresentInProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") - public void testFieldAccessFromExtensionInTraitImpl() throws Exception { - runTest("compiler/testData/codegen/box/property/fieldAccessFromExtensionInTraitImpl.kt"); - } - - @Test - @TestMetadata("fieldAccessViaSubclass.kt") - public void testFieldAccessViaSubclass() throws Exception { - runTest("compiler/testData/codegen/box/property/fieldAccessViaSubclass.kt"); - } - - @Test - @TestMetadata("referenceToJavaFieldViaBridge.kt") - public void testReferenceToJavaFieldViaBridge() throws Exception { - runTest("compiler/testData/codegen/box/property/referenceToJavaFieldViaBridge.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/publishedApi") @TestDataPath("$PROJECT_ROOT") @@ -36282,6 +36420,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/sam/kt17091_4.kt"); } + @Test + @TestMetadata("kt19910.kt") + public void testKt19910() throws Exception { + runTest("compiler/testData/codegen/box/sam/kt19910.kt"); + } + @Test @TestMetadata("kt22906.kt") public void testKt22906() throws Exception { @@ -37469,22 +37613,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } - @Nested - @TestMetadata("compiler/testData/codegen/box/staticFun") - @TestDataPath("$PROJECT_ROOT") - public class StaticFun { - @Test - public void testAllFilesPresentInStaticFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/staticFun"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("classWithNestedEnum.kt") - public void testClassWithNestedEnum() throws Exception { - runTest("compiler/testData/codegen/box/staticFun/classWithNestedEnum.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/statics") @TestDataPath("$PROJECT_ROOT") @@ -38508,6 +38636,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/traits/defaultImplCall.kt"); } + @Test + @TestMetadata("defaultMethod.kt") + public void testDefaultMethod() throws Exception { + runTest("compiler/testData/codegen/box/traits/defaultMethod.kt"); + } + @Test @TestMetadata("diamondPropertyAccessors.kt") public void testDiamondPropertyAccessors() throws Exception { @@ -38544,6 +38678,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/traits/inheritJavaInterface.kt"); } + @Test + @TestMetadata("inheritJavaInterface_AgainstCompiled.kt") + public void testInheritJavaInterface_AgainstCompiled() throws Exception { + runTest("compiler/testData/codegen/box/traits/inheritJavaInterface_AgainstCompiled.kt"); + } + @Test @TestMetadata("inheritedFun.kt") public void testInheritedFun() throws Exception { @@ -39569,223 +39709,23 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes public void testVarargsAndFunctionLiterals() throws Exception { runTest("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt"); } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/varargs") - @TestDataPath("$PROJECT_ROOT") - public class Varargs { - @Test - public void testAllFilesPresentInVarargs() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/varargs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } @Test @TestMetadata("varargsOverride.kt") public void testVarargsOverride() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride.kt"); + runTest("compiler/testData/codegen/box/vararg/varargsOverride.kt"); } @Test @TestMetadata("varargsOverride2.kt") public void testVarargsOverride2() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride2.kt"); + runTest("compiler/testData/codegen/box/vararg/varargsOverride2.kt"); } @Test @TestMetadata("varargsOverride3.kt") public void testVarargsOverride3() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride3.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility") - @TestDataPath("$PROJECT_ROOT") - public class Visibility { - @Test - public void testAllFilesPresentInVisibility() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility/package") - @TestDataPath("$PROJECT_ROOT") - public class Package { - @Test - public void testAllFilesPresentInPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("kt2781.kt") - public void testKt2781() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/kt2781.kt"); - } - - @Test - @TestMetadata("packageClass.kt") - public void testPackageClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageClass.kt"); - } - - @Test - @TestMetadata("packageFun.kt") - public void testPackageFun() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageFun.kt"); - } - - @Test - @TestMetadata("packageProperty.kt") - public void testPackageProperty() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageProperty.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility/protectedAndPackage") - @TestDataPath("$PROJECT_ROOT") - public class ProtectedAndPackage { - @Test - public void testAllFilesPresentInProtectedAndPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("kt42012.kt") - public void testKt42012() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/kt42012.kt"); - } - - @Test - @TestMetadata("overrideProtectedFunInPackage.kt") - public void testOverrideProtectedFunInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); - } - - @Test - @TestMetadata("protectedAccessor.kt") - public void testProtectedAccessor() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedAccessor.kt"); - } - - @Test - @TestMetadata("protectedFunInPackage.kt") - public void testProtectedFunInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedFunInPackage.kt"); - } - - @Test - @TestMetadata("protectedPropertyInPackage.kt") - public void testProtectedPropertyInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackage.kt"); - } - - @Test - @TestMetadata("protectedPropertyInPackageFromCrossinline.kt") - public void testProtectedPropertyInPackageFromCrossinline() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt"); - } - - @Test - @TestMetadata("protectedStaticClass.kt") - public void testProtectedStaticClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedStaticClass.kt"); - } - - @Test - @TestMetadata("protectedSuperField.kt") - public void testProtectedSuperField() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperField.kt"); - } - - @Test - @TestMetadata("protectedSuperMethod.kt") - public void testProtectedSuperMethod() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperMethod.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/visibility/protectedStatic") - @TestDataPath("$PROJECT_ROOT") - public class ProtectedStatic { - @Test - public void testAllFilesPresentInProtectedStatic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("funCallInConstructor.kt") - public void testFunCallInConstructor() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funCallInConstructor.kt"); - } - - @Test - @TestMetadata("funClassObject.kt") - public void testFunClassObject() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funClassObject.kt"); - } - - @Test - @TestMetadata("funGenericClass.kt") - public void testFunGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funGenericClass.kt"); - } - - @Test - @TestMetadata("funNestedStaticClass.kt") - public void testFunNestedStaticClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass.kt"); - } - - @Test - @TestMetadata("funNestedStaticClass2.kt") - public void testFunNestedStaticClass2() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass2.kt"); - } - - @Test - @TestMetadata("funNestedStaticGenericClass.kt") - public void testFunNestedStaticGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticGenericClass.kt"); - } - - @Test - @TestMetadata("funNotDirectSuperClass.kt") - public void testFunNotDirectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNotDirectSuperClass.kt"); - } - - @Test - @TestMetadata("funObject.kt") - public void testFunObject() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funObject.kt"); - } - - @Test - @TestMetadata("simpleClass.kt") - public void testSimpleClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleClass.kt"); - } - - @Test - @TestMetadata("simpleClass2.kt") - public void testSimpleClass2() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleClass2.kt"); - } - - @Test - @TestMetadata("simpleFun.kt") - public void testSimpleFun() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleFun.kt"); - } - - @Test - @TestMetadata("simpleProperty.kt") - public void testSimpleProperty() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleProperty.kt"); - } + runTest("compiler/testData/codegen/box/vararg/varargsOverride3.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index ca8036bff73..56cb38f9750 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -11438,6 +11438,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt"); } + @TestMetadata("javaClassWithNestedEnum.kt") + public void testJavaClassWithNestedEnum() throws Exception { + runTest("compiler/testData/codegen/box/enum/javaClassWithNestedEnum.kt"); + } + @TestMetadata("kt1119.kt") public void testKt1119() throws Exception { runTest("compiler/testData/codegen/box/enum/kt1119.kt"); @@ -13949,24 +13954,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } - @TestMetadata("compiler/testData/codegen/box/inline") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Inline extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInInline() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("kt19910.kt") - public void testKt19910() throws Exception { - runTest("compiler/testData/codegen/box/inline/kt19910.kt"); - } - } - @TestMetadata("compiler/testData/codegen/box/inlineClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -16046,34 +16033,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } - @TestMetadata("compiler/testData/codegen/box/innerClass") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class InnerClass extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInInnerClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("kt3532.kt") - public void testKt3532() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt3532.kt"); - } - - @TestMetadata("kt3812.kt") - public void testKt3812() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt3812.kt"); - } - - @TestMetadata("kt4036.kt") - public void testKt4036() throws Exception { - runTest("compiler/testData/codegen/box/innerClass/kt4036.kt"); - } - } - @TestMetadata("compiler/testData/codegen/box/innerNested") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -16156,11 +16115,26 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/innerNested/kt3132.kt"); } + @TestMetadata("kt3532.kt") + public void testKt3532() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt3532.kt"); + } + + @TestMetadata("kt3812.kt") + public void testKt3812() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt3812.kt"); + } + @TestMetadata("kt3927.kt") public void testKt3927() throws Exception { runTest("compiler/testData/codegen/box/innerNested/kt3927.kt"); } + @TestMetadata("kt4036.kt") + public void testKt4036() throws Exception { + runTest("compiler/testData/codegen/box/innerNested/kt4036.kt"); + } + @TestMetadata("kt5363.kt") public void testKt5363() throws Exception { runTest("compiler/testData/codegen/box/innerNested/kt5363.kt"); @@ -16381,29 +16355,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } - @TestMetadata("compiler/testData/codegen/box/interfaces") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Interfaces extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInInterfaces() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/interfaces"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("defaultMethod.kt") - public void testDefaultMethod() throws Exception { - runTest("compiler/testData/codegen/box/interfaces/defaultMethod.kt"); - } - - @TestMetadata("inheritJavaInterface.kt") - public void testInheritJavaInterface() throws Exception { - runTest("compiler/testData/codegen/box/interfaces/inheritJavaInterface.kt"); - } - } - @TestMetadata("compiler/testData/codegen/box/intrinsics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -17517,6 +17468,183 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } + @TestMetadata("compiler/testData/codegen/box/javaVisibility") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class JavaVisibility extends AbstractLightAnalysisModeTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInJavaVisibility() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/package") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Package extends AbstractLightAnalysisModeTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @TestMetadata("kt2781.kt") + public void testKt2781() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/kt2781.kt"); + } + + @TestMetadata("packageClass.kt") + public void testPackageClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageClass.kt"); + } + + @TestMetadata("packageFun.kt") + public void testPackageFun() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageFun.kt"); + } + + @TestMetadata("packageProperty.kt") + public void testPackageProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/package/packageProperty.kt"); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedAndPackage") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedAndPackage extends AbstractLightAnalysisModeTest { + @TestMetadata("kt42012.kt") + public void ignoreKt42012() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/kt42012.kt"); + } + + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInProtectedAndPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @TestMetadata("overrideProtectedFunInPackage.kt") + public void testOverrideProtectedFunInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); + } + + @TestMetadata("protectedAccessor.kt") + public void testProtectedAccessor() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedAccessor.kt"); + } + + @TestMetadata("protectedFunInPackage.kt") + public void testProtectedFunInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedFunInPackage.kt"); + } + + @TestMetadata("protectedPropertyInPackage.kt") + public void testProtectedPropertyInPackage() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackage.kt"); + } + + @TestMetadata("protectedPropertyInPackageFromCrossinline.kt") + public void testProtectedPropertyInPackageFromCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt"); + } + + @TestMetadata("protectedStaticClass.kt") + public void testProtectedStaticClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedStaticClass.kt"); + } + + @TestMetadata("protectedSuperField.kt") + public void testProtectedSuperField() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperField.kt"); + } + + @TestMetadata("protectedSuperMethod.kt") + public void testProtectedSuperMethod() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedAndPackage/protectedSuperMethod.kt"); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedStatic") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedStatic extends AbstractLightAnalysisModeTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInProtectedStatic() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @TestMetadata("funCallInConstructor.kt") + public void testFunCallInConstructor() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funCallInConstructor.kt"); + } + + @TestMetadata("funClassObject.kt") + public void testFunClassObject() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funClassObject.kt"); + } + + @TestMetadata("funGenericClass.kt") + public void testFunGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funGenericClass.kt"); + } + + @TestMetadata("funNestedStaticClass.kt") + public void testFunNestedStaticClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass.kt"); + } + + @TestMetadata("funNestedStaticClass2.kt") + public void testFunNestedStaticClass2() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticClass2.kt"); + } + + @TestMetadata("funNestedStaticGenericClass.kt") + public void testFunNestedStaticGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNestedStaticGenericClass.kt"); + } + + @TestMetadata("funNotDirectSuperClass.kt") + public void testFunNotDirectSuperClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funNotDirectSuperClass.kt"); + } + + @TestMetadata("funObject.kt") + public void testFunObject() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/funObject.kt"); + } + + @TestMetadata("simpleClass.kt") + public void testSimpleClass() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass.kt"); + } + + @TestMetadata("simpleClass2.kt") + public void testSimpleClass2() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleClass2.kt"); + } + + @TestMetadata("simpleFun.kt") + public void testSimpleFun() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleFun.kt"); + } + + @TestMetadata("simpleProperty.kt") + public void testSimpleProperty() throws Exception { + runTest("compiler/testData/codegen/box/javaVisibility/protectedStatic/simpleProperty.kt"); + } + } + } + @TestMetadata("compiler/testData/codegen/box/jdk") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -22454,6 +22582,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/properties/field.kt"); } + @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") + public void testFieldAccessFromExtensionInTraitImpl() throws Exception { + runTest("compiler/testData/codegen/box/properties/fieldAccessFromExtensionInTraitImpl.kt"); + } + + @TestMetadata("fieldAccessViaSubclass.kt") + public void testFieldAccessViaSubclass() throws Exception { + runTest("compiler/testData/codegen/box/properties/fieldAccessViaSubclass.kt"); + } + @TestMetadata("fieldInClass.kt") public void testFieldInClass() throws Exception { runTest("compiler/testData/codegen/box/properties/fieldInClass.kt"); @@ -22734,6 +22872,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/properties/protectedJavaPropertyInCompanion.kt"); } + @TestMetadata("referenceToJavaFieldViaBridge.kt") + public void testReferenceToJavaFieldViaBridge() throws Exception { + runTest("compiler/testData/codegen/box/properties/referenceToJavaFieldViaBridge.kt"); + } + @TestMetadata("substituteJavaSuperField.kt") public void testSubstituteJavaSuperField() throws Exception { runTest("compiler/testData/codegen/box/properties/substituteJavaSuperField.kt"); @@ -23040,34 +23183,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } - @TestMetadata("compiler/testData/codegen/box/property") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Property extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") - public void testFieldAccessFromExtensionInTraitImpl() throws Exception { - runTest("compiler/testData/codegen/box/property/fieldAccessFromExtensionInTraitImpl.kt"); - } - - @TestMetadata("fieldAccessViaSubclass.kt") - public void testFieldAccessViaSubclass() throws Exception { - runTest("compiler/testData/codegen/box/property/fieldAccessViaSubclass.kt"); - } - - @TestMetadata("referenceToJavaFieldViaBridge.kt") - public void testReferenceToJavaFieldViaBridge() throws Exception { - runTest("compiler/testData/codegen/box/property/referenceToJavaFieldViaBridge.kt"); - } - } - @TestMetadata("compiler/testData/codegen/box/publishedApi") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -28909,6 +29024,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/sam/kt17091_4.kt"); } + @TestMetadata("kt19910.kt") + public void testKt19910() throws Exception { + runTest("compiler/testData/codegen/box/sam/kt19910.kt"); + } + @TestMetadata("kt22906.kt") public void testKt22906() throws Exception { runTest("compiler/testData/codegen/box/sam/kt22906.kt"); @@ -29945,24 +30065,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } - @TestMetadata("compiler/testData/codegen/box/staticFun") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class StaticFun extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInStaticFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/staticFun"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("classWithNestedEnum.kt") - public void testClassWithNestedEnum() throws Exception { - runTest("compiler/testData/codegen/box/staticFun/classWithNestedEnum.kt"); - } - } - @TestMetadata("compiler/testData/codegen/box/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -30876,6 +30978,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/traits/defaultImplCall.kt"); } + @TestMetadata("defaultMethod.kt") + public void testDefaultMethod() throws Exception { + runTest("compiler/testData/codegen/box/traits/defaultMethod.kt"); + } + @TestMetadata("diamondPropertyAccessors.kt") public void testDiamondPropertyAccessors() throws Exception { runTest("compiler/testData/codegen/box/traits/diamondPropertyAccessors.kt"); @@ -30906,6 +31013,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/traits/inheritJavaInterface.kt"); } + @TestMetadata("inheritJavaInterface_AgainstCompiled.kt") + public void testInheritJavaInterface_AgainstCompiled() throws Exception { + runTest("compiler/testData/codegen/box/traits/inheritJavaInterface_AgainstCompiled.kt"); + } + @TestMetadata("inheritedFun.kt") public void testInheritedFun() throws Exception { runTest("compiler/testData/codegen/box/traits/inheritedFun.kt"); @@ -31802,210 +31914,20 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes public void testVarargsAndFunctionLiterals() throws Exception { runTest("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt"); } - } - - @TestMetadata("compiler/testData/codegen/box/varargs") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Varargs extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInVarargs() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/varargs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } @TestMetadata("varargsOverride.kt") public void testVarargsOverride() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride.kt"); + runTest("compiler/testData/codegen/box/vararg/varargsOverride.kt"); } @TestMetadata("varargsOverride2.kt") public void testVarargsOverride2() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride2.kt"); + runTest("compiler/testData/codegen/box/vararg/varargsOverride2.kt"); } @TestMetadata("varargsOverride3.kt") public void testVarargsOverride3() throws Exception { - runTest("compiler/testData/codegen/box/varargs/varargsOverride3.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Visibility extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInVisibility() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("compiler/testData/codegen/box/visibility/package") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Package extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("kt2781.kt") - public void testKt2781() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/kt2781.kt"); - } - - @TestMetadata("packageClass.kt") - public void testPackageClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageClass.kt"); - } - - @TestMetadata("packageFun.kt") - public void testPackageFun() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageFun.kt"); - } - - @TestMetadata("packageProperty.kt") - public void testPackageProperty() throws Exception { - runTest("compiler/testData/codegen/box/visibility/package/packageProperty.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedAndPackage") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedAndPackage extends AbstractLightAnalysisModeTest { - @TestMetadata("kt42012.kt") - public void ignoreKt42012() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/kt42012.kt"); - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInProtectedAndPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("overrideProtectedFunInPackage.kt") - public void testOverrideProtectedFunInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); - } - - @TestMetadata("protectedAccessor.kt") - public void testProtectedAccessor() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedAccessor.kt"); - } - - @TestMetadata("protectedFunInPackage.kt") - public void testProtectedFunInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedFunInPackage.kt"); - } - - @TestMetadata("protectedPropertyInPackage.kt") - public void testProtectedPropertyInPackage() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackage.kt"); - } - - @TestMetadata("protectedPropertyInPackageFromCrossinline.kt") - public void testProtectedPropertyInPackageFromCrossinline() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedPropertyInPackageFromCrossinline.kt"); - } - - @TestMetadata("protectedStaticClass.kt") - public void testProtectedStaticClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedStaticClass.kt"); - } - - @TestMetadata("protectedSuperField.kt") - public void testProtectedSuperField() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperField.kt"); - } - - @TestMetadata("protectedSuperMethod.kt") - public void testProtectedSuperMethod() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedAndPackage/protectedSuperMethod.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedStatic") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedStatic extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInProtectedStatic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("funCallInConstructor.kt") - public void testFunCallInConstructor() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funCallInConstructor.kt"); - } - - @TestMetadata("funClassObject.kt") - public void testFunClassObject() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funClassObject.kt"); - } - - @TestMetadata("funGenericClass.kt") - public void testFunGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funGenericClass.kt"); - } - - @TestMetadata("funNestedStaticClass.kt") - public void testFunNestedStaticClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass.kt"); - } - - @TestMetadata("funNestedStaticClass2.kt") - public void testFunNestedStaticClass2() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticClass2.kt"); - } - - @TestMetadata("funNestedStaticGenericClass.kt") - public void testFunNestedStaticGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNestedStaticGenericClass.kt"); - } - - @TestMetadata("funNotDirectSuperClass.kt") - public void testFunNotDirectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funNotDirectSuperClass.kt"); - } - - @TestMetadata("funObject.kt") - public void testFunObject() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/funObject.kt"); - } - - @TestMetadata("simpleClass.kt") - public void testSimpleClass() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleClass.kt"); - } - - @TestMetadata("simpleClass2.kt") - public void testSimpleClass2() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleClass2.kt"); - } - - @TestMetadata("simpleFun.kt") - public void testSimpleFun() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleFun.kt"); - } - - @TestMetadata("simpleProperty.kt") - public void testSimpleProperty() throws Exception { - runTest("compiler/testData/codegen/box/visibility/protectedStatic/simpleProperty.kt"); - } + runTest("compiler/testData/codegen/box/vararg/varargsOverride3.kt"); } } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java index 22e16155bb8..52a8968ba1f 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java @@ -12229,19 +12229,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } } - @TestMetadata("compiler/testData/codegen/box/inline") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Inline extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInInline() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - @TestMetadata("compiler/testData/codegen/box/inlineClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -14126,19 +14113,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } } - @TestMetadata("compiler/testData/codegen/box/innerClass") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class InnerClass extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInInnerClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - @TestMetadata("compiler/testData/codegen/box/innerNested") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -14426,19 +14400,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } } - @TestMetadata("compiler/testData/codegen/box/interfaces") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Interfaces extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInInterfaces() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/interfaces"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - @TestMetadata("compiler/testData/codegen/box/intrinsics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -14967,6 +14928,58 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } } + @TestMetadata("compiler/testData/codegen/box/javaVisibility") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class JavaVisibility extends AbstractIrJsCodegenBoxES6Test { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); + } + + public void testAllFilesPresentInJavaVisibility() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/package") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Package extends AbstractIrJsCodegenBoxES6Test { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); + } + + public void testAllFilesPresentInPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedAndPackage") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedAndPackage extends AbstractIrJsCodegenBoxES6Test { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); + } + + public void testAllFilesPresentInProtectedAndPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedStatic") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedStatic extends AbstractIrJsCodegenBoxES6Test { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); + } + + public void testAllFilesPresentInProtectedStatic() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); + } + } + } + @TestMetadata("compiler/testData/codegen/box/jdk") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -18695,19 +18708,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } } - @TestMetadata("compiler/testData/codegen/box/property") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Property extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - @TestMetadata("compiler/testData/codegen/box/publishedApi") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -25671,19 +25671,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } } - @TestMetadata("compiler/testData/codegen/box/staticFun") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class StaticFun extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInStaticFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/staticFun"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - @TestMetadata("compiler/testData/codegen/box/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -27145,71 +27132,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } } - @TestMetadata("compiler/testData/codegen/box/varargs") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Varargs extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInVarargs() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/varargs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Visibility extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInVisibility() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @TestMetadata("compiler/testData/codegen/box/visibility/package") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Package extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedAndPackage") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedAndPackage extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInProtectedAndPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedStatic") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedStatic extends AbstractIrJsCodegenBoxES6Test { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); - } - - public void testAllFilesPresentInProtectedStatic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - } - } - @TestMetadata("compiler/testData/codegen/box/when") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java index 35a5b27b444..0ef0133f9be 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java @@ -11714,19 +11714,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/inline") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Inline extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInInline() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - @TestMetadata("compiler/testData/codegen/box/inlineClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -13611,19 +13598,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/innerClass") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class InnerClass extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInInnerClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - @TestMetadata("compiler/testData/codegen/box/innerNested") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -13911,19 +13885,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/interfaces") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Interfaces extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInInterfaces() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/interfaces"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - @TestMetadata("compiler/testData/codegen/box/intrinsics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -14452,6 +14413,58 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } + @TestMetadata("compiler/testData/codegen/box/javaVisibility") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class JavaVisibility extends AbstractIrJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); + } + + public void testAllFilesPresentInJavaVisibility() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/package") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Package extends AbstractIrJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); + } + + public void testAllFilesPresentInPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedAndPackage") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedAndPackage extends AbstractIrJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); + } + + public void testAllFilesPresentInProtectedAndPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedStatic") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedStatic extends AbstractIrJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); + } + + public void testAllFilesPresentInProtectedStatic() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + } + } + @TestMetadata("compiler/testData/codegen/box/jdk") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -18180,19 +18193,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/property") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Property extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - @TestMetadata("compiler/testData/codegen/box/publishedApi") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -25156,19 +25156,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/staticFun") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class StaticFun extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInStaticFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/staticFun"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - @TestMetadata("compiler/testData/codegen/box/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -26630,71 +26617,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/varargs") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Varargs extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInVarargs() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/varargs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Visibility extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInVisibility() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("compiler/testData/codegen/box/visibility/package") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Package extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedAndPackage") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedAndPackage extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInProtectedAndPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedStatic") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedStatic extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInProtectedStatic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - } - } - @TestMetadata("compiler/testData/codegen/box/when") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index 19c1f9409d1..7ffcaac194e 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -11779,19 +11779,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/inline") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Inline extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInInline() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - @TestMetadata("compiler/testData/codegen/box/inlineClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -13676,19 +13663,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/innerClass") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class InnerClass extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInInnerClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerClass"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - @TestMetadata("compiler/testData/codegen/box/innerNested") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -13976,19 +13950,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/interfaces") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Interfaces extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInInterfaces() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/interfaces"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - @TestMetadata("compiler/testData/codegen/box/intrinsics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -14517,6 +14478,58 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } + @TestMetadata("compiler/testData/codegen/box/javaVisibility") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class JavaVisibility extends AbstractJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); + } + + public void testAllFilesPresentInJavaVisibility() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/package") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Package extends AbstractJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); + } + + public void testAllFilesPresentInPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedAndPackage") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedAndPackage extends AbstractJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); + } + + public void testAllFilesPresentInProtectedAndPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedStatic") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedStatic extends AbstractJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); + } + + public void testAllFilesPresentInProtectedStatic() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); + } + } + } + @TestMetadata("compiler/testData/codegen/box/jdk") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -18230,19 +18243,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/property") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Property extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/property"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - @TestMetadata("compiler/testData/codegen/box/publishedApi") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -25116,19 +25116,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/staticFun") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class StaticFun extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInStaticFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/staticFun"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - @TestMetadata("compiler/testData/codegen/box/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -26590,71 +26577,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/varargs") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Varargs extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInVarargs() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/varargs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Visibility extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInVisibility() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("compiler/testData/codegen/box/visibility/package") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Package extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/package"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedAndPackage") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedAndPackage extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInProtectedAndPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedStatic") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedStatic extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInProtectedStatic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - } - } - @TestMetadata("compiler/testData/codegen/box/when") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java index e5f94e5ea75..38d21ec3cdd 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java @@ -6215,19 +6215,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest } } - @TestMetadata("compiler/testData/codegen/box/inline") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Inline extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInInline() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inline"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - } - @TestMetadata("compiler/testData/codegen/box/inlineClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -7747,19 +7734,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest } } - @TestMetadata("compiler/testData/codegen/box/innerClass") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class InnerClass extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInInnerClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/innerClass"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - } - @TestMetadata("compiler/testData/codegen/box/innerNested") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -8047,19 +8021,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest } } - @TestMetadata("compiler/testData/codegen/box/interfaces") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Interfaces extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInInterfaces() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/interfaces"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - } - @TestMetadata("compiler/testData/codegen/box/intrinsics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -8483,6 +8444,58 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest } } + @TestMetadata("compiler/testData/codegen/box/javaVisibility") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class JavaVisibility extends AbstractIrCodegenBoxWasmTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); + } + + public void testAllFilesPresentInJavaVisibility() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/package") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Package extends AbstractIrCodegenBoxWasmTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); + } + + public void testAllFilesPresentInPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/package"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedAndPackage") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedAndPackage extends AbstractIrCodegenBoxWasmTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); + } + + public void testAllFilesPresentInProtectedAndPackage() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedAndPackage"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); + } + } + + @TestMetadata("compiler/testData/codegen/box/javaVisibility/protectedStatic") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ProtectedStatic extends AbstractIrCodegenBoxWasmTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); + } + + public void testAllFilesPresentInProtectedStatic() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/javaVisibility/protectedStatic"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); + } + } + } + @TestMetadata("compiler/testData/codegen/box/jdk") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -11642,19 +11655,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest } } - @TestMetadata("compiler/testData/codegen/box/property") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Property extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/property"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - } - @TestMetadata("compiler/testData/codegen/box/publishedApi") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -13678,19 +13678,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest } } - @TestMetadata("compiler/testData/codegen/box/staticFun") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class StaticFun extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInStaticFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/staticFun"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - } - @TestMetadata("compiler/testData/codegen/box/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -14899,71 +14886,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest } } - @TestMetadata("compiler/testData/codegen/box/varargs") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Varargs extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInVarargs() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/varargs"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Visibility extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInVisibility() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - - @TestMetadata("compiler/testData/codegen/box/visibility/package") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Package extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/package"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedAndPackage") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedAndPackage extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInProtectedAndPackage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedAndPackage"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/visibility/protectedStatic") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedStatic extends AbstractIrCodegenBoxWasmTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); - } - - public void testAllFilesPresentInProtectedStatic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/visibility/protectedStatic"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - } - } - @TestMetadata("compiler/testData/codegen/box/when") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)