From 44e13dd697455f5404c393389e9903b9a26a0493 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 5 Aug 2015 16:09:19 +0300 Subject: [PATCH] Add another package part with inline to multi-module inline test --- .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++------ .../inlineFunctionChanged/module2_other.kt | 4 ---- .../build.log | 0 .../dependencies.txt | 0 .../module1_inlineF.kt} | 0 .../module1_inlineF.kt.new} | 0 .../inlineFunctionTwoPackageParts/module1_inlineG.kt | 6 ++++++ .../module1_inlineG.kt.new | 6 ++++++ .../module1_other.kt | 0 .../inlineFunctionTwoPackageParts/module2_other.kt | 6 ++++++ .../module2_usageF.kt} | 2 +- .../inlineFunctionTwoPackageParts/module2_usageG.kt | 5 +++++ 12 files changed, 30 insertions(+), 11 deletions(-) delete mode 100644 jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt rename jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged => inlineFunctionTwoPackageParts}/build.log (100%) rename jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged => inlineFunctionTwoPackageParts}/dependencies.txt (100%) rename jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged/module1_inline.kt => inlineFunctionTwoPackageParts/module1_inlineF.kt} (100%) rename jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged/module1_inline.kt.new => inlineFunctionTwoPackageParts/module1_inlineF.kt.new} (100%) create mode 100644 jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt create mode 100644 jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new rename jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged => inlineFunctionTwoPackageParts}/module1_other.kt (100%) create mode 100644 jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt rename jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged/module2_usage.kt => inlineFunctionTwoPackageParts/module2_usageF.kt} (64%) create mode 100644 jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index ba638ed4bbd..662a2a15cd6 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -61,18 +61,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("inlineFunctionChanged") - public void testInlineFunctionChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/"); - doTest(fileName); - } - @TestMetadata("inlineFunctionInlined") public void testInlineFunctionInlined() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); doTest(fileName); } + @TestMetadata("inlineFunctionTwoPackageParts") + public void testInlineFunctionTwoPackageParts() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/"); + doTest(fileName); + } + @TestMetadata("simpleDependency") public void testSimpleDependency() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt b/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt deleted file mode 100644 index b6f3ec9668d..00000000000 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt +++ /dev/null @@ -1,4 +0,0 @@ -package usage - -fun other() { -} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log rename to jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/dependencies.txt b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt rename to jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt.new b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt.new rename to jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt new file mode 100644 index 00000000000..ba93f50fb4f --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt @@ -0,0 +1,6 @@ +package inline + +inline fun g(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new new file mode 100644 index 00000000000..1aa58fd92fd --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new @@ -0,0 +1,6 @@ +package inline + +inline fun g(body: () -> Unit) { + body() + println("i'm inline function") +} diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_other.kt b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_other.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_other.kt rename to jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_other.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt new file mode 100644 index 00000000000..f8c6a2b9721 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt @@ -0,0 +1,6 @@ +package usage + +fun main(args: Array) { + useF() + useG() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageF.kt similarity index 64% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt rename to jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageF.kt index 3f8161245b6..a8b25a5582c 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageF.kt @@ -1,5 +1,5 @@ package usage -fun main(args: Array) { +fun useF() { inline.f { println("to be inlined") } } diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt new file mode 100644 index 00000000000..3ea53b7ef59 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt @@ -0,0 +1,5 @@ +package usage + +fun useG() { + inline.g { println("to be inlined") } +}