diff --git a/plugins/junit_rt/junit_rt.iml b/plugins/junit_rt/junit_rt.iml index 651673bba3f3..e24b63784ebd 100644 --- a/plugins/junit_rt/junit_rt.iml +++ b/plugins/junit_rt/junit_rt.iml @@ -1,6 +1,6 @@ - + diff --git a/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java b/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java index 93eef3c693a0..7214f8d6c8de 100644 --- a/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java +++ b/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java @@ -14,13 +14,13 @@ import java.util.ArrayList; public class JUnit3IdeaTestRunner extends TestRunner implements IdeaTestRunner { private TestListener myTestsListener; private JUnit3OutputObjectRegistry myRegistry; - private ArrayList myListeners; + private ArrayList myListeners; public JUnit3IdeaTestRunner() { super(DeafStream.DEAF_PRINT_STREAM); } - public int startRunnerWithArgs(String[] args, ArrayList 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) {} diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java index 76a8792b9775..0a3826183a1f 100644 --- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java +++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java @@ -42,7 +42,7 @@ public class JUnit4IdeaTestRunner implements IdeaTestRunner { packet.send(); } - public int startRunnerWithArgs(String[] args, ArrayList 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)); } diff --git a/plugins/junit_rt/src/com/intellij/rt/execution/junit/IdeaTestRunner.java b/plugins/junit_rt/src/com/intellij/rt/execution/junit/IdeaTestRunner.java index a2e31e220d7b..6342b7b3c381 100644 --- a/plugins/junit_rt/src/com/intellij/rt/execution/junit/IdeaTestRunner.java +++ b/plugins/junit_rt/src/com/intellij/rt/execution/junit/IdeaTestRunner.java @@ -9,7 +9,7 @@ import com.intellij.rt.execution.junit.segments.SegmentedOutputStream; import java.util.ArrayList; public interface IdeaTestRunner { - int startRunnerWithArgs(String[] args, ArrayList listeners); + int startRunnerWithArgs(String[] args, ArrayList listeners); void setStreams(SegmentedOutputStream segmentedOut, SegmentedOutputStream segmentedErr); } \ No newline at end of file diff --git a/plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitStarter.java b/plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitStarter.java index f3b2ea701fec..d9e5f1366c84 100644 --- a/plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitStarter.java +++ b/plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitStarter.java @@ -28,7 +28,7 @@ public class JUnitStarter { argList.addElement(arg); } - final ArrayList listeners = new ArrayList(); + 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 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 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;