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

Updated Kannotator JPS build test for new incremental compilation.

Browse Source 
Now it only invokes make for each changed file (much faster). And for each source target, it also checks that out directories are the same as after full rebuild.

Original commit: b94665e948
This commit is contained in:
Evgeny Gerashchenko
2015-06-01 12:54:05 +03:00
parent bb9d74813b
commit fa97fd2b64
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java
+26 -15
View File
@@ -22,8 +22,10 @@ import org.jetbrains.jps.builders.BuildResult;
import org.jetbrains.jps.model.module.JpsModule;
import org.jetbrains.jps.model.module.JpsModuleSourceRoot;
import org.jetbrains.kotlin.jps.build.AbstractKotlinJpsBuildTestCase;
import org.jetbrains.kotlin.jps.build.classFilesComparison.ClassFilesComparisonPackage;
import java.io.File;
import java.io.IOException;
public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
private static final String JDK_NAME = "1.6";
@@ -35,41 +37,50 @@ public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
workDir = copyTestDataToTmpDir(sourceFilesRoot);
}
public void testMakeKannotator() {
doTest(false);
}
public void testRebuildKannotator() {
doTest(true);
}
private void doTest(boolean rebuildBeforeMake) {
public void testMakeKannotator() throws IOException {
initProject();
rebuildAll();
FileUtil.copyDir(getOutDir(), getOutDirAfterRebuild());
for (JpsModule module : myProject.getModules()) {
for (JpsModuleSourceRoot sourceRoot : module.getSourceRoots()) {
processFile(sourceRoot.getFile(), rebuildBeforeMake);
processFile(sourceRoot.getFile());
}
}
}
private void processFile(File root, boolean rebuildBeforeMake) {
@NotNull
private File getOutDir() {
return new File(workDir, "out");
}
@NotNull
private File getOutDirAfterRebuild() {
return new File(workDir, "out-after-rebuild");
}
private void processFile(File root) {
if (root.isDirectory()) {
File[] files = root.listFiles();
if (files == null) return;
for (File file : files) {
processFile(file, rebuildBeforeMake);
processFile(file);
}
}
else if (root.getName().endsWith(".kt")) {
System.out.println("Test started. File: " + root.getName());
String path = root.getAbsolutePath();
if (rebuildBeforeMake) {
rebuildAll();
}
System.out.println("Change file: " + path);
change(path);
makeAll().assertSuccessful();
System.out.println("Make successful");
System.out.println("Checking output directories after make and rebuild");
ClassFilesComparisonPackage
.assertEqualDirectories(new File(getOutDirAfterRebuild(), "production"), new File(getOutDir(), "production"), false);
ClassFilesComparisonPackage
.assertEqualDirectories(new File(getOutDirAfterRebuild(), "test"), new File(getOutDir(), "test"), false);
System.out.println("Test successfully finished. File: " + root.getName());
System.out.println("-----");
}