Repository: maven-surefire Updated Branches: refs/heads/master 2ef3a7162 -> 1d7630689
[SUREFIRE] refactoring Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1d763068 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1d763068 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1d763068 Branch: refs/heads/master Commit: 1d7630689977fb42e1f88f91837d5f061be789a1 Parents: 2ef3a71 Author: Tibor17 <tibo...@lycos.com> Authored: Wed Dec 16 01:33:49 2015 +0100 Committer: Tibor17 <tibo...@lycos.com> Committed: Wed Dec 16 01:33:49 2015 +0100 ---------------------------------------------------------------------- .../maven/surefire/booter/CommandReader.java | 2 +- .../maven/surefire/junit4/JUnit4Provider.java | 31 ++++++++-------- .../junitcore/JUnit47FailFastListener.java | 2 +- .../surefire/junitcore/JUnitCoreProvider.java | 29 ++++++++------- .../surefire/junitcore/JUnitCoreWrapper.java | 2 +- .../maven/surefire/testng/TestNGProvider.java | 37 +++++++++++--------- 6 files changed, 56 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d763068/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java index d77e7ec..330fd8d 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java @@ -133,7 +133,7 @@ public final class CommandReader addListener( TEST_SET_FINISHED, listener ); } - public void addSkipNextListener( CommandListener listener ) + public void addSkipNextTestsListener( CommandListener listener ) { addListener( SKIP_SINCE_NEXT_TEST, listener ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d763068/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java index 6d42b40..d57d4dd 100644 --- a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java +++ b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java @@ -160,19 +160,13 @@ public class JUnit4Provider if ( commandsReader != null ) { - commandsReader.addShutdownListener( new CommandListener() - { - public void update( Command command ) - { - testsToRun.markTestSetFinished(); - } - } ); + registerShutdownListener( testsToRun ); commandsReader.awaitStarted(); } - for ( Class<?> aTestsToRun : testsToRun ) + for ( Class<?> testToRun : testsToRun ) { - executeTestSet( aTestsToRun, reporter, notifier ); + executeTestSet( testToRun, reporter, notifier ); } } finally @@ -221,17 +215,26 @@ public class JUnit4Provider return isFailFast() && !isRerunFailingTests() ? providerParameters.getSkipAfterFailureCount() : 0; } - private CommandListener registerPleaseStopJUnitListener( final Notifier notifier ) + private void registerShutdownListener( final TestsToRun testsToRun ) { - CommandListener listener = new CommandListener() + commandsReader.addShutdownListener( new CommandListener() + { + public void update( Command command ) + { + testsToRun.markTestSetFinished(); + } + } ); + } + + private void registerPleaseStopJUnitListener( final Notifier notifier ) + { + commandsReader.addSkipNextTestsListener( new CommandListener() { public void update( Command command ) { notifier.pleaseStop(); } - }; - commandsReader.addSkipNextListener( listener ); - return listener; + } ); } private void executeTestSet( Class<?> clazz, RunListener reporter, Notifier notifier ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d763068/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnit47FailFastListener.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnit47FailFastListener.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnit47FailFastListener.java index 0f6efc9..3ccb3d2 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnit47FailFastListener.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnit47FailFastListener.java @@ -38,7 +38,7 @@ final class JUnit47FailFastListener { private final Stoppable stoppable; - private final ConcurrentLinkedQueue<String> testClassNames = new ConcurrentLinkedQueue<String>(); + private final Queue<String> testClassNames = new ConcurrentLinkedQueue<String>(); JUnit47FailFastListener( Stoppable stoppable ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d763068/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 72d0b13..1b45a26 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 @@ -157,13 +157,7 @@ public class JUnitCoreProvider if ( commandsReader != null ) { - commandsReader.addShutdownListener( new CommandListener() - { - public void update( Command command ) - { - testsToRun.markTestSetFinished(); - } - } ); + registerShutdownListener( testsToRun ); commandsReader.awaitStarted(); } @@ -177,7 +171,7 @@ public class JUnitCoreProvider List<Failure> failures = testFailureListener.getAllFailures(); Map<Class<?>, Set<String>> failingTests = generateFailingTests( failures, testClassLoader ); testFailureListener.reset(); - final FilterFactory filterFactory = new FilterFactory( testClassLoader ); + FilterFactory filterFactory = new FilterFactory( testClassLoader ); Filter failingMethodsFilter = filterFactory.createFailingMethodFilter( failingTests ); core.execute( testsToRun, failingMethodsFilter ); } @@ -224,17 +218,26 @@ public class JUnitCoreProvider return isFailFast() && !isRerunFailingTests() ? providerParameters.getSkipAfterFailureCount() : 0; } - private CommandListener registerPleaseStopJUnitListener( final Notifier stoppable ) + private void registerShutdownListener( final TestsToRun testsToRun ) + { + commandsReader.addShutdownListener( new CommandListener() + { + public void update( Command command ) + { + testsToRun.markTestSetFinished(); + } + } ); + } + + private void registerPleaseStopJUnitListener( final Notifier stoppable ) { - CommandListener listener = new CommandListener() + commandsReader.addSkipNextTestsListener( new CommandListener() { public void update( Command command ) { stoppable.pleaseStop(); } - }; - commandsReader.addSkipNextListener( listener ); - return listener; + } ); } private JUnit4RunListener createRunListener( ReporterFactory reporterFactory, ConsoleLogger consoleLogger ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d763068/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 eb41217..5c33716 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 @@ -82,7 +82,7 @@ final class JUnitCoreWrapper } } - private JUnitCore createJUnitCore( final Notifier notifier, Collection<RunListener> listeners ) + private JUnitCore createJUnitCore( Notifier notifier, Collection<RunListener> listeners ) { JUnitCore junitCore = new JUnitCore(); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d763068/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java index cd2a99a..f78dad8 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java @@ -99,11 +99,6 @@ public class TestNGProvider registerPleaseStopListener(); } - if ( commandsReader != null ) - { - commandsReader.awaitStarted(); - } - final ReporterFactory reporterFactory = providerParameters.getReporterFactory(); final RunListener reporter = reporterFactory.createReporter(); /** @@ -117,6 +112,10 @@ public class TestNGProvider { if ( isTestNGXmlTestSuite( testRequest ) ) { + if ( commandsReader != null ) + { + commandsReader.awaitStarted(); + } TestNGXmlTestSuite testNGXmlTestSuite = newXmlSuite(); testNGXmlTestSuite.locateTestSets(); testNGXmlTestSuite.execute( reporter ); @@ -141,13 +140,8 @@ public class TestNGProvider if ( commandsReader != null ) { - commandsReader.addShutdownListener( new CommandListener() - { - public void update( Command command ) - { - testsToRun.markTestSetFinished(); - } - } ); + registerShutdownListener( testsToRun ); + commandsReader.awaitStarted(); } TestNGDirectoryTestSuite suite = newDirectorySuite(); suite.execute( testsToRun, reporter ); @@ -176,17 +170,26 @@ public class TestNGProvider return isFailFast() ? providerParameters.getSkipAfterFailureCount() : 0; } - private CommandListener registerPleaseStopListener() + private void registerShutdownListener( final TestsToRun testsToRun ) + { + commandsReader.addShutdownListener( new CommandListener() + { + public void update( Command command ) + { + testsToRun.markTestSetFinished(); + } + } ); + } + + private void registerPleaseStopListener() { - CommandListener listener = new CommandListener() + commandsReader.addSkipNextTestsListener( new CommandListener() { public void update( Command command ) { FailFastEventsSingleton.getInstance().setSkipOnNextTest(); } - }; - commandsReader.addSkipNextListener( listener ); - return listener; + } ); } private TestNGDirectoryTestSuite newDirectorySuite()
