Add new tests for incremental compilation and disable the one for current IC

Original commit: ca71f929f9

jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt

@@ -340,6 +340,8 @@ public abstract class AbstractIncrementalJpsTest(
             UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs)
         }
 
+        if (!enableExperimentalIncrementalCompilation && File(testDataDir, "dont-check-caches-in-non-experimental-ic.txt").exists()) return
+
         val lastMakeResult = otherMakeResults.last()
         rebuildAndCheckOutput(lastMakeResult)
         clearCachesRebuildAndCheckOutput(lastMakeResult)

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

@@ -185,6 +185,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
             doTest(fileName);
         }
 
+        @TestMetadata("changeTypeImplicitlyWithCircularDependency")
+        public void testChangeTypeImplicitlyWithCircularDependency() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("changeWithRemovingUsage")
+        public void testChangeWithRemovingUsage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
+            doTest(fileName);
+        }
+
         @TestMetadata("classInlineFunctionChanged")
         public void testClassInlineFunctionChanged() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/");

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

@@ -185,6 +185,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("changeTypeImplicitlyWithCircularDependency")
+        public void testChangeTypeImplicitlyWithCircularDependency() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("changeWithRemovingUsage")
+        public void testChangeWithRemovingUsage() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
+            doTest(fileName);
+        }
+
         @TestMetadata("classInlineFunctionChanged")
         public void testClassInlineFunctionChanged() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/");

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

@@ -0,0 +1,14 @@
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/Usage1Kt.class
+End of files
+Compiling files:
+src/usage1.kt
+End of files
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/Usage2Kt.class
+End of files
+Compiling files:
+src/usage2.kt
+End of files

jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log

@@ -0,0 +1,23 @@
+========== Step #1 ============
+
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/Usage1Kt.class
+End of files
+Compiling files:
+src/usage1.kt
+End of files
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/Usage2Kt.class
+End of files
+Compiling files:
+src/usage2.kt
+End of files
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/Usage1Kt.class
+End of files
+Compiling files:
+src/usage1.kt
+End of files

jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt

@@ -0,0 +1,5 @@
+package test
+
+fun foo() = ""
+
+fun baz() = bar()

jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new

@@ -0,0 +1,5 @@
+package test
+
+fun foo() = 1
+
+fun baz() = bar()

jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt

@@ -0,0 +1,3 @@
+package test
+
+fun bar() = foo()

jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt

@@ -0,0 +1,3 @@
+package test
+
+fun bar() = foo()

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

@@ -0,0 +1,10 @@
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/BarKt.class
+End of files
+Cleaning output files:
+out/production/module/test/FooKt.class
+End of files
+Compiling files:
+src/foo.kt
+End of files

jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log

@@ -0,0 +1,12 @@
+========== Step #1 ============
+
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/BarKt.class
+End of files
+Cleaning output files:
+out/production/module/test/FooKt.class
+End of files
+Compiling files:
+src/foo.kt
+End of files

jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt

@@ -0,0 +1,3 @@
+package test
+
+fun foo() = ""

jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new

@@ -0,0 +1,3 @@
+package test
+
+fun foo() = 1