You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/12/14 08:05:05 UTC
git commit: o Extracted a few methods
Updated Branches:
refs/heads/master 9b1e57de3 -> 0db53f71e
o Extracted a few methods
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/0db53f71
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/0db53f71
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/0db53f71
Branch: refs/heads/master
Commit: 0db53f71ea7bbb8484a49d5365b90ecb428283e6
Parents: 9b1e57d
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Wed Dec 12 18:03:00 2012 +0100
Committer: Kristian Rosenvold <kr...@apache.org>
Committed: Fri Dec 14 08:04:02 2012 +0100
----------------------------------------------------------------------
.../surefire/junitcore/JUnitCoreProvider.java | 18 +++++++---
.../maven/surefire/junitcore/JUnitCoreWrapper.java | 28 +++++++++++++--
2 files changed, 38 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/0db53f71/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
index 73cdca7..b880785 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
@@ -103,8 +103,8 @@ public class JUnitCoreProvider
private boolean isSingleThreaded()
{
- return !jUnitCoreParameters.isAnyParallelitySelected() ||
- ( testsToRun.containsExactly( 1 ) && !jUnitCoreParameters.isParallelMethod() );
+ return !jUnitCoreParameters.isAnyParallelitySelected() || ( testsToRun.containsExactly( 1 )
+ && !jUnitCoreParameters.isParallelMethod() );
}
public RunResult invoke( Object forkTestSet )
@@ -133,6 +133,16 @@ public class JUnitCoreProvider
}
}
+ org.junit.runner.notification.RunListener jUnit4RunListener = getRunListener( reporterFactory, consoleLogger );
+ customRunListeners.add( 0, jUnit4RunListener );
+ JUnitCoreWrapper.execute( testsToRun, jUnitCoreParameters, customRunListeners, filter );
+ return reporterFactory.close();
+ }
+
+ private org.junit.runner.notification.RunListener getRunListener( ReporterFactory reporterFactory,
+ ConsoleLogger consoleLogger )
+ throws TestSetFailedException
+ {
org.junit.runner.notification.RunListener jUnit4RunListener;
if ( isSingleThreaded() )
{
@@ -152,9 +162,7 @@ public class JUnitCoreProvider
jUnit4RunListener = new JUnitCoreRunListener( listener, testSetMap );
}
- customRunListeners.add( 0, jUnit4RunListener );
- JUnitCoreWrapper.execute( testsToRun, jUnitCoreParameters, customRunListeners, filter );
- return reporterFactory.close();
+ return jUnit4RunListener;
}
private Filter createJUnit48Filter()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/0db53f71/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
index 99bf6dc..0608ab4 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
@@ -22,6 +22,7 @@ package org.apache.maven.surefire.junitcore;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ExecutionException;
+
import org.apache.maven.surefire.common.junit4.JUnit4RunListener;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.util.TestsToRun;
@@ -74,12 +75,22 @@ class JUnitCoreWrapper
throws TestSetFailedException
{
Computer computer = getComputer( jUnitCoreParameters );
- JUnitCore junitCore = new JUnitCore();
- for ( RunListener runListener : listeners )
+
+ JUnitCore junitCore = createJUnitCore( listeners );
+ /*
+ Request req = Request.classes( computer, testsToRun.getLocatedClasses() );
+ if ( filter != null )
{
- junitCore.addListener( runListener );
+ req = req.filterWith( filter );
+ }
+
+ try
+ {
+ final Result run = junitCore.run( req );
+ JUnit4RunListener.rethrowAnyTestMechanismFailures( run );
}
+ */
try
{
// in order to support LazyTestsToRun, the iterator must be used
@@ -151,4 +162,15 @@ class JUnitCoreWrapper
jUnitCoreParameters.getThreadCount(), jUnitCoreParameters.isPerCoreThreadCount() );
}
}
+
+ private static JUnitCore createJUnitCore( List<RunListener> listeners )
+ {
+ JUnitCore junitCore = new JUnitCore();
+ for ( RunListener runListener : listeners )
+ {
+ junitCore.addListener( runListener );
+ }
+ return junitCore;
+ }
+
}