mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Retooling incremental tests to the new builders (compiler server).
This commit is contained in:
Dmitry Boulytchev
@@ -4,6 +4,7 @@
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
@@ -32,6 +33,16 @@
|
||||
<orderEntry type="library" name="Guava" level="project" />
|
||||
<orderEntry type="module" module-name="java-runtime" scope="RUNTIME" />
|
||||
<orderEntry type="library" name="Log4J" level="project" />
|
||||
<orderEntry type="library" name="JUnit4" level="project" />
|
||||
<orderEntry type="module-library">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="jar://$MODULE_DIR$/../lib/junit-addons-1.4.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</orderEntry>
|
||||
</component>
|
||||
</module>
|
||||
|
||||
|
||||
@@ -5,5 +5,12 @@ package org.jetbrains.jps.api;
|
||||
* Date: 1/13/12
|
||||
*/
|
||||
public interface CanceledStatus {
|
||||
CanceledStatus NULL = new CanceledStatus() {
|
||||
@Override
|
||||
public boolean isCanceled() {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
boolean isCanceled();
|
||||
}
|
||||
|
||||
@@ -71,19 +71,14 @@ public abstract class ModuleLevelBuilder extends Builder {
|
||||
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("Differentiate Results:");
|
||||
|
||||
LOG.debug(" Compiled Files:");
|
||||
|
||||
for (final File c : allCompiledFiles) {
|
||||
LOG.debug(" " + c.getAbsolutePath());
|
||||
}
|
||||
|
||||
LOG.debug(" Affected Files:");
|
||||
|
||||
for (final File c : allAffectedFiles) {
|
||||
LOG.debug(" " + c.getAbsolutePath());
|
||||
}
|
||||
|
||||
LOG.debug("End Of Differentiate Results.");
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,246 @@
|
||||
/*
|
||||
* Copyright 2000-2012 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.jetbrains.ether;
|
||||
|
||||
import com.intellij.openapi.diagnostic.Logger;
|
||||
import junit.framework.TestCase;
|
||||
import junitx.framework.FileAssert;
|
||||
import org.apache.log4j.Level;
|
||||
import org.apache.log4j.xml.DOMConfigurator;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.jps.Project;
|
||||
import org.jetbrains.jps.api.CanceledStatus;
|
||||
import org.jetbrains.jps.idea.IdeaProjectLoader;
|
||||
import org.jetbrains.jps.incremental.AllProjectScope;
|
||||
import org.jetbrains.jps.incremental.BuilderRegistry;
|
||||
import org.jetbrains.jps.incremental.FSState;
|
||||
import org.jetbrains.jps.incremental.IncProjectBuilder;
|
||||
import org.jetbrains.jps.incremental.storage.BuildDataManager;
|
||||
import org.jetbrains.jps.incremental.storage.ProjectTimestamps;
|
||||
import org.jetbrains.jps.server.ProjectDescriptor;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
/**
|
||||
* Created by IntelliJ IDEA.
|
||||
* User: db
|
||||
* Date: 26.07.11
|
||||
* Time: 0:34
|
||||
* To change this template use File | Settings | File Templates.
|
||||
*/
|
||||
public abstract class IncrementalTestCase extends TestCase {
|
||||
private final String groupName;
|
||||
private final String tempDir = System.getProperty("java.io.tmpdir");
|
||||
|
||||
private String baseDir;
|
||||
private String workDir;
|
||||
|
||||
protected IncrementalTestCase(final String name) throws Exception {
|
||||
super(name);
|
||||
groupName = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
baseDir = "jps/testData" + File.separator + "incremental" + File.separator;
|
||||
|
||||
for (int i = 0; ; i++) {
|
||||
final File tmp = new File(tempDir + File.separator + "__temp__" + i);
|
||||
if (tmp.mkdir()) {
|
||||
workDir = tmp.getPath() + File.separator;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
copy(new File(getBaseDir()), new File(getWorkDir()));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void tearDown() throws Exception {
|
||||
// delete(new File(workDir));
|
||||
}
|
||||
|
||||
private String getDir(final String prefix) {
|
||||
final String name = getName();
|
||||
|
||||
assert (name.startsWith("test"));
|
||||
|
||||
final String result = Character.toLowerCase(name.charAt("test".length())) + name.substring("test".length() + 1);
|
||||
|
||||
return prefix + File.separator + groupName + File.separator + result;
|
||||
}
|
||||
|
||||
private String getBaseDir() {
|
||||
return getDir(baseDir);
|
||||
}
|
||||
|
||||
private String getWorkDir() {
|
||||
return getDir(workDir);
|
||||
}
|
||||
|
||||
private void delete(final File file) throws Exception {
|
||||
if (file.isDirectory()) {
|
||||
for (File f : file.listFiles()) {
|
||||
delete(f);
|
||||
}
|
||||
}
|
||||
|
||||
if (!file.delete()) throw new IOException("could not delete file or directory " + file.getPath());
|
||||
|
||||
}
|
||||
|
||||
private void copy(final File input, final File output) throws Exception {
|
||||
if (input.isDirectory()) {
|
||||
if (output.mkdirs()) {
|
||||
for (File f : input.listFiles()) {
|
||||
copy(f, new File(output.getPath() + File.separator + f.getName()));
|
||||
}
|
||||
}
|
||||
else {
|
||||
throw new IOException("unable to create directory " + output.getPath());
|
||||
}
|
||||
}
|
||||
else if (input.isFile()) {
|
||||
final FileReader in = new FileReader(input);
|
||||
final FileWriter out = new FileWriter(output);
|
||||
int c;
|
||||
|
||||
while ((c = in.read()) != -1) out.write(c);
|
||||
|
||||
in.close();
|
||||
out.close();
|
||||
}
|
||||
}
|
||||
|
||||
private void modify() throws Exception {
|
||||
final File dir = new File(getBaseDir());
|
||||
final File[] files = dir.listFiles(new FileFilter() {
|
||||
public boolean accept(final File pathname) {
|
||||
final String name = pathname.getName();
|
||||
|
||||
return name.endsWith(".java.new") || name.endsWith(".java.remove");
|
||||
}
|
||||
});
|
||||
|
||||
for (File input : files) {
|
||||
final String name = input.getName();
|
||||
|
||||
final boolean copy = name.endsWith(".java.new");
|
||||
final String postfix = name.substring(0, name.length() - (copy ? ".new" : ".remove").length());
|
||||
final int pathSep = postfix.indexOf("$");
|
||||
final String basename = pathSep == -1 ? postfix : postfix.substring(pathSep + 1);
|
||||
final String path =
|
||||
getWorkDir() + File.separator + (pathSep == -1 ? "src" : postfix.substring(0, pathSep).replace('-', File.separatorChar));
|
||||
final File output = new File(path + File.separator + basename);
|
||||
|
||||
if (copy) {
|
||||
copy(input, output);
|
||||
}
|
||||
else {
|
||||
output.delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void initLoggers() {
|
||||
final String logFile = getWorkDir() + File.separator + "log.xml";
|
||||
|
||||
if (new File(logFile).exists()) {
|
||||
DOMConfigurator.configure(logFile);
|
||||
}
|
||||
|
||||
Logger.setFactory(new Logger.Factory() {
|
||||
@Override
|
||||
public Logger getLoggerInstance(String category) {
|
||||
final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(category);
|
||||
|
||||
return new Logger() {
|
||||
@Override
|
||||
public boolean isDebugEnabled() {
|
||||
return logger.isDebugEnabled();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void debug(@NonNls String message) {
|
||||
logger.debug(message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void debug(@Nullable Throwable t) {
|
||||
logger.debug("", t);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void debug(@NonNls String message, @Nullable Throwable t) {
|
||||
logger.debug(message, t);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error(@NonNls String message, @Nullable Throwable t, @NonNls String... details) {
|
||||
logger.debug(message, t);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void info(@NonNls String message) {
|
||||
logger.info(message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void info(@NonNls String message, @Nullable Throwable t) {
|
||||
logger.info(message, t);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void warn(@NonNls String message, @Nullable Throwable t) {
|
||||
logger.warn(message, t);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLevel(Level level) {
|
||||
logger.setLevel(level);
|
||||
}
|
||||
};
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void doTest() throws Exception {
|
||||
initLoggers();
|
||||
|
||||
final String projectPath = getWorkDir() + File.separator + ".idea";
|
||||
final Project project = new Project();
|
||||
|
||||
IdeaProjectLoader.loadFromPath(project, projectPath, "");
|
||||
|
||||
final ProjectDescriptor projectDescriptor =
|
||||
new ProjectDescriptor(projectPath, project, new FSState(true), new ProjectTimestamps(projectPath),
|
||||
new BuildDataManager(projectPath, true));
|
||||
final IncProjectBuilder builder = new IncProjectBuilder(projectDescriptor, BuilderRegistry.getInstance(), CanceledStatus.NULL);
|
||||
|
||||
builder.build(new AllProjectScope(project, true), false, true);
|
||||
|
||||
Thread.sleep(1000);
|
||||
|
||||
modify();
|
||||
|
||||
builder.build(new AllProjectScope(project, false), true, false);
|
||||
|
||||
projectDescriptor.release();
|
||||
|
||||
FileAssert.assertEquals(new File(getBaseDir() + ".log"), new File(getWorkDir() + ".log"));
|
||||
}
|
||||
}
|
||||
@@ -1436,7 +1436,6 @@ public class Mappings {
|
||||
}
|
||||
|
||||
debug("Dependent file: ", depFile);
|
||||
|
||||
final Collection<UsageRepr.Cluster> depClusters = mySourceFileToUsages.get(depFile);
|
||||
|
||||
for (UsageRepr.Cluster depCluster : depClusters) {
|
||||
|
||||
@@ -1,170 +0,0 @@
|
||||
package org.jetbrains.ether;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
import junitx.framework.FileAssert;
|
||||
import org.jetbrains.ether.dependencyView.Mappings;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
/**
|
||||
* Created by IntelliJ IDEA.
|
||||
* User: db
|
||||
* Date: 26.07.11
|
||||
* Time: 0:34
|
||||
* To change this template use File | Settings | File Templates.
|
||||
*/
|
||||
public abstract class IncrementalTestCase extends TestCase {
|
||||
private final String groupName;
|
||||
private final String tempDir = System.getProperty("java.io.tmpdir");
|
||||
|
||||
private String baseDir;
|
||||
private String workDir;
|
||||
|
||||
protected IncrementalTestCase(final String name) throws Exception {
|
||||
super(name);
|
||||
groupName = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
baseDir = "jps/testData" + File.separator + "incremental" + File.separator;
|
||||
|
||||
for (int i = 0; ; i++) {
|
||||
final File tmp = new File(tempDir + File.separator + "__temp__" + i);
|
||||
if (tmp.mkdir()) {
|
||||
workDir = tmp.getPath() + File.separator;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
copy(new File(getBaseDir()), new File(getWorkDir()));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void tearDown() throws Exception {
|
||||
// delete(new File(workDir));
|
||||
}
|
||||
|
||||
private String getDir(final String prefix) {
|
||||
final String name = getName();
|
||||
|
||||
assert (name.startsWith("test"));
|
||||
|
||||
final String result = Character.toLowerCase(name.charAt("test".length())) + name.substring("test".length() + 1);
|
||||
|
||||
return prefix + File.separator + groupName + File.separator + result;
|
||||
}
|
||||
|
||||
private String getBaseDir() {
|
||||
return getDir(baseDir);
|
||||
}
|
||||
|
||||
private String getWorkDir() {
|
||||
return getDir(workDir);
|
||||
}
|
||||
|
||||
private void delete(final File file) throws Exception {
|
||||
if (file.isDirectory()) {
|
||||
for (File f : file.listFiles()) {
|
||||
delete(f);
|
||||
}
|
||||
}
|
||||
|
||||
if (!file.delete()) throw new IOException("could not delete file or directory " + file.getPath());
|
||||
|
||||
}
|
||||
|
||||
private void copy(final File input, final File output) throws Exception {
|
||||
if (input.isDirectory()) {
|
||||
if (output.mkdirs()) {
|
||||
for (File f : input.listFiles()) {
|
||||
copy(f, new File(output.getPath() + File.separator + f.getName()));
|
||||
}
|
||||
}
|
||||
else {
|
||||
throw new IOException("unable to create directory " + output.getPath());
|
||||
}
|
||||
}
|
||||
else if (input.isFile()) {
|
||||
final FileReader in = new FileReader(input);
|
||||
final FileWriter out = new FileWriter(output);
|
||||
int c;
|
||||
|
||||
while ((c = in.read()) != -1) out.write(c);
|
||||
|
||||
in.close();
|
||||
out.close();
|
||||
}
|
||||
}
|
||||
|
||||
private void modify() throws Exception {
|
||||
final File dir = new File(getBaseDir());
|
||||
final File[] files = dir.listFiles(new FileFilter() {
|
||||
public boolean accept(final File pathname) {
|
||||
final String name = pathname.getName();
|
||||
|
||||
return name.endsWith(".java.new") || name.endsWith(".java.remove");
|
||||
}
|
||||
});
|
||||
|
||||
for (File input : files) {
|
||||
final String name = input.getName();
|
||||
|
||||
final boolean copy = name.endsWith(".java.new");
|
||||
final String postfix = name.substring(0, name.length() - (copy ? ".new" : ".remove").length());
|
||||
final int pathSep = postfix.indexOf("$");
|
||||
final String basename = pathSep == -1 ? postfix : postfix.substring(pathSep + 1);
|
||||
final String path =
|
||||
getWorkDir() + File.separator + (pathSep == -1 ? "src" : postfix.substring(0, pathSep).replace('-', File.separatorChar));
|
||||
final File output = new File(path + File.separator + basename);
|
||||
|
||||
if (copy) {
|
||||
copy(input, output);
|
||||
}
|
||||
else {
|
||||
output.delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void doTest() throws Exception {
|
||||
final ProjectWrapper first = ProjectWrapper.load(getWorkDir(), "project.builder.useInProcessJavac=true", false);
|
||||
|
||||
first.rebuild();
|
||||
first.save();
|
||||
|
||||
Thread.sleep(1000);
|
||||
|
||||
modify();
|
||||
|
||||
final ProjectWrapper second = ProjectWrapper.load(getWorkDir(), "project.builder.useInProcessJavac=true", true);
|
||||
|
||||
final PrintStream stream = new PrintStream(new FileOutputStream(getWorkDir() + ".log"), true);
|
||||
|
||||
try {
|
||||
second.makeModule(null, new ProjectWrapper.Flags() {
|
||||
public boolean tests() {
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean incremental() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean force() {
|
||||
return false;
|
||||
}
|
||||
|
||||
public PrintStream logStream() {
|
||||
return stream;
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
finally {
|
||||
stream.close();
|
||||
}
|
||||
|
||||
FileAssert.assertEquals(new File(getBaseDir() + ".log"), new File(getWorkDir() + ".log"));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user