From c6608a057e04ee15fd2c9fddc28c3bd130336c52 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 22 Aug 2017 22:07:06 +0300 Subject: [PATCH] Make test case more useful Original commit: 141c889a84baa50f3e3a58f226aa6b3cc79cd767 --- .../build/IncrementalJpsTestGenerated.java | 6 ++--- .../inlineFunctionBecomesNonInline/build.log | 22 +++++++++++++++++++ .../inlineFunctionBecomesNonInline/dummy.kt | 3 +++ .../inline.kt | 0 .../inline.kt.new | 0 .../useInline.kt | 5 +++++ .../inlineFunctionRemoved/build.log | 11 ---------- 7 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt rename jps/jps-plugin/testData/incremental/pureKotlin/{inlineFunctionRemoved => inlineFunctionBecomesNonInline}/inline.kt (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/{inlineFunctionRemoved => inlineFunctionBecomesNonInline}/inline.kt.new (100%) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 4a86d072ec9..43fdd344c9c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -479,9 +479,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("inlineFunctionRemoved") - public void testInlineFunctionRemoved() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); + @TestMetadata("inlineFunctionBecomesNonInline") + public void testInlineFunctionBecomesNonInline() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/"); doTest(fileName); } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log new file mode 100644 index 00000000000..cbce054c33e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/useInline.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/UseInlineKt.class +End of files +Compiling files: + src/useInline.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt new file mode 100644 index 00000000000..789dc274f72 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt @@ -0,0 +1,3 @@ +package test + +fun dummy() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt.new diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt new file mode 100644 index 00000000000..26057ad0f30 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt @@ -0,0 +1,5 @@ +package inline + +fun useF() { + f { println("useF") } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log deleted file mode 100644 index 21a15a07f99..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ /dev/null @@ -1,11 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/inline/InlineKt.class -End of files -Compiling files: - src/inline.kt -End of files -Exit code: OK -------------------------------------------