Skip to content

Add projects to defects4j handlers #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add projects to defects4j handlers #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions tregression/src/main/traceagent/handler/RunAllDefects4jHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,18 @@ && new File(oldDefects4jFile).exists()) {
}

protected void runAll(String reportFile, IProgressMonitor monitor) throws Exception {
String[] projects = {"Chart", "Closure", "Lang", "Math", "Mockito", "Time"};
int[] bugNum = {26, 133, 65, 106, 38, 27};
String[] projects = {"Chart", "Cli", "Closure", "Codec",
"Collections", "Compress", "Csv", "Gson","JacksonCore", "JacksonDatabind",
"JacksonXml", "Jsoup", "JxPath", "Lang", "Math", "Mockito", "Time"};
int[] bugNum = {26, 40, 176, 18, 28, 47, 16, 18, 26, 112, 6, 93, 22, 65, 106, 38, 27};
AgentDefects4jReport report = new AgentDefects4jReport(new File(reportFile));
TestcaseFilter filter = new TestcaseFilter(false);
TestcaseFilter filter = new TestcaseFilter(false);
for (int i = 0; i < projects.length; i++) {
String project = projects[i];
if (monitor.isCanceled()) {
return;
}
for (int j = 0; j <= bugNum[i]; j++) {
for (int j = 1; j <= bugNum[i]; j++) {
if (monitor.isCanceled()) {
return;
}
Expand Down Expand Up @@ -123,9 +125,9 @@ void runSingleBug(Defects4jProjectConfig config, AgentDefects4jReport report, Li
TraceTrial correctTrace = run(fixPath, tc, config, includeLibs, excludeLibs, false);
trial.setFixedTrace(correctTrace);
}

report.record(trial);
}

}

public TraceTrial run(String workingDir, TestCase tc, Defects4jProjectConfig config, List<String> includeLibs,
Expand Down
2 changes: 0 additions & 2 deletions tregression/src/main/traceagent/report/AgentDefects4jReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,4 @@ private void writeTestcase(Row row, BugCaseTrial trial, TraceTrial traceTrial, b
}
addCell(row, SUMMARY, traceTrial.getSummary());
}


}
13 changes: 11 additions & 2 deletions tregression/src/main/tregression/editors/CompareEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,23 @@ private void highlightStyles(boolean isSource, TraceNode node, StyledText text,
}

private void adjustTextForSelectedNode(TraceNode node, StyledText text, List<StyleRange> ranges) {
int topLine = node.getLineNumber()-15;
topLine = (topLine<1) ? 1 : topLine;
int topIndex = text.getTopIndex();
int bottomIndex = getPartiallyVisibleBottomIndex(text);
int numLinesDisplayed = Math.max(bottomIndex - topIndex, 1);
int topLine = node.getLineNumber() - numLinesDisplayed / 2 - 1;
topLine = (topLine < 2) ? 1 : topLine;
text.setTopIndex(topLine);

StyleRange selectedRange = selectedLineStyle(text, node.getLineNumber());
ranges.add(selectedRange);
}

private int getPartiallyVisibleBottomIndex(StyledText text) {
int clientAreaHeight = text.getClientArea().height;
int lastVisiblePixel = clientAreaHeight - 1;
return text.getLineIndex(lastVisiblePixel);
}

public StyledText generateText(SashForm sashForm, String path, DiffMatcher matcher, final boolean isSource){
// ScrolledComposite scrolledComp = new ScrolledComposite(sashForm, SWT.H_SCROLL | SWT.V_SCROLL);
// scrolledComp.setExpandHorizontal(true);
Expand Down
42 changes: 42 additions & 0 deletions tregression/src/main/tregression/empiricalstudy/config/Defects4jProjectConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,51 @@ public static Defects4jProjectConfig getConfig(String projectName, String regres
if(projectName.equals("Chart")) {
config = new Defects4jProjectConfig("tests", "source", "build-tests", "build", "build", projectName, regressionID);
}
else if (projectName.equals("Cli")) {
if (bugID < 30) {
config = new Defects4jProjectConfig("src"+File.separator+"test", "src"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else {
config = new Defects4jProjectConfig("src"+File.separator+"test", "src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
}
else if (projectName.equals("Closure")) {
config = new Defects4jProjectConfig("test", "src", "build"+File.separator+"test", "build"+File.separator+"classes", "build", projectName, regressionID);
}
else if (projectName.equals("Codec")) {
if (bugID<11) {
config = new Defects4jProjectConfig("src"+File.separator+"test", "src"+File.separator+"java", "target"+File.separator+"tests", "target"+File.separator+"classes", "target", projectName, regressionID);
} else {
config = new Defects4jProjectConfig("src"+File.separator+"test", "src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"tests", "target"+File.separator+"classes", "target", projectName, regressionID);
}
}
else if (projectName.equals("Collections")) {
config = new Defects4jProjectConfig("src"+File.separator+"test", "src"+File.separator+"main", "target"+File.separator+"tests", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else if (projectName.equals("Compress")) {
config = new Defects4jProjectConfig("src"+File.separator+"test"+File.separator+"java", "src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else if (projectName.equals("Csv")) {
config = new Defects4jProjectConfig("src"+File.separator+"test"+File.separator+"java", "src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else if (projectName.equals("Gson")) {
config = new Defects4jProjectConfig("gson"+File.separator+"src"+File.separator+"test"+File.separator+"java", "gson"+File.separator+"src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else if (projectName.equals("JacksonCore")) {
config = new Defects4jProjectConfig("src"+File.separator+"test"+File.separator+"java", "src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else if (projectName.equals("JacksonDatabind")) {
config = new Defects4jProjectConfig("src"+File.separator+"test"+File.separator+"java", "src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else if (projectName.equals("JacksonXml")) {
config = new Defects4jProjectConfig("src"+File.separator+"test"+File.separator+"java", "src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else if (projectName.equals("Jsoup")) {
config = new Defects4jProjectConfig("src"+File.separator+"test"+File.separator+"java", "src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else if (projectName.equals("JxPath")) {
config = new Defects4jProjectConfig("src"+File.separator+"test", "src"+File.separator+"java", "target"+File.separator+"test-classes", "target"+File.separator+"classes", "target", projectName, regressionID);
}
else if (projectName.equals("Lang")) {
if(bugID<21){
config = new Defects4jProjectConfig("src"+File.separator+"test"+File.separator+"java", "src"+File.separator+"main"+File.separator+"java", "target"+File.separator+"tests", "target"+File.separator+"classes", "target", projectName, regressionID);
Expand Down
7 changes: 3 additions & 4 deletions tregression/src/main/tregression/handler/AllDefects4jHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ protected IStatus run(IProgressMonitor monitor) {
int skippedNum = 0;
int endNum = 500;

String[] projects = {"Chart", "Closure", "Lang", "Math", "Mockito", "Time"};
int[] bugNum = {26, 133, 65, 106, 38, 27};

String[] projects = {"Chart", "Cli", "Closure", "Codec", "Collections", "Compress", "Csv", "Gson","JacksonCore", "JacksonDatabind", "JacksonXml", "Jsoup", "JxPath", "Lang", "Math", "Mockito", "Time"};
int[] bugNum = {26, 40, 176, 18, 28, 47, 16, 18, 26, 112, 6, 93, 22, 65, 106, 38, 27};
// String fileName = "defects4j0.old.xlsx";
String fileName = "benchmark" + File.separator + "ben.xlsx";
Map<ReadEmpiricalTrial, ReadEmpiricalTrial> map = new HashMap<>();
Expand Down Expand Up @@ -154,7 +153,7 @@ protected IStatus run(IProgressMonitor monitor) {
&& new File(oldDefects4jFile).exists()) {
Map<String, List<String>> keys = new HashMap<String, List<String>>();
keys.put("data", Arrays.asList("project", "bug_ID"));
ExperimentReportComparisonReporter.reportChange("defects4j_compare.xlsx", oldDefects4jFile, defects4jFile.getAbsolutePath(),
ExperimentReportComparisonReporter.reportChange("defects4j_compare.xlsx", oldDefects4jFile, defects4jFile.getAbsolutePath(),
Arrays.asList(new TextComparisonRule(null), new SimulatorComparisonRule()), keys);
}
}
Expand Down