From ddb685a8f971c41fa0a7c06ca327c2aab2e65712 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Tue, 30 Jul 2019 12:33:13 +0300 Subject: [PATCH] Add test on nonMPP -> MPP dependency --- .../commonMpp/common.kt | 7 +++++++ .../dependencies.txt | 6 ++++++ .../jvmMpp/jvm.kt | 9 +++++++++ .../nonMpp/nonMpp.kt | 11 +++++++++++ .../resolve/MultiplatformAnalysisTestGenerated.java | 5 +++++ 5 files changed, 38 insertions(+) create mode 100644 idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt create mode 100644 idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/dependencies.txt create mode 100644 idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt create mode 100644 idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt new file mode 100644 index 00000000000..a5255868830 --- /dev/null +++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt @@ -0,0 +1,7 @@ +package test + +expect class Expect { + fun commonFun(): String +} + +fun topLevelCommonFun(): Int = 42 \ No newline at end of file diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/dependencies.txt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/dependencies.txt new file mode 100644 index 00000000000..c243e39a5c8 --- /dev/null +++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/dependencies.txt @@ -0,0 +1,6 @@ +MODULE commonMpp { platform=[JVM, JS, Native] } +MODULE jvmMpp { platform=[JVM] } +MODULE nonMpp { platform=[JVM] } + +nonMpp -> jvmMpp { kind=DEPENDENCY } +jvmMpp -> commonMpp { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt new file mode 100644 index 00000000000..e66a68497f6 --- /dev/null +++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt @@ -0,0 +1,9 @@ +package test + +actual class Expect { + actual fun commonFun(): String = "" + + fun platformFun(): Int = 42 +} + +fun topLevelPlatformFun(): String = "" \ No newline at end of file diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt new file mode 100644 index 00000000000..4c8d8e9fd40 --- /dev/null +++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt @@ -0,0 +1,11 @@ +package test + +fun main() { + val e = Expect() + + e.platformFun() + e.commonFun() + + topLevelPlatformFun() + topLevelCommonFun() +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java index 8820a9d2bad..64aceb5f577 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java @@ -114,6 +114,11 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna runTest("idea/testData/multiplatform/supertypes/"); } + @TestMetadata("transitiveDependencyOnCommonSourceSets") + public void testTransitiveDependencyOnCommonSourceSets() throws Exception { + runTest("idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/"); + } + @TestMetadata("typeAliasToExpectClassExplicitReference") public void testTypeAliasToExpectClassExplicitReference() throws Exception { runTest("idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/");