Test caches creation with turning incremental on/off

Original commit: 2bed8d0557

jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt

@@ -447,12 +447,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
             incrementalCaches: Map<ModuleBuildTarget, IncrementalCacheImpl>,
             generatedFiles: List<GeneratedFile>
     ): ChangesInfo {
-        incrementalCaches.values().forEach { it.saveCacheFormatVersion() }
-
         if (!IncrementalCompilation.isEnabled()) {
             return ChangesInfo.NO_CHANGES
         }
 
+        incrementalCaches.values().forEach { it.saveCacheFormatVersion() }
+
         var changesInfo = ChangesInfo.NO_CHANGES
         for (generatedFile in generatedFiles) {
             val ic = incrementalCaches[generatedFile.target]!!

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

@@ -345,13 +345,13 @@ public abstract class AbstractIncrementalJpsTest(
         val modifications = getModificationsToPerform(moduleNames)
         for (step in modifications) {
             step.forEach { it.perform(workDir) }
-            performAdditionalModifications()
+            performAdditionalModifications(step)
             results.add(make())
         }
         return results
     }
 
-    protected open fun performAdditionalModifications() {
+    protected open fun performAdditionalModifications(modifications: List<Modification>) {
     }
 
     // null means one module
@@ -415,13 +415,13 @@ public abstract class AbstractIncrementalJpsTest(
         }
     }
 
-    private abstract class Modification(val path: String) {
+    protected abstract class Modification(val path: String) {
         abstract fun perform(workDir: File)
 
         override fun toString(): String = "${javaClass.simpleName} $path"
     }
 
-    private class ModifyContent(path: String, val dataFile: File) : Modification(path) {
+    protected class ModifyContent(path: String, val dataFile: File) : Modification(path) {
         override fun perform(workDir: File) {
             val file = File(workDir, path)
 
@@ -437,7 +437,7 @@ public abstract class AbstractIncrementalJpsTest(
         }
     }
 
-    private class DeleteFile(path: String) : Modification(path) {
+    protected class DeleteFile(path: String) : Modification(path) {
         override fun perform(workDir: File) {
             val fileToDelete = File(workDir, path)
             if (!fileToDelete.delete()) {

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

@@ -26,11 +26,44 @@ import java.io.File
 
 public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() {
     override fun doTest(testDataPath: String) {
-        super.doTest(testDataPath)
+        try {
+            super.doTest(testDataPath)
 
-        val actual = dumpKotlinCachesFileNames()
+            val actual = dumpKotlinCachesFileNames()
-        val expectedFile = File(testDataPath, "expected-kotlin-caches.txt")
+            val expectedFile = File(testDataPath, "expected-kotlin-caches.txt")
-        UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual)
+            UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual)
+        }
+        finally {
+            IncrementalCompilation.enableIncrementalCompilation()
+        }
+    }
+
+    override fun performAdditionalModifications(modifications: List<AbstractIncrementalJpsTest.Modification>) {
+        super.performAdditionalModifications(modifications)
+
+        var modified = 0
+
+        for (modification in modifications) {
+            if (!modification.path.endsWith("incremental_compilation_off")) continue
+
+            when (modification) {
+                is AbstractIncrementalJpsTest.ModifyContent -> {
+                    IncrementalCompilation.disableIncrementalCompilation()
+                }
+                is AbstractIncrementalJpsTest.DeleteFile -> {
+                    IncrementalCompilation.enableIncrementalCompilation()
+                }
+                else -> {
+                    throw IllegalStateException("Unknown modification type: ${modification.javaClass}")
+                }
+            }
+
+            modified++
+        }
+
+        if (modified > 1) {
+            throw IllegalStateException("Incremental compilation was enabled/disable more than once")
+        }
     }
 
     private fun dumpKotlinCachesFileNames(): String {

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

@@ -32,7 +32,7 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(all
         doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/")
     }
 
-    override fun performAdditionalModifications() {
+    override fun performAdditionalModifications(modifications: List<AbstractIncrementalJpsTest.Modification>) {
         val targets = projectDescriptor.allModuleTargets
         val paths = projectDescriptor.dataManager.dataPaths
 

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

@@ -53,6 +53,18 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
         doTest(fileName);
     }
 
+    @TestMetadata("incrementalCompilationOff")
+    public void testIncrementalCompilationOff() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("incrementalCompilationOffOn")
+    public void testIncrementalCompilationOffOn() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/");
+        doTest(fileName);
+    }
+
     @TestMetadata("inlineFunctionDeclared")
     public void testInlineFunctionDeclared() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/");

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

@@ -36,7 +36,7 @@ public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(
         super.doTest(testDataPath)
     }
 
-    override fun performAdditionalModifications() {
+    override fun performAdditionalModifications(modifications: List<AbstractIncrementalJpsTest.Modification>) {
         val module = myProject.getModules()[0]
         val sourceRoot = module.getSourceRoots()[0].getUrl()
         assert(sourceRoot.endsWith("/src"))

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log

@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module1/module1/A.class
+End of files
+Compiling files:
+module1/src/module1_a.kt
+module1/src/module1_other.kt
+End of files

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt

@@ -0,0 +1,2 @@
+module1->
+module2->module1

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt

@@ -0,0 +1,4 @@
+Module 'module1' production
+Module 'module1' tests
+Module 'module2' production
+Module 'module2' tests

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt

@@ -0,0 +1,3 @@
+package module1
+
+class A

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new

@@ -0,0 +1,5 @@
+package module1
+
+class A
+
+inline fun f() {}

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt

@@ -0,0 +1,3 @@
+package module1
+
+fun other() {}

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java

@@ -0,0 +1,5 @@
+class B {
+    void f() {
+        new module1.A();
+    }
+}

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log

@@ -0,0 +1,35 @@
+Cleaning output files:
+out/production/module1/module1/A.class
+End of files
+Compiling files:
+module1/src/module1_a.kt
+module1/src/module1_other.kt
+End of files
+
+
+Cleaning output files:
+out/production/module1/META-INF/module1.kotlin_module
+out/production/module1/module1/A.class
+out/production/module1/module1/Module1Package.class
+out/production/module1/module1/Module1_aKt.class
+End of files
+Compiling files:
+module1/src/module1_a.kt
+End of files
+Cleaning output files:
+out/production/module1/META-INF/module1.kotlin_module
+out/production/module1/module1/A.class
+out/production/module1/module1/Module1Package.class
+out/production/module1/module1/Module1_aKt.class
+out/production/module1/module1/Module1_otherKt.class
+End of files
+Compiling files:
+module1/src/module1_a.kt
+module1/src/module1_other.kt
+End of files
+Cleaning output files:
+out/production/module2/B.class
+End of files
+Compiling files:
+module2/src/module2_B.java
+End of files

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt

@@ -0,0 +1,3 @@
+module1->
+module2->module1
+module3->

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt

@@ -0,0 +1,18 @@
+Module 'module1' production
+    format-version.txt
+    inline-functions.tab
+    package-parts.tab
+    proto.tab
+    source-to-classes.tab
+Module 'module1' tests
+    format-version.txt
+Module 'module2' production
+    format-version.txt
+Module 'module2' tests
+Module 'module3' production
+    format-version.txt
+    package-parts.tab
+    proto.tab
+    source-to-classes.tab
+Module 'module3' tests
+    format-version.txt

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt

@@ -0,0 +1,3 @@
+package module1
+
+class A

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1

@@ -0,0 +1,5 @@
+package module1
+
+class A
+
+inline fun f() {}

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2

@@ -0,0 +1,5 @@
+package module1
+
+class A
+
+inline fun f() {}

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt

@@ -0,0 +1,3 @@
+package module1
+
+fun other() {}

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java

@@ -0,0 +1,5 @@
+class B {
+    void f() {
+        new module1.A();
+    }
+}

jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt

@@ -0,0 +1,3 @@
+package module3
+
+fun c() {}