Skip to content

added append arguments #2

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
henryw30 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

added append arguments #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d2c7db
added append argument to lockfiles and tmp files generated (each thre…
henryw30 Jan 16, 2018
cd42749
using upstream's format
henryw30 Jan 16, 2018
3be0374
added append arguments
winglam Jan 21, 2018
19de332
Fixed file merges.
ReedOei Feb 5, 2018
361dbd5
use reed's merge
winglam Feb 6, 2018
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
272 changes: 143 additions & 129 deletions src/main/java/edu/washington/cs/dt/runners/AbstractTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,129 +1,143 @@
/** Copyright 2012 University of Washington. All Rights Reserved.
* @author Sai Zhang
*/
package edu.washington.cs.dt.runners;

import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;

import edu.washington.cs.dt.OneTestExecResult;
import edu.washington.cs.dt.RESULT;
import edu.washington.cs.dt.TestExecResults;
import edu.washington.cs.dt.main.Main;
import edu.washington.cs.dt.util.Files;
import edu.washington.cs.dt.util.Globals;
import edu.washington.cs.dt.util.TestExecUtils;
import edu.washington.cs.dt.util.Utils;

public abstract class AbstractTestRunner {

/* The input tests */
protected final List<String> junitTestList;

/*keep the classpath needs to run the tests, tmp output file to keep the
* intermediate results*/
protected String classPath = null;
protected String tmpOutputFile = null;

/* Note that we use List here, since order matters*/
public AbstractTestRunner(List<String> tests) {
this.junitTestList = new LinkedList<String>();
this.junitTestList.addAll(tests);
this.classPath = System.getProperties().getProperty("java.class.path", null);
tmpOutputFile = Main.tmpfile;
}

public AbstractTestRunner(String fileName) {
this(Files.readWholeNoExp(fileName));
}

public void setClassPath(String classPath) {
this.classPath = classPath;
}

public String getClassPath() {
return this.classPath;
}

public void setTmpOutputFile(String fileName) {
this.tmpOutputFile = fileName;
}

public String getTmpOutputFile() {
return this.tmpOutputFile;
}

public boolean isTestInList(String test) {
return this.junitTestList.contains(test);
}

public abstract TestExecResults run();

protected void saveResultsToFile(Collection<Map<String, OneTestExecResult>> results, String fileName) {
StringBuilder sb = new StringBuilder();
int numOfPass = 0;
int numOfError = 0;
int numOfFail = 0;
for(Map<String, OneTestExecResult> result : results) {
for(String test : result.keySet()) {
RESULT r = result.get(test).result;
sb.append(test);
sb.append(" : ");
sb.append(r);
String fullStackTrace = result.get(test).getFullStackTrace();
if(fullStackTrace != null && !fullStackTrace.trim().equals(TestExecUtils.noStackTrace)) {
sb.append(Globals.lineSep);
String[] sts = fullStackTrace.split(TestExecUtils.stackTraceSep);
for(String st : sts) {
sb.append(" ");
sb.append(st);
sb.append(Globals.lineSep);
}
}
// String filteredStack = result.get(test).getFilteredStackTrace();
// if(filteredStack != null && !filteredStack.trim().equals(TestExecUtils.noStackTrace)) {
// sb.append(Globals.lineSep);
// String[] sts = filteredStack.split(TestExecUtils.stackTraceSep);
// for(String st : sts) {
// sb.append(" ");
// sb.append(st);
// sb.append(Globals.lineSep);
// }
// }
sb.append(Globals.lineSep);
if(r == RESULT.PASS) {
numOfPass++;
} else if (r == RESULT.ERROR) {
numOfError++;
} else if (r == RESULT.FAILURE) {
numOfFail ++;
} else {
throw new Error("Unknown: " + r);
}
}
// Utils.checkTrue(numOfPass + numOfError + numOfFail == result.size(),
// "Wrong number.");
}
sb.append("-----------------");
sb.append(Globals.lineSep);
sb.append("Passing tests: " + numOfPass);
sb.append(Globals.lineSep);
sb.append("Failing tests: " + numOfFail);
sb.append(Globals.lineSep);
sb.append("Error tests: " + numOfError);
sb.append(Globals.lineSep);
try {
Files.writeToFile(sb.toString(), fileName);
} catch (IOException e) {
throw new Error(e);
}
}

protected void saveResultsToFile(Map<String, OneTestExecResult> result, String fileName) {
this.saveResultsToFile(Collections.singletonList(result), fileName);
}
}
/** Copyright 2012 University of Washington. All Rights Reserved.
* @author Sai Zhang
*/
package edu.washington.cs.dt.runners;

import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;

import edu.washington.cs.dt.OneTestExecResult;
import edu.washington.cs.dt.RESULT;
import edu.washington.cs.dt.TestExecResults;
import edu.washington.cs.dt.main.Main;
import edu.washington.cs.dt.util.Files;
import edu.washington.cs.dt.util.Globals;
import edu.washington.cs.dt.util.TestExecUtils;
import edu.washington.cs.dt.util.Utils;

public abstract class AbstractTestRunner {

/* The input tests */
protected final List<String> junitTestList;

/*keep the classpath needs to run the tests, tmp output file to keep the
* intermediate results*/
protected String classPath = null;
protected String tmpOutputFile = null;
protected String threadnum = "";

/* Note that we use List here, since order matters*/
public AbstractTestRunner(List<String> tests) {
this.junitTestList = new LinkedList<String>();
this.junitTestList.addAll(tests);
this.classPath = System.getProperties().getProperty("java.class.path", null);
tmpOutputFile = Main.tmpfile;
}
//overloaded with tmpfilepath argument (the number of threads is passed in for this)
public AbstractTestRunner(List<String> tests, String tmpfilepath) {
this.junitTestList = new LinkedList<String>();
this.junitTestList.addAll(tests);
this.classPath = System.getProperties().getProperty("java.class.path", null);
tmpOutputFile = (Main.tmpfile)+tmpfilepath;
this.threadnum = tmpfilepath;
}
public String getThreadnum()
{
return this.threadnum;
}

public AbstractTestRunner(String fileName) {
this(Files.readWholeNoExp(fileName));
}

public void setClassPath(String classPath) {
this.classPath = classPath;
}

public String getClassPath() {
return this.classPath;
}

public void setTmpOutputFile(String fileName) {
this.tmpOutputFile = fileName;
}

public String getTmpOutputFile() {
return this.tmpOutputFile;
}

public boolean isTestInList(String test) {
return this.junitTestList.contains(test);
}

public abstract TestExecResults run();

protected void saveResultsToFile(Collection<Map<String, OneTestExecResult>> results, String fileName) {
StringBuilder sb = new StringBuilder();
int numOfPass = 0;
int numOfError = 0;
int numOfFail = 0;
for(Map<String, OneTestExecResult> result : results) {
for(String test : result.keySet()) {
RESULT r = result.get(test).result;
sb.append(test);
sb.append(" : ");
sb.append(r);
String fullStackTrace = result.get(test).getFullStackTrace();
if(fullStackTrace != null && !fullStackTrace.trim().equals(TestExecUtils.noStackTrace)) {
sb.append(Globals.lineSep);
String[] sts = fullStackTrace.split(TestExecUtils.stackTraceSep);
for(String st : sts) {
sb.append(" ");
sb.append(st);
sb.append(Globals.lineSep);
}
}
// String filteredStack = result.get(test).getFilteredStackTrace();
// if(filteredStack != null && !filteredStack.trim().equals(TestExecUtils.noStackTrace)) {
// sb.append(Globals.lineSep);
// String[] sts = filteredStack.split(TestExecUtils.stackTraceSep);
// for(String st : sts) {
// sb.append(" ");
// sb.append(st);
// sb.append(Globals.lineSep);
// }
// }
sb.append(Globals.lineSep);
if(r == RESULT.PASS) {
numOfPass++;
} else if (r == RESULT.ERROR) {
numOfError++;
} else if (r == RESULT.FAILURE) {
numOfFail ++;
} else {
throw new Error("Unknown: " + r);
}
}
// Utils.checkTrue(numOfPass + numOfError + numOfFail == result.size(),
// "Wrong number.");
}
sb.append("-----------------");
sb.append(Globals.lineSep);
sb.append("Passing tests: " + numOfPass);
sb.append(Globals.lineSep);
sb.append("Failing tests: " + numOfFail);
sb.append(Globals.lineSep);
sb.append("Error tests: " + numOfError);
sb.append(Globals.lineSep);
try {
Files.writeToFile(sb.toString(), fileName);
} catch (IOException e) {
throw new Error(e);
}
}

protected void saveResultsToFile(Map<String, OneTestExecResult> result, String fileName) {
this.saveResultsToFile(Collections.singletonList(result), fileName);
}
}

85 changes: 47 additions & 38 deletions src/main/java/edu/washington/cs/dt/runners/FixedOrderRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,47 @@
/** Copyright 2012 University of Washington. All Rights Reserved.
* @author Sai Zhang
*/
package edu.washington.cs.dt.runners;

import java.util.List;
import java.util.Map;

import edu.washington.cs.dt.OneTestExecResult;
import edu.washington.cs.dt.TestExecResults;
import edu.washington.cs.dt.main.Main;
import edu.washington.cs.dt.util.TestExecUtils;

public class FixedOrderRunner extends AbstractTestRunner {

public FixedOrderRunner(List<String> tests) {
super(tests);
}

public FixedOrderRunner(String fileName) {
super(fileName);
}

@Override
public TestExecResults run() {
System.out.println("Executing fixed runner now.");

TestExecResults result = TestExecResults.createInstance();
Map<String, OneTestExecResult> singleRun = TestExecUtils.executeTestsInFreshJVM(super.getClassPath(),
super.getTmpOutputFile(), super.junitTestList);
result.addExecutionResults(singleRun);
//check do we need to dump the fixed ordered results to an intermediate file
if(Main.fixedOrderReport != null) {
super.saveResultsToFile(singleRun, Main.fixedOrderReport);
}
return result;
}
}
/** Copyright 2012 University of Washington. All Rights Reserved.
* @author Sai Zhang
*/
package edu.washington.cs.dt.runners;

import java.util.List;
import java.util.Map;

import edu.washington.cs.dt.OneTestExecResult;
import edu.washington.cs.dt.TestExecResults;
import edu.washington.cs.dt.main.Main;
import edu.washington.cs.dt.util.TestExecUtils;

public class FixedOrderRunner extends AbstractTestRunner {

public FixedOrderRunner(List<String> tests) {
super(tests);
}
//overloaded
public FixedOrderRunner(List<String> tests, String tmpfilepath) {
super(tests, tmpfilepath);
}

public FixedOrderRunner(String fileName) {
super(fileName);
}

@Override
public TestExecResults run() {
System.out.println("Executing fixed runner now.");

TestExecResults result = TestExecResults.createInstance();
//Map<String, OneTestExecResult> singleRun = TestExecUtils.executeTestsInFreshJVM(super.getClassPath(),
//super.getTmpOutputFile(), super.junitTestList);

TestExecUtils util = new TestExecUtils();
Map<String, OneTestExecResult> singleRun = util.executeTestsInFreshJVM(super.getClassPath(),
super.getTmpOutputFile(), super.junitTestList, super.getThreadnum());

result.addExecutionResults(singleRun);
//check do we need to dump the fixed ordered results to an intermediate file
if(Main.fixedOrderReport != null) {
super.saveResultsToFile(singleRun, Main.fixedOrderReport);
}
return result;
}
}
Loading