azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enabled incremental compilation by default.

Browse Source 
Original commit: 36915bf846
This commit is contained in:
Evgeny Gerashchenko
2015-05-29 16:09:28 +03:00
parent 0994979f05
commit 122b533076
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
-4
View File
@@ -219,10 +219,6 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
}
protected fun doTest(testDataPath: String) {
if (!IncrementalCompilation.ENABLED) {
return
}
testDataDir = File(testDataPath)
workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null)
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java
+22 -4
View File
@@ -20,6 +20,7 @@ import com.google.common.collect.Lists;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.testFramework.LightVirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.io.ZipUtil;
import kotlin.KotlinPackage;
@@ -303,12 +304,16 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase {
checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"));
checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"));
checkWhen(touch("src/Bar.kt"),
new String[] {"src/Bar.kt", "src/boo.kt", "src/main.kt"},
new String[] {"src/Bar.kt"},
new String[] {klass("kotlinProject", "foo.Bar")});
checkWhen(del("src/main.kt"),
new String[] {"src/Bar.kt", "src/boo.kt"},
packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"));
mergeArrays(
packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"),
packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"),
new String[]{ klass("kotlinProject", "foo.Bar") }
));
assertFilesExistInOutput(module, "boo/BooPackage.class", "foo/Bar.class");
assertFilesNotExistInOutput(module, "foo/FooPackage.class");
@@ -325,7 +330,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase {
checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"));
checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"));
checkWhen(touch("src/Bar.kt"),
new String[] {"src/Bar.kt", "src/boo.kt", "src/main.kt"},
new String[] {"src/Bar.kt"},
new String[] {
klass("kotlinProject", "foo.Bar"),
klass("kotlinProject", "foo.FooPackage"),
@@ -333,7 +338,12 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase {
checkWhen(del("src/main.kt"),
new String[] {"src/Bar.kt", "src/boo.kt"},
packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"));
mergeArrays(
packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"),
packageClasses("kotlinProject", "src/Bar.kt", "foo.FooPackage"),
packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"),
new String[] {klass("kotlinProject", "foo.Bar")}
));
assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class");
checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"));
@@ -618,6 +628,14 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase {
return klass(moduleName, AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName));
}
public static String[] mergeArrays(String[]... stringArrays) {
Set<String> result = new HashSet<String>();
for (String[] array : stringArrays) {
result.addAll(Arrays.asList(array));
}
return ArrayUtil.toStringArray(result);
}
private enum Operation {
CHANGE, DELETE
}