From bafd0840942dedbb973482940abbb705e34b45ed Mon Sep 17 00:00:00 2001 From: Anastasiya Shadrina Date: Thu, 29 Jul 2021 17:56:52 +0700 Subject: [PATCH] [Tests] Check Java interop --- .../method/contextualFunctions/Signature.java | 7 ++++ .../method/contextualFunctions/Signature.kt | 12 +++++++ .../method/contextualFunctions/Signature.txt | 25 +++++++++++++ ...CompileJavaAgainstKotlinTestGenerated.java | 26 ++++++++++++++ ...CompileJavaAgainstKotlinTestGenerated.java | 36 +++++++++++++++++++ 5 files changed, 106 insertions(+) create mode 100644 compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.java create mode 100644 compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.kt create mode 100644 compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.txt diff --git a/compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.java b/compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.java new file mode 100644 index 00000000000..6cb794d94a4 --- /dev/null +++ b/compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.java @@ -0,0 +1,7 @@ +package test; + +class JavaClass { + public static void test(C1 c1, C2 c2, R r, P1 p1, P2 p2) { + SignatureKt.f(c1, c2, r, p1, p2); + } +} \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.kt b/compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.kt new file mode 100644 index 00000000000..66dc81a58d6 --- /dev/null +++ b/compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.kt @@ -0,0 +1,12 @@ +// TARGET_BACKEND: JVM_IR + +package test + +interface C1 +interface C2 +interface R +interface P1 +interface P2 + +context(C1, C2) +fun R.f(p1: P1, p2: P2) {} \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.txt b/compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.txt new file mode 100644 index 00000000000..37e6a4e5811 --- /dev/null +++ b/compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.txt @@ -0,0 +1,25 @@ +package test + +public fun test.R.f(/*0*/ test.P1, /*1*/ test.P2): kotlin.Unit + +public interface C1 { +} + +public interface C2 { +} + +public/*package*/ open class JavaClass { + public/*package*/ constructor JavaClass() + + // Static members + public open fun test(/*0*/ test.C1!, /*1*/ test.C2!, /*2*/ test.R!, /*3*/ test.P1!, /*4*/ test.P2!): kotlin.Unit +} + +public interface P1 { +} + +public interface P2 { +} + +public interface R { +} diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java index 073ceb1fd74..c1f2e310011 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java @@ -339,6 +339,19 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg runTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt"); } + @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ContextualFunctions extends AbstractCompileJavaAgainstKotlinTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInContextualFunctions() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + } + @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -1002,6 +1015,19 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg runTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt"); } + @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ContextualFunctions extends AbstractCompileJavaAgainstKotlinTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInContextualFunctions() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + } + @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileJavaAgainstKotlinTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileJavaAgainstKotlinTestGenerated.java index e306b1bc8d7..9c7acdcbeb4 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileJavaAgainstKotlinTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrCompileJavaAgainstKotlinTestGenerated.java @@ -339,6 +339,24 @@ public class IrCompileJavaAgainstKotlinTestGenerated extends AbstractIrCompileJa runTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt"); } + @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ContextualFunctions extends AbstractIrCompileJavaAgainstKotlinTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTestWithoutJavac, TargetBackend.JVM_IR, testDataFilePath); + } + + public void testAllFilesPresentInContextualFunctions() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @TestMetadata("Signature.kt") + public void testSignature() throws Exception { + runTest("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.kt"); + } + } + @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -1002,6 +1020,24 @@ public class IrCompileJavaAgainstKotlinTestGenerated extends AbstractIrCompileJa runTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt"); } + @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ContextualFunctions extends AbstractIrCompileJavaAgainstKotlinTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTestWithJavac, TargetBackend.JVM_IR, testDataFilePath); + } + + public void testAllFilesPresentInContextualFunctions() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @TestMetadata("Signature.kt") + public void testSignature() throws Exception { + runTest("compiler/testData/compileJavaAgainstKotlin/method/contextualFunctions/Signature.kt"); + } + } + @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)