azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge and improve tests on Java parameter metadata in reflection

Browse Source
This commit is contained in:
Alexander Udalov
2018-07-17 14:58:34 +02:00
parent 5fbe35d1c8
commit 873e1b01d6
6 changed files with 55 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/java8/box/reflection/parameters/javaParametersHaveDefaultNames.kt
Vendored
-22
View File
@@ -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"
}
compiler/testData/codegen/java8/box/reflection/parameters/realParameterNames.kt
Vendored
+24
View File
@@ -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"
}
compiler/testData/codegen/java8/box/reflection/parameters/synthesizedParameterNames.kt
Vendored
+23
View File
@@ -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"
}
compiler/testData/codegen/java8/box/reflection/realParameterNames.kt
Vendored
-25
View File
@@ -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"
}
compiler/testData/codegen/java8/box/reflection/synthesizedParameterNames.kt
Vendored
-24
View File
@@ -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"
}
compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java
Generated
+8 -13
View File
@@ -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");
}
}
}