1.3 for junit runtime

This commit is contained in:
Anna Kozlova
2009-09-15 14:45:40 +04:00
parent b92339f3ea
commit 82e9f72479
5 changed files with 13 additions and 15 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="true">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_3" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -14,13 +14,13 @@ import java.util.ArrayList;
public class JUnit3IdeaTestRunner extends TestRunner implements IdeaTestRunner {
private TestListener myTestsListener;
private JUnit3OutputObjectRegistry myRegistry;
private ArrayList<String> myListeners;
private ArrayList myListeners;
public JUnit3IdeaTestRunner() {
super(DeafStream.DEAF_PRINT_STREAM);
}
public int startRunnerWithArgs(String[] args, ArrayList<String> listeners) {
public int startRunnerWithArgs(String[] args, ArrayList listeners) {
myListeners = listeners;
try {
Test suite = TestRunnerUtil.getTestSuite(this, args);
@@ -54,8 +54,8 @@ public class JUnit3IdeaTestRunner extends TestRunner implements IdeaTestRunner {
TestResult testResult = super.createTestResult();
testResult.addListener(myTestsListener);
try {
for (String listener : myListeners) {
final IDEAJUnitListener junitListener = (IDEAJUnitListener)Class.forName(listener).newInstance();
for (int i = 0; i < myListeners.size(); i++) {
final IDEAJUnitListener junitListener = (IDEAJUnitListener)Class.forName((String)myListeners.get(i)).newInstance();
testResult.addListener(new TestListener() {
public void addError(Test test, Throwable t) {}
@@ -42,7 +42,7 @@ public class JUnit4IdeaTestRunner implements IdeaTestRunner {
packet.send();
}
public int startRunnerWithArgs(String[] args, ArrayList<String> listeners) {
public int startRunnerWithArgs(String[] args, ArrayList listeners) {
try {
final JUnitCore runner = new JUnitCore();
@@ -65,15 +65,13 @@ public class JUnit4IdeaTestRunner implements IdeaTestRunner {
}
runner.addListener(myTestsListener);
for (String listener : listeners) {
final IDEAJUnitListener junitListener = (IDEAJUnitListener)Class.forName(listener).newInstance();
runner.addListener(new RunListener(){
@Override
for (Iterator iterator = listeners.iterator(); iterator.hasNext();) {
final IDEAJUnitListener junitListener = (IDEAJUnitListener)Class.forName((String)iterator.next()).newInstance();
runner.addListener(new RunListener() {
public void testStarted(Description description) throws Exception {
junitListener.testStarted(JUnit4ReflectionUtil.getClassName(description), JUnit4ReflectionUtil.getMethodName(description));
}
@Override
public void testFinished(Description description) throws Exception {
junitListener.testFinished(JUnit4ReflectionUtil.getClassName(description), JUnit4ReflectionUtil.getMethodName(description));
}
@@ -9,7 +9,7 @@ import com.intellij.rt.execution.junit.segments.SegmentedOutputStream;
import java.util.ArrayList;
public interface IdeaTestRunner {
int startRunnerWithArgs(String[] args, ArrayList<String> listeners);
int startRunnerWithArgs(String[] args, ArrayList listeners);
void setStreams(SegmentedOutputStream segmentedOut, SegmentedOutputStream segmentedErr);
}
@@ -28,7 +28,7 @@ public class JUnitStarter {
argList.addElement(arg);
}
final ArrayList<String> listeners = new ArrayList<String>();
final ArrayList listeners = new ArrayList();
boolean isJUnit4 = processParameters(argList, listeners);
if (!canWorkWithJUnitVersion(err, isJUnit4)) {
@@ -46,7 +46,7 @@ public class JUnitStarter {
System.exit(exitCode);
}
private static boolean processParameters(Vector args, final List<String> listeners) {
private static boolean processParameters(Vector args, final List listeners) {
boolean isJunit4 = false;
Vector result = new Vector(args.size());
for (int i = 0; i < args.size(); i++) {
@@ -137,7 +137,7 @@ public class JUnitStarter {
new TestRunner().setPrinter(new JUnit3IdeaTestRunner.MockResultPrinter());
}
private static int prepareStreamsAndStart(String[] args, final boolean isJUnit4, ArrayList<String> listeners, SegmentedOutputStream out,
private static int prepareStreamsAndStart(String[] args, final boolean isJUnit4, ArrayList listeners, SegmentedOutputStream out,
SegmentedOutputStream err) {
PrintStream oldOut = System.out;
PrintStream oldErr = System.err;