diff --git a/compiler/testData/codegen/java8/box/reflection/parameters/javaParametersHaveDefaultNames.kt b/compiler/testData/codegen/java8/box/reflection/parameters/javaParametersHaveDefaultNames.kt deleted file mode 100644 index a16962fbf65..00000000000 --- a/compiler/testData/codegen/java8/box/reflection/parameters/javaParametersHaveDefaultNames.kt +++ /dev/null @@ -1,22 +0,0 @@ -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE - -// WITH_REFLECT -// FILE: J.java - -public class J { - void foo(String s, int i) {} - - static void bar(J j) {} -} - -// FILE: K.kt - -import kotlin.test.assertEquals - -fun box(): String { - assertEquals(listOf(null, "arg0", "arg1"), J::foo.parameters.map { it.name }) - assertEquals(listOf("arg0"), J::bar.parameters.map { it.name }) - - return "OK" -} diff --git a/compiler/testData/codegen/java8/box/reflection/parameters/realParameterNames.kt b/compiler/testData/codegen/java8/box/reflection/parameters/realParameterNames.kt new file mode 100644 index 00000000000..2288e7f38d3 --- /dev/null +++ b/compiler/testData/codegen/java8/box/reflection/parameters/realParameterNames.kt @@ -0,0 +1,24 @@ +// TARGET_BACKEND: JVM +// WITH_REFLECT +// JAVAC_OPTIONS: -parameters +// FILE: J.java + +public class J { + public J(String constructorParam) {} + + public void foo(int methodParam) {} + + public static void bar(J staticMethodParam) {} +} + +// FILE: K.kt + +import kotlin.test.assertEquals + +fun box(): String { + assertEquals(listOf("constructorParam"), ::J.parameters.map { it.name }) + assertEquals(listOf(null, "methodParam"), J::foo.parameters.map { it.name }) + assertEquals(listOf("staticMethodParam"), J::bar.parameters.map { it.name }) + + return "OK" +} diff --git a/compiler/testData/codegen/java8/box/reflection/parameters/synthesizedParameterNames.kt b/compiler/testData/codegen/java8/box/reflection/parameters/synthesizedParameterNames.kt new file mode 100644 index 00000000000..be9234e7a73 --- /dev/null +++ b/compiler/testData/codegen/java8/box/reflection/parameters/synthesizedParameterNames.kt @@ -0,0 +1,23 @@ +// TARGET_BACKEND: JVM +// WITH_REFLECT +// FILE: J.java + +public class J { + public J(String constructorParam) {} + + public void foo(int methodParam) {} + + public static void bar(J staticMethodParam) {} +} + +// FILE: K.kt + +import kotlin.test.assertEquals + +fun box(): String { + assertEquals(listOf("arg0"), ::J.parameters.map { it.name }) + assertEquals(listOf(null, "arg0"), J::foo.parameters.map { it.name }) + assertEquals(listOf("arg0"), J::bar.parameters.map { it.name }) + + return "OK" +} diff --git a/compiler/testData/codegen/java8/box/reflection/realParameterNames.kt b/compiler/testData/codegen/java8/box/reflection/realParameterNames.kt deleted file mode 100644 index 32a42c4e0ac..00000000000 --- a/compiler/testData/codegen/java8/box/reflection/realParameterNames.kt +++ /dev/null @@ -1,25 +0,0 @@ -// WITH_REFLECT -// JAVAC_OPTIONS: -parameters -// FILE: J.java - -public class J { - public J(String constructorParam) {} - - public static void foo(int methodParam) {} -} - -// FILE: K.kt - -import kotlin.test.assertEquals - -fun box(): String { - val methodParam = J::foo.parameters.single() - if (methodParam.name == null) return "Fail: method parameter has no name" - assertEquals("methodParam", methodParam.name) - - val constructorParam = J::class.constructors.single().parameters.single() - if (constructorParam.name == null) return "Fail: constructor parameter has no name" - assertEquals("constructorParam", constructorParam.name) - - return "OK" -} diff --git a/compiler/testData/codegen/java8/box/reflection/synthesizedParameterNames.kt b/compiler/testData/codegen/java8/box/reflection/synthesizedParameterNames.kt deleted file mode 100644 index 0ed849407a4..00000000000 --- a/compiler/testData/codegen/java8/box/reflection/synthesizedParameterNames.kt +++ /dev/null @@ -1,24 +0,0 @@ -// WITH_REFLECT -// FILE: J.java - -public class J { - public J(String constructorParam) {} - - public static void foo(int methodParam) {} -} - -// FILE: K.kt - -import kotlin.test.assertEquals - -fun box(): String { - val methodParam = J::foo.parameters.single() - if (methodParam.name == null) return "Fail: method parameter has no name" - assertEquals("arg0", methodParam.name) - - val constructorParam = J::class.constructors.single().parameters.single() - if (constructorParam.name == null) return "Fail: constructor parameter has no name" - assertEquals("arg0", constructorParam.name) - - return "OK" -} diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java index 78dd5f23b15..c33eb8b791e 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java @@ -749,16 +749,6 @@ public class BlackBoxWithJava8CodegenTestGenerated extends AbstractBlackBoxCodeg KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/box/reflection"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - @TestMetadata("realParameterNames.kt") - public void testRealParameterNames() throws Exception { - runTest("compiler/testData/codegen/java8/box/reflection/realParameterNames.kt"); - } - - @TestMetadata("synthesizedParameterNames.kt") - public void testSynthesizedParameterNames() throws Exception { - runTest("compiler/testData/codegen/java8/box/reflection/synthesizedParameterNames.kt"); - } - @TestMetadata("compiler/testData/codegen/java8/box/reflection/parameters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -771,9 +761,14 @@ public class BlackBoxWithJava8CodegenTestGenerated extends AbstractBlackBoxCodeg KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/box/reflection/parameters"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - @TestMetadata("javaParametersHaveDefaultNames.kt") - public void testJavaParametersHaveDefaultNames() throws Exception { - runTest("compiler/testData/codegen/java8/box/reflection/parameters/javaParametersHaveDefaultNames.kt"); + @TestMetadata("realParameterNames.kt") + public void testRealParameterNames() throws Exception { + runTest("compiler/testData/codegen/java8/box/reflection/parameters/realParameterNames.kt"); + } + + @TestMetadata("synthesizedParameterNames.kt") + public void testSynthesizedParameterNames() throws Exception { + runTest("compiler/testData/codegen/java8/box/reflection/parameters/synthesizedParameterNames.kt"); } } }