From f8ac8f727e7ae6f3691ad6a9548f342aec0fcc0c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 7 Jul 2014 15:10:12 +0400 Subject: [PATCH] Merged tests with inline functions in class and in package. Now this test also checks situation when several class files with inline functions are emitted from one source file. --- .../jps/build/IncrementalJpsTestGenerated.java | 15 +++++---------- .../classInlineFunctionUnchanged/build.log | 6 ------ .../build.log | 1 + .../inline.kt | 5 +++++ .../inline.kt.new | 5 +++++ .../usage.kt | 1 + .../packageInlineFunctionUnchanged/inline.kt | 6 ------ .../packageInlineFunctionUnchanged/inline.kt.new | 6 ------ .../packageInlineFunctionUnchanged/usage.kt | 5 ----- 9 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log rename jps-plugin/testData/incremental/{packageInlineFunctionUnchanged => inlineFunctionsUnchanged}/build.log (82%) rename jps-plugin/testData/incremental/{classInlineFunctionUnchanged => inlineFunctionsUnchanged}/inline.kt (61%) rename jps-plugin/testData/incremental/{classInlineFunctionUnchanged => inlineFunctionsUnchanged}/inline.kt.new (61%) rename jps-plugin/testData/incremental/{classInlineFunctionUnchanged => inlineFunctionsUnchanged}/usage.kt (70%) delete mode 100644 jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt delete mode 100644 jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new delete mode 100644 jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index bb880f3439f..c27e8be304e 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -61,11 +61,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/classInlineFunctionChanged/"); } - @TestMetadata("classInlineFunctionUnchanged") - public void testClassInlineFunctionUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/classInlineFunctionUnchanged/"); - } - @TestMetadata("classObjectConstantChanged") public void testClassObjectConstantChanged() throws Exception { doTest("jps-plugin/testData/incremental/classObjectConstantChanged/"); @@ -111,6 +106,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/inlineFunctionsCircularDependency/"); } + @TestMetadata("inlineFunctionsUnchanged") + public void testInlineFunctionsUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/inlineFunctionsUnchanged/"); + } + @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { doTest("jps-plugin/testData/incremental/multiplePackagesModified/"); @@ -166,11 +166,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/"); } - @TestMetadata("packageInlineFunctionUnchanged") - public void testPackageInlineFunctionUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/packageInlineFunctionUnchanged/"); - } - @TestMetadata("packageRecreated") public void testPackageRecreated() throws Exception { doTest("jps-plugin/testData/incremental/packageRecreated/"); diff --git a/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log b/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log deleted file mode 100644 index ea54d90c2ed..00000000000 --- a/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log +++ /dev/null @@ -1,6 +0,0 @@ -Cleaning output files: -out/production/module/inline/Klass.class -End of files -Compiling files: -src/inline.kt -End of files diff --git a/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log b/jps-plugin/testData/incremental/inlineFunctionsUnchanged/build.log similarity index 82% rename from jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log rename to jps-plugin/testData/incremental/inlineFunctionsUnchanged/build.log index b0e0bfb31e6..b01a631083b 100644 --- a/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log +++ b/jps-plugin/testData/incremental/inlineFunctionsUnchanged/build.log @@ -1,6 +1,7 @@ Cleaning output files: out/production/module/inline/InlinePackage-inline-*.class out/production/module/inline/InlinePackage.class +out/production/module/inline/Klass.class End of files Compiling files: src/inline.kt diff --git a/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt b/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt similarity index 61% rename from jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt rename to jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt index 4ac2a4efd18..9edab4e5554 100644 --- a/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt +++ b/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt @@ -1,5 +1,10 @@ package inline +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} + class Klass { inline fun f(body: () -> Unit) { println("i'm inline function") diff --git a/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new b/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt.new similarity index 61% rename from jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new rename to jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt.new index 4ac2a4efd18..9edab4e5554 100644 --- a/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new +++ b/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt.new @@ -1,5 +1,10 @@ package inline +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} + class Klass { inline fun f(body: () -> Unit) { println("i'm inline function") diff --git a/jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt b/jps-plugin/testData/incremental/inlineFunctionsUnchanged/usage.kt similarity index 70% rename from jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt rename to jps-plugin/testData/incremental/inlineFunctionsUnchanged/usage.kt index 204a8e2537f..ed756cfe5f1 100644 --- a/jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt +++ b/jps-plugin/testData/incremental/inlineFunctionsUnchanged/usage.kt @@ -1,5 +1,6 @@ package usage fun main(args: Array) { + inline.f { println("to be inlined") } inline.Klass().f { println("to be inlined") } } diff --git a/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt b/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt deleted file mode 100644 index 80d71e901a3..00000000000 --- a/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt +++ /dev/null @@ -1,6 +0,0 @@ -package inline - -inline fun f(body: () -> Unit) { - println("i'm inline function") - body() -} diff --git a/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new b/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new deleted file mode 100644 index 80d71e901a3..00000000000 --- a/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package inline - -inline fun f(body: () -> Unit) { - println("i'm inline function") - body() -} diff --git a/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt b/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt deleted file mode 100644 index 3f8161245b6..00000000000 --- a/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt +++ /dev/null @@ -1,5 +0,0 @@ -package usage - -fun main(args: Array) { - inline.f { println("to be inlined") } -}