From b4947e6cfe846111436d96410cd2d0326e8556bf Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 12 Dec 2023 16:11:21 +0200 Subject: [PATCH] [Test] Exclude K2 MPP codegen box tests from K1 generated suites Those tests always were muted for K1 because of incompatible module structure in testdata, so there is no actual sense to even generate them for K1 --- .../codegen/BlackBoxCodegenTestGenerated.java | 562 +-------------- .../IrBlackBoxCodegenTestGenerated.java | 640 +----------------- ...kBoxCodegenWithIrInlinerTestGenerated.java | 640 +----------------- .../generators/GenerateJUnit3CompilerTests.kt | 3 +- .../generators/GenerateJUnit5CompilerTests.kt | 7 +- .../LightAnalysisModeTestGenerated.java | 562 +-------------- .../generators/tests/GenerateJsTests.kt | 12 +- .../ir/IrJsCodegenBoxErrorTestGenerated.java | 2 +- .../test/ir/IrJsCodegenBoxTestGenerated.java | 544 +-------------- .../ir/IrJsES6CodegenBoxTestGenerated.java | 544 +-------------- .../NativeCodegenBoxTestGenerated.java | 556 +-------------- .../NativeCodegenBoxTestNoPLGenerated.java | 568 +--------------- .../generators/tests/GenerateNativeTests.kt | 7 +- .../generators/tests/GenerateWasmTests.kt | 10 +- .../test/K1WasmCodegenBoxTestGenerated.java | 544 +-------------- 15 files changed, 39 insertions(+), 5162 deletions(-) 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 3124875f96e..a98a8351f77 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 @@ -23,7 +23,7 @@ import java.util.regex.Pattern; public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true, "multiplatform/k2"); } @Nested @@ -32712,7 +32712,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public class Multiplatform { @Test public void testAllFilesPresentInMultiplatform() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true, "k2"); } @Test @@ -33007,564 +33007,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2") - @TestDataPath("$PROJECT_ROOT") - public class K2 { - @Test - @TestMetadata("actualInnerClassesFirMemberMapping.kt") - public void testActualInnerClassesFirMemberMapping() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt"); - } - - @Test - public void testAllFilesPresentInK2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("anonymousObjectAndSpecificImplementationInDeserializedIr.kt") - public void testAnonymousObjectAndSpecificImplementationInDeserializedIr() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt"); - } - - @Test - @TestMetadata("dataClassInCommonAndPlatform.kt") - public void testDataClassInCommonAndPlatform() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt"); - } - - @Test - @TestMetadata("expectValInInlineClass.kt") - public void testExpectValInInlineClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt"); - } - - @Test - @TestMetadata("expectValInInlineClassJVM.kt") - public void testExpectValInInlineClassJVM() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClassJVM.kt"); - } - - @Test - @TestMetadata("extensionPropertiesOverloads.kt") - public void testExtensionPropertiesOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt"); - } - - @Test - @TestMetadata("internalOverride.kt") - public void testInternalOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") - @TestDataPath("$PROJECT_ROOT") - public class Annotations { - @Test - public void testAllFilesPresentInAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("annotationsViaActualTypeAliasFromBinary.kt") - public void testAnnotationsViaActualTypeAliasFromBinary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/annotationsViaActualTypeAliasFromBinary.kt"); - } - - @Test - @TestMetadata("deprecatedAnnotationOnlyOnActual_useInCommon.kt") - public void testDeprecatedAnnotationOnlyOnActual_useInCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt"); - } - - @Test - @TestMetadata("expectAnnotationCallInLibrary.kt") - public void testExpectAnnotationCallInLibrary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt"); - } - - @Test - @TestMetadata("expectClassInJvmMultifileFacade.kt") - public void testExpectClassInJvmMultifileFacade() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectClassInJvmMultifileFacade.kt"); - } - - @Test - @TestMetadata("optionalExpectation.kt") - public void testOptionalExpectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/basic") - @TestDataPath("$PROJECT_ROOT") - public class Basic { - @Test - @TestMetadata("accessToLocalClassFromBackend.kt") - public void testAccessToLocalClassFromBackend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt"); - } - - @Test - @TestMetadata("actualFunctionWithArgumentOfExpectType.kt") - public void testActualFunctionWithArgumentOfExpectType() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/actualFunctionWithArgumentOfExpectType.kt"); - } - - @Test - public void testAllFilesPresentInBasic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("anyMethodInExpect.kt") - public void testAnyMethodInExpect() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt"); - } - - @Test - @TestMetadata("correctParentForTypeParameter.kt") - public void testCorrectParentForTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt"); - } - - @Test - @TestMetadata("enumEntryNameCall.kt") - public void testEnumEntryNameCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt"); - } - - @Test - @TestMetadata("expectActualCallableReference.kt") - public void testExpectActualCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt"); - } - - @Test - @TestMetadata("expectActualDifferentExtensionReceiversOnOverloads.kt") - public void testExpectActualDifferentExtensionReceiversOnOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt"); - } - - @Test - @TestMetadata("expectActualDifferentPackages.kt") - public void testExpectActualDifferentPackages() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides.kt") - public void testExpectActualFakeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides2.kt") - public void testExpectActualFakeOverrides2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides3.kt") - public void testExpectActualFakeOverrides3() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters.kt") - public void testExpectActualFakeOverridesWithTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt") - public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride.kt") - public void testExpectActualIntersectionOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride2.kt") - public void testExpectActualIntersectionOverride2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt"); - } - - @Test - @TestMetadata("expectActualMultiCommon.kt") - public void testExpectActualMultiCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt"); - } - - @Test - @TestMetadata("expectActualNullabilityBasedOverloads.kt") - public void testExpectActualNullabilityBasedOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt"); - } - - @Test - @TestMetadata("expectActualOverloads.kt") - public void testExpectActualOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt"); - } - - @Test - @TestMetadata("expectActualSimple.kt") - public void testExpectActualSimple() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt"); - } - - @Test - @TestMetadata("expectActualTypeParameters.kt") - public void testExpectActualTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualTypealias.kt") - public void testExpectActualTypealias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); - } - - @Test - @TestMetadata("expectAndCommonFunctionOverloads.kt") - public void testExpectAndCommonFunctionOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes.kt") - public void testExpectInterfaceInSupertypes() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes2.kt") - public void testExpectInterfaceInSupertypes2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt"); - } - - @Test - @TestMetadata("expectProperty.kt") - public void testExpectProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt"); - } - - @Test - @TestMetadata("fakeOverridesInPlatformModule.kt") - public void testFakeOverridesInPlatformModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt"); - } - - @Test - @TestMetadata("getRidOfDoubleBindingInFir2IrLazyProperty.kt") - public void testGetRidOfDoubleBindingInFir2IrLazyProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/getRidOfDoubleBindingInFir2IrLazyProperty.kt"); - } - - @Test - @TestMetadata("independentCommonSourceModules.kt") - public void testIndependentCommonSourceModules() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt"); - } - - @Test - @TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt") - public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt"); - } - - @Test - @TestMetadata("intersectionOverrideInCommonModule.kt") - public void testIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("kt-56329.kt") - public void testKt_56329() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideInCommonModule.kt") - public void testLocalIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("localSubstitutionOverrideInCommonModule.kt") - public void testLocalSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("noArgActualConstructor.kt") - public void testNoArgActualConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/noArgActualConstructor.kt"); - } - - @Test - @TestMetadata("nonExternalEquals.kt") - public void testNonExternalEquals() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt"); - } - - @Test - @TestMetadata("overridesOfExpectMembers.kt") - public void testOverridesOfExpectMembers() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt"); - } - - @Test - @TestMetadata("removeExpectDeclarationsFromMetadata.kt") - public void testRemoveExpectDeclarationsFromMetadata() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt"); - } - - @Test - @TestMetadata("substitutionOverrideInCommonModule.kt") - public void testSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization.kt") - public void testTransitiveSuperclassActualization() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt"); - } - - @Test - @TestMetadata("widerVisibilityInActualClassifier.kt") - public void testWiderVisibilityInActualClassifier() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/complexMatchings") - @TestDataPath("$PROJECT_ROOT") - public class ComplexMatchings { - @Test - public void testAllFilesPresentInComplexMatchings() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualObject.kt") - public void testExpectCtorlessFinalToActualObject() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt"); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualUnit.kt") - public void testExpectCtorlessFinalToActualUnit() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments") - @TestDataPath("$PROJECT_ROOT") - public class DefaultArguments { - @Test - public void testAllFilesPresentInDefaultArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("annotations.kt") - public void testAnnotations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/annotations.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual.kt") - public void testBothInExpectAndActual() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual2.kt") - public void testBothInExpectAndActual2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt"); - } - - @Test - @TestMetadata("constructor.kt") - public void testConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt"); - } - - @Test - @TestMetadata("defaultArgumentInDelegatedFunction.kt") - public void testDefaultArgumentInDelegatedFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt"); - } - - @Test - @TestMetadata("delegatedExpectedInterface.kt") - public void testDelegatedExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt"); - } - - @Test - @TestMetadata("dispatchReceiverValue.kt") - public void testDispatchReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt"); - } - - @Test - @TestMetadata("expectPropertyAsDefaultArgument.kt") - public void testExpectPropertyAsDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt"); - } - - @Test - @TestMetadata("extensionReceiverValue.kt") - public void testExtensionReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt"); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt"); - } - - @Test - @TestMetadata("functionFromOtherModule.kt") - public void testFunctionFromOtherModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt"); - } - - @Test - @TestMetadata("inheritedFromCommonClass.kt") - public void testInheritedFromCommonClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedClass.kt") - public void testInheritedFromExpectedClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedInterface.kt") - public void testInheritedFromExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedMethod.kt") - public void testInheritedFromExpectedMethod() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt"); - } - - @Test - @TestMetadata("inheritedInExpectedDeclarations.kt") - public void testInheritedInExpectedDeclarations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt"); - } - - @Test - @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt") - public void testInheritedViaAnotherInterfaceIndirectly() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt"); - } - - @Test - @TestMetadata("inlineFunctionWithDefaultLambda.kt") - public void testInlineFunctionWithDefaultLambda() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt"); - } - - @Test - @TestMetadata("jvmOverloads.kt") - public void testJvmOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/jvmOverloads.kt"); - } - - @Test - @TestMetadata("kt23239.kt") - public void testKt23239() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt"); - } - - @Test - @TestMetadata("kt23739.kt") - public void testKt23739() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt"); - } - - @Test - @TestMetadata("nestedEnumEntryValue.kt") - public void testNestedEnumEntryValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt"); - } - - @Test - @TestMetadata("parametersInArgumentValues.kt") - public void testParametersInArgumentValues() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt"); - } - - @Test - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt"); - } - - @Test - @TestMetadata("suspend.kt") - public void testSuspend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt"); - } - - @Test - @TestMetadata("typeAlias.kt") - public void testTypeAlias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt"); - } - - @Test - @TestMetadata("withTypeParameter.kt") - public void testWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests") - @TestDataPath("$PROJECT_ROOT") - public class MigratedOldTests { - @Test - public void testAllFilesPresentInMigratedOldTests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index e3eb33583d0..eb5453fb7c9 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 @@ -23,7 +23,7 @@ import java.util.regex.Pattern; public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTest { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "multiplatform/k2"); } @Nested @@ -34458,7 +34458,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes public class Multiplatform { @Test public void testAllFilesPresentInMultiplatform() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "k2"); } @Test @@ -34771,642 +34771,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2") - @TestDataPath("$PROJECT_ROOT") - public class K2 { - @Test - @TestMetadata("actualInnerClassesFirMemberMapping.kt") - public void testActualInnerClassesFirMemberMapping() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt"); - } - - @Test - public void testAllFilesPresentInK2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("anonymousObjectAndSpecificImplementationInDeserializedIr.kt") - public void testAnonymousObjectAndSpecificImplementationInDeserializedIr() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt"); - } - - @Test - @TestMetadata("dataClassInCommonAndPlatform.kt") - public void testDataClassInCommonAndPlatform() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt"); - } - - @Test - @TestMetadata("expectValInInlineClass.kt") - public void testExpectValInInlineClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt"); - } - - @Test - @TestMetadata("expectValInInlineClassJVM.kt") - public void testExpectValInInlineClassJVM() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClassJVM.kt"); - } - - @Test - @TestMetadata("extensionPropertiesOverloads.kt") - public void testExtensionPropertiesOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt"); - } - - @Test - @TestMetadata("internalOverride.kt") - public void testInternalOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt"); - } - - @Test - @TestMetadata("javaMethodWithTypeParameter.kt") - public void testJavaMethodWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/javaMethodWithTypeParameter.kt"); - } - - @Test - @TestMetadata("jvmDeclarationsUpdatedMembersInCommonModule.kt") - public void testJvmDeclarationsUpdatedMembersInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt"); - } - - @Test - @TestMetadata("staticjavaFieldInCommonCode.kt") - public void testStaticjavaFieldInCommonCode() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/staticjavaFieldInCommonCode.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") - @TestDataPath("$PROJECT_ROOT") - public class Annotations { - @Test - public void testAllFilesPresentInAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("annotationsViaActualTypeAliasFromBinary.kt") - public void testAnnotationsViaActualTypeAliasFromBinary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/annotationsViaActualTypeAliasFromBinary.kt"); - } - - @Test - @TestMetadata("deprecatedAnnotationOnlyOnActual_useInCommon.kt") - public void testDeprecatedAnnotationOnlyOnActual_useInCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt"); - } - - @Test - @TestMetadata("expectAnnotationCallInLibrary.kt") - public void testExpectAnnotationCallInLibrary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt"); - } - - @Test - @TestMetadata("expectClassInJvmMultifileFacade.kt") - public void testExpectClassInJvmMultifileFacade() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectClassInJvmMultifileFacade.kt"); - } - - @Test - @TestMetadata("optionalExpectation.kt") - public void testOptionalExpectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/basic") - @TestDataPath("$PROJECT_ROOT") - public class Basic { - @Test - @TestMetadata("accessToLocalClassFromBackend.kt") - public void testAccessToLocalClassFromBackend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt"); - } - - @Test - @TestMetadata("actualFunctionWithArgumentOfExpectType.kt") - public void testActualFunctionWithArgumentOfExpectType() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/actualFunctionWithArgumentOfExpectType.kt"); - } - - @Test - public void testAllFilesPresentInBasic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("anyMethodInExpect.kt") - public void testAnyMethodInExpect() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt"); - } - - @Test - @TestMetadata("correctParentForTypeParameter.kt") - public void testCorrectParentForTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt"); - } - - @Test - @TestMetadata("enumEntryNameCall.kt") - public void testEnumEntryNameCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt"); - } - - @Test - @TestMetadata("expectActualCallableReference.kt") - public void testExpectActualCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt"); - } - - @Test - @TestMetadata("expectActualDifferentExtensionReceiversOnOverloads.kt") - public void testExpectActualDifferentExtensionReceiversOnOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt"); - } - - @Test - @TestMetadata("expectActualDifferentPackages.kt") - public void testExpectActualDifferentPackages() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides.kt") - public void testExpectActualFakeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides2.kt") - public void testExpectActualFakeOverrides2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides3.kt") - public void testExpectActualFakeOverrides3() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters.kt") - public void testExpectActualFakeOverridesWithTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt") - public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride.kt") - public void testExpectActualIntersectionOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride2.kt") - public void testExpectActualIntersectionOverride2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt"); - } - - @Test - @TestMetadata("expectActualMultiCommon.kt") - public void testExpectActualMultiCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt"); - } - - @Test - @TestMetadata("expectActualNullabilityBasedOverloads.kt") - public void testExpectActualNullabilityBasedOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt"); - } - - @Test - @TestMetadata("expectActualOverloads.kt") - public void testExpectActualOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt"); - } - - @Test - @TestMetadata("expectActualSimple.kt") - public void testExpectActualSimple() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt"); - } - - @Test - @TestMetadata("expectActualTypeParameters.kt") - public void testExpectActualTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualTypealias.kt") - public void testExpectActualTypealias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); - } - - @Test - @TestMetadata("expectActualTypealiasCoercion.kt") - public void testExpectActualTypealiasCoercion() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); - } - - @Test - @TestMetadata("expectAndCommonFunctionOverloads.kt") - public void testExpectAndCommonFunctionOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes.kt") - public void testExpectInterfaceInSupertypes() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes2.kt") - public void testExpectInterfaceInSupertypes2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt"); - } - - @Test - @TestMetadata("expectProperty.kt") - public void testExpectProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt"); - } - - @Test - @TestMetadata("fakeOverridesInPlatformModule.kt") - public void testFakeOverridesInPlatformModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt"); - } - - @Test - @TestMetadata("getRidOfDoubleBindingInFir2IrLazyProperty.kt") - public void testGetRidOfDoubleBindingInFir2IrLazyProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/getRidOfDoubleBindingInFir2IrLazyProperty.kt"); - } - - @Test - @TestMetadata("independentCommonSourceModules.kt") - public void testIndependentCommonSourceModules() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt"); - } - - @Test - @TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt") - public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt"); - } - - @Test - @TestMetadata("intersectionOverrideInCommonModule.kt") - public void testIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("kt-51753-1.kt") - public void testKt_51753_1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-1.kt"); - } - - @Test - @TestMetadata("kt-51753-2.kt") - public void testKt_51753_2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-2.kt"); - } - - @Test - @TestMetadata("kt-56329.kt") - public void testKt_56329() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideInCommonModule.kt") - public void testLocalIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("localSubstitutionOverrideInCommonModule.kt") - public void testLocalSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("noArgActualConstructor.kt") - public void testNoArgActualConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/noArgActualConstructor.kt"); - } - - @Test - @TestMetadata("nonExternalEquals.kt") - public void testNonExternalEquals() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt"); - } - - @Test - @TestMetadata("overridesOfExpectMembers.kt") - public void testOverridesOfExpectMembers() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt"); - } - - @Test - @TestMetadata("removeExpectDeclarationsFromMetadata.kt") - public void testRemoveExpectDeclarationsFromMetadata() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt"); - } - - @Test - @TestMetadata("substitutionOverrideInCommonModule.kt") - public void testSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization.kt") - public void testTransitiveSuperclassActualization() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization_java.kt") - public void testTransitiveSuperclassActualization_java() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization_java.kt"); - } - - @Test - @TestMetadata("valueClasses.kt") - public void testValueClasses() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/valueClasses.kt"); - } - - @Test - @TestMetadata("widerVisibilityInActualClassifier.kt") - public void testWiderVisibilityInActualClassifier() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/complexMatchings") - @TestDataPath("$PROJECT_ROOT") - public class ComplexMatchings { - @Test - public void testAllFilesPresentInComplexMatchings() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualObject.kt") - public void testExpectCtorlessFinalToActualObject() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt"); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualUnit.kt") - public void testExpectCtorlessFinalToActualUnit() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments") - @TestDataPath("$PROJECT_ROOT") - public class DefaultArguments { - @Test - public void testAllFilesPresentInDefaultArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("annotations.kt") - public void testAnnotations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/annotations.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual.kt") - public void testBothInExpectAndActual() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual2.kt") - public void testBothInExpectAndActual2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt"); - } - - @Test - @TestMetadata("constructor.kt") - public void testConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt"); - } - - @Test - @TestMetadata("defaultArgumentInDelegatedFunction.kt") - public void testDefaultArgumentInDelegatedFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt"); - } - - @Test - @TestMetadata("delegatedExpectedInterface.kt") - public void testDelegatedExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt"); - } - - @Test - @TestMetadata("dispatchReceiverValue.kt") - public void testDispatchReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt"); - } - - @Test - @TestMetadata("expectPropertyAsDefaultArgument.kt") - public void testExpectPropertyAsDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt"); - } - - @Test - @TestMetadata("extensionReceiverValue.kt") - public void testExtensionReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt"); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt"); - } - - @Test - @TestMetadata("functionFromOtherModule.kt") - public void testFunctionFromOtherModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt"); - } - - @Test - @TestMetadata("inheritedFromCommonClass.kt") - public void testInheritedFromCommonClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedClass.kt") - public void testInheritedFromExpectedClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedInterface.kt") - public void testInheritedFromExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedMethod.kt") - public void testInheritedFromExpectedMethod() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt"); - } - - @Test - @TestMetadata("inheritedInExpectedDeclarations.kt") - public void testInheritedInExpectedDeclarations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt"); - } - - @Test - @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt") - public void testInheritedViaAnotherInterfaceIndirectly() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt"); - } - - @Test - @TestMetadata("inlineFunctionWithDefaultLambda.kt") - public void testInlineFunctionWithDefaultLambda() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt"); - } - - @Test - @TestMetadata("jvmOverloads.kt") - public void testJvmOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/jvmOverloads.kt"); - } - - @Test - @TestMetadata("kt23239.kt") - public void testKt23239() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt"); - } - - @Test - @TestMetadata("kt23739.kt") - public void testKt23739() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt"); - } - - @Test - @TestMetadata("nestedEnumEntryValue.kt") - public void testNestedEnumEntryValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt"); - } - - @Test - @TestMetadata("parametersInArgumentValues.kt") - public void testParametersInArgumentValues() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt"); - } - - @Test - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt"); - } - - @Test - @TestMetadata("suspend.kt") - public void testSuspend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt"); - } - - @Test - @TestMetadata("typeAlias.kt") - public void testTypeAlias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt"); - } - - @Test - @TestMetadata("withTypeParameter.kt") - public void testWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests") - @TestDataPath("$PROJECT_ROOT") - public class MigratedOldTests { - @Test - public void testAllFilesPresentInMigratedOldTests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("mpp1.kt") - public void testMpp1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt"); - } - - @Test - @TestMetadata("mpp2.kt") - public void testMpp2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt"); - } - - @Test - @TestMetadata("mpp_default_args.kt") - public void testMpp_default_args() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt"); - } - - @Test - @TestMetadata("mpp_optional_expectation.kt") - public void testMpp_optional_expectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt"); - } - - @Test - @TestMetadata("remap_expect_property_ref.kt") - public void testRemap_expect_property_ref() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index fad3c771aad..7987b2e5ea3 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlackBoxCodegenWithIrInlinerTest { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "multiplatform/k2"); } @Nested @@ -34458,7 +34458,7 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack public class Multiplatform { @Test public void testAllFilesPresentInMultiplatform() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "k2"); } @Test @@ -34771,642 +34771,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack } } - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2") - @TestDataPath("$PROJECT_ROOT") - public class K2 { - @Test - @TestMetadata("actualInnerClassesFirMemberMapping.kt") - public void testActualInnerClassesFirMemberMapping() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt"); - } - - @Test - public void testAllFilesPresentInK2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("anonymousObjectAndSpecificImplementationInDeserializedIr.kt") - public void testAnonymousObjectAndSpecificImplementationInDeserializedIr() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt"); - } - - @Test - @TestMetadata("dataClassInCommonAndPlatform.kt") - public void testDataClassInCommonAndPlatform() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt"); - } - - @Test - @TestMetadata("expectValInInlineClass.kt") - public void testExpectValInInlineClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt"); - } - - @Test - @TestMetadata("expectValInInlineClassJVM.kt") - public void testExpectValInInlineClassJVM() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClassJVM.kt"); - } - - @Test - @TestMetadata("extensionPropertiesOverloads.kt") - public void testExtensionPropertiesOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt"); - } - - @Test - @TestMetadata("internalOverride.kt") - public void testInternalOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt"); - } - - @Test - @TestMetadata("javaMethodWithTypeParameter.kt") - public void testJavaMethodWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/javaMethodWithTypeParameter.kt"); - } - - @Test - @TestMetadata("jvmDeclarationsUpdatedMembersInCommonModule.kt") - public void testJvmDeclarationsUpdatedMembersInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt"); - } - - @Test - @TestMetadata("staticjavaFieldInCommonCode.kt") - public void testStaticjavaFieldInCommonCode() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/staticjavaFieldInCommonCode.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") - @TestDataPath("$PROJECT_ROOT") - public class Annotations { - @Test - public void testAllFilesPresentInAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("annotationsViaActualTypeAliasFromBinary.kt") - public void testAnnotationsViaActualTypeAliasFromBinary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/annotationsViaActualTypeAliasFromBinary.kt"); - } - - @Test - @TestMetadata("deprecatedAnnotationOnlyOnActual_useInCommon.kt") - public void testDeprecatedAnnotationOnlyOnActual_useInCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt"); - } - - @Test - @TestMetadata("expectAnnotationCallInLibrary.kt") - public void testExpectAnnotationCallInLibrary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt"); - } - - @Test - @TestMetadata("expectClassInJvmMultifileFacade.kt") - public void testExpectClassInJvmMultifileFacade() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectClassInJvmMultifileFacade.kt"); - } - - @Test - @TestMetadata("optionalExpectation.kt") - public void testOptionalExpectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/basic") - @TestDataPath("$PROJECT_ROOT") - public class Basic { - @Test - @TestMetadata("accessToLocalClassFromBackend.kt") - public void testAccessToLocalClassFromBackend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt"); - } - - @Test - @TestMetadata("actualFunctionWithArgumentOfExpectType.kt") - public void testActualFunctionWithArgumentOfExpectType() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/actualFunctionWithArgumentOfExpectType.kt"); - } - - @Test - public void testAllFilesPresentInBasic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("anyMethodInExpect.kt") - public void testAnyMethodInExpect() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt"); - } - - @Test - @TestMetadata("correctParentForTypeParameter.kt") - public void testCorrectParentForTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt"); - } - - @Test - @TestMetadata("enumEntryNameCall.kt") - public void testEnumEntryNameCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt"); - } - - @Test - @TestMetadata("expectActualCallableReference.kt") - public void testExpectActualCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt"); - } - - @Test - @TestMetadata("expectActualDifferentExtensionReceiversOnOverloads.kt") - public void testExpectActualDifferentExtensionReceiversOnOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt"); - } - - @Test - @TestMetadata("expectActualDifferentPackages.kt") - public void testExpectActualDifferentPackages() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides.kt") - public void testExpectActualFakeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides2.kt") - public void testExpectActualFakeOverrides2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides3.kt") - public void testExpectActualFakeOverrides3() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters.kt") - public void testExpectActualFakeOverridesWithTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt") - public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride.kt") - public void testExpectActualIntersectionOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride2.kt") - public void testExpectActualIntersectionOverride2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt"); - } - - @Test - @TestMetadata("expectActualMultiCommon.kt") - public void testExpectActualMultiCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt"); - } - - @Test - @TestMetadata("expectActualNullabilityBasedOverloads.kt") - public void testExpectActualNullabilityBasedOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt"); - } - - @Test - @TestMetadata("expectActualOverloads.kt") - public void testExpectActualOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt"); - } - - @Test - @TestMetadata("expectActualSimple.kt") - public void testExpectActualSimple() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt"); - } - - @Test - @TestMetadata("expectActualTypeParameters.kt") - public void testExpectActualTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualTypealias.kt") - public void testExpectActualTypealias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); - } - - @Test - @TestMetadata("expectActualTypealiasCoercion.kt") - public void testExpectActualTypealiasCoercion() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); - } - - @Test - @TestMetadata("expectAndCommonFunctionOverloads.kt") - public void testExpectAndCommonFunctionOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes.kt") - public void testExpectInterfaceInSupertypes() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes2.kt") - public void testExpectInterfaceInSupertypes2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt"); - } - - @Test - @TestMetadata("expectProperty.kt") - public void testExpectProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt"); - } - - @Test - @TestMetadata("fakeOverridesInPlatformModule.kt") - public void testFakeOverridesInPlatformModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt"); - } - - @Test - @TestMetadata("getRidOfDoubleBindingInFir2IrLazyProperty.kt") - public void testGetRidOfDoubleBindingInFir2IrLazyProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/getRidOfDoubleBindingInFir2IrLazyProperty.kt"); - } - - @Test - @TestMetadata("independentCommonSourceModules.kt") - public void testIndependentCommonSourceModules() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt"); - } - - @Test - @TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt") - public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt"); - } - - @Test - @TestMetadata("intersectionOverrideInCommonModule.kt") - public void testIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("kt-51753-1.kt") - public void testKt_51753_1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-1.kt"); - } - - @Test - @TestMetadata("kt-51753-2.kt") - public void testKt_51753_2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-2.kt"); - } - - @Test - @TestMetadata("kt-56329.kt") - public void testKt_56329() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideInCommonModule.kt") - public void testLocalIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("localSubstitutionOverrideInCommonModule.kt") - public void testLocalSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("noArgActualConstructor.kt") - public void testNoArgActualConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/noArgActualConstructor.kt"); - } - - @Test - @TestMetadata("nonExternalEquals.kt") - public void testNonExternalEquals() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt"); - } - - @Test - @TestMetadata("overridesOfExpectMembers.kt") - public void testOverridesOfExpectMembers() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt"); - } - - @Test - @TestMetadata("removeExpectDeclarationsFromMetadata.kt") - public void testRemoveExpectDeclarationsFromMetadata() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt"); - } - - @Test - @TestMetadata("substitutionOverrideInCommonModule.kt") - public void testSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization.kt") - public void testTransitiveSuperclassActualization() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization_java.kt") - public void testTransitiveSuperclassActualization_java() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization_java.kt"); - } - - @Test - @TestMetadata("valueClasses.kt") - public void testValueClasses() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/valueClasses.kt"); - } - - @Test - @TestMetadata("widerVisibilityInActualClassifier.kt") - public void testWiderVisibilityInActualClassifier() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/complexMatchings") - @TestDataPath("$PROJECT_ROOT") - public class ComplexMatchings { - @Test - public void testAllFilesPresentInComplexMatchings() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualObject.kt") - public void testExpectCtorlessFinalToActualObject() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt"); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualUnit.kt") - public void testExpectCtorlessFinalToActualUnit() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments") - @TestDataPath("$PROJECT_ROOT") - public class DefaultArguments { - @Test - public void testAllFilesPresentInDefaultArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("annotations.kt") - public void testAnnotations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/annotations.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual.kt") - public void testBothInExpectAndActual() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual2.kt") - public void testBothInExpectAndActual2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt"); - } - - @Test - @TestMetadata("constructor.kt") - public void testConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt"); - } - - @Test - @TestMetadata("defaultArgumentInDelegatedFunction.kt") - public void testDefaultArgumentInDelegatedFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt"); - } - - @Test - @TestMetadata("delegatedExpectedInterface.kt") - public void testDelegatedExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt"); - } - - @Test - @TestMetadata("dispatchReceiverValue.kt") - public void testDispatchReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt"); - } - - @Test - @TestMetadata("expectPropertyAsDefaultArgument.kt") - public void testExpectPropertyAsDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt"); - } - - @Test - @TestMetadata("extensionReceiverValue.kt") - public void testExtensionReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt"); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt"); - } - - @Test - @TestMetadata("functionFromOtherModule.kt") - public void testFunctionFromOtherModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt"); - } - - @Test - @TestMetadata("inheritedFromCommonClass.kt") - public void testInheritedFromCommonClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedClass.kt") - public void testInheritedFromExpectedClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedInterface.kt") - public void testInheritedFromExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedMethod.kt") - public void testInheritedFromExpectedMethod() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt"); - } - - @Test - @TestMetadata("inheritedInExpectedDeclarations.kt") - public void testInheritedInExpectedDeclarations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt"); - } - - @Test - @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt") - public void testInheritedViaAnotherInterfaceIndirectly() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt"); - } - - @Test - @TestMetadata("inlineFunctionWithDefaultLambda.kt") - public void testInlineFunctionWithDefaultLambda() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt"); - } - - @Test - @TestMetadata("jvmOverloads.kt") - public void testJvmOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/jvmOverloads.kt"); - } - - @Test - @TestMetadata("kt23239.kt") - public void testKt23239() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt"); - } - - @Test - @TestMetadata("kt23739.kt") - public void testKt23739() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt"); - } - - @Test - @TestMetadata("nestedEnumEntryValue.kt") - public void testNestedEnumEntryValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt"); - } - - @Test - @TestMetadata("parametersInArgumentValues.kt") - public void testParametersInArgumentValues() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt"); - } - - @Test - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt"); - } - - @Test - @TestMetadata("suspend.kt") - public void testSuspend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt"); - } - - @Test - @TestMetadata("typeAlias.kt") - public void testTypeAlias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt"); - } - - @Test - @TestMetadata("withTypeParameter.kt") - public void testWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests") - @TestDataPath("$PROJECT_ROOT") - public class MigratedOldTests { - @Test - public void testAllFilesPresentInMigratedOldTests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("mpp1.kt") - public void testMpp1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt"); - } - - @Test - @TestMetadata("mpp2.kt") - public void testMpp2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt"); - } - - @Test - @TestMetadata("mpp_default_args.kt") - public void testMpp_default_args() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt"); - } - - @Test - @TestMetadata("mpp_optional_expectation.kt") - public void testMpp_optional_expectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt"); - } - - @Test - @TestMetadata("remap_expect_property_ref.kt") - public void testRemap_expect_property_ref() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt index 6ea6f06100c..6fa30aef33b 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt @@ -85,7 +85,8 @@ fun generateJUnit3CompilerTests(args: Array, mainClassName: String?) { "compileKotlinAgainstKotlin", "testsWithJava9", "testsWithJava15", - "testsWithJava17" + "testsWithJava17", + "multiplatform/k2", ) ) } diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt index 44b67527043..a81f56b31f8 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.test.utils.CUSTOM_TEST_DATA_EXTENSION_PATTERN fun generateJUnit5CompilerTests(args: Array, mainClassName: String?) { val excludedCustomTestdataPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN + val k2BoxTestDir = listOf("multiplatform/k2") generateTestGroupSuiteWithJUnit5(args, mainClassName) { testGroup(testsRoot = "compiler/tests-common-new/tests-gen", testDataRoot = "compiler/testData") { @@ -72,15 +73,15 @@ fun generateJUnit5CompilerTests(args: Array, mainClassName: String?) { } testClass { - model("codegen/box") + model("codegen/box", excludeDirs = k2BoxTestDir) } testClass { - model("codegen/box") + model("codegen/box", excludeDirs = k2BoxTestDir) } testClass { - model("codegen/box") + model("codegen/box", excludeDirs = k2BoxTestDir) } testClass { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 9b0526e8dee..75aaf8eaa52 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -28,7 +28,7 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "ranges/stepped", "compileKotlinAgainstKotlin", "testsWithJava9", "testsWithJava15", "testsWithJava17"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "ranges/stepped", "compileKotlinAgainstKotlin", "testsWithJava9", "testsWithJava15", "testsWithJava17", "multiplatform/k2"); } @TestMetadata("compiler/testData/codegen/box/annotations") @@ -29375,7 +29375,7 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } public void testAllFilesPresentInMultiplatform() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "k2"); } @TestMetadata("annotationsViaActualTypeAliasFromBinary.kt") @@ -29645,564 +29645,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class K2 extends AbstractLightAnalysisModeTest { - @TestMetadata("actualInnerClassesFirMemberMapping.kt") - public void ignoreActualInnerClassesFirMemberMapping() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt"); - } - - @TestMetadata("extensionPropertiesOverloads.kt") - public void ignoreExtensionPropertiesOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt"); - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInK2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @TestMetadata("anonymousObjectAndSpecificImplementationInDeserializedIr.kt") - public void testAnonymousObjectAndSpecificImplementationInDeserializedIr() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt"); - } - - @TestMetadata("dataClassInCommonAndPlatform.kt") - public void testDataClassInCommonAndPlatform() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt"); - } - - @TestMetadata("expectValInInlineClass.kt") - public void testExpectValInInlineClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt"); - } - - @TestMetadata("expectValInInlineClassJVM.kt") - public void testExpectValInInlineClassJVM() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClassJVM.kt"); - } - - @TestMetadata("internalOverride.kt") - public void testInternalOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt"); - } - - @TestMetadata("javaMethodWithTypeParameter.kt") - public void testJavaMethodWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/javaMethodWithTypeParameter.kt"); - } - - @TestMetadata("jvmDeclarationsUpdatedMembersInCommonModule.kt") - public void testJvmDeclarationsUpdatedMembersInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt"); - } - - @TestMetadata("staticjavaFieldInCommonCode.kt") - public void testStaticjavaFieldInCommonCode() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/staticjavaFieldInCommonCode.kt"); - } - - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Annotations extends AbstractLightAnalysisModeTest { - @TestMetadata("annotationsViaActualTypeAliasFromBinary.kt") - public void ignoreAnnotationsViaActualTypeAliasFromBinary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/annotationsViaActualTypeAliasFromBinary.kt"); - } - - @TestMetadata("deprecatedAnnotationOnlyOnActual_useInCommon.kt") - public void ignoreDeprecatedAnnotationOnlyOnActual_useInCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt"); - } - - @TestMetadata("expectClassInJvmMultifileFacade.kt") - public void ignoreExpectClassInJvmMultifileFacade() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectClassInJvmMultifileFacade.kt"); - } - - @TestMetadata("optionalExpectation.kt") - public void ignoreOptionalExpectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt"); - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @TestMetadata("expectAnnotationCallInLibrary.kt") - public void testExpectAnnotationCallInLibrary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/basic") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Basic extends AbstractLightAnalysisModeTest { - @TestMetadata("anyMethodInExpect.kt") - public void ignoreAnyMethodInExpect() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt"); - } - - @TestMetadata("expectActualFakeOverrides2.kt") - public void ignoreExpectActualFakeOverrides2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt"); - } - - @TestMetadata("expectActualFakeOverrides3.kt") - public void ignoreExpectActualFakeOverrides3() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt"); - } - - @TestMetadata("expectActualFakeOverridesWithTypeParameters.kt") - public void ignoreExpectActualFakeOverridesWithTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt"); - } - - @TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt") - public void ignoreExpectActualFakeOverridesWithTypeParameters2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt"); - } - - @TestMetadata("expectActualIntersectionOverride.kt") - public void ignoreExpectActualIntersectionOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt"); - } - - @TestMetadata("expectActualIntersectionOverride2.kt") - public void ignoreExpectActualIntersectionOverride2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt"); - } - - @TestMetadata("expectActualNullabilityBasedOverloads.kt") - public void ignoreExpectActualNullabilityBasedOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt"); - } - - @TestMetadata("expectProperty.kt") - public void ignoreExpectProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt"); - } - - @TestMetadata("intersectionOverrideInCommonModule.kt") - public void ignoreIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt"); - } - - @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt") - public void ignoreIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @TestMetadata("localIntersectionOverrideInCommonModule.kt") - public void ignoreLocalIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt"); - } - - @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt") - public void ignoreLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @TestMetadata("localSubstitutionOverrideInCommonModule.kt") - public void ignoreLocalSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt"); - } - - @TestMetadata("noArgActualConstructor.kt") - public void ignoreNoArgActualConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/noArgActualConstructor.kt"); - } - - @TestMetadata("nonExternalEquals.kt") - public void ignoreNonExternalEquals() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt"); - } - - @TestMetadata("overridesOfExpectMembers.kt") - public void ignoreOverridesOfExpectMembers() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt"); - } - - @TestMetadata("removeExpectDeclarationsFromMetadata.kt") - public void ignoreRemoveExpectDeclarationsFromMetadata() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt"); - } - - @TestMetadata("substitutionOverrideInCommonModule.kt") - public void ignoreSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt"); - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - @TestMetadata("accessToLocalClassFromBackend.kt") - public void testAccessToLocalClassFromBackend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt"); - } - - @TestMetadata("actualFunctionWithArgumentOfExpectType.kt") - public void testActualFunctionWithArgumentOfExpectType() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/actualFunctionWithArgumentOfExpectType.kt"); - } - - public void testAllFilesPresentInBasic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @TestMetadata("correctParentForTypeParameter.kt") - public void testCorrectParentForTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt"); - } - - @TestMetadata("enumEntryNameCall.kt") - public void testEnumEntryNameCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt"); - } - - @TestMetadata("expectActualCallableReference.kt") - public void testExpectActualCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt"); - } - - @TestMetadata("expectActualDifferentExtensionReceiversOnOverloads.kt") - public void testExpectActualDifferentExtensionReceiversOnOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt"); - } - - @TestMetadata("expectActualDifferentPackages.kt") - public void testExpectActualDifferentPackages() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt"); - } - - @TestMetadata("expectActualFakeOverrides.kt") - public void testExpectActualFakeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt"); - } - - @TestMetadata("expectActualMultiCommon.kt") - public void testExpectActualMultiCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt"); - } - - @TestMetadata("expectActualOverloads.kt") - public void testExpectActualOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt"); - } - - @TestMetadata("expectActualSimple.kt") - public void testExpectActualSimple() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt"); - } - - @TestMetadata("expectActualTypeParameters.kt") - public void testExpectActualTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt"); - } - - @TestMetadata("expectActualTypealias.kt") - public void testExpectActualTypealias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); - } - - @TestMetadata("expectActualTypealiasCoercion.kt") - public void testExpectActualTypealiasCoercion() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); - } - - @TestMetadata("expectAndCommonFunctionOverloads.kt") - public void testExpectAndCommonFunctionOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); - } - - @TestMetadata("expectInterfaceInSupertypes.kt") - public void testExpectInterfaceInSupertypes() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); - } - - @TestMetadata("expectInterfaceInSupertypes2.kt") - public void testExpectInterfaceInSupertypes2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt"); - } - - @TestMetadata("fakeOverridesInPlatformModule.kt") - public void testFakeOverridesInPlatformModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt"); - } - - @TestMetadata("getRidOfDoubleBindingInFir2IrLazyProperty.kt") - public void testGetRidOfDoubleBindingInFir2IrLazyProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/getRidOfDoubleBindingInFir2IrLazyProperty.kt"); - } - - @TestMetadata("independentCommonSourceModules.kt") - public void testIndependentCommonSourceModules() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt"); - } - - @TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt") - public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt"); - } - - @TestMetadata("kt-51753-1.kt") - public void testKt_51753_1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-1.kt"); - } - - @TestMetadata("kt-51753-2.kt") - public void testKt_51753_2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-2.kt"); - } - - @TestMetadata("kt-56329.kt") - public void testKt_56329() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt"); - } - - @TestMetadata("transitiveSuperclassActualization.kt") - public void testTransitiveSuperclassActualization() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt"); - } - - @TestMetadata("transitiveSuperclassActualization_java.kt") - public void testTransitiveSuperclassActualization_java() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization_java.kt"); - } - - @TestMetadata("valueClasses.kt") - public void testValueClasses() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/valueClasses.kt"); - } - - @TestMetadata("widerVisibilityInActualClassifier.kt") - public void testWiderVisibilityInActualClassifier() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/complexMatchings") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ComplexMatchings extends AbstractLightAnalysisModeTest { - @TestMetadata("expectCtorlessFinalToActualObject.kt") - public void ignoreExpectCtorlessFinalToActualObject() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt"); - } - - @TestMetadata("expectCtorlessFinalToActualUnit.kt") - public void ignoreExpectCtorlessFinalToActualUnit() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt"); - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInComplexMatchings() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - } - - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultArguments extends AbstractLightAnalysisModeTest { - @TestMetadata("bothInExpectAndActual.kt") - public void ignoreBothInExpectAndActual() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt"); - } - - @TestMetadata("bothInExpectAndActual2.kt") - public void ignoreBothInExpectAndActual2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt"); - } - - @TestMetadata("constructor.kt") - public void ignoreConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt"); - } - - @TestMetadata("delegatedExpectedInterface.kt") - public void ignoreDelegatedExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt"); - } - - @TestMetadata("dispatchReceiverValue.kt") - public void ignoreDispatchReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt"); - } - - @TestMetadata("extensionReceiverValue.kt") - public void ignoreExtensionReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt"); - } - - @TestMetadata("function.kt") - public void ignoreFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt"); - } - - @TestMetadata("functionFromOtherModule.kt") - public void ignoreFunctionFromOtherModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt"); - } - - @TestMetadata("inheritedFromCommonClass.kt") - public void ignoreInheritedFromCommonClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt"); - } - - @TestMetadata("inheritedFromExpectedClass.kt") - public void ignoreInheritedFromExpectedClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt"); - } - - @TestMetadata("inheritedFromExpectedInterface.kt") - public void ignoreInheritedFromExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt"); - } - - @TestMetadata("inheritedFromExpectedMethod.kt") - public void ignoreInheritedFromExpectedMethod() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt"); - } - - @TestMetadata("inheritedInExpectedDeclarations.kt") - public void ignoreInheritedInExpectedDeclarations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt"); - } - - @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt") - public void ignoreInheritedViaAnotherInterfaceIndirectly() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt"); - } - - @TestMetadata("inlineFunctionWithDefaultLambda.kt") - public void ignoreInlineFunctionWithDefaultLambda() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt"); - } - - @TestMetadata("jvmOverloads.kt") - public void ignoreJvmOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/jvmOverloads.kt"); - } - - @TestMetadata("kt23239.kt") - public void ignoreKt23239() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt"); - } - - @TestMetadata("kt23739.kt") - public void ignoreKt23739() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt"); - } - - @TestMetadata("nestedEnumEntryValue.kt") - public void ignoreNestedEnumEntryValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt"); - } - - @TestMetadata("parametersInArgumentValues.kt") - public void ignoreParametersInArgumentValues() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt"); - } - - @TestMetadata("superCall.kt") - public void ignoreSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt"); - } - - @TestMetadata("suspend.kt") - public void ignoreSuspend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt"); - } - - @TestMetadata("typeAlias.kt") - public void ignoreTypeAlias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt"); - } - - @TestMetadata("withTypeParameter.kt") - public void ignoreWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt"); - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInDefaultArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @TestMetadata("annotations.kt") - public void testAnnotations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/annotations.kt"); - } - - @TestMetadata("defaultArgumentInDelegatedFunction.kt") - public void testDefaultArgumentInDelegatedFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt"); - } - - @TestMetadata("expectPropertyAsDefaultArgument.kt") - public void testExpectPropertyAsDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt"); - } - } - - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class MigratedOldTests extends AbstractLightAnalysisModeTest { - @TestMetadata("mpp1.kt") - public void ignoreMpp1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt"); - } - - @TestMetadata("mpp2.kt") - public void ignoreMpp2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt"); - } - - @TestMetadata("mpp_default_args.kt") - public void ignoreMpp_default_args() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt"); - } - - @TestMetadata("remap_expect_property_ref.kt") - public void ignoreRemap_expect_property_ref() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt"); - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInMigratedOldTests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @TestMetadata("mpp_optional_expectation.kt") - public void testMpp_optional_expectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt"); - } - } - } - @TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index d616ee388af..af6ccbcb64c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -22,10 +22,8 @@ import org.jetbrains.kotlin.js.testOld.klib.AbstractFirJsKlibEvolutionTest fun main(args: Array) { System.setProperty("java.awt.headless", "true") - val jvmOnlyBoxTests = listOf( - "compileKotlinAgainstKotlin", - ) - + val jvmOnlyBoxTests = listOf("compileKotlinAgainstKotlin") + val k2BoxTestDir = "multiplatform/k2" val excludedFirTestdataPattern = TestGeneratorUtil.KT_OR_KTS_WITH_FIR_PREFIX // TODO: repair these tests @@ -160,11 +158,11 @@ fun main(args: Array) { testGroup("js/js.tests/tests-gen", "compiler/testData", testRunnerMethodName = "runTest0") { testClass { - model("codegen/box", excludeDirs = jvmOnlyBoxTests) + model("codegen/box", excludeDirs = jvmOnlyBoxTests + k2BoxTestDir) } testClass { - model("codegen/boxError", excludeDirs = jvmOnlyBoxTests) + model("codegen/boxError", excludeDirs = jvmOnlyBoxTests + k2BoxTestDir) } testClass { @@ -172,7 +170,7 @@ fun main(args: Array) { } testClass { - model("codegen/box", excludeDirs = jvmOnlyBoxTests) + model("codegen/box", excludeDirs = jvmOnlyBoxTests + k2BoxTestDir) } testClass { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java index bbea76c5cb1..5dafba4491e 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxErrorTestGenerated.java @@ -22,7 +22,7 @@ import java.util.regex.Pattern; public class IrJsCodegenBoxErrorTestGenerated extends AbstractIrJsCodegenBoxErrorTest { @Test public void testAllFilesPresentInBoxError() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxError"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "compileKotlinAgainstKotlin"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxError"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "compileKotlinAgainstKotlin", "multiplatform/k2"); } @Nested diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index b81540c9836..d9809d74ba4 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "compileKotlinAgainstKotlin"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "compileKotlinAgainstKotlin", "multiplatform/k2"); } @Nested @@ -24168,7 +24168,7 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { public class Multiplatform { @Test public void testAllFilesPresentInMultiplatform() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "k2"); } @Test @@ -24391,546 +24391,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } } - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2") - @TestDataPath("$PROJECT_ROOT") - public class K2 { - @Test - @TestMetadata("actualInnerClassesFirMemberMapping.kt") - public void testActualInnerClassesFirMemberMapping() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt"); - } - - @Test - public void testAllFilesPresentInK2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @Test - @TestMetadata("anonymousObjectAndSpecificImplementationInDeserializedIr.kt") - public void testAnonymousObjectAndSpecificImplementationInDeserializedIr() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt"); - } - - @Test - @TestMetadata("dataClassInCommonAndPlatform.kt") - public void testDataClassInCommonAndPlatform() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt"); - } - - @Test - @TestMetadata("expectValInInlineClass.kt") - public void testExpectValInInlineClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt"); - } - - @Test - @TestMetadata("extensionPropertiesOverloads.kt") - public void testExtensionPropertiesOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt"); - } - - @Test - @TestMetadata("internalOverride.kt") - public void testInternalOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") - @TestDataPath("$PROJECT_ROOT") - public class Annotations { - @Test - public void testAllFilesPresentInAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @Test - @TestMetadata("deprecatedAnnotationOnlyOnActual_useInCommon.kt") - public void testDeprecatedAnnotationOnlyOnActual_useInCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt"); - } - - @Test - @TestMetadata("expectAnnotationCallInLibrary.kt") - public void testExpectAnnotationCallInLibrary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt"); - } - - @Test - @TestMetadata("optionalExpectation.kt") - public void testOptionalExpectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/basic") - @TestDataPath("$PROJECT_ROOT") - public class Basic { - @Test - @TestMetadata("accessToLocalClassFromBackend.kt") - public void testAccessToLocalClassFromBackend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt"); - } - - @Test - public void testAllFilesPresentInBasic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @Test - @TestMetadata("anyMethodInExpect.kt") - public void testAnyMethodInExpect() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt"); - } - - @Test - @TestMetadata("correctParentForTypeParameter.kt") - public void testCorrectParentForTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt"); - } - - @Test - @TestMetadata("enumEntryNameCall.kt") - public void testEnumEntryNameCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt"); - } - - @Test - @TestMetadata("expectActualCallableReference.kt") - public void testExpectActualCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt"); - } - - @Test - @TestMetadata("expectActualDifferentExtensionReceiversOnOverloads.kt") - public void testExpectActualDifferentExtensionReceiversOnOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt"); - } - - @Test - @TestMetadata("expectActualDifferentPackages.kt") - public void testExpectActualDifferentPackages() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides.kt") - public void testExpectActualFakeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides2.kt") - public void testExpectActualFakeOverrides2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides3.kt") - public void testExpectActualFakeOverrides3() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters.kt") - public void testExpectActualFakeOverridesWithTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt") - public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride.kt") - public void testExpectActualIntersectionOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride2.kt") - public void testExpectActualIntersectionOverride2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt"); - } - - @Test - @TestMetadata("expectActualMultiCommon.kt") - public void testExpectActualMultiCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt"); - } - - @Test - @TestMetadata("expectActualNullabilityBasedOverloads.kt") - public void testExpectActualNullabilityBasedOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt"); - } - - @Test - @TestMetadata("expectActualOverloads.kt") - public void testExpectActualOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt"); - } - - @Test - @TestMetadata("expectActualSimple.kt") - public void testExpectActualSimple() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt"); - } - - @Test - @TestMetadata("expectActualTypeParameters.kt") - public void testExpectActualTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualTypealias.kt") - public void testExpectActualTypealias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); - } - - @Test - @TestMetadata("expectAndCommonFunctionOverloads.kt") - public void testExpectAndCommonFunctionOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes.kt") - public void testExpectInterfaceInSupertypes() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes2.kt") - public void testExpectInterfaceInSupertypes2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt"); - } - - @Test - @TestMetadata("expectProperty.kt") - public void testExpectProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt"); - } - - @Test - @TestMetadata("fakeOverridesInPlatformModule.kt") - public void testFakeOverridesInPlatformModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt"); - } - - @Test - @TestMetadata("independentCommonSourceModules.kt") - public void testIndependentCommonSourceModules() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt"); - } - - @Test - @TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt") - public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt"); - } - - @Test - @TestMetadata("intersectionOverrideInCommonModule.kt") - public void testIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("kt-56329.kt") - public void testKt_56329() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideInCommonModule.kt") - public void testLocalIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("localSubstitutionOverrideInCommonModule.kt") - public void testLocalSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("nonExternalEquals.kt") - public void testNonExternalEquals() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt"); - } - - @Test - @TestMetadata("overridesOfExpectMembers.kt") - public void testOverridesOfExpectMembers() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt"); - } - - @Test - @TestMetadata("removeExpectDeclarationsFromMetadata.kt") - public void testRemoveExpectDeclarationsFromMetadata() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt"); - } - - @Test - @TestMetadata("substitutionOverrideInCommonModule.kt") - public void testSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization.kt") - public void testTransitiveSuperclassActualization() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt"); - } - - @Test - @TestMetadata("widerVisibilityInActualClassifier.kt") - public void testWiderVisibilityInActualClassifier() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/complexMatchings") - @TestDataPath("$PROJECT_ROOT") - public class ComplexMatchings { - @Test - public void testAllFilesPresentInComplexMatchings() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualObject.kt") - public void testExpectCtorlessFinalToActualObject() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt"); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualUnit.kt") - public void testExpectCtorlessFinalToActualUnit() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments") - @TestDataPath("$PROJECT_ROOT") - public class DefaultArguments { - @Test - public void testAllFilesPresentInDefaultArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @Test - @TestMetadata("bothInExpectAndActual.kt") - public void testBothInExpectAndActual() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual2.kt") - public void testBothInExpectAndActual2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt"); - } - - @Test - @TestMetadata("constructor.kt") - public void testConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt"); - } - - @Test - @TestMetadata("defaultArgumentInDelegatedFunction.kt") - public void testDefaultArgumentInDelegatedFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt"); - } - - @Test - @TestMetadata("delegatedExpectedInterface.kt") - public void testDelegatedExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt"); - } - - @Test - @TestMetadata("dispatchReceiverValue.kt") - public void testDispatchReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt"); - } - - @Test - @TestMetadata("expectPropertyAsDefaultArgument.kt") - public void testExpectPropertyAsDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt"); - } - - @Test - @TestMetadata("extensionReceiverValue.kt") - public void testExtensionReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt"); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt"); - } - - @Test - @TestMetadata("functionFromOtherModule.kt") - public void testFunctionFromOtherModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt"); - } - - @Test - @TestMetadata("inheritedFromCommonClass.kt") - public void testInheritedFromCommonClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedClass.kt") - public void testInheritedFromExpectedClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedInterface.kt") - public void testInheritedFromExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedMethod.kt") - public void testInheritedFromExpectedMethod() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt"); - } - - @Test - @TestMetadata("inheritedInExpectedDeclarations.kt") - public void testInheritedInExpectedDeclarations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt"); - } - - @Test - @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt") - public void testInheritedViaAnotherInterfaceIndirectly() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt"); - } - - @Test - @TestMetadata("inlineFunctionWithDefaultLambda.kt") - public void testInlineFunctionWithDefaultLambda() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt"); - } - - @Test - @TestMetadata("kt23239.kt") - public void testKt23239() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt"); - } - - @Test - @TestMetadata("kt23739.kt") - public void testKt23739() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt"); - } - - @Test - @TestMetadata("nestedEnumEntryValue.kt") - public void testNestedEnumEntryValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt"); - } - - @Test - @TestMetadata("parametersInArgumentValues.kt") - public void testParametersInArgumentValues() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt"); - } - - @Test - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt"); - } - - @Test - @TestMetadata("suspend.kt") - public void testSuspend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt"); - } - - @Test - @TestMetadata("typeAlias.kt") - public void testTypeAlias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt"); - } - - @Test - @TestMetadata("withTypeParameter.kt") - public void testWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests") - @TestDataPath("$PROJECT_ROOT") - public class MigratedOldTests { - @Test - public void testAllFilesPresentInMigratedOldTests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @Test - @TestMetadata("mpp1.kt") - public void testMpp1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt"); - } - - @Test - @TestMetadata("mpp2.kt") - public void testMpp2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt"); - } - - @Test - @TestMetadata("mpp_default_args.kt") - public void testMpp_default_args() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt"); - } - - @Test - @TestMetadata("mpp_optional_expectation.kt") - public void testMpp_optional_expectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt"); - } - - @Test - @TestMetadata("remap_expect_property_ref.kt") - public void testRemap_expect_property_ref() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests") @TestDataPath("$PROJECT_ROOT") diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index 1f97d503093..9714aa3ed7c 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTest { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true, "compileKotlinAgainstKotlin"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true, "compileKotlinAgainstKotlin", "multiplatform/k2"); } @Nested @@ -24168,7 +24168,7 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes public class Multiplatform { @Test public void testAllFilesPresentInMultiplatform() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true, "k2"); } @Test @@ -24391,546 +24391,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes } } - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2") - @TestDataPath("$PROJECT_ROOT") - public class K2 { - @Test - @TestMetadata("actualInnerClassesFirMemberMapping.kt") - public void testActualInnerClassesFirMemberMapping() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt"); - } - - @Test - public void testAllFilesPresentInK2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @Test - @TestMetadata("anonymousObjectAndSpecificImplementationInDeserializedIr.kt") - public void testAnonymousObjectAndSpecificImplementationInDeserializedIr() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt"); - } - - @Test - @TestMetadata("dataClassInCommonAndPlatform.kt") - public void testDataClassInCommonAndPlatform() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt"); - } - - @Test - @TestMetadata("expectValInInlineClass.kt") - public void testExpectValInInlineClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt"); - } - - @Test - @TestMetadata("extensionPropertiesOverloads.kt") - public void testExtensionPropertiesOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt"); - } - - @Test - @TestMetadata("internalOverride.kt") - public void testInternalOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") - @TestDataPath("$PROJECT_ROOT") - public class Annotations { - @Test - public void testAllFilesPresentInAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @Test - @TestMetadata("deprecatedAnnotationOnlyOnActual_useInCommon.kt") - public void testDeprecatedAnnotationOnlyOnActual_useInCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt"); - } - - @Test - @TestMetadata("expectAnnotationCallInLibrary.kt") - public void testExpectAnnotationCallInLibrary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt"); - } - - @Test - @TestMetadata("optionalExpectation.kt") - public void testOptionalExpectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/basic") - @TestDataPath("$PROJECT_ROOT") - public class Basic { - @Test - @TestMetadata("accessToLocalClassFromBackend.kt") - public void testAccessToLocalClassFromBackend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt"); - } - - @Test - public void testAllFilesPresentInBasic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @Test - @TestMetadata("anyMethodInExpect.kt") - public void testAnyMethodInExpect() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt"); - } - - @Test - @TestMetadata("correctParentForTypeParameter.kt") - public void testCorrectParentForTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt"); - } - - @Test - @TestMetadata("enumEntryNameCall.kt") - public void testEnumEntryNameCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt"); - } - - @Test - @TestMetadata("expectActualCallableReference.kt") - public void testExpectActualCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt"); - } - - @Test - @TestMetadata("expectActualDifferentExtensionReceiversOnOverloads.kt") - public void testExpectActualDifferentExtensionReceiversOnOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt"); - } - - @Test - @TestMetadata("expectActualDifferentPackages.kt") - public void testExpectActualDifferentPackages() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides.kt") - public void testExpectActualFakeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides2.kt") - public void testExpectActualFakeOverrides2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides3.kt") - public void testExpectActualFakeOverrides3() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters.kt") - public void testExpectActualFakeOverridesWithTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt") - public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride.kt") - public void testExpectActualIntersectionOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride2.kt") - public void testExpectActualIntersectionOverride2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt"); - } - - @Test - @TestMetadata("expectActualMultiCommon.kt") - public void testExpectActualMultiCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt"); - } - - @Test - @TestMetadata("expectActualNullabilityBasedOverloads.kt") - public void testExpectActualNullabilityBasedOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt"); - } - - @Test - @TestMetadata("expectActualOverloads.kt") - public void testExpectActualOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt"); - } - - @Test - @TestMetadata("expectActualSimple.kt") - public void testExpectActualSimple() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt"); - } - - @Test - @TestMetadata("expectActualTypeParameters.kt") - public void testExpectActualTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualTypealias.kt") - public void testExpectActualTypealias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); - } - - @Test - @TestMetadata("expectAndCommonFunctionOverloads.kt") - public void testExpectAndCommonFunctionOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes.kt") - public void testExpectInterfaceInSupertypes() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes2.kt") - public void testExpectInterfaceInSupertypes2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt"); - } - - @Test - @TestMetadata("expectProperty.kt") - public void testExpectProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt"); - } - - @Test - @TestMetadata("fakeOverridesInPlatformModule.kt") - public void testFakeOverridesInPlatformModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt"); - } - - @Test - @TestMetadata("independentCommonSourceModules.kt") - public void testIndependentCommonSourceModules() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt"); - } - - @Test - @TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt") - public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt"); - } - - @Test - @TestMetadata("intersectionOverrideInCommonModule.kt") - public void testIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("kt-56329.kt") - public void testKt_56329() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideInCommonModule.kt") - public void testLocalIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("localSubstitutionOverrideInCommonModule.kt") - public void testLocalSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("nonExternalEquals.kt") - public void testNonExternalEquals() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt"); - } - - @Test - @TestMetadata("overridesOfExpectMembers.kt") - public void testOverridesOfExpectMembers() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt"); - } - - @Test - @TestMetadata("removeExpectDeclarationsFromMetadata.kt") - public void testRemoveExpectDeclarationsFromMetadata() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt"); - } - - @Test - @TestMetadata("substitutionOverrideInCommonModule.kt") - public void testSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization.kt") - public void testTransitiveSuperclassActualization() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt"); - } - - @Test - @TestMetadata("widerVisibilityInActualClassifier.kt") - public void testWiderVisibilityInActualClassifier() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/complexMatchings") - @TestDataPath("$PROJECT_ROOT") - public class ComplexMatchings { - @Test - public void testAllFilesPresentInComplexMatchings() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualObject.kt") - public void testExpectCtorlessFinalToActualObject() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt"); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualUnit.kt") - public void testExpectCtorlessFinalToActualUnit() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments") - @TestDataPath("$PROJECT_ROOT") - public class DefaultArguments { - @Test - public void testAllFilesPresentInDefaultArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @Test - @TestMetadata("bothInExpectAndActual.kt") - public void testBothInExpectAndActual() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual2.kt") - public void testBothInExpectAndActual2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt"); - } - - @Test - @TestMetadata("constructor.kt") - public void testConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt"); - } - - @Test - @TestMetadata("defaultArgumentInDelegatedFunction.kt") - public void testDefaultArgumentInDelegatedFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt"); - } - - @Test - @TestMetadata("delegatedExpectedInterface.kt") - public void testDelegatedExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt"); - } - - @Test - @TestMetadata("dispatchReceiverValue.kt") - public void testDispatchReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt"); - } - - @Test - @TestMetadata("expectPropertyAsDefaultArgument.kt") - public void testExpectPropertyAsDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt"); - } - - @Test - @TestMetadata("extensionReceiverValue.kt") - public void testExtensionReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt"); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt"); - } - - @Test - @TestMetadata("functionFromOtherModule.kt") - public void testFunctionFromOtherModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt"); - } - - @Test - @TestMetadata("inheritedFromCommonClass.kt") - public void testInheritedFromCommonClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedClass.kt") - public void testInheritedFromExpectedClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedInterface.kt") - public void testInheritedFromExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedMethod.kt") - public void testInheritedFromExpectedMethod() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt"); - } - - @Test - @TestMetadata("inheritedInExpectedDeclarations.kt") - public void testInheritedInExpectedDeclarations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt"); - } - - @Test - @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt") - public void testInheritedViaAnotherInterfaceIndirectly() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt"); - } - - @Test - @TestMetadata("inlineFunctionWithDefaultLambda.kt") - public void testInlineFunctionWithDefaultLambda() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt"); - } - - @Test - @TestMetadata("kt23239.kt") - public void testKt23239() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt"); - } - - @Test - @TestMetadata("kt23739.kt") - public void testKt23739() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt"); - } - - @Test - @TestMetadata("nestedEnumEntryValue.kt") - public void testNestedEnumEntryValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt"); - } - - @Test - @TestMetadata("parametersInArgumentValues.kt") - public void testParametersInArgumentValues() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt"); - } - - @Test - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt"); - } - - @Test - @TestMetadata("suspend.kt") - public void testSuspend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt"); - } - - @Test - @TestMetadata("typeAlias.kt") - public void testTypeAlias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt"); - } - - @Test - @TestMetadata("withTypeParameter.kt") - public void testWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests") - @TestDataPath("$PROJECT_ROOT") - public class MigratedOldTests { - @Test - public void testAllFilesPresentInMigratedOldTests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); - } - - @Test - @TestMetadata("mpp1.kt") - public void testMpp1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt"); - } - - @Test - @TestMetadata("mpp2.kt") - public void testMpp2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt"); - } - - @Test - @TestMetadata("mpp_default_args.kt") - public void testMpp_default_args() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt"); - } - - @Test - @TestMetadata("mpp_optional_expectation.kt") - public void testMpp_optional_expectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt"); - } - - @Test - @TestMetadata("remap_expect_property_ref.kt") - public void testRemap_expect_property_ref() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests") @TestDataPath("$PROJECT_ROOT") diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java index 9c990d63d55..4f5b5ed6459 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java @@ -27,7 +27,7 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest public class Box { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "multiplatform/k2"); } @Nested @@ -26787,7 +26787,7 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest public class Multiplatform { @Test public void testAllFilesPresentInMultiplatform() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "k2"); } @Test @@ -27014,558 +27014,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest } } - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - public class K2 { - @Test - @TestMetadata("actualInnerClassesFirMemberMapping.kt") - public void testActualInnerClassesFirMemberMapping() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt"); - } - - @Test - public void testAllFilesPresentInK2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("anonymousObjectAndSpecificImplementationInDeserializedIr.kt") - public void testAnonymousObjectAndSpecificImplementationInDeserializedIr() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt"); - } - - @Test - @TestMetadata("dataClassInCommonAndPlatform.kt") - public void testDataClassInCommonAndPlatform() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt"); - } - - @Test - @TestMetadata("expectValInInlineClass.kt") - public void testExpectValInInlineClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt"); - } - - @Test - @TestMetadata("extensionPropertiesOverloads.kt") - public void testExtensionPropertiesOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt"); - } - - @Test - @TestMetadata("internalOverride.kt") - public void testInternalOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - public class Annotations { - @Test - public void testAllFilesPresentInAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("deprecatedAnnotationOnlyOnActual_useInCommon.kt") - public void testDeprecatedAnnotationOnlyOnActual_useInCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt"); - } - - @Test - @TestMetadata("expectAnnotationCallInLibrary.kt") - public void testExpectAnnotationCallInLibrary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt"); - } - - @Test - @TestMetadata("optionalExpectation.kt") - public void testOptionalExpectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/basic") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - public class Basic { - @Test - @TestMetadata("accessToLocalClassFromBackend.kt") - public void testAccessToLocalClassFromBackend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt"); - } - - @Test - public void testAllFilesPresentInBasic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("anyMethodInExpect.kt") - public void testAnyMethodInExpect() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt"); - } - - @Test - @TestMetadata("correctParentForTypeParameter.kt") - public void testCorrectParentForTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt"); - } - - @Test - @TestMetadata("enumEntryNameCall.kt") - public void testEnumEntryNameCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt"); - } - - @Test - @TestMetadata("expectActualCallableReference.kt") - public void testExpectActualCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt"); - } - - @Test - @TestMetadata("expectActualDifferentExtensionReceiversOnOverloads.kt") - public void testExpectActualDifferentExtensionReceiversOnOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt"); - } - - @Test - @TestMetadata("expectActualDifferentPackages.kt") - public void testExpectActualDifferentPackages() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides.kt") - public void testExpectActualFakeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides2.kt") - public void testExpectActualFakeOverrides2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides3.kt") - public void testExpectActualFakeOverrides3() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters.kt") - public void testExpectActualFakeOverridesWithTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt") - public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride.kt") - public void testExpectActualIntersectionOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride2.kt") - public void testExpectActualIntersectionOverride2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt"); - } - - @Test - @TestMetadata("expectActualMultiCommon.kt") - public void testExpectActualMultiCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt"); - } - - @Test - @TestMetadata("expectActualNullabilityBasedOverloads.kt") - public void testExpectActualNullabilityBasedOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt"); - } - - @Test - @TestMetadata("expectActualOverloads.kt") - public void testExpectActualOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt"); - } - - @Test - @TestMetadata("expectActualSimple.kt") - public void testExpectActualSimple() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt"); - } - - @Test - @TestMetadata("expectActualTypeParameters.kt") - public void testExpectActualTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualTypealias.kt") - public void testExpectActualTypealias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); - } - - @Test - @TestMetadata("expectActualTypealiasCoercion.kt") - public void testExpectActualTypealiasCoercion() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); - } - - @Test - @TestMetadata("expectAndCommonFunctionOverloads.kt") - public void testExpectAndCommonFunctionOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes.kt") - public void testExpectInterfaceInSupertypes() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes2.kt") - public void testExpectInterfaceInSupertypes2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt"); - } - - @Test - @TestMetadata("expectProperty.kt") - public void testExpectProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt"); - } - - @Test - @TestMetadata("fakeOverridesInPlatformModule.kt") - public void testFakeOverridesInPlatformModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt"); - } - - @Test - @TestMetadata("independentCommonSourceModules.kt") - public void testIndependentCommonSourceModules() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt"); - } - - @Test - @TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt") - public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt"); - } - - @Test - @TestMetadata("intersectionOverrideInCommonModule.kt") - public void testIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("kt-56329.kt") - public void testKt_56329() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideInCommonModule.kt") - public void testLocalIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("localSubstitutionOverrideInCommonModule.kt") - public void testLocalSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("nonExternalEquals.kt") - public void testNonExternalEquals() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt"); - } - - @Test - @TestMetadata("overridesOfExpectMembers.kt") - public void testOverridesOfExpectMembers() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt"); - } - - @Test - @TestMetadata("removeExpectDeclarationsFromMetadata.kt") - public void testRemoveExpectDeclarationsFromMetadata() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt"); - } - - @Test - @TestMetadata("substitutionOverrideInCommonModule.kt") - public void testSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization.kt") - public void testTransitiveSuperclassActualization() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt"); - } - - @Test - @TestMetadata("widerVisibilityInActualClassifier.kt") - public void testWiderVisibilityInActualClassifier() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/complexMatchings") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - public class ComplexMatchings { - @Test - public void testAllFilesPresentInComplexMatchings() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualObject.kt") - public void testExpectCtorlessFinalToActualObject() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt"); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualUnit.kt") - public void testExpectCtorlessFinalToActualUnit() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - public class DefaultArguments { - @Test - public void testAllFilesPresentInDefaultArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("bothInExpectAndActual.kt") - public void testBothInExpectAndActual() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual2.kt") - public void testBothInExpectAndActual2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt"); - } - - @Test - @TestMetadata("constructor.kt") - public void testConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt"); - } - - @Test - @TestMetadata("defaultArgumentInDelegatedFunction.kt") - public void testDefaultArgumentInDelegatedFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt"); - } - - @Test - @TestMetadata("delegatedExpectedInterface.kt") - public void testDelegatedExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt"); - } - - @Test - @TestMetadata("dispatchReceiverValue.kt") - public void testDispatchReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt"); - } - - @Test - @TestMetadata("expectPropertyAsDefaultArgument.kt") - public void testExpectPropertyAsDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt"); - } - - @Test - @TestMetadata("extensionReceiverValue.kt") - public void testExtensionReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt"); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt"); - } - - @Test - @TestMetadata("functionFromOtherModule.kt") - public void testFunctionFromOtherModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt"); - } - - @Test - @TestMetadata("inheritedFromCommonClass.kt") - public void testInheritedFromCommonClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedClass.kt") - public void testInheritedFromExpectedClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedInterface.kt") - public void testInheritedFromExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedMethod.kt") - public void testInheritedFromExpectedMethod() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt"); - } - - @Test - @TestMetadata("inheritedInExpectedDeclarations.kt") - public void testInheritedInExpectedDeclarations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt"); - } - - @Test - @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt") - public void testInheritedViaAnotherInterfaceIndirectly() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt"); - } - - @Test - @TestMetadata("inlineFunctionWithDefaultLambda.kt") - public void testInlineFunctionWithDefaultLambda() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt"); - } - - @Test - @TestMetadata("kt23239.kt") - public void testKt23239() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt"); - } - - @Test - @TestMetadata("kt23739.kt") - public void testKt23739() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt"); - } - - @Test - @TestMetadata("nestedEnumEntryValue.kt") - public void testNestedEnumEntryValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt"); - } - - @Test - @TestMetadata("parametersInArgumentValues.kt") - public void testParametersInArgumentValues() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt"); - } - - @Test - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt"); - } - - @Test - @TestMetadata("suspend.kt") - public void testSuspend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt"); - } - - @Test - @TestMetadata("typeAlias.kt") - public void testTypeAlias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt"); - } - - @Test - @TestMetadata("withTypeParameter.kt") - public void testWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - public class MigratedOldTests { - @Test - public void testAllFilesPresentInMigratedOldTests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("mpp1.kt") - public void testMpp1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt"); - } - - @Test - @TestMetadata("mpp2.kt") - public void testMpp2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt"); - } - - @Test - @TestMetadata("mpp_default_args.kt") - public void testMpp_default_args() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt"); - } - - @Test - @TestMetadata("mpp_optional_expectation.kt") - public void testMpp_optional_expectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt"); - } - - @Test - @TestMetadata("remap_expect_property_ref.kt") - public void testRemap_expect_property_ref() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests") @TestDataPath("$PROJECT_ROOT") diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java index 4ea44472cdb..dc852da8f52 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java @@ -32,7 +32,7 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT public class Box { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "multiplatform/k2"); } @Nested @@ -27408,7 +27408,7 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT public class Multiplatform { @Test public void testAllFilesPresentInMultiplatform() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "k2"); } @Test @@ -27643,570 +27643,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT } } - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - @UsePartialLinkage(mode = Mode.DISABLED) - @Tag("no-partial-linkage-may-be-skipped") - public class K2 { - @Test - @TestMetadata("actualInnerClassesFirMemberMapping.kt") - public void testActualInnerClassesFirMemberMapping() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt"); - } - - @Test - public void testAllFilesPresentInK2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("anonymousObjectAndSpecificImplementationInDeserializedIr.kt") - public void testAnonymousObjectAndSpecificImplementationInDeserializedIr() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt"); - } - - @Test - @TestMetadata("dataClassInCommonAndPlatform.kt") - public void testDataClassInCommonAndPlatform() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt"); - } - - @Test - @TestMetadata("expectValInInlineClass.kt") - public void testExpectValInInlineClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt"); - } - - @Test - @TestMetadata("extensionPropertiesOverloads.kt") - public void testExtensionPropertiesOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt"); - } - - @Test - @TestMetadata("internalOverride.kt") - public void testInternalOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - @UsePartialLinkage(mode = Mode.DISABLED) - @Tag("no-partial-linkage-may-be-skipped") - public class Annotations { - @Test - public void testAllFilesPresentInAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/annotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("deprecatedAnnotationOnlyOnActual_useInCommon.kt") - public void testDeprecatedAnnotationOnlyOnActual_useInCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt"); - } - - @Test - @TestMetadata("expectAnnotationCallInLibrary.kt") - public void testExpectAnnotationCallInLibrary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt"); - } - - @Test - @TestMetadata("optionalExpectation.kt") - public void testOptionalExpectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/basic") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - @UsePartialLinkage(mode = Mode.DISABLED) - @Tag("no-partial-linkage-may-be-skipped") - public class Basic { - @Test - @TestMetadata("accessToLocalClassFromBackend.kt") - public void testAccessToLocalClassFromBackend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt"); - } - - @Test - public void testAllFilesPresentInBasic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("anyMethodInExpect.kt") - public void testAnyMethodInExpect() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt"); - } - - @Test - @TestMetadata("correctParentForTypeParameter.kt") - public void testCorrectParentForTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt"); - } - - @Test - @TestMetadata("enumEntryNameCall.kt") - public void testEnumEntryNameCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt"); - } - - @Test - @TestMetadata("expectActualCallableReference.kt") - public void testExpectActualCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt"); - } - - @Test - @TestMetadata("expectActualDifferentExtensionReceiversOnOverloads.kt") - public void testExpectActualDifferentExtensionReceiversOnOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt"); - } - - @Test - @TestMetadata("expectActualDifferentPackages.kt") - public void testExpectActualDifferentPackages() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides.kt") - public void testExpectActualFakeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides2.kt") - public void testExpectActualFakeOverrides2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides3.kt") - public void testExpectActualFakeOverrides3() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters.kt") - public void testExpectActualFakeOverridesWithTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt") - public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride.kt") - public void testExpectActualIntersectionOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride2.kt") - public void testExpectActualIntersectionOverride2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt"); - } - - @Test - @TestMetadata("expectActualMultiCommon.kt") - public void testExpectActualMultiCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt"); - } - - @Test - @TestMetadata("expectActualNullabilityBasedOverloads.kt") - public void testExpectActualNullabilityBasedOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt"); - } - - @Test - @TestMetadata("expectActualOverloads.kt") - public void testExpectActualOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt"); - } - - @Test - @TestMetadata("expectActualSimple.kt") - public void testExpectActualSimple() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt"); - } - - @Test - @TestMetadata("expectActualTypeParameters.kt") - public void testExpectActualTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualTypealias.kt") - public void testExpectActualTypealias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); - } - - @Test - @TestMetadata("expectActualTypealiasCoercion.kt") - public void testExpectActualTypealiasCoercion() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt"); - } - - @Test - @TestMetadata("expectAndCommonFunctionOverloads.kt") - public void testExpectAndCommonFunctionOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes.kt") - public void testExpectInterfaceInSupertypes() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes2.kt") - public void testExpectInterfaceInSupertypes2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt"); - } - - @Test - @TestMetadata("expectProperty.kt") - public void testExpectProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt"); - } - - @Test - @TestMetadata("fakeOverridesInPlatformModule.kt") - public void testFakeOverridesInPlatformModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt"); - } - - @Test - @TestMetadata("independentCommonSourceModules.kt") - public void testIndependentCommonSourceModules() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt"); - } - - @Test - @TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt") - public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt"); - } - - @Test - @TestMetadata("intersectionOverrideInCommonModule.kt") - public void testIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("kt-56329.kt") - public void testKt_56329() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideInCommonModule.kt") - public void testLocalIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("localSubstitutionOverrideInCommonModule.kt") - public void testLocalSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("nonExternalEquals.kt") - public void testNonExternalEquals() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt"); - } - - @Test - @TestMetadata("overridesOfExpectMembers.kt") - public void testOverridesOfExpectMembers() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt"); - } - - @Test - @TestMetadata("removeExpectDeclarationsFromMetadata.kt") - public void testRemoveExpectDeclarationsFromMetadata() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt"); - } - - @Test - @TestMetadata("substitutionOverrideInCommonModule.kt") - public void testSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization.kt") - public void testTransitiveSuperclassActualization() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt"); - } - - @Test - @TestMetadata("widerVisibilityInActualClassifier.kt") - public void testWiderVisibilityInActualClassifier() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/complexMatchings") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - @UsePartialLinkage(mode = Mode.DISABLED) - @Tag("no-partial-linkage-may-be-skipped") - public class ComplexMatchings { - @Test - public void testAllFilesPresentInComplexMatchings() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualObject.kt") - public void testExpectCtorlessFinalToActualObject() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt"); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualUnit.kt") - public void testExpectCtorlessFinalToActualUnit() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - @UsePartialLinkage(mode = Mode.DISABLED) - @Tag("no-partial-linkage-may-be-skipped") - public class DefaultArguments { - @Test - public void testAllFilesPresentInDefaultArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("bothInExpectAndActual.kt") - public void testBothInExpectAndActual() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual2.kt") - public void testBothInExpectAndActual2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt"); - } - - @Test - @TestMetadata("constructor.kt") - public void testConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt"); - } - - @Test - @TestMetadata("defaultArgumentInDelegatedFunction.kt") - public void testDefaultArgumentInDelegatedFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt"); - } - - @Test - @TestMetadata("delegatedExpectedInterface.kt") - public void testDelegatedExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt"); - } - - @Test - @TestMetadata("dispatchReceiverValue.kt") - public void testDispatchReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt"); - } - - @Test - @TestMetadata("expectPropertyAsDefaultArgument.kt") - public void testExpectPropertyAsDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt"); - } - - @Test - @TestMetadata("extensionReceiverValue.kt") - public void testExtensionReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt"); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt"); - } - - @Test - @TestMetadata("functionFromOtherModule.kt") - public void testFunctionFromOtherModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt"); - } - - @Test - @TestMetadata("inheritedFromCommonClass.kt") - public void testInheritedFromCommonClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedClass.kt") - public void testInheritedFromExpectedClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedInterface.kt") - public void testInheritedFromExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedMethod.kt") - public void testInheritedFromExpectedMethod() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt"); - } - - @Test - @TestMetadata("inheritedInExpectedDeclarations.kt") - public void testInheritedInExpectedDeclarations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt"); - } - - @Test - @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt") - public void testInheritedViaAnotherInterfaceIndirectly() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt"); - } - - @Test - @TestMetadata("inlineFunctionWithDefaultLambda.kt") - public void testInlineFunctionWithDefaultLambda() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt"); - } - - @Test - @TestMetadata("kt23239.kt") - public void testKt23239() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt"); - } - - @Test - @TestMetadata("kt23739.kt") - public void testKt23739() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt"); - } - - @Test - @TestMetadata("nestedEnumEntryValue.kt") - public void testNestedEnumEntryValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt"); - } - - @Test - @TestMetadata("parametersInArgumentValues.kt") - public void testParametersInArgumentValues() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt"); - } - - @Test - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt"); - } - - @Test - @TestMetadata("suspend.kt") - public void testSuspend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt"); - } - - @Test - @TestMetadata("typeAlias.kt") - public void testTypeAlias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt"); - } - - @Test - @TestMetadata("withTypeParameter.kt") - public void testWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests") - @TestDataPath("$PROJECT_ROOT") - @UseExtTestCaseGroupProvider() - @UsePartialLinkage(mode = Mode.DISABLED) - @Tag("no-partial-linkage-may-be-skipped") - public class MigratedOldTests { - @Test - public void testAllFilesPresentInMigratedOldTests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); - } - - @Test - @TestMetadata("mpp1.kt") - public void testMpp1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt"); - } - - @Test - @TestMetadata("mpp2.kt") - public void testMpp2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt"); - } - - @Test - @TestMetadata("mpp_default_args.kt") - public void testMpp_default_args() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt"); - } - - @Test - @TestMetadata("mpp_optional_expectation.kt") - public void testMpp_optional_expectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt"); - } - - @Test - @TestMetadata("remap_expect_property_ref.kt") - public void testRemap_expect_property_ref() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests") @TestDataPath("$PROJECT_ROOT") diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt index b64ba746151..4ad372517ae 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt @@ -26,6 +26,7 @@ import org.junit.jupiter.api.Tag fun main() { System.setProperty("java.awt.headless", "true") + val k2BoxTestDir = listOf("multiplatform/k2") generateTestGroupSuiteWithJUnit5 { // Codegen box tests. @@ -36,7 +37,7 @@ fun main() { provider(), ) ) { - model("codegen/box", targetBackend = TargetBackend.NATIVE) + model("codegen/box", targetBackend = TargetBackend.NATIVE, excludeDirs = k2BoxTestDir) model("codegen/boxInline", targetBackend = TargetBackend.NATIVE) } testClass( @@ -46,7 +47,7 @@ fun main() { *noPartialLinkage() ) ) { - model("codegen/box", targetBackend = TargetBackend.NATIVE) + model("codegen/box", targetBackend = TargetBackend.NATIVE, excludeDirs = k2BoxTestDir) model("codegen/boxInline", targetBackend = TargetBackend.NATIVE) } testClass( @@ -480,4 +481,4 @@ private fun standalone() = arrayOf( "property" to ClassLevelProperty.TEST_KIND, "propertyValue" to "STANDALONE_NO_TR" ) -) \ No newline at end of file +) diff --git a/wasm/wasm.tests/test/org/jetbrains/kotlin/generators/tests/GenerateWasmTests.kt b/wasm/wasm.tests/test/org/jetbrains/kotlin/generators/tests/GenerateWasmTests.kt index d710d01239c..e7dfc4db280 100644 --- a/wasm/wasm.tests/test/org/jetbrains/kotlin/generators/tests/GenerateWasmTests.kt +++ b/wasm/wasm.tests/test/org/jetbrains/kotlin/generators/tests/GenerateWasmTests.kt @@ -17,9 +17,9 @@ fun main(args: Array) { System.setProperty("java.awt.headless", "true") // Common configuration shared between K1 and K2 tests: - val jvmOnlyBoxTests = listOf( - "compileKotlinAgainstKotlin", - ) + val jvmOnlyBoxTests = listOf("compileKotlinAgainstKotlin") + val k2BoxTestDir = "multiplatform/k2" + val jsTranslatorTestPattern = "^([^_](.+))\\.kt$" val jsTranslatorReflectionPattern = "^(findAssociatedObject(InSeparatedFile)?)\\.kt$" val jsTranslatorEsModulesExcludedDirs = listOf( @@ -90,7 +90,7 @@ fun main(args: Array) { testGroup("wasm/wasm.tests/tests-gen", "compiler/testData", testRunnerMethodName = "runTest0") { testClass { - model("codegen/box", pattern = jsTranslatorTestPattern, excludeDirs = jvmOnlyBoxTests) + model("codegen/box", pattern = jsTranslatorTestPattern, excludeDirs = jvmOnlyBoxTests + k2BoxTestDir) } testClass { @@ -110,4 +110,4 @@ fun main(args: Array) { } } } -} \ No newline at end of file +} diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java index 0ac4579f437..d539390bdd7 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest { @Test public void testAllFilesPresentInBox() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true, "compileKotlinAgainstKotlin"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true, "compileKotlinAgainstKotlin", "multiplatform/k2"); } @Nested @@ -24138,7 +24138,7 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest public class Multiplatform { @Test public void testAllFilesPresentInMultiplatform() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true, "k2"); } @Test @@ -24361,546 +24361,6 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest } } - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2") - @TestDataPath("$PROJECT_ROOT") - public class K2 { - @Test - @TestMetadata("actualInnerClassesFirMemberMapping.kt") - public void testActualInnerClassesFirMemberMapping() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt"); - } - - @Test - public void testAllFilesPresentInK2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - - @Test - @TestMetadata("anonymousObjectAndSpecificImplementationInDeserializedIr.kt") - public void testAnonymousObjectAndSpecificImplementationInDeserializedIr() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt"); - } - - @Test - @TestMetadata("dataClassInCommonAndPlatform.kt") - public void testDataClassInCommonAndPlatform() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt"); - } - - @Test - @TestMetadata("expectValInInlineClass.kt") - public void testExpectValInInlineClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt"); - } - - @Test - @TestMetadata("extensionPropertiesOverloads.kt") - public void testExtensionPropertiesOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt"); - } - - @Test - @TestMetadata("internalOverride.kt") - public void testInternalOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt"); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") - @TestDataPath("$PROJECT_ROOT") - public class Annotations { - @Test - public void testAllFilesPresentInAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/annotations"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - - @Test - @TestMetadata("deprecatedAnnotationOnlyOnActual_useInCommon.kt") - public void testDeprecatedAnnotationOnlyOnActual_useInCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt"); - } - - @Test - @TestMetadata("expectAnnotationCallInLibrary.kt") - public void testExpectAnnotationCallInLibrary() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt"); - } - - @Test - @TestMetadata("optionalExpectation.kt") - public void testOptionalExpectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/basic") - @TestDataPath("$PROJECT_ROOT") - public class Basic { - @Test - @TestMetadata("accessToLocalClassFromBackend.kt") - public void testAccessToLocalClassFromBackend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt"); - } - - @Test - public void testAllFilesPresentInBasic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - - @Test - @TestMetadata("anyMethodInExpect.kt") - public void testAnyMethodInExpect() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt"); - } - - @Test - @TestMetadata("correctParentForTypeParameter.kt") - public void testCorrectParentForTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt"); - } - - @Test - @TestMetadata("enumEntryNameCall.kt") - public void testEnumEntryNameCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt"); - } - - @Test - @TestMetadata("expectActualCallableReference.kt") - public void testExpectActualCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt"); - } - - @Test - @TestMetadata("expectActualDifferentExtensionReceiversOnOverloads.kt") - public void testExpectActualDifferentExtensionReceiversOnOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt"); - } - - @Test - @TestMetadata("expectActualDifferentPackages.kt") - public void testExpectActualDifferentPackages() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides.kt") - public void testExpectActualFakeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides2.kt") - public void testExpectActualFakeOverrides2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverrides3.kt") - public void testExpectActualFakeOverrides3() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters.kt") - public void testExpectActualFakeOverridesWithTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt") - public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride.kt") - public void testExpectActualIntersectionOverride() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt"); - } - - @Test - @TestMetadata("expectActualIntersectionOverride2.kt") - public void testExpectActualIntersectionOverride2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt"); - } - - @Test - @TestMetadata("expectActualMultiCommon.kt") - public void testExpectActualMultiCommon() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt"); - } - - @Test - @TestMetadata("expectActualNullabilityBasedOverloads.kt") - public void testExpectActualNullabilityBasedOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt"); - } - - @Test - @TestMetadata("expectActualOverloads.kt") - public void testExpectActualOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt"); - } - - @Test - @TestMetadata("expectActualSimple.kt") - public void testExpectActualSimple() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt"); - } - - @Test - @TestMetadata("expectActualTypeParameters.kt") - public void testExpectActualTypeParameters() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt"); - } - - @Test - @TestMetadata("expectActualTypealias.kt") - public void testExpectActualTypealias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt"); - } - - @Test - @TestMetadata("expectAndCommonFunctionOverloads.kt") - public void testExpectAndCommonFunctionOverloads() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes.kt") - public void testExpectInterfaceInSupertypes() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt"); - } - - @Test - @TestMetadata("expectInterfaceInSupertypes2.kt") - public void testExpectInterfaceInSupertypes2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt"); - } - - @Test - @TestMetadata("expectProperty.kt") - public void testExpectProperty() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt"); - } - - @Test - @TestMetadata("fakeOverridesInPlatformModule.kt") - public void testFakeOverridesInPlatformModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt"); - } - - @Test - @TestMetadata("independentCommonSourceModules.kt") - public void testIndependentCommonSourceModules() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt"); - } - - @Test - @TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt") - public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt"); - } - - @Test - @TestMetadata("intersectionOverrideInCommonModule.kt") - public void testIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("kt-56329.kt") - public void testKt_56329() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideInCommonModule.kt") - public void testLocalIntersectionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt") - public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt"); - } - - @Test - @TestMetadata("localSubstitutionOverrideInCommonModule.kt") - public void testLocalSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("nonExternalEquals.kt") - public void testNonExternalEquals() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt"); - } - - @Test - @TestMetadata("overridesOfExpectMembers.kt") - public void testOverridesOfExpectMembers() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt"); - } - - @Test - @TestMetadata("removeExpectDeclarationsFromMetadata.kt") - public void testRemoveExpectDeclarationsFromMetadata() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt"); - } - - @Test - @TestMetadata("substitutionOverrideInCommonModule.kt") - public void testSubstitutionOverrideInCommonModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt"); - } - - @Test - @TestMetadata("transitiveSuperclassActualization.kt") - public void testTransitiveSuperclassActualization() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt"); - } - - @Test - @TestMetadata("widerVisibilityInActualClassifier.kt") - public void testWiderVisibilityInActualClassifier() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/complexMatchings") - @TestDataPath("$PROJECT_ROOT") - public class ComplexMatchings { - @Test - public void testAllFilesPresentInComplexMatchings() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualObject.kt") - public void testExpectCtorlessFinalToActualObject() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt"); - } - - @Test - @TestMetadata("expectCtorlessFinalToActualUnit.kt") - public void testExpectCtorlessFinalToActualUnit() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments") - @TestDataPath("$PROJECT_ROOT") - public class DefaultArguments { - @Test - public void testAllFilesPresentInDefaultArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/defaultArguments"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - - @Test - @TestMetadata("bothInExpectAndActual.kt") - public void testBothInExpectAndActual() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt"); - } - - @Test - @TestMetadata("bothInExpectAndActual2.kt") - public void testBothInExpectAndActual2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt"); - } - - @Test - @TestMetadata("constructor.kt") - public void testConstructor() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt"); - } - - @Test - @TestMetadata("defaultArgumentInDelegatedFunction.kt") - public void testDefaultArgumentInDelegatedFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt"); - } - - @Test - @TestMetadata("delegatedExpectedInterface.kt") - public void testDelegatedExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt"); - } - - @Test - @TestMetadata("dispatchReceiverValue.kt") - public void testDispatchReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt"); - } - - @Test - @TestMetadata("expectPropertyAsDefaultArgument.kt") - public void testExpectPropertyAsDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt"); - } - - @Test - @TestMetadata("extensionReceiverValue.kt") - public void testExtensionReceiverValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt"); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt"); - } - - @Test - @TestMetadata("functionFromOtherModule.kt") - public void testFunctionFromOtherModule() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt"); - } - - @Test - @TestMetadata("inheritedFromCommonClass.kt") - public void testInheritedFromCommonClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedClass.kt") - public void testInheritedFromExpectedClass() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedInterface.kt") - public void testInheritedFromExpectedInterface() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt"); - } - - @Test - @TestMetadata("inheritedFromExpectedMethod.kt") - public void testInheritedFromExpectedMethod() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt"); - } - - @Test - @TestMetadata("inheritedInExpectedDeclarations.kt") - public void testInheritedInExpectedDeclarations() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt"); - } - - @Test - @TestMetadata("inheritedViaAnotherInterfaceIndirectly.kt") - public void testInheritedViaAnotherInterfaceIndirectly() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt"); - } - - @Test - @TestMetadata("inlineFunctionWithDefaultLambda.kt") - public void testInlineFunctionWithDefaultLambda() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt"); - } - - @Test - @TestMetadata("kt23239.kt") - public void testKt23239() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt"); - } - - @Test - @TestMetadata("kt23739.kt") - public void testKt23739() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt"); - } - - @Test - @TestMetadata("nestedEnumEntryValue.kt") - public void testNestedEnumEntryValue() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt"); - } - - @Test - @TestMetadata("parametersInArgumentValues.kt") - public void testParametersInArgumentValues() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt"); - } - - @Test - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt"); - } - - @Test - @TestMetadata("suspend.kt") - public void testSuspend() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt"); - } - - @Test - @TestMetadata("typeAlias.kt") - public void testTypeAlias() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt"); - } - - @Test - @TestMetadata("withTypeParameter.kt") - public void testWithTypeParameter() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests") - @TestDataPath("$PROJECT_ROOT") - public class MigratedOldTests { - @Test - public void testAllFilesPresentInMigratedOldTests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); - } - - @Test - @TestMetadata("mpp1.kt") - public void testMpp1() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt"); - } - - @Test - @TestMetadata("mpp2.kt") - public void testMpp2() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt"); - } - - @Test - @TestMetadata("mpp_default_args.kt") - public void testMpp_default_args() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt"); - } - - @Test - @TestMetadata("mpp_optional_expectation.kt") - public void testMpp_optional_expectation() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt"); - } - - @Test - @TestMetadata("remap_expect_property_ref.kt") - public void testRemap_expect_property_ref() throws Exception { - runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/migratedOldTests") @TestDataPath("$PROJECT_ROOT")