Added tests with conversion between Java and Kotlin and moving class.

Original commit: 460a77275a

jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java

@@ -285,6 +285,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("moveClass")
+        public void testMoveClass() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/");
+            doTest(fileName);
+        }
+
         @TestMetadata("multiplePackagesModified")
         public void testMultiplePackagesModified() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/");
@@ -449,6 +455,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("javaToKotlinAndBack")
+            public void testJavaToKotlinAndBack() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/");
+                doTest(fileName);
+            }
+
+            @TestMetadata("javaToKotlinAndRemove")
+            public void testJavaToKotlinAndRemove() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/");
+                doTest(fileName);
+            }
+
             @TestMetadata("kotlinToJava")
             public void testKotlinToJava() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/");

jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt

@@ -0,0 +1 @@
+class Foo

jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1

@@ -0,0 +1 @@
+class Foo

jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log

@@ -0,0 +1,13 @@
+Cleaning output files:
+out/production/module/Foo.class
+End of files
+Compiling files:
+src/b.kt
+End of files
+
+
+Cleaning output files:
+out/production/module/Foo.class
+End of files
+Compiling files:
+End of files

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java

@@ -0,0 +1,4 @@
+class Foo {
+    void bar() {
+    }
+}

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2

@@ -0,0 +1,4 @@
+class Foo {
+    void bar() {
+    }
+}

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1

@@ -0,0 +1,5 @@
+class Foo {
+    fun baz() {
+
+    }
+}

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log

@@ -0,0 +1,33 @@
+Cleaning output files:
+out/production/module/Foo.class
+End of files
+Cleaning output files:
+out/production/module/_DefaultPackage$usage$*.class
+out/production/module/_DefaultPackage.class
+End of files
+Compiling files:
+src/Foo.kt
+src/usage.kt
+End of files
+Cleaning output files:
+out/production/module/_DefaultPackage$usage$*.class
+out/production/module/_DefaultPackage.class
+End of files
+Compiling files:
+src/usage.kt
+End of files
+
+
+Cleaning output files:
+out/production/module/Foo.class
+End of files
+Cleaning output files:
+out/production/module/_DefaultPackage$usage$*.class
+out/production/module/_DefaultPackage.class
+End of files
+Compiling files:
+src/usage.kt
+End of files
+Compiling files:
+src/Foo.java
+End of files

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    Foo().bar()
+}

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    Foo().baz()
+}

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+//    Foo().bar()
+}

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java

@@ -0,0 +1,2 @@
+public class TheClass {
+}

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1

@@ -0,0 +1 @@
+public class TheClass

jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log

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