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-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/");

jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log

@@ -1,6 +0,0 @@
-Cleaning output files:
-out/production/module/inline/Klass.class
-End of files
-Compiling files:
-src/inline.kt
-End of files

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

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")

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")

jps-plugin/testData/incremental/inlineFunctionsUnchanged/usage.kt

@@ -1,5 +1,6 @@
 package usage
 
 fun main(args: Array<String>) {
+    inline.f { println("to be inlined") }
     inline.Klass().f { println("to be inlined") }
 }

jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt

@@ -1,6 +0,0 @@
-package inline
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}

jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new

@@ -1,6 +0,0 @@
-package inline
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}

jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt

@@ -1,5 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    inline.f { println("to be inlined") }
-}