From fa879e667f783540c22248dbc151ce7cd4dcdbec Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 6 Apr 2020 18:44:36 +0200 Subject: [PATCH] Add some tests on adapted references with varargs and reflection Also rename "varargAndDefaults" test directory to "adaptedReferences" --- .../ir/FirBlackBoxCodegenTestGenerated.java | 231 +++++++++--------- .../bothWithCoercionToUnit.kt | 0 .../boundReferences.kt | 0 .../defaultAfterVararg.kt | 0 .../defaultWithGenericExpectedType.kt | 0 .../emptyVarargAndDefault.kt | 0 .../inlineDefault.kt | 0 .../inlineVararg.kt | 0 .../inlineVarargAndDefault.kt | 0 .../inlineVarargInts.kt | 0 .../innerConstructorWithVararg.kt | 0 .../largeVararg.kt | 0 .../localFunctionWithDefault.kt | 0 .../manyDefaultsAndVararg.kt | 0 ...oReflectionForAdaptedCallableReferences.kt | 14 +- .../reflectionForVarargAsArray.kt | 22 ++ .../simpleDefaultArgument.kt | 0 .../simpleEmptyVararg.kt | 0 .../unboundReferences.kt | 0 .../varargViewedAsArray.kt | 0 .../varargViewedAsPrimitiveArray.kt | 0 .../varargWithDefaultValue.kt | 0 .../codegen/BlackBoxCodegenTestGenerated.java | 231 +++++++++--------- .../LightAnalysisModeTestGenerated.java | 231 +++++++++--------- .../ir/IrBlackBoxCodegenTestGenerated.java | 231 +++++++++--------- .../IrJsCodegenBoxTestGenerated.java | 216 ++++++++-------- .../semantics/JsCodegenBoxTestGenerated.java | 216 ++++++++-------- 27 files changed, 718 insertions(+), 674 deletions(-) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/bothWithCoercionToUnit.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/boundReferences.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/defaultAfterVararg.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/defaultWithGenericExpectedType.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/emptyVarargAndDefault.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/inlineDefault.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/inlineVararg.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/inlineVarargAndDefault.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/inlineVarargInts.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/innerConstructorWithVararg.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/largeVararg.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/localFunctionWithDefault.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/manyDefaultsAndVararg.kt (100%) rename compiler/testData/codegen/box/callableReference/{ => adaptedReferences}/noReflectionForAdaptedCallableReferences.kt (67%) create mode 100644 compiler/testData/codegen/box/callableReference/adaptedReferences/reflectionForVarargAsArray.kt rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/simpleDefaultArgument.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/simpleEmptyVararg.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/unboundReferences.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/varargViewedAsArray.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/varargViewedAsPrimitiveArray.kt (100%) rename compiler/testData/codegen/box/callableReference/{varargAndDefaults => adaptedReferences}/varargWithDefaultValue.kt (100%) diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java index e76516cb82b..1ac62301884 100644 --- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java @@ -1983,11 +1983,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/callableReference/nested.kt"); } - @TestMetadata("noReflectionForAdaptedCallableReferences.kt") - public void testNoReflectionForAdaptedCallableReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/noReflectionForAdaptedCallableReferences.kt"); - } - @TestMetadata("optimizedSuperclasses_after.kt") public void testOptimizedSuperclasses_after() throws Exception { runTest("compiler/testData/codegen/box/callableReference/optimizedSuperclasses_after.kt"); @@ -1998,6 +1993,124 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/callableReference/optimizedSuperclasses_before.kt"); } + @TestMetadata("compiler/testData/codegen/box/callableReference/adaptedReferences") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class AdaptedReferences extends AbstractFirBlackBoxCodegenTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); + } + + public void testAllFilesPresentInAdaptedReferences() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/adaptedReferences"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @TestMetadata("bothWithCoercionToUnit.kt") + public void testBothWithCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt"); + } + + @TestMetadata("boundReferences.kt") + public void testBoundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt"); + } + + @TestMetadata("defaultAfterVararg.kt") + public void testDefaultAfterVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt"); + } + + @TestMetadata("defaultWithGenericExpectedType.kt") + public void testDefaultWithGenericExpectedType() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt"); + } + + @TestMetadata("emptyVarargAndDefault.kt") + public void testEmptyVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt"); + } + + @TestMetadata("inlineDefault.kt") + public void testInlineDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt"); + } + + @TestMetadata("inlineVararg.kt") + public void testInlineVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt"); + } + + @TestMetadata("inlineVarargAndDefault.kt") + public void testInlineVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt"); + } + + @TestMetadata("inlineVarargInts.kt") + public void testInlineVarargInts() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt"); + } + + @TestMetadata("innerConstructorWithVararg.kt") + public void testInnerConstructorWithVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt"); + } + + @TestMetadata("largeVararg.kt") + public void testLargeVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt"); + } + + @TestMetadata("localFunctionWithDefault.kt") + public void testLocalFunctionWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt"); + } + + @TestMetadata("manyDefaultsAndVararg.kt") + public void testManyDefaultsAndVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt"); + } + + @TestMetadata("noReflectionForAdaptedCallableReferences.kt") + public void testNoReflectionForAdaptedCallableReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/noReflectionForAdaptedCallableReferences.kt"); + } + + @TestMetadata("reflectionForVarargAsArray.kt") + public void testReflectionForVarargAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/reflectionForVarargAsArray.kt"); + } + + @TestMetadata("simpleDefaultArgument.kt") + public void testSimpleDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt"); + } + + @TestMetadata("simpleEmptyVararg.kt") + public void testSimpleEmptyVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt"); + } + + @TestMetadata("unboundReferences.kt") + public void testUnboundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt"); + } + + @TestMetadata("varargViewedAsArray.kt") + public void testVarargViewedAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsArray.kt"); + } + + @TestMetadata("varargViewedAsPrimitiveArray.kt") + public void testVarargViewedAsPrimitiveArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt"); + } + + @TestMetadata("varargWithDefaultValue.kt") + public void testVarargWithDefaultValue() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt"); + } + } + @TestMetadata("compiler/testData/codegen/box/callableReference/bound") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -2833,114 +2946,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/callableReference/serializability/withReflect.kt"); } } - - @TestMetadata("compiler/testData/codegen/box/callableReference/varargAndDefaults") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class VarargAndDefaults extends AbstractFirBlackBoxCodegenTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - - public void testAllFilesPresentInVarargAndDefaults() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/varargAndDefaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @TestMetadata("bothWithCoercionToUnit.kt") - public void testBothWithCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/bothWithCoercionToUnit.kt"); - } - - @TestMetadata("boundReferences.kt") - public void testBoundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/boundReferences.kt"); - } - - @TestMetadata("defaultAfterVararg.kt") - public void testDefaultAfterVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultAfterVararg.kt"); - } - - @TestMetadata("defaultWithGenericExpectedType.kt") - public void testDefaultWithGenericExpectedType() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultWithGenericExpectedType.kt"); - } - - @TestMetadata("emptyVarargAndDefault.kt") - public void testEmptyVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/emptyVarargAndDefault.kt"); - } - - @TestMetadata("inlineDefault.kt") - public void testInlineDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineDefault.kt"); - } - - @TestMetadata("inlineVararg.kt") - public void testInlineVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVararg.kt"); - } - - @TestMetadata("inlineVarargAndDefault.kt") - public void testInlineVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargAndDefault.kt"); - } - - @TestMetadata("inlineVarargInts.kt") - public void testInlineVarargInts() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargInts.kt"); - } - - @TestMetadata("innerConstructorWithVararg.kt") - public void testInnerConstructorWithVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/innerConstructorWithVararg.kt"); - } - - @TestMetadata("largeVararg.kt") - public void testLargeVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/largeVararg.kt"); - } - - @TestMetadata("localFunctionWithDefault.kt") - public void testLocalFunctionWithDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/localFunctionWithDefault.kt"); - } - - @TestMetadata("manyDefaultsAndVararg.kt") - public void testManyDefaultsAndVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/manyDefaultsAndVararg.kt"); - } - - @TestMetadata("simpleDefaultArgument.kt") - public void testSimpleDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleDefaultArgument.kt"); - } - - @TestMetadata("simpleEmptyVararg.kt") - public void testSimpleEmptyVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleEmptyVararg.kt"); - } - - @TestMetadata("unboundReferences.kt") - public void testUnboundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/unboundReferences.kt"); - } - - @TestMetadata("varargViewedAsArray.kt") - public void testVarargViewedAsArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsArray.kt"); - } - - @TestMetadata("varargViewedAsPrimitiveArray.kt") - public void testVarargViewedAsPrimitiveArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsPrimitiveArray.kt"); - } - - @TestMetadata("varargWithDefaultValue.kt") - public void testVarargWithDefaultValue() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargWithDefaultValue.kt"); - } - } } @TestMetadata("compiler/testData/codegen/box/casts") diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/bothWithCoercionToUnit.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/bothWithCoercionToUnit.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/boundReferences.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/boundReferences.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultAfterVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultAfterVararg.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultWithGenericExpectedType.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultWithGenericExpectedType.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/emptyVarargAndDefault.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/emptyVarargAndDefault.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineDefault.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineDefault.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVararg.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargAndDefault.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargAndDefault.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargInts.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargInts.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/innerConstructorWithVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/innerConstructorWithVararg.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/largeVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/largeVararg.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/localFunctionWithDefault.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/localFunctionWithDefault.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/manyDefaultsAndVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/manyDefaultsAndVararg.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt diff --git a/compiler/testData/codegen/box/callableReference/noReflectionForAdaptedCallableReferences.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/noReflectionForAdaptedCallableReferences.kt similarity index 67% rename from compiler/testData/codegen/box/callableReference/noReflectionForAdaptedCallableReferences.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/noReflectionForAdaptedCallableReferences.kt index f447af8be39..3d1f52642a1 100644 --- a/compiler/testData/codegen/box/callableReference/noReflectionForAdaptedCallableReferences.kt +++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/noReflectionForAdaptedCallableReferences.kt @@ -1,19 +1,18 @@ // TARGET_BACKEND: JVM // IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME + import kotlin.reflect.KCallable -fun checkUnit(label: String, fn: () -> Unit) { +private fun check(label: String, fn: Any) { if (fn is KCallable<*>) { throw AssertionError("$label is KCallable, ${fn::class.java.simpleName}") } } -fun checkAny(label: String, fn: () -> Any) { - if (fn is KCallable<*>) { - throw AssertionError("$label is KCallable, ${fn::class.java.simpleName}") - } -} +fun checkUnit(label: String, fn: () -> Unit) = check(label, fn) +fun checkAny(label: String, fn: () -> Any) = check(label, fn) +fun checkOneElementForVararg(label: String, fn: (Int) -> Unit) = check(label, fn) fun withDefaults(a: Int = 1, b: Int = 2) {} fun withVarargs(vararg xs: Int) {} @@ -33,5 +32,8 @@ fun box(): String { checkUnit("::CWithDefaults", ::CWithDefaults) checkUnit("::CWithVarargs", ::CWithVarargs) + checkOneElementForVararg("::withVarargs", ::withVarargs) + checkOneElementForVararg("::CWithVarargs", ::CWithVarargs) + return "OK" } diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/reflectionForVarargAsArray.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/reflectionForVarargAsArray.kt new file mode 100644 index 00000000000..211ab549b22 --- /dev/null +++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/reflectionForVarargAsArray.kt @@ -0,0 +1,22 @@ +// TARGET_BACKEND: JVM +// WITH_RUNTIME + +import kotlin.reflect.KCallable + +private fun check(label: String, fn: Any) { + if (fn !is KCallable<*>) { + throw AssertionError("$label is not KCallable, ${fn::class.java.simpleName}") + } +} + +fun checkVarargAsArray(label: String, fn: (IntArray) -> C) = check(label, fn) + +fun withVarargs(vararg xs: Int): C = C(*xs) +class C(vararg xs: Int) + +fun box(): String { + checkVarargAsArray("::withVarargs", ::withVarargs) + checkVarargAsArray("::C", ::C) + + return "OK" +} diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleDefaultArgument.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleDefaultArgument.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleEmptyVararg.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleEmptyVararg.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/unboundReferences.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/unboundReferences.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsArray.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsArray.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsArray.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsArray.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsPrimitiveArray.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsPrimitiveArray.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt diff --git a/compiler/testData/codegen/box/callableReference/varargAndDefaults/varargWithDefaultValue.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt similarity index 100% rename from compiler/testData/codegen/box/callableReference/varargAndDefaults/varargWithDefaultValue.kt rename to compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index e011f85cabf..2379a2e9ed3 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -2003,11 +2003,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/callableReference/nested.kt"); } - @TestMetadata("noReflectionForAdaptedCallableReferences.kt") - public void testNoReflectionForAdaptedCallableReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/noReflectionForAdaptedCallableReferences.kt"); - } - @TestMetadata("optimizedSuperclasses_after.kt") public void testOptimizedSuperclasses_after() throws Exception { runTest("compiler/testData/codegen/box/callableReference/optimizedSuperclasses_after.kt"); @@ -2018,6 +2013,124 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/callableReference/optimizedSuperclasses_before.kt"); } + @TestMetadata("compiler/testData/codegen/box/callableReference/adaptedReferences") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class AdaptedReferences extends AbstractBlackBoxCodegenTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInAdaptedReferences() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/adaptedReferences"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @TestMetadata("bothWithCoercionToUnit.kt") + public void testBothWithCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt"); + } + + @TestMetadata("boundReferences.kt") + public void testBoundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt"); + } + + @TestMetadata("defaultAfterVararg.kt") + public void testDefaultAfterVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt"); + } + + @TestMetadata("defaultWithGenericExpectedType.kt") + public void testDefaultWithGenericExpectedType() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt"); + } + + @TestMetadata("emptyVarargAndDefault.kt") + public void testEmptyVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt"); + } + + @TestMetadata("inlineDefault.kt") + public void testInlineDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt"); + } + + @TestMetadata("inlineVararg.kt") + public void testInlineVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt"); + } + + @TestMetadata("inlineVarargAndDefault.kt") + public void testInlineVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt"); + } + + @TestMetadata("inlineVarargInts.kt") + public void testInlineVarargInts() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt"); + } + + @TestMetadata("innerConstructorWithVararg.kt") + public void testInnerConstructorWithVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt"); + } + + @TestMetadata("largeVararg.kt") + public void testLargeVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt"); + } + + @TestMetadata("localFunctionWithDefault.kt") + public void testLocalFunctionWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt"); + } + + @TestMetadata("manyDefaultsAndVararg.kt") + public void testManyDefaultsAndVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt"); + } + + @TestMetadata("noReflectionForAdaptedCallableReferences.kt") + public void testNoReflectionForAdaptedCallableReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/noReflectionForAdaptedCallableReferences.kt"); + } + + @TestMetadata("reflectionForVarargAsArray.kt") + public void testReflectionForVarargAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/reflectionForVarargAsArray.kt"); + } + + @TestMetadata("simpleDefaultArgument.kt") + public void testSimpleDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt"); + } + + @TestMetadata("simpleEmptyVararg.kt") + public void testSimpleEmptyVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt"); + } + + @TestMetadata("unboundReferences.kt") + public void testUnboundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt"); + } + + @TestMetadata("varargViewedAsArray.kt") + public void testVarargViewedAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsArray.kt"); + } + + @TestMetadata("varargViewedAsPrimitiveArray.kt") + public void testVarargViewedAsPrimitiveArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt"); + } + + @TestMetadata("varargWithDefaultValue.kt") + public void testVarargWithDefaultValue() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt"); + } + } + @TestMetadata("compiler/testData/codegen/box/callableReference/bound") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -2853,114 +2966,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/callableReference/serializability/withReflect.kt"); } } - - @TestMetadata("compiler/testData/codegen/box/callableReference/varargAndDefaults") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class VarargAndDefaults extends AbstractBlackBoxCodegenTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInVarargAndDefaults() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/varargAndDefaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("bothWithCoercionToUnit.kt") - public void testBothWithCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/bothWithCoercionToUnit.kt"); - } - - @TestMetadata("boundReferences.kt") - public void testBoundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/boundReferences.kt"); - } - - @TestMetadata("defaultAfterVararg.kt") - public void testDefaultAfterVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultAfterVararg.kt"); - } - - @TestMetadata("defaultWithGenericExpectedType.kt") - public void testDefaultWithGenericExpectedType() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultWithGenericExpectedType.kt"); - } - - @TestMetadata("emptyVarargAndDefault.kt") - public void testEmptyVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/emptyVarargAndDefault.kt"); - } - - @TestMetadata("inlineDefault.kt") - public void testInlineDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineDefault.kt"); - } - - @TestMetadata("inlineVararg.kt") - public void testInlineVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVararg.kt"); - } - - @TestMetadata("inlineVarargAndDefault.kt") - public void testInlineVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargAndDefault.kt"); - } - - @TestMetadata("inlineVarargInts.kt") - public void testInlineVarargInts() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargInts.kt"); - } - - @TestMetadata("innerConstructorWithVararg.kt") - public void testInnerConstructorWithVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/innerConstructorWithVararg.kt"); - } - - @TestMetadata("largeVararg.kt") - public void testLargeVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/largeVararg.kt"); - } - - @TestMetadata("localFunctionWithDefault.kt") - public void testLocalFunctionWithDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/localFunctionWithDefault.kt"); - } - - @TestMetadata("manyDefaultsAndVararg.kt") - public void testManyDefaultsAndVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/manyDefaultsAndVararg.kt"); - } - - @TestMetadata("simpleDefaultArgument.kt") - public void testSimpleDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleDefaultArgument.kt"); - } - - @TestMetadata("simpleEmptyVararg.kt") - public void testSimpleEmptyVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleEmptyVararg.kt"); - } - - @TestMetadata("unboundReferences.kt") - public void testUnboundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/unboundReferences.kt"); - } - - @TestMetadata("varargViewedAsArray.kt") - public void testVarargViewedAsArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsArray.kt"); - } - - @TestMetadata("varargViewedAsPrimitiveArray.kt") - public void testVarargViewedAsPrimitiveArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsPrimitiveArray.kt"); - } - - @TestMetadata("varargWithDefaultValue.kt") - public void testVarargWithDefaultValue() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargWithDefaultValue.kt"); - } - } } @TestMetadata("compiler/testData/codegen/box/casts") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index a0dbbaa9d55..1b6c8affeab 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -2003,11 +2003,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/callableReference/nested.kt"); } - @TestMetadata("noReflectionForAdaptedCallableReferences.kt") - public void testNoReflectionForAdaptedCallableReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/noReflectionForAdaptedCallableReferences.kt"); - } - @TestMetadata("optimizedSuperclasses_after.kt") public void testOptimizedSuperclasses_after() throws Exception { runTest("compiler/testData/codegen/box/callableReference/optimizedSuperclasses_after.kt"); @@ -2018,6 +2013,124 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/callableReference/optimizedSuperclasses_before.kt"); } + @TestMetadata("compiler/testData/codegen/box/callableReference/adaptedReferences") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class AdaptedReferences extends AbstractLightAnalysisModeTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInAdaptedReferences() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/adaptedReferences"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @TestMetadata("bothWithCoercionToUnit.kt") + public void testBothWithCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt"); + } + + @TestMetadata("boundReferences.kt") + public void testBoundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt"); + } + + @TestMetadata("defaultAfterVararg.kt") + public void testDefaultAfterVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt"); + } + + @TestMetadata("defaultWithGenericExpectedType.kt") + public void testDefaultWithGenericExpectedType() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt"); + } + + @TestMetadata("emptyVarargAndDefault.kt") + public void testEmptyVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt"); + } + + @TestMetadata("inlineDefault.kt") + public void testInlineDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt"); + } + + @TestMetadata("inlineVararg.kt") + public void testInlineVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt"); + } + + @TestMetadata("inlineVarargAndDefault.kt") + public void testInlineVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt"); + } + + @TestMetadata("inlineVarargInts.kt") + public void testInlineVarargInts() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt"); + } + + @TestMetadata("innerConstructorWithVararg.kt") + public void testInnerConstructorWithVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt"); + } + + @TestMetadata("largeVararg.kt") + public void testLargeVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt"); + } + + @TestMetadata("localFunctionWithDefault.kt") + public void testLocalFunctionWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt"); + } + + @TestMetadata("manyDefaultsAndVararg.kt") + public void testManyDefaultsAndVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt"); + } + + @TestMetadata("noReflectionForAdaptedCallableReferences.kt") + public void testNoReflectionForAdaptedCallableReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/noReflectionForAdaptedCallableReferences.kt"); + } + + @TestMetadata("reflectionForVarargAsArray.kt") + public void testReflectionForVarargAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/reflectionForVarargAsArray.kt"); + } + + @TestMetadata("simpleDefaultArgument.kt") + public void testSimpleDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt"); + } + + @TestMetadata("simpleEmptyVararg.kt") + public void testSimpleEmptyVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt"); + } + + @TestMetadata("unboundReferences.kt") + public void testUnboundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt"); + } + + @TestMetadata("varargViewedAsArray.kt") + public void testVarargViewedAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsArray.kt"); + } + + @TestMetadata("varargViewedAsPrimitiveArray.kt") + public void testVarargViewedAsPrimitiveArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt"); + } + + @TestMetadata("varargWithDefaultValue.kt") + public void testVarargWithDefaultValue() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt"); + } + } + @TestMetadata("compiler/testData/codegen/box/callableReference/bound") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -2853,114 +2966,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/callableReference/serializability/withReflect.kt"); } } - - @TestMetadata("compiler/testData/codegen/box/callableReference/varargAndDefaults") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class VarargAndDefaults extends AbstractLightAnalysisModeTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); - } - - public void testAllFilesPresentInVarargAndDefaults() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/varargAndDefaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @TestMetadata("bothWithCoercionToUnit.kt") - public void testBothWithCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/bothWithCoercionToUnit.kt"); - } - - @TestMetadata("boundReferences.kt") - public void testBoundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/boundReferences.kt"); - } - - @TestMetadata("defaultAfterVararg.kt") - public void testDefaultAfterVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultAfterVararg.kt"); - } - - @TestMetadata("defaultWithGenericExpectedType.kt") - public void testDefaultWithGenericExpectedType() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultWithGenericExpectedType.kt"); - } - - @TestMetadata("emptyVarargAndDefault.kt") - public void testEmptyVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/emptyVarargAndDefault.kt"); - } - - @TestMetadata("inlineDefault.kt") - public void testInlineDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineDefault.kt"); - } - - @TestMetadata("inlineVararg.kt") - public void testInlineVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVararg.kt"); - } - - @TestMetadata("inlineVarargAndDefault.kt") - public void testInlineVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargAndDefault.kt"); - } - - @TestMetadata("inlineVarargInts.kt") - public void testInlineVarargInts() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargInts.kt"); - } - - @TestMetadata("innerConstructorWithVararg.kt") - public void testInnerConstructorWithVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/innerConstructorWithVararg.kt"); - } - - @TestMetadata("largeVararg.kt") - public void testLargeVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/largeVararg.kt"); - } - - @TestMetadata("localFunctionWithDefault.kt") - public void testLocalFunctionWithDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/localFunctionWithDefault.kt"); - } - - @TestMetadata("manyDefaultsAndVararg.kt") - public void testManyDefaultsAndVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/manyDefaultsAndVararg.kt"); - } - - @TestMetadata("simpleDefaultArgument.kt") - public void testSimpleDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleDefaultArgument.kt"); - } - - @TestMetadata("simpleEmptyVararg.kt") - public void testSimpleEmptyVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleEmptyVararg.kt"); - } - - @TestMetadata("unboundReferences.kt") - public void testUnboundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/unboundReferences.kt"); - } - - @TestMetadata("varargViewedAsArray.kt") - public void testVarargViewedAsArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsArray.kt"); - } - - @TestMetadata("varargViewedAsPrimitiveArray.kt") - public void testVarargViewedAsPrimitiveArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsPrimitiveArray.kt"); - } - - @TestMetadata("varargWithDefaultValue.kt") - public void testVarargWithDefaultValue() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargWithDefaultValue.kt"); - } - } } @TestMetadata("compiler/testData/codegen/box/casts") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index 93253b1542d..54aa1a8bf84 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -1983,11 +1983,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/callableReference/nested.kt"); } - @TestMetadata("noReflectionForAdaptedCallableReferences.kt") - public void testNoReflectionForAdaptedCallableReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/noReflectionForAdaptedCallableReferences.kt"); - } - @TestMetadata("optimizedSuperclasses_after.kt") public void testOptimizedSuperclasses_after() throws Exception { runTest("compiler/testData/codegen/box/callableReference/optimizedSuperclasses_after.kt"); @@ -1998,6 +1993,124 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/callableReference/optimizedSuperclasses_before.kt"); } + @TestMetadata("compiler/testData/codegen/box/callableReference/adaptedReferences") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class AdaptedReferences extends AbstractIrBlackBoxCodegenTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); + } + + public void testAllFilesPresentInAdaptedReferences() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/adaptedReferences"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @TestMetadata("bothWithCoercionToUnit.kt") + public void testBothWithCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt"); + } + + @TestMetadata("boundReferences.kt") + public void testBoundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt"); + } + + @TestMetadata("defaultAfterVararg.kt") + public void testDefaultAfterVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt"); + } + + @TestMetadata("defaultWithGenericExpectedType.kt") + public void testDefaultWithGenericExpectedType() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt"); + } + + @TestMetadata("emptyVarargAndDefault.kt") + public void testEmptyVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt"); + } + + @TestMetadata("inlineDefault.kt") + public void testInlineDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt"); + } + + @TestMetadata("inlineVararg.kt") + public void testInlineVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt"); + } + + @TestMetadata("inlineVarargAndDefault.kt") + public void testInlineVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt"); + } + + @TestMetadata("inlineVarargInts.kt") + public void testInlineVarargInts() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt"); + } + + @TestMetadata("innerConstructorWithVararg.kt") + public void testInnerConstructorWithVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt"); + } + + @TestMetadata("largeVararg.kt") + public void testLargeVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt"); + } + + @TestMetadata("localFunctionWithDefault.kt") + public void testLocalFunctionWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt"); + } + + @TestMetadata("manyDefaultsAndVararg.kt") + public void testManyDefaultsAndVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt"); + } + + @TestMetadata("noReflectionForAdaptedCallableReferences.kt") + public void testNoReflectionForAdaptedCallableReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/noReflectionForAdaptedCallableReferences.kt"); + } + + @TestMetadata("reflectionForVarargAsArray.kt") + public void testReflectionForVarargAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/reflectionForVarargAsArray.kt"); + } + + @TestMetadata("simpleDefaultArgument.kt") + public void testSimpleDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt"); + } + + @TestMetadata("simpleEmptyVararg.kt") + public void testSimpleEmptyVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt"); + } + + @TestMetadata("unboundReferences.kt") + public void testUnboundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt"); + } + + @TestMetadata("varargViewedAsArray.kt") + public void testVarargViewedAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsArray.kt"); + } + + @TestMetadata("varargViewedAsPrimitiveArray.kt") + public void testVarargViewedAsPrimitiveArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt"); + } + + @TestMetadata("varargWithDefaultValue.kt") + public void testVarargWithDefaultValue() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt"); + } + } + @TestMetadata("compiler/testData/codegen/box/callableReference/bound") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -2833,114 +2946,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/callableReference/serializability/withReflect.kt"); } } - - @TestMetadata("compiler/testData/codegen/box/callableReference/varargAndDefaults") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class VarargAndDefaults extends AbstractIrBlackBoxCodegenTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInVarargAndDefaults() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/varargAndDefaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @TestMetadata("bothWithCoercionToUnit.kt") - public void testBothWithCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/bothWithCoercionToUnit.kt"); - } - - @TestMetadata("boundReferences.kt") - public void testBoundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/boundReferences.kt"); - } - - @TestMetadata("defaultAfterVararg.kt") - public void testDefaultAfterVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultAfterVararg.kt"); - } - - @TestMetadata("defaultWithGenericExpectedType.kt") - public void testDefaultWithGenericExpectedType() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultWithGenericExpectedType.kt"); - } - - @TestMetadata("emptyVarargAndDefault.kt") - public void testEmptyVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/emptyVarargAndDefault.kt"); - } - - @TestMetadata("inlineDefault.kt") - public void testInlineDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineDefault.kt"); - } - - @TestMetadata("inlineVararg.kt") - public void testInlineVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVararg.kt"); - } - - @TestMetadata("inlineVarargAndDefault.kt") - public void testInlineVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargAndDefault.kt"); - } - - @TestMetadata("inlineVarargInts.kt") - public void testInlineVarargInts() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargInts.kt"); - } - - @TestMetadata("innerConstructorWithVararg.kt") - public void testInnerConstructorWithVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/innerConstructorWithVararg.kt"); - } - - @TestMetadata("largeVararg.kt") - public void testLargeVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/largeVararg.kt"); - } - - @TestMetadata("localFunctionWithDefault.kt") - public void testLocalFunctionWithDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/localFunctionWithDefault.kt"); - } - - @TestMetadata("manyDefaultsAndVararg.kt") - public void testManyDefaultsAndVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/manyDefaultsAndVararg.kt"); - } - - @TestMetadata("simpleDefaultArgument.kt") - public void testSimpleDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleDefaultArgument.kt"); - } - - @TestMetadata("simpleEmptyVararg.kt") - public void testSimpleEmptyVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleEmptyVararg.kt"); - } - - @TestMetadata("unboundReferences.kt") - public void testUnboundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/unboundReferences.kt"); - } - - @TestMetadata("varargViewedAsArray.kt") - public void testVarargViewedAsArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsArray.kt"); - } - - @TestMetadata("varargViewedAsPrimitiveArray.kt") - public void testVarargViewedAsPrimitiveArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsPrimitiveArray.kt"); - } - - @TestMetadata("varargWithDefaultValue.kt") - public void testVarargWithDefaultValue() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargWithDefaultValue.kt"); - } - } } @TestMetadata("compiler/testData/codegen/box/casts") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java index a220401fd8d..a3988976232 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java @@ -1433,6 +1433,114 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/callableReference/nested.kt"); } + @TestMetadata("compiler/testData/codegen/box/callableReference/adaptedReferences") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class AdaptedReferences extends AbstractIrJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); + } + + public void testAllFilesPresentInAdaptedReferences() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/adaptedReferences"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + + @TestMetadata("bothWithCoercionToUnit.kt") + public void testBothWithCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt"); + } + + @TestMetadata("boundReferences.kt") + public void testBoundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt"); + } + + @TestMetadata("defaultAfterVararg.kt") + public void testDefaultAfterVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt"); + } + + @TestMetadata("defaultWithGenericExpectedType.kt") + public void testDefaultWithGenericExpectedType() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt"); + } + + @TestMetadata("emptyVarargAndDefault.kt") + public void testEmptyVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt"); + } + + @TestMetadata("inlineDefault.kt") + public void testInlineDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt"); + } + + @TestMetadata("inlineVararg.kt") + public void testInlineVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt"); + } + + @TestMetadata("inlineVarargAndDefault.kt") + public void testInlineVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt"); + } + + @TestMetadata("inlineVarargInts.kt") + public void testInlineVarargInts() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt"); + } + + @TestMetadata("innerConstructorWithVararg.kt") + public void testInnerConstructorWithVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt"); + } + + @TestMetadata("largeVararg.kt") + public void testLargeVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt"); + } + + @TestMetadata("localFunctionWithDefault.kt") + public void testLocalFunctionWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt"); + } + + @TestMetadata("manyDefaultsAndVararg.kt") + public void testManyDefaultsAndVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt"); + } + + @TestMetadata("simpleDefaultArgument.kt") + public void testSimpleDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt"); + } + + @TestMetadata("simpleEmptyVararg.kt") + public void testSimpleEmptyVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt"); + } + + @TestMetadata("unboundReferences.kt") + public void testUnboundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt"); + } + + @TestMetadata("varargViewedAsArray.kt") + public void testVarargViewedAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsArray.kt"); + } + + @TestMetadata("varargViewedAsPrimitiveArray.kt") + public void testVarargViewedAsPrimitiveArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt"); + } + + @TestMetadata("varargWithDefaultValue.kt") + public void testVarargWithDefaultValue() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt"); + } + } + @TestMetadata("compiler/testData/codegen/box/callableReference/bound") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -2208,114 +2316,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } } - - @TestMetadata("compiler/testData/codegen/box/callableReference/varargAndDefaults") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class VarargAndDefaults extends AbstractIrJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); - } - - public void testAllFilesPresentInVarargAndDefaults() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/varargAndDefaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); - } - - @TestMetadata("bothWithCoercionToUnit.kt") - public void testBothWithCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/bothWithCoercionToUnit.kt"); - } - - @TestMetadata("boundReferences.kt") - public void testBoundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/boundReferences.kt"); - } - - @TestMetadata("defaultAfterVararg.kt") - public void testDefaultAfterVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultAfterVararg.kt"); - } - - @TestMetadata("defaultWithGenericExpectedType.kt") - public void testDefaultWithGenericExpectedType() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultWithGenericExpectedType.kt"); - } - - @TestMetadata("emptyVarargAndDefault.kt") - public void testEmptyVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/emptyVarargAndDefault.kt"); - } - - @TestMetadata("inlineDefault.kt") - public void testInlineDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineDefault.kt"); - } - - @TestMetadata("inlineVararg.kt") - public void testInlineVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVararg.kt"); - } - - @TestMetadata("inlineVarargAndDefault.kt") - public void testInlineVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargAndDefault.kt"); - } - - @TestMetadata("inlineVarargInts.kt") - public void testInlineVarargInts() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargInts.kt"); - } - - @TestMetadata("innerConstructorWithVararg.kt") - public void testInnerConstructorWithVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/innerConstructorWithVararg.kt"); - } - - @TestMetadata("largeVararg.kt") - public void testLargeVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/largeVararg.kt"); - } - - @TestMetadata("localFunctionWithDefault.kt") - public void testLocalFunctionWithDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/localFunctionWithDefault.kt"); - } - - @TestMetadata("manyDefaultsAndVararg.kt") - public void testManyDefaultsAndVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/manyDefaultsAndVararg.kt"); - } - - @TestMetadata("simpleDefaultArgument.kt") - public void testSimpleDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleDefaultArgument.kt"); - } - - @TestMetadata("simpleEmptyVararg.kt") - public void testSimpleEmptyVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleEmptyVararg.kt"); - } - - @TestMetadata("unboundReferences.kt") - public void testUnboundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/unboundReferences.kt"); - } - - @TestMetadata("varargViewedAsArray.kt") - public void testVarargViewedAsArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsArray.kt"); - } - - @TestMetadata("varargViewedAsPrimitiveArray.kt") - public void testVarargViewedAsPrimitiveArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsPrimitiveArray.kt"); - } - - @TestMetadata("varargWithDefaultValue.kt") - public void testVarargWithDefaultValue() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargWithDefaultValue.kt"); - } - } } @TestMetadata("compiler/testData/codegen/box/casts") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index b2e39f17b50..da86edbd7b5 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -1433,6 +1433,114 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/callableReference/nested.kt"); } + @TestMetadata("compiler/testData/codegen/box/callableReference/adaptedReferences") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class AdaptedReferences extends AbstractJsCodegenBoxTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); + } + + public void testAllFilesPresentInAdaptedReferences() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/adaptedReferences"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); + } + + @TestMetadata("bothWithCoercionToUnit.kt") + public void testBothWithCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt"); + } + + @TestMetadata("boundReferences.kt") + public void testBoundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt"); + } + + @TestMetadata("defaultAfterVararg.kt") + public void testDefaultAfterVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt"); + } + + @TestMetadata("defaultWithGenericExpectedType.kt") + public void testDefaultWithGenericExpectedType() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt"); + } + + @TestMetadata("emptyVarargAndDefault.kt") + public void testEmptyVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt"); + } + + @TestMetadata("inlineDefault.kt") + public void testInlineDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt"); + } + + @TestMetadata("inlineVararg.kt") + public void testInlineVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt"); + } + + @TestMetadata("inlineVarargAndDefault.kt") + public void testInlineVarargAndDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt"); + } + + @TestMetadata("inlineVarargInts.kt") + public void testInlineVarargInts() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt"); + } + + @TestMetadata("innerConstructorWithVararg.kt") + public void testInnerConstructorWithVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt"); + } + + @TestMetadata("largeVararg.kt") + public void testLargeVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt"); + } + + @TestMetadata("localFunctionWithDefault.kt") + public void testLocalFunctionWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt"); + } + + @TestMetadata("manyDefaultsAndVararg.kt") + public void testManyDefaultsAndVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt"); + } + + @TestMetadata("simpleDefaultArgument.kt") + public void testSimpleDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt"); + } + + @TestMetadata("simpleEmptyVararg.kt") + public void testSimpleEmptyVararg() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt"); + } + + @TestMetadata("unboundReferences.kt") + public void testUnboundReferences() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt"); + } + + @TestMetadata("varargViewedAsArray.kt") + public void testVarargViewedAsArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsArray.kt"); + } + + @TestMetadata("varargViewedAsPrimitiveArray.kt") + public void testVarargViewedAsPrimitiveArray() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt"); + } + + @TestMetadata("varargWithDefaultValue.kt") + public void testVarargWithDefaultValue() throws Exception { + runTest("compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt"); + } + } + @TestMetadata("compiler/testData/codegen/box/callableReference/bound") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -2208,114 +2316,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/serializability"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } } - - @TestMetadata("compiler/testData/codegen/box/callableReference/varargAndDefaults") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class VarargAndDefaults extends AbstractJsCodegenBoxTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); - } - - public void testAllFilesPresentInVarargAndDefaults() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/varargAndDefaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); - } - - @TestMetadata("bothWithCoercionToUnit.kt") - public void testBothWithCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/bothWithCoercionToUnit.kt"); - } - - @TestMetadata("boundReferences.kt") - public void testBoundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/boundReferences.kt"); - } - - @TestMetadata("defaultAfterVararg.kt") - public void testDefaultAfterVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultAfterVararg.kt"); - } - - @TestMetadata("defaultWithGenericExpectedType.kt") - public void testDefaultWithGenericExpectedType() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/defaultWithGenericExpectedType.kt"); - } - - @TestMetadata("emptyVarargAndDefault.kt") - public void testEmptyVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/emptyVarargAndDefault.kt"); - } - - @TestMetadata("inlineDefault.kt") - public void testInlineDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineDefault.kt"); - } - - @TestMetadata("inlineVararg.kt") - public void testInlineVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVararg.kt"); - } - - @TestMetadata("inlineVarargAndDefault.kt") - public void testInlineVarargAndDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargAndDefault.kt"); - } - - @TestMetadata("inlineVarargInts.kt") - public void testInlineVarargInts() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/inlineVarargInts.kt"); - } - - @TestMetadata("innerConstructorWithVararg.kt") - public void testInnerConstructorWithVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/innerConstructorWithVararg.kt"); - } - - @TestMetadata("largeVararg.kt") - public void testLargeVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/largeVararg.kt"); - } - - @TestMetadata("localFunctionWithDefault.kt") - public void testLocalFunctionWithDefault() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/localFunctionWithDefault.kt"); - } - - @TestMetadata("manyDefaultsAndVararg.kt") - public void testManyDefaultsAndVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/manyDefaultsAndVararg.kt"); - } - - @TestMetadata("simpleDefaultArgument.kt") - public void testSimpleDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleDefaultArgument.kt"); - } - - @TestMetadata("simpleEmptyVararg.kt") - public void testSimpleEmptyVararg() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/simpleEmptyVararg.kt"); - } - - @TestMetadata("unboundReferences.kt") - public void testUnboundReferences() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/unboundReferences.kt"); - } - - @TestMetadata("varargViewedAsArray.kt") - public void testVarargViewedAsArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsArray.kt"); - } - - @TestMetadata("varargViewedAsPrimitiveArray.kt") - public void testVarargViewedAsPrimitiveArray() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargViewedAsPrimitiveArray.kt"); - } - - @TestMetadata("varargWithDefaultValue.kt") - public void testVarargWithDefaultValue() throws Exception { - runTest("compiler/testData/codegen/box/callableReference/varargAndDefaults/varargWithDefaultValue.kt"); - } - } } @TestMetadata("compiler/testData/codegen/box/casts")