[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/1e547c8c Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1e547c8c Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1e547c8c Branch: refs/heads/master Commit: 1e547c8c319d8ba38048f3caa5f86e4be5338a48 Parents: 8e37515 Author: Tibor17 <tibo...@lycos.com> Authored: Mon Aug 3 15:40:59 2015 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Sun Sep 6 22:57:55 2015 +0200 ---------------------------------------------------------------------- .../TestSetMockReporterFactory.java | 2 ++ .../surefire/booter/MainCliOptionsAware.java | 2 +- .../booter/SurefireClassLoadersAware.java | 2 +- .../apache/maven/surefire/booter/Classpath.java | 5 ++- .../surefire/booter/PropertiesWrapper.java | 5 --- .../maven/surefire/junitcore/TestSet.java | 33 ++++++++++---------- 6 files changed, 22 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e547c8c/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java index df6c253..2e337e2 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java @@ -24,6 +24,8 @@ import org.apache.maven.plugin.surefire.report.DefaultReporterFactory; import org.apache.maven.surefire.report.RunListener; /** + * Internal tests use only. + * * @author Kristian Rosenvold */ public class TestSetMockReporterFactory http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e547c8c/surefire-api/src/main/java/org/apache/maven/surefire/booter/MainCliOptionsAware.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MainCliOptionsAware.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MainCliOptionsAware.java index b3b3c9d..eddebed 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MainCliOptionsAware.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MainCliOptionsAware.java @@ -29,7 +29,7 @@ import java.util.List; * @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a> * @since 2.19 */ -public interface MainCliOptionsAware +interface MainCliOptionsAware { void setMainCliOptions( List<CommandLineOption> mainCliOptions ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e547c8c/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.java index d55002e..351bb51 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.java @@ -23,7 +23,7 @@ package org.apache.maven.surefire.booter; * @author Kristian Rosenvold * @noinspection UnusedDeclaration */ -public interface SurefireClassLoadersAware +interface SurefireClassLoadersAware { void setClassLoaders( ClassLoader testClassLoader ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e547c8c/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java ---------------------------------------------------------------------- diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java index ee093c9..a2a3d52 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java @@ -155,11 +155,10 @@ public class Classpath implements Iterable<String> { try { - List urls = getAsUrlList(); + List<URL> urls = getAsUrlList(); IsolatedClassLoader classLoader = new IsolatedClassLoader( parent, childDelegation, roleName ); - for ( Object url1 : urls ) + for ( URL url : urls ) { - URL url = (URL) url1; classLoader.addURL( url ); } if ( parent != null ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e547c8c/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java ---------------------------------------------------------------------- diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java index 8fec269..c4a7103 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java @@ -65,11 +65,6 @@ public class PropertiesWrapper return Boolean.valueOf( properties.get( propertyName ) ); } - public boolean getBooleanObjectProperty( String propertyName ) - { - return Boolean.valueOf( properties.get( propertyName ) ); - } - public int getIntProperty( String propertyName ) { return Integer.parseInt( properties.get( propertyName ) ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e547c8c/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java index aa03b97..d7a6a01 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java @@ -19,11 +19,10 @@ package org.apache.maven.surefire.junitcore; * under the License. */ -import java.util.ArrayList; -import java.util.Collections; +import java.util.Collection; import java.util.List; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; import org.apache.maven.surefire.report.ReportEntry; import org.apache.maven.surefire.report.RunListener; import org.apache.maven.surefire.report.SimpleReportEntry; @@ -35,22 +34,22 @@ import org.junit.runner.Description; */ public class TestSet { - private final Description testSetDescription; + private static final InheritableThreadLocal<TestSet> TEST_SET = new InheritableThreadLocal<TestSet>(); - private final AtomicInteger numberOfCompletedChildren = new AtomicInteger( 0 ); + private final Description testSetDescription; - // While the two parameters below may seem duplicated, it is not entirely the case, - // since numberOfTests has the correct value from the start, while testMethods grows as method execution starts. + private final Collection<TestMethod> testMethods = new ConcurrentLinkedQueue<TestMethod>(); - private final AtomicInteger numberOfTests = new AtomicInteger( 0 ); + private final AtomicBoolean played = new AtomicBoolean(); - private final List<TestMethod> testMethods = Collections.synchronizedList( new ArrayList<TestMethod>() ); + private volatile boolean allScheduled; - private static final InheritableThreadLocal<TestSet> TEST_SET = new InheritableThreadLocal<TestSet>(); + private volatile int numberOfCompletedChildren; - private final AtomicBoolean allScheduled = new AtomicBoolean(); + // While the two parameters may seem duplicated, it is not entirely the case, + // since numberOfTests has the correct value from the start, while testMethods grows as method execution starts. - private final AtomicBoolean played = new AtomicBoolean(); + private volatile int numberOfTests; public TestSet( Description testSetDescription ) { @@ -124,7 +123,7 @@ public class TestSet public void incrementTestMethodCount() { - numberOfTests.incrementAndGet(); + numberOfTests++; } private void addTestMethod( TestMethod testMethod ) @@ -134,8 +133,8 @@ public class TestSet public void incrementFinishedTests( RunListener reporterManager, boolean reportImmediately ) { - numberOfCompletedChildren.incrementAndGet(); - if ( allScheduled.get() && isAllTestsDone() && reportImmediately ) + numberOfCompletedChildren++; + if ( allScheduled && isAllTestsDone() && reportImmediately ) { replay( reporterManager ); } @@ -143,7 +142,7 @@ public class TestSet public void setAllScheduled( RunListener reporterManager ) { - allScheduled.set( true ); + allScheduled = true; if ( isAllTestsDone() ) { replay( reporterManager ); @@ -152,7 +151,7 @@ public class TestSet private boolean isAllTestsDone() { - return numberOfTests.get() == numberOfCompletedChildren.get(); + return numberOfTests == numberOfCompletedChildren; } public void attachToThread()
