MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix: after deletion of files that previously could not be compiled (had errors), those paths were not recognized as deleted and could be scheduled for recompilation

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-09-21 18:58:59 +04:00
parent e483d67491
commit 6ec02f5a9d
9 changed files with 95 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/compileServer/incremental/common/deleteClassAfterCompileErrors.log
+12
View File
@@ -0,0 +1,12 @@
Cleaning output files:
out/production/DeleteClassAfterCompileErrors/packageA/Server.class
End of files
Compiling files:
src/packageA/Server.java
End of files
Cleaning output files:
out/production/DeleteClassAfterCompileErrors/packageA/Client.class
End of files
Compiling files:
src/packageA/Client.java
End of files
java/java-tests/testData/compileServer/incremental/common/deleteClassAfterCompileErrors/src/packageA/Client.java
+9
View File
@@ -0,0 +1,9 @@
package packageA;
public class Client {
public void method(Server server) {
server.method();
}
}
java/java-tests/testData/compileServer/incremental/common/deleteClassAfterCompileErrors/src/packageA/Server.java
+7
View File
@@ -0,0 +1,7 @@
package packageA;
public class Server {
public void method() {
System.out.println("Server.method");
}
}
java/java-tests/testData/compileServer/incremental/common/deleteClassAfterCompileErrors/src/packageA/Server.java.new
+7
View File
@@ -0,0 +1,7 @@
package packageA;
public class Server {
public void method() {
System.out.println("Server.method"); <some-error!>
}
}
java/java-tests/testData/compileServer/incremental/common/deleteClassAfterCompileErrors/src/packageA/Server.java.remove1
View File
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+1 -1
View File
@@ -821,7 +821,7 @@ public class IncProjectBuilder {
if (!outputs.isEmpty()) {
context.processMessage(new FileDeletedEvent(outputs));
}
srcToOut.remove(srcPath);
srcToOut.update(srcPath, Collections.<String>emptyList());
}
return true;
}
jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java
+6
View File
@@ -36,6 +36,12 @@ public class CommonTest extends IncrementalTestCase {
doTest();
}
public void testDeleteClassAfterCompileErrors() throws Exception {
setupInitialProject();
doTestBuild(2);
}
public void testDeleteClassPackageDoesntMatchRoot() throws Exception {
doTest();
}
jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
+51 -30
View File
@@ -97,12 +97,15 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase {
}
}
private void modify() {
private void modify(int stage) {
final String removedSuffix = stage == 0? ".remove" : ".remove" + stage;
final String newSuffix = stage == 0? ".new" : ".new" + stage;
FileUtil.processFilesRecursively(baseDir, new Processor<File>() {
@Override
public boolean process(File file) {
if (file.getName().endsWith(".remove")) {
FileUtil.delete(getTargetFile(file, ".remove"));
if (file.getName().endsWith(removedSuffix)) {
FileUtil.delete(getTargetFile(file, removedSuffix));
}
return true;
}
@@ -111,8 +114,8 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase {
@Override
public boolean process(File file) {
try {
if (file.getName().endsWith(".new")) {
FileUtil.copyContent(file, getTargetFile(file, ".new"));
if (file.getName().endsWith(newSuffix)) {
FileUtil.copyContent(file, getTargetFile(file, newSuffix));
}
}
catch (IOException e) {
@@ -121,6 +124,13 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase {
return true;
}
});
if (Utils.TIMESTAMP_ACCURACY > 1) {
try {
Thread.sleep(Utils.TIMESTAMP_ACCURACY);
}
catch (InterruptedException ignored) {
}
}
}
private File getTargetFile(File sourceFile, final String suffix) {
@@ -133,6 +143,12 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase {
}
public BuildResult doTest() {
setupInitialProject();
return doTestBuild(1);
}
protected void setupInitialProject() {
if (new File(workDir, ".idea").exists()) {
getOrCreateJdk();
loadProject(workDir.getAbsolutePath());
@@ -140,8 +156,6 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase {
else {
addModule();
}
return doTestBuild();
}
protected JpsModule addModule() {
@@ -153,30 +167,31 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase {
return addModule(moduleName, new String[]{srcPath}, null, getOrCreateJdk());
}
protected BuildResult doTestBuild() {
final TestJavaBuilderLogger
javaBuilderLogger = new TestJavaBuilderLogger(FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) + "/");
final ProjectDescriptor
projectDescriptor = createProjectDescriptor(new BuildLoggingManager(new ArtifactBuilderLoggerImpl(), javaBuilderLogger));
protected BuildResult doTestBuild(int makesCount) {
final TestJavaBuilderLogger builderLogger = new TestJavaBuilderLogger(FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) + "/");
final ProjectDescriptor pd = createProjectDescriptor(new BuildLoggingManager(new ArtifactBuilderLoggerImpl(), builderLogger));
try {
doBuild(projectDescriptor, createAllModulesScope(true), false, true, false).assertSuccessful();
doBuild(pd, createAllModulesScope(true), false, true, false).assertSuccessful();
modify();
if (Utils.TIMESTAMP_ACCURACY > 1) {
try {
Thread.sleep(Utils.TIMESTAMP_ACCURACY);
}
catch (InterruptedException ignored) {
}
BuildResult result = null;
for (int idx = 0; idx < makesCount; idx++) {
modify(idx);
result = doBuild(pd, createAllModulesScope(false), true, false, false);
}
BuildResult result = doBuild(projectDescriptor, createAllModulesScope(false), true, false, false);
assertNotNull(result);
final ByteArrayOutputStream makeDump = new ByteArrayOutputStream();
if (result.isSuccessful()) {
projectDescriptor.dataManager.getMappings().toStream(new PrintStream(makeDump));
final PrintStream stream = new PrintStream(makeDump);
try {
pd.dataManager.getMappings().toStream(stream);
}
finally {
stream.close();
}
}
makeDump.close();
@@ -186,19 +201,25 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase {
logFile = new File(baseDir, "build.log");
}
final String expected = StringUtil.convertLineSeparators(FileUtil.loadFile(logFile));
final String actual = javaBuilderLogger.myLog.toString();
final String actual = builderLogger.myLog.toString();
assertEquals(expected, actual);
if (result.isSuccessful()) {
doBuild(projectDescriptor, createAllModulesScope(true), false, true, false).assertSuccessful();
doBuild(pd, createAllModulesScope(true), false, true, false).assertSuccessful();
final ByteArrayOutputStream rebuildDump = new ByteArrayOutputStream();
projectDescriptor.dataManager.getMappings().toStream(new PrintStream(rebuildDump));
final PrintStream stream = new PrintStream(rebuildDump);
try {
pd.dataManager.getMappings().toStream(stream);
}
finally {
stream.close();
}
rebuildDump.close();
assertEquals(rebuildDump.toString(), makeDump.toString());
}
return result;
@@ -207,7 +228,7 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase {
throw new RuntimeException(e);
}
finally {
projectDescriptor.release();
pd.release();
}
}
jps/jps-builders/testSrc/org/jetbrains/ether/MarkDirtyTest.java
+2 -2
View File
@@ -26,7 +26,7 @@ public class MarkDirtyTest extends IncrementalTestCase {
addTestRoot(module, "testSrc");
JpsLibrary library = addLibrary("lib/a.jar");
JpsModuleRootModificationUtil.addDependency(module, library, JpsJavaDependencyScope.TEST, false);
doTestBuild().assertSuccessful();
doTestBuild(1).assertSuccessful();
}
public void testTransitiveRecompile() {
@@ -38,6 +38,6 @@ public class MarkDirtyTest extends IncrementalTestCase {
JpsModule lib = addModule("lib", "lib/src");
addTestRoot(lib, "lib/testSrc");
JpsModuleRootModificationUtil.addDependency(util, lib);
doTestBuild().assertSuccessful();
doTestBuild(1).assertSuccessful();
}
}