You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ag...@apache.org on 2014/10/26 00:59:41 UTC
[1/5] o Update to maven-parent 25,
fix tons of rat and checkstyle errors
Repository: maven-surefire
Updated Branches:
refs/heads/master 2e62ff472 -> 5d61287af
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
index 80baa97..7f5d347 100644
--- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
+++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.testng.utils;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -31,6 +32,10 @@ import org.testng.IMethodSelector;
import org.testng.IMethodSelectorContext;
import org.testng.ITestNGMethod;
+/**
+ * Method selector delegating to {@link GroupMatcher} to decide if a method is included or not.
+ *
+ */
public class GroupMatcherMethodSelector
implements IMethodSelector
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
index 3c06bca..bf42daa 100644
--- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
+++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
@@ -37,11 +37,11 @@ public class MethodSelector
implements IMethodSelector
{
- private static String METHOD_NAME = null;
+ private static String methodName = null;
public void setTestMethods( List arg0 )
{
- // noop
+ // noop
}
public boolean includeMethod( IMethodSelectorContext context, ITestNGMethod testngMethod, boolean isTestMethod )
@@ -59,11 +59,11 @@ public class MethodSelector
return true;
}
- return SelectorUtils.match( METHOD_NAME, testngMethod.getMethodName() );
+ return SelectorUtils.match( methodName, testngMethod.getMethodName() );
}
public static void setMethodName( String methodName )
{
- METHOD_NAME = methodName;
+ MethodSelector.methodName = methodName;
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
index 62286eb..d30ad3c 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
@@ -76,8 +76,9 @@ public class TestNGDirectoryTestSuite
private Class<? extends Annotation> junitTestAnnotation;
- public TestNGDirectoryTestSuite( String testSourceDirectory, Properties confOptions, File reportsDirectory, String testMethodPattern,
- RunOrderCalculator runOrderCalculator, ScanResult scanResult )
+ public TestNGDirectoryTestSuite( String testSourceDirectory, Properties confOptions, File reportsDirectory,
+ String testMethodPattern, RunOrderCalculator runOrderCalculator,
+ ScanResult scanResult )
{
this.runOrderCalculator = runOrderCalculator;
@@ -95,7 +96,7 @@ public class TestNGDirectoryTestSuite
}
public void execute( TestsToRun testsToRun, ReporterFactory reporterManagerFactory )
- throws ReporterException, TestSetFailedException
+ throws TestSetFailedException
{
if ( !testsToRun.allowEagerReading() )
@@ -132,7 +133,7 @@ public class TestNGDirectoryTestSuite
}
public void executeLazy( TestsToRun testsToRun, ReporterFactory reporterFactory )
- throws ReporterException, TestSetFailedException
+ throws TestSetFailedException
{
for ( Class c : testsToRun )
@@ -171,7 +172,7 @@ public class TestNGDirectoryTestSuite
}
public void executeMulti( TestsToRun testsToRun, ReporterFactory reporterFactory )
- throws ReporterException, TestSetFailedException
+ throws TestSetFailedException
{
List<Class> testNgTestClasses = new ArrayList<Class>();
List<Class> junitTestClasses = new ArrayList<Class>();
@@ -260,7 +261,7 @@ public class TestNGDirectoryTestSuite
// single class test
public void execute( String testSetName, ReporterFactory reporterManagerFactory )
- throws ReporterException, TestSetFailedException
+ throws TestSetFailedException
{
if ( testSets == null )
{
@@ -278,7 +279,8 @@ public class TestNGDirectoryTestSuite
startTestSuite( reporter, this );
- TestNGExecutor.run( new Class[]{ testSet.getTestClass() }, this.testSourceDirectory, this.options, reporter, this, reportsDirectory, testMethodPattern );
+ TestNGExecutor.run( new Class[] { testSet.getTestClass() }, this.testSourceDirectory, this.options, reporter,
+ this, reportsDirectory, testMethodPattern );
finishTestSuite( reporter, this );
}
@@ -298,7 +300,6 @@ public class TestNGDirectoryTestSuite
}
public static void finishTestSuite( RunListener reporterManager, Object suite )
- throws ReporterException
{
ReportEntry report = new SimpleReportEntry( suite.getClass().getName(), getSuiteName( suite ) );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
index 5655739..b3801fe 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
@@ -175,6 +175,7 @@ public class TestNGExecutor
}
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
private static XmlMethodSelector getMethodNameFilteringSelector( String methodNamePattern )
throws TestSetFailedException
{
@@ -226,6 +227,7 @@ public class TestNGExecutor
return xms;
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
private static XmlMethodSelector getGroupMatchingSelector( Map options )
throws TestSetFailedException
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/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 1f28a29..5d89d35 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
@@ -24,7 +24,6 @@ import java.util.Properties;
import org.apache.maven.surefire.providerapi.AbstractProvider;
import org.apache.maven.surefire.providerapi.ProviderParameters;
import org.apache.maven.surefire.report.ReporterConfiguration;
-import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.report.ReporterFactory;
import org.apache.maven.surefire.suite.RunResult;
import org.apache.maven.surefire.testset.TestRequest;
@@ -73,7 +72,7 @@ public class TestNGProvider
}
public RunResult invoke( Object forkTestSet )
- throws TestSetFailedException, ReporterException
+ throws TestSetFailedException
{
final ReporterFactory reporterFactory = providerParameters.getReporterFactory();
@@ -117,8 +116,8 @@ public class TestNGProvider
boolean isTestNGXmlTestSuite( TestRequest testSuiteDefinition )
{
- return testSuiteDefinition.getSuiteXmlFiles() != null && testSuiteDefinition.getSuiteXmlFiles().size() > 0 &&
- testSuiteDefinition.getRequestedTest() == null;
+ return testSuiteDefinition.getSuiteXmlFiles() != null && testSuiteDefinition.getSuiteXmlFiles().size() > 0
+ && testSuiteDefinition.getRequestedTest() == null;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
index cf3df4b..b4770d6 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
@@ -31,7 +31,6 @@ import org.testng.ISuiteListener;
import org.testng.ITestContext;
import org.testng.ITestListener;
import org.testng.ITestResult;
-import org.testng.TestNG;
/**
* Listens for and provides and adaptor layer so that
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
index 8448a2d..590b699 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Properties;
import org.apache.maven.surefire.report.ConsoleOutputCapture;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
-import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.report.ReporterFactory;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.testset.TestSetFailedException;
@@ -52,13 +51,14 @@ public class TestNGXmlTestSuite
private final File reportsDirectory;
// Not really used
- private Map<File,String> testSets;
+ private Map<File, String> testSets;
/**
* Creates a testng testset to be configured by the specified
* xml file(s). The XML files are suite definitions files according to TestNG DTD.
*/
- public TestNGXmlTestSuite( List<File> suiteFiles, String testSourceDirectory, Properties confOptions, File reportsDirectory )
+ public TestNGXmlTestSuite( List<File> suiteFiles, String testSourceDirectory, Properties confOptions,
+ File reportsDirectory )
{
this.suiteFiles = suiteFiles;
@@ -70,7 +70,7 @@ public class TestNGXmlTestSuite
}
public void execute( ReporterFactory reporterManagerFactory )
- throws ReporterException, TestSetFailedException
+ throws TestSetFailedException
{
if ( testSets == null )
{
@@ -105,7 +105,7 @@ public class TestNGXmlTestSuite
throw new IllegalStateException( "No suite files were specified" );
}
- this.testSets = new HashMap<File,String>();
+ this.testSets = new HashMap<File, String>();
this.suiteFilePaths = new ArrayList<String>();
for ( Object suiteFile : suiteFiles )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java
index 12491bb..a1d8e0f 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java
@@ -20,7 +20,6 @@ package org.apache.maven.surefire.testng;
*/
import java.util.Map;
-import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.report.ReporterFactory;
import org.apache.maven.surefire.testset.TestSetFailedException;
@@ -33,7 +32,7 @@ public interface TestNgTestSuite
{
void execute( String testSetName, ReporterFactory reporterManagerFactory )
- throws ReporterException, TestSetFailedException;
+ throws TestSetFailedException;
Map locateTestSets( ClassLoader classLoader )
throws TestSetFailedException;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
index b344d3d..1c77c83 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
@@ -31,6 +31,10 @@ import org.apache.maven.surefire.testset.TestSetFailedException;
import org.testng.TestNG;
import org.testng.xml.XmlSuite;
+/**
+ * Configurator that relies on reflection to set parameters in TestNG
+ *
+ */
public abstract class AbstractDirectConfigurator
implements Configurator
{
@@ -143,6 +147,10 @@ public abstract class AbstractDirectConfigurator
}
}
+ /**
+ * Describes a property setter by method name and parameter class
+ *
+ */
public static final class Setter
{
private final String setterName;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java
index 3019d3d..ddad3d9 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java
@@ -25,6 +25,10 @@ import org.apache.maven.surefire.testset.TestSetFailedException;
import org.testng.TestNG;
import org.testng.xml.XmlSuite;
+/**
+ * Configurator for passing configuration properties to TestNG
+ *
+ */
public interface Configurator
{
void configure( TestNG testng, Map options )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
index fc06989..004004f 100755
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
@@ -61,7 +61,8 @@ public class TestNGMapConfigurator
suite.setThreadCount( threadCount );
String parallel = (String) options.get( ProviderParameterNames.PARALLEL_PROP );
- if ( parallel != null ) {
+ if ( parallel != null )
+ {
suite.setParallel( parallel );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
----------------------------------------------------------------------
diff --git a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
index db6beae..6c05ef6 100644
--- a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
+++ b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
@@ -43,7 +43,8 @@ public class SurefireReportParser
{
private static final String INCLUDES = "*.xml";
- private static final String EXCLUDES = "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml, failsafe-summary*.xml";
+ private static final String EXCLUDES =
+ "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml, failsafe-summary*.xml";
private NumberFormat numberFormat = NumberFormat.getInstance();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
----------------------------------------------------------------------
diff --git a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
index 72afd44..7723245 100644
--- a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
+++ b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
@@ -126,7 +126,8 @@ public class TestSuiteXmlParser
{
if ( "testsuite".equals( qName ) )
{
- currentSuite = defaultSuite = new ReportTestSuite();
+ defaultSuite = new ReportTestSuite();
+ currentSuite = defaultSuite;
try
{
@@ -176,7 +177,8 @@ public class TestSuiteXmlParser
currentSuite.setFullClassName( fullClassName );
suites.add( currentSuite );
classesToSuitesIndex.put( fullClassName, suites.size() - 1 );
- } else
+ }
+ else
{
currentSuite = suites.get( currentSuiteIndex );
}
[4/5] git commit: o Update to maven-parent 25,
fix tons of rat and checkstyle errors
Posted by ag...@apache.org.
o Update to maven-parent 25, fix tons of rat and checkstyle errors
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e4ff0329
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e4ff0329
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e4ff0329
Branch: refs/heads/master
Commit: e4ff03293e74a2e049fdd9fe4a8e03753568e8a9
Parents: 2e62ff4
Author: Andreas Gudian <ag...@apache.org>
Authored: Sun Oct 26 00:57:48 2014 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Sun Oct 26 00:57:48 2014 +0200
----------------------------------------------------------------------
CONTRIBUTING.md | 19 ++
.../plugin/failsafe/IntegrationTestMojo.java | 21 +-
.../maven/plugin/failsafe/VerifyMojo.java | 4 +-
.../plugin/surefire/AbstractSurefireMojo.java | 247 +++++++++--------
.../maven/plugin/surefire/ClasspathCache.java | 7 +-
.../maven/plugin/surefire/ProviderList.java | 2 +
.../surefire/StartupReportConfiguration.java | 4 +-
.../plugin/surefire/SurefireProperties.java | 20 +-
.../surefire/booterclient/BooterSerializer.java | 5 +-
.../booterclient/ChecksumCalculator.java | 3 +-
.../booterclient/ForkConfiguration.java | 30 ++-
.../surefire/booterclient/ForkNumberBucket.java | 29 +-
.../surefire/booterclient/ForkStarter.java | 13 +-
.../OutputStreamFlushableCommandline.java | 3 -
.../TestProvidingInputStream.java | 6 +-
.../output/ThreadedStreamConsumer.java | 11 +-
.../report/ConsoleOutputFileReporter.java | 4 +-
.../plugin/surefire/report/ConsoleReporter.java | 3 -
.../surefire/report/DefaultReporterFactory.java | 22 +-
.../plugin/surefire/report/FileReporter.java | 5 +-
.../surefire/report/FileReporterUtils.java | 4 +-
.../surefire/report/PrettyPrintXMLWriter.java | 4 +
.../plugin/surefire/report/ReportEntryType.java | 12 +-
.../surefire/report/StatelessXmlReporter.java | 15 +-
.../surefire/report/TestSetRunListener.java | 13 +-
.../plugin/surefire/report/TestSetStats.java | 7 +-
.../Utf8RecodingDeferredFileOutputStream.java | 1 +
.../surefire/report/WrappedReportEntry.java | 9 +-
.../plugin/surefire/util/DependencyScanner.java | 15 +-
.../plugin/surefire/util/DirectoryScanner.java | 5 +-
.../maven/plugin/surefire/util/Relocator.java | 7 +-
.../maven/plugin/surefire/util/ScannerUtil.java | 16 +-
.../surefire/util/SpecificFileFilter.java | 4 +
.../surefire/report/SurefireReportParser.java | 3 +-
.../surefire/report/TestSuiteXmlParser.java | 4 +-
.../maven/surefire/report/RunStatistics.java | 7 -
.../report/DefaultReporterFactoryTest.java | 65 +++--
.../report/StatelessXmlReporterTest.java | 16 +-
.../maven/surefire/report/FileReporterTest.java | 4 +-
.../maven/plugin/surefire/SurefirePlugin.java | 25 +-
.../src/site/markdown/newerrorsummary.md | 19 ++
.../report/AbstractSurefireReportMojo.java | 17 +-
.../surefire/report/FailsafeReportMojo.java | 9 +-
.../report/SurefireReportGenerator.java | 269 ++++++++++---------
.../surefire/report/SurefireReportMojo.java | 10 +-
.../surefire/report/SurefireReportOnlyMojo.java | 4 +-
pom.xml | 2 +-
.../surefire/runorder/RunEntryStatistics.java | 1 +
.../runorder/ThreadedExecutionScheduler.java | 1 +
.../maven/surefire/SpecificTestClassFilter.java | 5 +
.../surefire/booter/BaseProviderFactory.java | 4 +-
.../surefire/booter/ForkingRunListener.java | 14 +-
.../surefire/booter/ProviderParameterNames.java | 1 +
.../surefire/booter/SurefireReflector.java | 7 +-
.../surefire/providerapi/SurefireProvider.java | 2 +-
.../maven/surefire/report/ConsoleLogger.java | 2 +-
.../surefire/report/ConsoleOutputCapture.java | 4 +-
.../ConsoleOutputReceiverForCurrentThread.java | 9 +-
.../report/DefaultDirectConsoleReporter.java | 1 +
.../report/LegacyPojoStackTraceWriter.java | 6 +-
.../maven/surefire/report/ReportEntry.java | 18 +-
.../maven/surefire/report/SafeThrowable.java | 1 +
.../surefire/testset/RunOrderParameters.java | 2 +-
.../util/DefaultRunOrderCalculator.java | 4 +-
.../maven/surefire/util/DefaultScanResult.java | 10 +-
.../maven/surefire/util/ReflectionUtils.java | 1 +
.../maven/surefire/util/RunOrderCalculator.java | 34 +--
.../surefire/util/internal/ByteBuffer.java | 8 +-
.../surefire/util/internal/StringUtils.java | 5 +-
.../report/LegacyPojoStackTraceWriterTest.java | 19 ++
.../surefire/util/RunOrderCalculatorTest.java | 2 +-
.../maven/surefire/booter/BooterConstants.java | 48 ++--
.../surefire/booter/BooterDeserializer.java | 4 +-
.../apache/maven/surefire/booter/Classpath.java | 18 +-
.../surefire/booter/ClasspathConfiguration.java | 5 +-
.../maven/surefire/booter/ForkedBooter.java | 9 +-
.../surefire/booter/IsolatedClassLoader.java | 4 +-
.../maven/surefire/booter/KeyValueSource.java | 1 +
.../maven/surefire/booter/LazyTestsToRun.java | 3 +-
.../surefire/booter/PropertiesWrapper.java | 13 +-
.../surefire/booter/ProviderConfiguration.java | 1 +
.../maven/surefire/booter/ProviderFactory.java | 9 +-
.../surefire/booter/StartupConfiguration.java | 2 +-
.../maven/surefire/booter/TypeEncodedValue.java | 34 +--
.../surefire/booter/PropertiesWrapperTest.java | 4 +-
.../surefire/booter/SurefireReflectorTest.java | 3 +-
.../surefire/group/match/AndGroupMatcher.java | 5 +
.../surefire/group/match/GroupMatcher.java | 5 +
.../group/match/InverseGroupMatcher.java | 5 +
.../surefire/group/match/JoinGroupMatcher.java | 5 +
.../surefire/group/match/OrGroupMatcher.java | 5 +
.../group/match/SingleGroupMatcher.java | 5 +
.../its/Junit47StaticInnerClassTestsIT.java | 19 ++
.../its/fixture/SurefireLauncherTest.java | 19 ++
.../Surefire569RunTestFromDependencyJarsIT.java | 19 ++
.../surefire/report/PojoStackTraceWriter.java | 3 +-
.../surefire/report/SmartStackTraceParser.java | 6 +-
.../surefire/common/junit3/JUnit3Reflector.java | 4 +
.../surefire/common/junit4/JUnit4Reflector.java | 17 +-
.../common/junit4/JUnit4RunListener.java | 9 +-
.../common/junit4/JUnitTestFailureListener.java | 19 ++
.../common/junit48/JUnit48Reflector.java | 5 +-
.../common/junit48/JUnit48TestChecker.java | 8 +-
.../maven/surefire/junit/JUnit3Provider.java | 5 +-
.../maven/surefire/junit/JUnitTestSet.java | 4 +
.../maven/surefire/junit/PojoTestSet.java | 4 +
.../maven/surefire/junit/SurefireTestSet.java | 4 +
.../junit/TestListenerInvocationHandler.java | 4 +
.../maven/surefire/junit4/JUnit4Provider.java | 35 ++-
.../junitcore/ConfigurableParallelComputer.java | 2 +-
.../surefire/junitcore/JUnitCoreProvider.java | 6 +-
.../surefire/junitcore/SynchronousRunner.java | 1 +
.../maven/surefire/junitcore/TestSet.java | 6 +-
.../maven/surefire/junitcore/pc/Balancer.java | 6 +-
.../surefire/junitcore/pc/InvokerStrategy.java | 3 +-
.../surefire/junitcore/pc/ParallelComputer.java | 6 +-
.../junitcore/pc/ParallelComputerBuilder.java | 37 +--
.../junitcore/pc/ParallelComputerUtil.java | 13 +-
.../junitcore/pc/SchedulingStrategy.java | 3 -
.../junitcore/pc/SharedThreadPoolStrategy.java | 4 +-
.../surefire/junitcore/pc/ShutdownStatus.java | 1 +
.../utils/GroupMatcherMethodSelector.java | 5 +
.../surefire/testng/utils/MethodSelector.java | 8 +-
.../testng/TestNGDirectoryTestSuite.java | 17 +-
.../maven/surefire/testng/TestNGExecutor.java | 2 +
.../maven/surefire/testng/TestNGProvider.java | 7 +-
.../maven/surefire/testng/TestNGReporter.java | 1 -
.../surefire/testng/TestNGXmlTestSuite.java | 10 +-
.../maven/surefire/testng/TestNgTestSuite.java | 3 +-
.../testng/conf/AbstractDirectConfigurator.java | 8 +
.../surefire/testng/conf/Configurator.java | 4 +
.../testng/conf/TestNGMapConfigurator.java | 3 +-
.../surefire/report/SurefireReportParser.java | 3 +-
.../surefire/report/TestSuiteXmlParser.java | 6 +-
134 files changed, 1064 insertions(+), 658 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4041b4d..1985ce1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
Guidelines for contributing
===========
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 1d47248..91fdfa7 100644
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -163,7 +163,7 @@ public class IntegrationTestMojo
*/
@Parameter( property = "failsafe.parallel.forcedTimeout" )
private double parallelTestsTimeoutForcedInSeconds;
-
+
/**
* A list of <include> elements specifying the tests (by pattern) that should be included in testing. When not
* specified and when the <code>test</code> parameter is not specified, the default includes will be <code><br/>
@@ -219,7 +219,8 @@ public class IntegrationTestMojo
@Parameter( property = "failsafe.rerunFailingTestsCount", defaultValue = "0" )
protected int rerunFailingTestsCount;
- protected int getRerunFailingTestsCount() {
+ protected int getRerunFailingTestsCount()
+ {
return rerunFailingTestsCount;
}
@@ -264,8 +265,8 @@ public class IntegrationTestMojo
{
if ( StringUtils.isEmpty( encoding ) )
{
- getLog().warn( "File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING +
- ", i.e. build is platform dependent!" );
+ getLog().warn( "File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING
+ + ", i.e. build is platform dependent!" );
return ReaderFactory.FILE_ENCODING;
}
else
@@ -471,19 +472,23 @@ public class IntegrationTestMojo
this.forkedProcessTimeoutInSeconds = forkedProcessTimeoutInSeconds;
}
- public double getParallelTestsTimeoutInSeconds() {
+ public double getParallelTestsTimeoutInSeconds()
+ {
return parallelTestsTimeoutInSeconds;
}
- public void setParallelTestsTimeoutInSeconds( double parallelTestsTimeoutInSeconds ) {
+ public void setParallelTestsTimeoutInSeconds( double parallelTestsTimeoutInSeconds )
+ {
this.parallelTestsTimeoutInSeconds = parallelTestsTimeoutInSeconds;
}
- public double getParallelTestsTimeoutForcedInSeconds() {
+ public double getParallelTestsTimeoutForcedInSeconds()
+ {
return parallelTestsTimeoutForcedInSeconds;
}
- public void setParallelTestsTimeoutForcedInSeconds( double parallelTestsTimeoutForcedInSeconds ) {
+ public void setParallelTestsTimeoutForcedInSeconds( double parallelTestsTimeoutForcedInSeconds )
+ {
this.parallelTestsTimeoutForcedInSeconds = parallelTestsTimeoutForcedInSeconds;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
index fb41b93..f9abed0 100644
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
@@ -60,8 +60,8 @@ public class VerifyMojo
private boolean skipTests;
/**
- * Set this to 'true' to skip running integration tests, but still compile them. Its use is NOT RECOMMENDED, but quite
- * convenient on occasion.
+ * Set this to 'true' to skip running integration tests, but still compile them. Its use is NOT RECOMMENDED, but
+ * quite convenient on occasion.
*
* @since 2.4.3-alpha-2
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 3d5e149..7398a25 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: FileLength|RegexpHeader
package org.apache.maven.plugin.surefire;
/*
@@ -207,8 +208,8 @@ public abstract class AbstractSurefireMojo
protected File testSourceDirectory;
/**
- * A file containing include patterns.
- * Blank lines, or lines starting with # are ignored. If {@code includes} are also specified these patterns are appended.
+ * A file containing include patterns. Blank lines, or lines starting with # are ignored. If {@code includes} are
+ * also specified these patterns are appended.
*/
@Parameter
protected File includesFile;
@@ -229,8 +230,8 @@ public abstract class AbstractSurefireMojo
protected List<String> excludes;
/**
- * A file containing exclude patterns.
- * Blank lines, or lines starting with # are ignored. If {@code excludes} are also specified these patterns are appended.
+ * A file containing exclude patterns. Blank lines, or lines starting with # are ignored. If {@code excludes} are
+ * also specified these patterns are appended.
*/
@Parameter
protected File excludesFile;
@@ -316,11 +317,13 @@ public abstract class AbstractSurefireMojo
protected Boolean failIfNoTests;
/**
- * <strong>DEPRECATED</strong> since version 2.14. Use <code>forkCount</code> and <code>reuseForks</code> instead.<br/>
+ * <strong>DEPRECATED</strong> since version 2.14. Use <code>forkCount</code> and <code>reuseForks</code> instead.
* <br/>
- * Option to specify the forking mode. Can be "never", "once", "always", "perthread". "none" and "pertest" are also accepted
- * for backwards compatibility. "always" forks for each test-class. "perthread" will create <code>threadCount</code>
- * parallel forks, each executing one test-class. See also parameter <code>reuseForks</code>.<br/>
+ * <br/>
+ * Option to specify the forking mode. Can be "never", "once", "always", "perthread". "none" and "pertest" are also
+ * accepted for backwards compatibility. "always" forks for each test-class. "perthread" will create
+ * <code>threadCount</code> parallel forks, each executing one test-class. See also parameter
+ * <code>reuseForks</code>.<br/>
*
* @since 2.1
*/
@@ -373,8 +376,9 @@ public abstract class AbstractSurefireMojo
protected boolean childDelegation;
/**
- * (TestNG/JUnit47 provider with JUnit4.8+ only) Groups for this test. Only classes/methods/etc decorated with one of the groups specified here will
- * be included in test run, if specified.<br/>For JUnit, this parameter forces the use of the 4.7 provider<br/>
+ * (TestNG/JUnit47 provider with JUnit4.8+ only) Groups for this test. Only classes/methods/etc decorated with one
+ * of the groups specified here will be included in test run, if specified.<br/>
+ * For JUnit, this parameter forces the use of the 4.7 provider<br/>
* This parameter is ignored if the <code>suiteXmlFiles</code> parameter is specified.
*
* @since 2.2
@@ -383,8 +387,9 @@ public abstract class AbstractSurefireMojo
protected String groups;
/**
- * (TestNG/JUnit47 provider with JUnit4.8+ only) Excluded groups. Any methods/classes/etc with one of the groups specified in this list will
- * specifically not be run.<br/>For JUnit, this parameter forces the use of the 4.7 provider<br/>
+ * (TestNG/JUnit47 provider with JUnit4.8+ only) Excluded groups. Any methods/classes/etc with one of the groups
+ * specified in this list will specifically not be run.<br/>
+ * For JUnit, this parameter forces the use of the 4.7 provider<br/>
* This parameter is ignored if the <code>suiteXmlFiles</code> parameter is specified.
*
* @since 2.2
@@ -430,15 +435,16 @@ public abstract class AbstractSurefireMojo
protected int threadCount;
/**
- * Option to specify the number of VMs to fork in parallel in order to execute the tests.
- * When terminated with "C", the number part is multiplied with the number of CPU cores. Floating point value are only accepted together with "C".
- * If set to "0", no VM is forked and all tests are executed within the main process.<br/>
+ * Option to specify the number of VMs to fork in parallel in order to execute the tests. When terminated with "C",
+ * the number part is multiplied with the number of CPU cores. Floating point value are only accepted together with
+ * "C". If set to "0", no VM is forked and all tests are executed within the main process.<br/>
* <br/>
* Example values: "1.5C", "4"<br/>
* <br/>
- * The system properties and the <code>argLine</code> of the forked processes may contain the place holder string <code>${surefire.forkNumber}</code>,
- * which is replaced with a fixed number for each of the parallel forks, ranging from <code>1</code> to the effective value of <code>forkCount</code>
- * times the maximum number of parallel Surefire executions in maven parallel builds, i.e. the effective value of the <code>-T</code> command line
+ * The system properties and the <code>argLine</code> of the forked processes may contain the place holder string
+ * <code>${surefire.forkNumber}</code>, which is replaced with a fixed number for each of the parallel forks,
+ * ranging from <code>1</code> to the effective value of <code>forkCount</code> times the maximum number of parallel
+ * Surefire executions in maven parallel builds, i.e. the effective value of the <code>-T</code> command line
* argument of maven core.
*
* @since 2.14
@@ -550,20 +556,19 @@ public abstract class AbstractSurefireMojo
/**
* (JUnit 4.7 provider) This attribute allows you to specify the concurrency in test methods, i.e.:
* <ul>
- * <li>number of concurrent methods if <code>threadCount</code> is 0 or unspecified</li>
- * <li>limited concurrency of methods if <code>useUnlimitedThreads</code> is set to <strong>true</strong></li>
- * <li>if <code>threadCount</code> and certain thread-count parameters are > 0 for <code>parallel</code>, the
- * concurrency is computed from ratio. For instance parallel=all and the ratio between
- * <code>threadCountSuites</code>:<code>threadCountClasses</code>:<em>threadCountMethods</em> is
- * 2:3:<em>5</em>, there is 50% of <code>threadCount</code> in concurrent methods.</li>
- * <li>as in the previous case but without this leaf thread-count. Example: parallel=all, threadCount=16,
- * threadCountSuites=2, threadCountClasses=3, but threadCountMethods is unspecified leaf, the number of concurrent
- * methods is varying from >= 11 to 14 or 15. The threadCountSuites and threadCountClasses become number of threads.
- * </li>
+ * <li>number of concurrent methods if <code>threadCount</code> is 0 or unspecified</li>
+ * <li>limited concurrency of methods if <code>useUnlimitedThreads</code> is set to <strong>true</strong></li>
+ * <li>if <code>threadCount</code> and certain thread-count parameters are > 0 for <code>parallel</code>, the
+ * concurrency is computed from ratio. For instance parallel=all and the ratio between
+ * <code>threadCountSuites</code>:<code>threadCountClasses</code>:<em>threadCountMethods</em> is 2:3:<em>5</em>,
+ * there is 50% of <code>threadCount</code> in concurrent methods.</li>
+ * <li>as in the previous case but without this leaf thread-count. Example: parallel=all, threadCount=16,
+ * threadCountSuites=2, threadCountClasses=3, but threadCountMethods is unspecified leaf, the number of concurrent
+ * methods is varying from >= 11 to 14 or 15. The threadCountSuites and threadCountClasses become number of
+ * threads.</li>
* </ul>
- *
- * Only makes sense to use in conjunction with the <code>parallel</code> parameter.
- * The default value <code>0</code> behaves same as unspecified one.
+ * Only makes sense to use in conjunction with the <code>parallel</code> parameter. The default value <code>0</code>
+ * behaves same as unspecified one.
*
* @since 2.16
*/
@@ -643,7 +648,8 @@ public abstract class AbstractSurefireMojo
/**
* Defines the order the tests will be run in. Supported values are "alphabetical", "reversealphabetical", "random",
- * "hourly" (alphabetical on even hours, reverse alphabetical on odd hours), "failedfirst", "balanced" and "filesystem".
+ * "hourly" (alphabetical on even hours, reverse alphabetical on odd hours), "failedfirst", "balanced" and
+ * "filesystem".
* <p/>
* <p/>
* Odd/Even for hourly is determined at the time the of scanning the classpath, meaning it could change during a
@@ -651,13 +657,13 @@ public abstract class AbstractSurefireMojo
* <p/>
* Failed first will run tests that failed on previous run first, as well as new tests for this run.
* <p/>
- * Balanced is only relevant with parallel=classes, and will try to optimize the run-order of the tests reducing
- * the overall execution time. Initially a statistics file is created and every next test run will reorder classes.
+ * Balanced is only relevant with parallel=classes, and will try to optimize the run-order of the tests reducing the
+ * overall execution time. Initially a statistics file is created and every next test run will reorder classes.
* <p/>
- * Note that the statistics are stored in a file named .surefire-XXXXXXXXX beside pom.xml, and should not
- * be checked into version control. The "XXXXX" is the SHA1 checksum of the entire surefire configuration,
- * so different configurations will have different statistics files, meaning if you change any config
- * settings you will re-run once before new statistics data can be established.
+ * Note that the statistics are stored in a file named .surefire-XXXXXXXXX beside pom.xml, and should not be checked
+ * into version control. The "XXXXX" is the SHA1 checksum of the entire surefire configuration, so different
+ * configurations will have different statistics files, meaning if you change any config settings you will re-run
+ * once before new statistics data can be established.
*
* @since 2.7
*/
@@ -886,7 +892,8 @@ public abstract class AbstractSurefireMojo
private SurefireProperties setupProperties()
{
SurefireProperties sysProps = null;
- try {
+ try
+ {
sysProps = SurefireProperties.loadProperties( systemPropertiesFile );
}
catch ( IOException e )
@@ -1059,8 +1066,8 @@ public abstract class AbstractSurefireMojo
}
Artifact testNgArtifact = getTestNgArtifact();
- if ( testNgArtifact != null){
-
+ if ( testNgArtifact != null )
+ {
DefaultArtifactVersion defaultArtifactVersion = new DefaultArtifactVersion( testNgArtifact.getVersion() );
getProperties().setProperty( "testng.configurator", getConfiguratorName( defaultArtifactVersion ) );
}
@@ -1137,7 +1144,7 @@ public abstract class AbstractSurefireMojo
String usedParallel = ( getParallel() != null ) ? getParallel() : "none";
- if ( !"none".equals( usedParallel ))
+ if ( !"none".equals( usedParallel ) )
{
checkNonForkedThreads( parallel );
}
@@ -1147,9 +1154,12 @@ public abstract class AbstractSurefireMojo
getProperties().setProperty( ProviderParameterNames.THREADCOUNT_PROP, usedThreadCount );
getProperties().setProperty( "perCoreThreadCount", Boolean.toString( getPerCoreThreadCount() ) );
getProperties().setProperty( "useUnlimitedThreads", Boolean.toString( getUseUnlimitedThreads() ) );
- getProperties().setProperty( ProviderParameterNames.THREADCOUNTSUITES_PROP, Integer.toString( getThreadCountSuites() ) );
- getProperties().setProperty( ProviderParameterNames.THREADCOUNTCLASSES_PROP, Integer.toString( getThreadCountClasses() ) );
- getProperties().setProperty( ProviderParameterNames.THREADCOUNTMETHODS_PROP, Integer.toString( getThreadCountMethods() ) );
+ getProperties().setProperty( ProviderParameterNames.THREADCOUNTSUITES_PROP,
+ Integer.toString( getThreadCountSuites() ) );
+ getProperties().setProperty( ProviderParameterNames.THREADCOUNTCLASSES_PROP,
+ Integer.toString( getThreadCountClasses() ) );
+ getProperties().setProperty( ProviderParameterNames.THREADCOUNTMETHODS_PROP,
+ Integer.toString( getThreadCountMethods() ) );
getProperties().setProperty( ProviderParameterNames.PARALLEL_TIMEOUT_PROP,
Double.toString( getParallelTestsTimeoutInSeconds() ) );
getProperties().setProperty( ProviderParameterNames.PARALLEL_TIMEOUTFORCED_PROP,
@@ -1159,9 +1169,11 @@ public abstract class AbstractSurefireMojo
String message =
"parallel='" + usedParallel + '\'' + ", perCoreThreadCount=" + getPerCoreThreadCount() + ", threadCount="
- + usedThreadCount + ", useUnlimitedThreads=" + getUseUnlimitedThreads() +
- ", threadCountSuites=" + getThreadCountSuites() + ", threadCountClasses=" + getThreadCountClasses() +
- ", threadCountMethods=" + getThreadCountMethods() + ", parallelOptimized=" + isParallelOptimized();
+ + usedThreadCount + ", useUnlimitedThreads=" + getUseUnlimitedThreads()
+ + ", threadCountSuites=" + getThreadCountSuites()
+ + ", threadCountClasses=" + getThreadCountClasses()
+ + ", threadCountMethods=" + getThreadCountMethods()
+ + ", parallelOptimized=" + isParallelOptimized();
getLog().info( message );
}
@@ -1172,8 +1184,8 @@ public abstract class AbstractSurefireMojo
{
if ( !( getUseUnlimitedThreads() || getThreadCount() > 0 ^ getThreadCountSuites() > 0 ) )
{
- throw new MojoExecutionException( "Use threadCount or threadCountSuites > 0 or useUnlimitedThreads=true " +
- "for parallel='suites'" );
+ throw new MojoExecutionException(
+ "Use threadCount or threadCountSuites > 0 or useUnlimitedThreads=true for parallel='suites'" );
}
setThreadCountClasses( 0 );
setThreadCountMethods( 0 );
@@ -1182,8 +1194,9 @@ public abstract class AbstractSurefireMojo
{
if ( !( getUseUnlimitedThreads() || getThreadCount() > 0 ^ getThreadCountClasses() > 0 ) )
{
- throw new MojoExecutionException( "Use threadCount or threadCountClasses > 0 or useUnlimitedThreads=true " +
- "for parallel='classes'" );
+ throw new MojoExecutionException(
+ "Use threadCount or threadCountClasses > 0 or useUnlimitedThreads=true for parallel='classes'"
+ );
}
setThreadCountSuites( 0 );
setThreadCountMethods( 0 );
@@ -1192,8 +1205,9 @@ public abstract class AbstractSurefireMojo
{
if ( !( getUseUnlimitedThreads() || getThreadCount() > 0 ^ getThreadCountMethods() > 0 ) )
{
- throw new MojoExecutionException( "Use threadCount or threadCountMethods > 0 or useUnlimitedThreads=true " +
- "for parallel='methods'" );
+ throw new MojoExecutionException(
+ "Use threadCount or threadCountMethods > 0 or useUnlimitedThreads=true for parallel='methods'"
+ );
}
setThreadCountSuites( 0 );
setThreadCountClasses( 0 );
@@ -1209,12 +1223,12 @@ public abstract class AbstractSurefireMojo
|| getThreadCount() > 0 && getThreadCountSuites() > 0 && getThreadCount() > getThreadCountSuites()
&& getThreadCountClasses() == 0 && getThreadCountMethods() == 0 ) )
{
- throw new MojoExecutionException( "Use useUnlimitedThreads=true, " +
- "or only threadCount > 0, " +
- "or (threadCountSuites > 0 and threadCountClasses > 0), " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCountClasses > 0) " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCount > threadCountSuites) " +
- "for parallel='suitesAndClasses' or 'both'" );
+ throw new MojoExecutionException( "Use useUnlimitedThreads=true, "
+ + "or only threadCount > 0, "
+ + "or (threadCountSuites > 0 and threadCountClasses > 0), "
+ + "or (threadCount > 0 and threadCountSuites > 0 and threadCountClasses > 0) "
+ + "or (threadCount > 0 and threadCountSuites > 0 and threadCount > threadCountSuites) "
+ + "for parallel='suitesAndClasses' or 'both'" );
}
setThreadCountMethods( 0 );
}
@@ -1229,12 +1243,12 @@ public abstract class AbstractSurefireMojo
|| getThreadCount() > 0 && getThreadCountSuites() > 0 && getThreadCount() > getThreadCountSuites()
&& getThreadCountClasses() == 0 && getThreadCountMethods() == 0 ) )
{
- throw new MojoExecutionException( "Use useUnlimitedThreads=true, " +
- "or only threadCount > 0, " +
- "or (threadCountSuites > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCount > threadCountSuites) " +
- "for parallel='suitesAndMethods'" );
+ throw new MojoExecutionException( "Use useUnlimitedThreads=true, "
+ + "or only threadCount > 0, "
+ + "or (threadCountSuites > 0 and threadCountMethods > 0), "
+ + "or (threadCount > 0 and threadCountSuites > 0 and threadCountMethods > 0), "
+ + "or (threadCount > 0 and threadCountSuites > 0 and threadCount > threadCountSuites) "
+ + "for parallel='suitesAndMethods'" );
}
setThreadCountClasses( 0 );
}
@@ -1249,12 +1263,12 @@ public abstract class AbstractSurefireMojo
|| getThreadCount() > 0 && getThreadCountClasses() > 0 && getThreadCount() > getThreadCountClasses()
&& getThreadCountSuites() == 0 && getThreadCountMethods() == 0 ) )
{
- throw new MojoExecutionException( "Use useUnlimitedThreads=true, " +
- "or only threadCount > 0, " +
- "or (threadCountClasses > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountClasses > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountClasses > 0 and threadCount > threadCountClasses) " +
- "for parallel='both' or parallel='classesAndMethods'" );
+ throw new MojoExecutionException( "Use useUnlimitedThreads=true, "
+ + "or only threadCount > 0, "
+ + "or (threadCountClasses > 0 and threadCountMethods > 0), "
+ + "or (threadCount > 0 and threadCountClasses > 0 and threadCountMethods > 0), "
+ + "or (threadCount > 0 and threadCountClasses > 0 and threadCount > threadCountClasses) "
+ + "for parallel='both' or parallel='classesAndMethods'" );
}
setThreadCountSuites( 0 );
}
@@ -1267,13 +1281,13 @@ public abstract class AbstractSurefireMojo
&& getThreadCountMethods() == 0
&& getThreadCount() > ( getThreadCountSuites() + getThreadCountClasses() ) ) )
{
- throw new MojoExecutionException( "Use useUnlimitedThreads=true, " +
- "or only threadCount > 0, " +
- "or (threadCountSuites > 0 and threadCountClasses > 0 and threadCountMethods > 0), " +
- "or every thread-count is specified, " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCountClasses > 0 " +
- "and threadCount > threadCountSuites + threadCountClasses) " +
- "for parallel='all'" );
+ throw new MojoExecutionException( "Use useUnlimitedThreads=true, "
+ + "or only threadCount > 0, "
+ + "or (threadCountSuites > 0 and threadCountClasses > 0 and threadCountMethods > 0), "
+ + "or every thread-count is specified, "
+ + "or (threadCount > 0 and threadCountSuites > 0 and threadCountClasses > 0 "
+ + "and threadCount > threadCountSuites + threadCountClasses) "
+ + "for parallel='all'" );
}
}
else
@@ -1288,11 +1302,13 @@ public abstract class AbstractSurefireMojo
&& getThreadCountMethods() == 0;
}
- private static void checkThreadCountEntity(int count, String entity) throws MojoExecutionException
+ private static void checkThreadCountEntity( int count, String entity )
+ throws MojoExecutionException
{
if ( count < 0 )
{
- throw new MojoExecutionException("parallel maven execution does not allow negative thread-count" + entity);
+ throw new MojoExecutionException(
+ "parallel maven execution does not allow negative thread-count" + entity );
}
}
@@ -1379,13 +1395,14 @@ public abstract class AbstractSurefireMojo
isTestNg ? new TestArtifactInfo( testNgArtifact.getVersion(), testNgArtifact.getClassifier() ) : null;
List<File> testXml = getSuiteXmlFiles() != null ? Arrays.asList( getSuiteXmlFiles() ) : null;
TestRequest testSuiteDefinition =
- new TestRequest(testXml, getTestSourceDirectory(), getTest(), getTestMethod(),
- getRerunFailingTestsCount());
- final boolean failIfNoTests;
+ new TestRequest( testXml, getTestSourceDirectory(), getTest(), getTestMethod(),
+ getRerunFailingTestsCount() );
+
+ final boolean actualFailIfNoTests;
if ( isValidSuiteXmlFileConfig() && getTest() == null )
{
- failIfNoTests = getFailIfNoTests() != null && getFailIfNoTests();
+ actualFailIfNoTests = getFailIfNoTests() != null && getFailIfNoTests();
if ( !isTestNg )
{
throw new MojoExecutionException( "suiteXmlFiles is configured, but there is no TestNG dependency" );
@@ -1395,25 +1412,25 @@ public abstract class AbstractSurefireMojo
{
if ( isSpecificTestSpecified() )
{
- failIfNoTests = getEffectiveFailIfNoTests();
- setFailIfNoTests( failIfNoTests );
+ actualFailIfNoTests = getEffectiveFailIfNoTests();
+ setFailIfNoTests( actualFailIfNoTests );
}
else
{
- failIfNoTests = getFailIfNoTests() != null && getFailIfNoTests();
+ actualFailIfNoTests = getFailIfNoTests() != null && getFailIfNoTests();
}
- List<String> includes = getIncludeList();
- List<String> excludes = getExcludeList();
+ List<String> actualIncludes = getIncludeList();
+ List<String> actualExcludes = getExcludeList();
List<String> specificTests = getSpecificTests();
directoryScannerParameters =
- new DirectoryScannerParameters( getTestClassesDirectory(), includes, excludes, specificTests,
- failIfNoTests, getRunOrder() );
+ new DirectoryScannerParameters( getTestClassesDirectory(), actualIncludes, actualExcludes,
+ specificTests, actualFailIfNoTests, getRunOrder() );
}
Properties providerProperties = getProperties();
- return new ProviderConfiguration( directoryScannerParameters, runOrderParameters, failIfNoTests,
+ return new ProviderConfiguration( directoryScannerParameters, runOrderParameters, actualFailIfNoTests,
reporterConfiguration, testNg, testSuiteDefinition, providerProperties, null,
false );
}
@@ -1444,7 +1461,7 @@ public abstract class AbstractSurefireMojo
Artifact surefireArtifact = getCommonArtifact();
Classpath inprocClassPath = providerClasspath.
addClassPathElementUrl( surefireArtifact.getFile().getAbsolutePath() )
- .addClassPathElementUrl( getApiArtifact().getFile().getAbsolutePath());
+ .addClassPathElementUrl( getApiArtifact().getFile().getAbsolutePath() );
final Classpath testClasspath = generateTestClasspath();
@@ -1504,7 +1521,8 @@ public abstract class AbstractSurefireMojo
return getSuiteXmlFiles() != null && getSuiteXmlFiles().length > 0;
}
- @Nonnull private List<String> readListFromFile( @Nonnull final File file )
+ @SuppressWarnings( "checkstyle:modifierorder" )
+ private @Nonnull List<String> readListFromFile( @Nonnull final File file )
{
List<String> list;
@@ -1543,42 +1561,43 @@ public abstract class AbstractSurefireMojo
}
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
private @Nonnull List<String> getExcludeList()
{
- List<String> excludes = null;
+ List<String> actualExcludes = null;
if ( isSpecificTestSpecified() )
{
// Check to see if we are running a single test. The raw parameter will
// come through if it has not been set.
// FooTest -> **/FooTest.java
- excludes = new ArrayList<String>();
+ actualExcludes = new ArrayList<String>();
}
else
{
if ( getExcludesFile() != null )
{
- excludes = readListFromFile( getExcludesFile() );
+ actualExcludes = readListFromFile( getExcludesFile() );
}
// If we have excludesFile, and we have excludes, then append excludes to excludesFile content
- if ( excludes == null )
+ if ( actualExcludes == null )
{
- excludes = this.getExcludes();
+ actualExcludes = this.getExcludes();
}
else
{
- maybeAppendList( excludes, this.getExcludes() );
+ maybeAppendList( actualExcludes, this.getExcludes() );
}
// defaults here, qdox doesn't like the end javadoc value
// Have to wrap in an ArrayList as surefire expects an ArrayList instead of a List for some reason
- if ( excludes == null || excludes.size() == 0 )
+ if ( actualExcludes == null || actualExcludes.size() == 0 )
{
- excludes = Arrays.asList( "**/*$*" );
+ actualExcludes = Arrays.asList( "**/*$*" );
}
}
- return filterNulls( excludes );
+ return filterNulls( actualExcludes );
}
private List<String> getIncludeList()
@@ -1616,6 +1635,7 @@ public abstract class AbstractSurefireMojo
return filterNulls( includes );
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
private @Nonnull List<String> filterNulls( @Nonnull List<String> toFilter )
{
List<String> result = new ArrayList<String>( toFilter.size() );
@@ -1784,6 +1804,7 @@ public abstract class AbstractSurefireMojo
}
}
+ @SuppressWarnings( "checkstyle:emptyblock" )
protected int getEffectiveForkCount()
{
if ( effectiveForkCount < 0 )
@@ -1833,7 +1854,8 @@ public abstract class AbstractSurefireMojo
String debugForkedProcess = getDebugForkedProcess();
if ( "true".equals( debugForkedProcess ) )
{
- return "-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005";
+ return "-Xdebug -Xnoagent -Djava.compiler=NONE"
+ + " -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005";
}
return debugForkedProcess;
}
@@ -2010,7 +2032,8 @@ public abstract class AbstractSurefireMojo
if ( getClasspathDependencyExcludes() != null )
{
- ArtifactFilter dependencyFilter = new PatternIncludesArtifactFilter( Arrays.asList( getClasspathDependencyExcludes() ) );
+ ArtifactFilter dependencyFilter =
+ new PatternIncludesArtifactFilter( Arrays.asList( getClasspathDependencyExcludes() ) );
classpathArtifacts = this.filterArtifacts( classpathArtifacts, dependencyFilter );
}
@@ -2142,8 +2165,8 @@ public abstract class AbstractSurefireMojo
Artifact artifact = (Artifact) o;
getLog().debug(
- "Adding to " + getPluginName() + " booter test classpath: " + artifact.getFile().getAbsolutePath() +
- " Scope: " + artifact.getScope() );
+ "Adding to " + getPluginName() + " booter test classpath: " + artifact.getFile().getAbsolutePath()
+ + " Scope: " + artifact.getScope() );
items.add( artifact.getFile().getAbsolutePath() );
}
@@ -2255,7 +2278,8 @@ public abstract class AbstractSurefireMojo
if ( junitArtifact != null )
{
throw new MojoFailureException( "groups/excludedGroups are specified but JUnit version on classpath"
- + " is too old to support groups. Check your dependency:tree to see if your project is picking up an old junit version" );
+ + " is too old to support groups. Check your dependency:tree to see if your project"
+ + " is picking up an old junit version" );
}
throw new MojoFailureException(
"groups/excludedGroups require TestNG or JUnit48+ on project test classpath" );
@@ -2273,6 +2297,7 @@ public abstract class AbstractSurefireMojo
this.testNgArtifact = testNgArtifact;
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
public @Nonnull String getProviderName()
{
return "org.apache.maven.surefire.testng.TestNGProvider";
@@ -2408,6 +2433,10 @@ public abstract class AbstractSurefireMojo
}
+ /**
+ * Provides the Provider information for manually configured providers
+ *
+ */
public class DynamicProviderInfo
implements ConfigurableProviderInfo
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java
index ea250c2..b8b2e2d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.surefire;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -28,16 +29,16 @@ import javax.annotation.Nonnull;
*/
public class ClasspathCache
{
- private static final ConcurrentHashMap<String, Classpath> classpaths =
+ private static final ConcurrentHashMap<String, Classpath> CLASSPATHS =
new ConcurrentHashMap<String, Classpath>( 4 );
public static Classpath getCachedClassPath( @Nonnull String artifactId )
{
- return classpaths.get( artifactId );
+ return CLASSPATHS.get( artifactId );
}
public static void setCachedClasspath( @Nonnull String key, @Nonnull Classpath classpath )
{
- classpaths.put( key, classpath );
+ CLASSPATHS.put( key, classpath );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java
index 7e56aa4..21e95d2 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java
@@ -45,6 +45,7 @@ public class ProviderList
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
public @Nonnull List<ProviderInfo> resolve( @Nonnull Log log )
{
List<ProviderInfo> providersToRun = new ArrayList<ProviderInfo>();
@@ -65,6 +66,7 @@ public class ProviderList
return autoDetectOneProvider();
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
private @Nonnull List<ProviderInfo> autoDetectOneProvider()
{
List<ProviderInfo> providersToRun = new ArrayList<ProviderInfo>();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
index f44ba3a..12837ed 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
@@ -72,6 +72,7 @@ public class StartupReportConfiguration
public static final String PLAIN_REPORT_FORMAT = ConsoleReporter.PLAIN;
+ @SuppressWarnings( "checkstyle:parameternumber" )
public StartupReportConfiguration( boolean useFile, boolean printSummary, String reportFormat,
boolean redirectTestOutputToFile, boolean disableXmlReport,
@Nonnull File reportsDirectory, boolean trimStackTrace, String reportNameSuffix,
@@ -142,7 +143,8 @@ public class StartupReportConfiguration
return reportsDirectory;
}
- public int getRerunFailingTestsCount() {
+ public int getRerunFailingTestsCount()
+ {
return rerunFailingTestsCount;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
index 606c26b..7d94368 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.surefire;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,14 +19,11 @@ package org.apache.maven.plugin.surefire;
* under the License.
*/
-import org.apache.maven.surefire.booter.Classpath;
-import org.apache.maven.surefire.booter.KeyValueSource;
-import org.apache.maven.surefire.util.internal.StringUtils;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
@@ -36,6 +34,10 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.apache.maven.surefire.booter.Classpath;
+import org.apache.maven.surefire.booter.KeyValueSource;
+import org.apache.maven.surefire.util.internal.StringUtils;
+
/**
* A properties implementation that preserves insertion order.
*/
@@ -111,19 +113,15 @@ public class SurefireProperties
return keySet();
}
- private static final Set<String> keysThatCannotBeUsedAsSystemProperties = new HashSet<String>()
- {{
- add( "java.library.path" );
- add( "file.encoding" );
- add( "jdk.map.althashing.threshold" );
- }};
+ private static final Set<String> KEYS_THAT_CANNOT_BE_USED_AS_SYSTEM_PROPERTIES = new HashSet<String>(
+ Arrays.asList( "java.library.path", "file.encoding", "jdk.map.althashing.threshold" ) );
public Set<Object> propertiesThatCannotBeSetASystemProperties()
{
Set<Object> result = new HashSet<Object>();
for ( Object key : getStringKeySet() )
{
- if ( keysThatCannotBeUsedAsSystemProperties.contains( key ) )
+ if ( KEYS_THAT_CANNOT_BE_USED_AS_SYSTEM_PROPERTIES.contains( key ) )
{
result.add( key );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
index d5c6181..57581ad 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
@@ -75,7 +75,7 @@ class BooterSerializer
ClasspathConfiguration cp = providerConfiguration.getClasspathConfiguration();
properties.setClasspath( ClasspathConfiguration.CLASSPATH, cp.getTestClasspath() );
properties.setClasspath( ClasspathConfiguration.SUREFIRE_CLASSPATH, cp.getProviderClasspath() );
- properties.setProperty( ClasspathConfiguration.ENABLE_ASSERTIONS, String.valueOf( cp.isEnableAssertions()) );
+ properties.setProperty( ClasspathConfiguration.ENABLE_ASSERTIONS, String.valueOf( cp.isEnableAssertions() ) );
properties.setProperty( ClasspathConfiguration.CHILD_DELEGATION, String.valueOf( cp.isChildDelegation() ) );
TestArtifactInfo testNg = booterConfiguration.getTestArtifact();
@@ -94,7 +94,8 @@ class BooterSerializer
properties.setProperty( BooterConstants.SOURCE_DIRECTORY, testSuiteDefinition.getTestSourceDirectory() );
properties.addList( testSuiteDefinition.getSuiteXmlFiles(), BooterConstants.TEST_SUITE_XML_FILES );
properties.setNullableProperty( BooterConstants.REQUESTEDTEST, testSuiteDefinition.getRequestedTest() );
- properties.setNullableProperty( BooterConstants.REQUESTEDTESTMETHOD, testSuiteDefinition.getRequestedTestMethod() );
+ properties.setNullableProperty( BooterConstants.REQUESTEDTESTMETHOD,
+ testSuiteDefinition.getRequestedTestMethod() );
properties.setNullableProperty( BooterConstants.RERUN_FAILING_TESTS_COUNT,
String.valueOf( testSuiteDefinition.getRerunFailingTestsCount() ) );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
index 5f703b1..7f62768 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
@@ -11,7 +11,7 @@ package org.apache.maven.plugin.surefire.booterclient;
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required| by applicable law or agreed to in writing,
+ * Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
@@ -122,6 +122,7 @@ public class ChecksumCalculator
appendObject( aBoolean );
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
private static String asHexString( byte[] bytes )
{
if ( bytes == null )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
index d468c37..5843428 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
@@ -79,9 +79,11 @@ public class ForkConfiguration
private final String debugLine;
- public ForkConfiguration( Classpath bootClasspathConfiguration, File tmpDir, String debugLine, String jvmExecutable,
- File workingDirectory, Properties modelProperties, String argLine, Map<String, String> environmentVariables,
- boolean debugEnabled, int forkCount, boolean reuseForks )
+ @SuppressWarnings( "checkstyle:parameternumber" )
+ public ForkConfiguration( Classpath bootClasspathConfiguration, File tmpDir, String debugLine,
+ String jvmExecutable, File workingDirectory, Properties modelProperties, String argLine,
+ Map<String, String> environmentVariables, boolean debugEnabled, int forkCount,
+ boolean reuseForks )
{
this.bootClasspathConfiguration = bootClasspathConfiguration;
this.tempDirectory = tmpDir;
@@ -111,8 +113,8 @@ public class ForkConfiguration
{
return FORK_NEVER;
}
- else if ( forkMode.equals( FORK_NEVER ) || forkMode.equals( FORK_ONCE ) ||
- forkMode.equals( FORK_ALWAYS ) || forkMode.equals( FORK_PERTHREAD ) )
+ else if ( forkMode.equals( FORK_NEVER ) || forkMode.equals( FORK_ONCE )
+ || forkMode.equals( FORK_ALWAYS ) || forkMode.equals( FORK_PERTHREAD ) )
{
return forkMode;
}
@@ -135,7 +137,8 @@ public class ForkConfiguration
throws SurefireBooterForkException
{
return createCommandLine( classPath,
- startupConfiguration.getClassLoaderConfiguration().isManifestOnlyJarRequestedAndUsable(),
+ startupConfiguration.getClassLoaderConfiguration()
+ .isManifestOnlyJarRequestedAndUsable(),
startupConfiguration.isShadefire(), startupConfiguration.isProviderMainClass()
? startupConfiguration.getActualClassName()
: ForkedBooter.class.getName(), threadNumber );
@@ -151,7 +154,9 @@ public class ForkConfiguration
if ( argLine != null )
{
- cli.createArg().setLine( replaceThreadNumberPlaceholder( stripNewLines( replacePropertyExpressions( argLine ) ), threadNumber ) );
+ cli.createArg().setLine(
+ replaceThreadNumberPlaceholder( stripNewLines( replacePropertyExpressions( argLine ) ),
+ threadNumber ) );
}
if ( environmentVariables != null )
@@ -217,15 +222,18 @@ public class ForkConfiguration
*/
private String replacePropertyExpressions( String argLine )
{
- if ( argLine == null ) {
+ if ( argLine == null )
+ {
return null;
}
- for ( Enumeration<?> e = modelProperties.propertyNames(); e.hasMoreElements(); ) {
+ for ( Enumeration<?> e = modelProperties.propertyNames(); e.hasMoreElements(); )
+ {
String key = e.nextElement().toString();
String field = "@{" + key + "}";
- if ( argLine.contains(field) ) {
- argLine = argLine.replace(field, modelProperties.getProperty(key, ""));
+ if ( argLine.contains( field ) )
+ {
+ argLine = argLine.replace( field, modelProperties.getProperty( key, "" ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkNumberBucket.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkNumberBucket.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkNumberBucket.java
index c107982..55d099d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkNumberBucket.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkNumberBucket.java
@@ -1,5 +1,24 @@
package org.apache.maven.plugin.surefire.booterclient;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
@@ -7,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* A bucket from which fork numbers can be drawn. Any drawn number needs to be returned to the bucket, in order to keep
* the range of provided values delivered as small as possible.
- *
+ *
* @author Andreas Gudian
*/
public class ForkNumberBucket
@@ -32,7 +51,7 @@ public class ForkNumberBucket
*/
public static int drawNumber()
{
- return getInstance()._drawNumber();
+ return getInstance().drawNumberInternal();
}
/**
@@ -40,7 +59,7 @@ public class ForkNumberBucket
*/
public static void returnNumber( int number )
{
- getInstance()._returnNumber( number );
+ getInstance().returnNumberInternal( number );
}
/**
@@ -55,7 +74,7 @@ public class ForkNumberBucket
* @return a fork number that is not currently in use. The value must be returned to the bucket using
* {@link #returnNumber(int)}.
*/
- protected int _drawNumber()
+ protected int drawNumberInternal()
{
Integer nextFree = qFree.poll();
@@ -80,7 +99,7 @@ public class ForkNumberBucket
/**
* @param number the number to return to the bucket so that it can be reused.
*/
- protected void _returnNumber( int number )
+ protected void returnNumberInternal( int number )
{
qFree.add( Integer.valueOf( number ) );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 31833d5..919867a 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -179,7 +179,7 @@ public class ForkStarter
}
finally
{
- defaultReporterFactory.mergeFromOtherFactories(defaultReporterFactoryList);
+ defaultReporterFactory.mergeFromOtherFactories( defaultReporterFactoryList );
defaultReporterFactory.close();
}
return result;
@@ -197,6 +197,7 @@ public class ForkStarter
&& !testSuiteDefinition.getSuiteXmlFiles().isEmpty();
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
private RunResult runSuitesForkOnceMultiple( final SurefireProperties effectiveSystemProperties, int forkCount )
throws SurefireBooterForkException
{
@@ -281,6 +282,7 @@ public class ForkStarter
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
private RunResult runSuitesForkPerTestSet( final SurefireProperties effectiveSystemProperties, final int forkCount )
throws SurefireBooterForkException
{
@@ -305,8 +307,9 @@ public class ForkStarter
DefaultReporterFactory forkedReporterFactory =
new DefaultReporterFactory( startupReportConfiguration );
defaultReporterFactoryList.add( forkedReporterFactory );
- ForkClient forkClient = new ForkClient( forkedReporterFactory,
- startupReportConfiguration.getTestVmSystemProperties() );
+ ForkClient forkClient =
+ new ForkClient( forkedReporterFactory,
+ startupReportConfiguration.getTestVmSystemProperties() );
return fork( testSet, new PropertiesWrapper( providerConfiguration.getProviderProperties() ),
forkClient, effectiveSystemProperties, null );
}
@@ -348,6 +351,7 @@ public class ForkStarter
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
private void closeExecutor( ExecutorService executorService )
throws SurefireBooterForkException
{
@@ -478,7 +482,8 @@ public class ForkStarter
}
catch ( CommandLineException e )
{
- runResult = RunResult.failure( forkClient.getDefaultReporterFactory().getGlobalRunStatistics().getRunResult(), e );
+ runResult =
+ RunResult.failure( forkClient.getDefaultReporterFactory().getGlobalRunStatistics().getRunResult(), e );
throw new SurefireBooterForkException( "Error while executing forked tests.", e.getCause() );
}
finally
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java
index deefbd0..ea8e0f6 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandline.java
@@ -71,9 +71,6 @@ public class OutputStreamFlushableCommandline
return process;
}
- /* (non-Javadoc)
- * @see org.apache.maven.plugin.surefire.booterclient.lazytestprovider.FlushReceiverProvider#getFlushReceiver()
- */
public FlushReceiver getFlushReceiver()
{
return flushReceiver;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
index 7304435..cb48cf0 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
@@ -32,7 +32,7 @@ import java.util.concurrent.Semaphore;
* After providing each test class name, followed by a newline character, a flush is performed on the
* {@link FlushReceiver} provided by the {@link FlushReceiverProvider} that can be set using
* {@link #setFlushReceiverProvider(FlushReceiverProvider)}.
- *
+ *
* @author Andreas Gudian
*/
public class TestProvidingInputStream
@@ -52,7 +52,7 @@ public class TestProvidingInputStream
/**
* C'tor
- *
+ *
* @param testItemQueue source of the tests to be read from this stream
*/
public TestProvidingInputStream( Queue<String> testItemQueue )
@@ -68,6 +68,7 @@ public class TestProvidingInputStream
this.flushReceiverProvider = flushReceiverProvider;
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
@Override
public synchronized int read()
throws IOException
@@ -117,6 +118,7 @@ public class TestProvidingInputStream
semaphore.release();
}
+ @Override
public void close()
{
closed = true;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
index d4d6991..7574eec 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
@@ -31,10 +31,10 @@ import java.util.concurrent.LinkedBlockingQueue;
public class ThreadedStreamConsumer
implements StreamConsumer
{
-
private final java.util.concurrent.BlockingQueue<String> items = new LinkedBlockingQueue<String>();
- private static final String poison = "Pioson";
+ private static final String POISON = "Pioson";
+ private static final int ITEM_LIMIT_BEFORE_SLEEP = 10000;
private final Thread thread;
@@ -62,7 +62,7 @@ public class ThreadedStreamConsumer
{
String item = queue.take();
//noinspection StringEquality
- while ( item != poison )
+ while ( item != POISON )
{
target.consumeLine( item );
item = queue.take();
@@ -89,10 +89,11 @@ public class ThreadedStreamConsumer
thread.start();
}
+ @SuppressWarnings( "checkstyle:emptyblock" )
public void consumeLine( String s )
{
items.add( s );
- if ( items.size() > 10000 )
+ if ( items.size() > ITEM_LIMIT_BEFORE_SLEEP )
{
try
{
@@ -109,7 +110,7 @@ public class ThreadedStreamConsumer
{
try
{
- items.add( poison );
+ items.add( POISON );
thread.join();
}
catch ( InterruptedException e )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
index 184d0bf..25afe73 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
@@ -24,7 +24,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.ReporterException;
/**
* Surefire output consumer proxy that writes test output to a {@link java.io.File} for each test suite.
@@ -58,10 +57,10 @@ public class ConsoleOutputFileReporter
}
public void testSetCompleted( ReportEntry report )
- throws ReporterException
{
}
+ @SuppressWarnings( "checkstyle:emptyblock" )
public void close()
{
if ( fileOutputStream != null )
@@ -73,7 +72,6 @@ public class ConsoleOutputFileReporter
}
catch ( IOException e )
{
- ;
}
fileOutputStream = null;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
index 14e8c67..605fbfb 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java
@@ -25,7 +25,6 @@ import java.io.PrintStream;
import java.io.PrintWriter;
import java.util.List;
import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.ReporterException;
/**
* Base class for console reporters.
@@ -53,7 +52,6 @@ public class ConsoleReporter
}
public void testSetStarting( ReportEntry report )
- throws ReporterException
{
writeMessage( getTestSetStartingMessage( report ) );
}
@@ -79,7 +77,6 @@ public class ConsoleReporter
}
public void testSetCompleted( WrappedReportEntry report, TestSetStats testSetStats, List<String> testResults )
- throws ReporterException
{
writeMessage( testSetStats.getTestSetSummary( report ) );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index 704c498..62619a3 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -175,12 +175,12 @@ public class DefaultReporterFactory
boolean seenSuccess = false, seenFailure = false;
for ( ReportEntryType resultType : reportEntryList )
{
- if ( resultType == ReportEntryType.success )
+ if ( resultType == ReportEntryType.SUCCESS )
{
seenSuccess = true;
}
- else if ( resultType == ReportEntryType.failure
- || resultType == ReportEntryType.error )
+ else if ( resultType == ReportEntryType.FAILURE
+ || resultType == ReportEntryType.ERROR )
{
seenFailure = true;
}
@@ -198,11 +198,11 @@ public class DefaultReporterFactory
if ( !seenSuccess && seenFailure )
{
- if ( reportEntryList.get( 0 ) == ReportEntryType.failure )
+ if ( reportEntryList.get( 0 ) == ReportEntryType.FAILURE )
{
return TestResultType.failure;
}
- else if ( reportEntryList.get( 0 ) == ReportEntryType.error )
+ else if ( reportEntryList.get( 0 ) == ReportEntryType.ERROR )
{
return TestResultType.error;
}
@@ -219,8 +219,8 @@ public class DefaultReporterFactory
}
/**
- * Merge all the TestMethodStats in each TestRunListeners and put results into flakyTests, failedTests and errorTests,
- * indexed by test class and method name. Update globalStatistics based on the result of the merge.
+ * Merge all the TestMethodStats in each TestRunListeners and put results into flakyTests, failedTests and
+ * errorTests, indexed by test class and method name. Update globalStatistics based on the result of the merge.
*/
void mergeTestHistoryResult()
{
@@ -261,7 +261,7 @@ public class DefaultReporterFactory
completedCount++;
List<ReportEntryType> resultTypeList = new ArrayList<ReportEntryType>();
- for (TestMethodStats methodStats : testMethodStats)
+ for ( TestMethodStats methodStats : testMethodStats )
{
resultTypeList.add( methodStats.getResultType() );
}
@@ -273,8 +273,10 @@ public class DefaultReporterFactory
case success:
// If there are multiple successful runs of the same test, count all of them
int successCount = 0;
- for (ReportEntryType type : resultTypeList) {
- if (type == ReportEntryType.success) {
+ for ( ReportEntryType type : resultTypeList )
+ {
+ if ( type == ReportEntryType.SUCCESS )
+ {
successCount++;
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
index f2e8e28..fddb00f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
@@ -24,6 +24,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
+
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.ReporterException;
@@ -31,7 +32,7 @@ import static org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIll
/**
* Base class for file reporters.
- *
+ *
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author Kristian Rosenvold
*/
@@ -51,7 +52,6 @@ public class FileReporter
}
private PrintWriter testSetStarting( ReportEntry report )
- throws ReporterException
{
File reportFile = getReportFile( reportsDirectory, report.getName(), reportNameSuffix, ".txt" );
@@ -103,7 +103,6 @@ public class FileReporter
}
public void testSetCompleted( WrappedReportEntry report, TestSetStats testSetStats, List<String> testResults )
- throws ReporterException
{
PrintWriter writer = testSetStarting( report );
writer.print( testSetStats.getTestSetSummary( report ) );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java
index 5009da9..f829121 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.surefire.report;
/**
* Utils class for file-based reporters
- *
+ *
* @author Andreas Gudian
*/
public class FileReporterUtils
@@ -31,7 +31,9 @@ public class FileReporterUtils
String result = original;
String illegalChars = getOSSpecificIllegalChars();
for ( int i = 0; i < illegalChars.length(); i++ )
+ {
result = result.replace( illegalChars.charAt( i ), '_' );
+ }
return result;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java
index b0fea62..551b54e 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/PrettyPrintXMLWriter.java
@@ -24,6 +24,10 @@ import java.util.LinkedList;
import org.apache.maven.shared.utils.xml.XMLWriter;
+/**
+ * A pretty printing XML writer
+ *
+ */
public class PrettyPrintXMLWriter
implements XMLWriter
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ReportEntryType.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ReportEntryType.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ReportEntryType.java
index e998c8e..863672a 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ReportEntryType.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ReportEntryType.java
@@ -19,13 +19,17 @@ package org.apache.maven.plugin.surefire.report;
* under the License.
*/
+/**
+ * Type of an entry in the report
+ *
+ */
public enum ReportEntryType
{
- error( "error", "flakyError", "rerunError" ),
- failure( "failure", "flakyFailure", "rerunFailure" ),
- skipped( "skipped", "", "" ),
- success( "", "", "" );
+ ERROR( "error", "flakyError", "rerunError" ),
+ FAILURE( "failure", "flakyFailure", "rerunFailure" ),
+ SKIPPED( "skipped", "", "" ),
+ SUCCESS( "", "", "" );
private final String xmlTag;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index d120c11..dedeb27 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -46,6 +46,7 @@ import java.util.StringTokenizer;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType;
import static org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars;
+// CHECKSTYLE_OFF: LineLength
/**
* XML format reporter writing to <code>TEST-<i>reportName</i>[-<i>suffix</i>].xml</code> file like written and read
* by Ant's <a href="http://ant.apache.org/manual/Tasks/junit.html"><code><junit></code></a> and
@@ -108,7 +109,6 @@ public class StatelessXmlReporter
}
public void testSetCompleted( WrappedReportEntry testSetReportEntry, TestSetStats testSetStats )
- throws ReporterException
{
String testClassName = testSetReportEntry.getName();
@@ -154,7 +154,7 @@ public class StatelessXmlReporter
case success:
for ( WrappedReportEntry methodEntry : methodEntryList )
{
- if ( methodEntry.getReportEntryType() == ReportEntryType.success )
+ if ( methodEntry.getReportEntryType() == ReportEntryType.SUCCESS )
{
startTestElement( ppw, methodEntry, reportNameSuffix,
methodEntryList.get( 0 ).elapsedTimeAsString() );
@@ -190,7 +190,7 @@ public class StatelessXmlReporter
// Get the run time of the first successful run
for ( WrappedReportEntry singleRunEntry : methodEntryList )
{
- if ( singleRunEntry.getReportEntryType() == ReportEntryType.success )
+ if ( singleRunEntry.getReportEntryType() == ReportEntryType.SUCCESS )
{
runtime = singleRunEntry.elapsedTimeAsString();
break;
@@ -199,7 +199,7 @@ public class StatelessXmlReporter
startTestElement( ppw, methodEntryList.get( 0 ), reportNameSuffix, runtime );
for ( WrappedReportEntry singleRunEntry : methodEntryList )
{
- if ( singleRunEntry.getReportEntryType() != ReportEntryType.success )
+ if ( singleRunEntry.getReportEntryType() != ReportEntryType.SUCCESS )
{
getTestProblems( fw, ppw, singleRunEntry, trimStackTrace, outputStream,
singleRunEntry.getReportEntryType().getFlakyXmlTag(), true );
@@ -226,7 +226,7 @@ public class StatelessXmlReporter
for ( WrappedReportEntry methodEntry : methodEntryList )
{
startTestElement( ppw, methodEntry, reportNameSuffix, methodEntry.elapsedTimeAsString() );
- if ( methodEntry.getReportEntryType() != ReportEntryType.success )
+ if ( methodEntry.getReportEntryType() != ReportEntryType.SUCCESS )
{
getTestProblems( fw, ppw, methodEntry, trimStackTrace, outputStream,
methodEntry.getReportEntryType().getXmlTag(), false );
@@ -247,7 +247,8 @@ public class StatelessXmlReporter
/**
* Clean testClassMethodRunHistoryMap
*/
- public void cleanTestHistoryMap() {
+ public void cleanTestHistoryMap()
+ {
testClassMethodRunHistoryMap.clear();
}
@@ -308,7 +309,7 @@ public class StatelessXmlReporter
// Get the first successful run's time for flaky runs
for ( WrappedReportEntry singleRunEntry : methodEntryList )
{
- if ( singleRunEntry.getReportEntryType() == ReportEntryType.success )
+ if ( singleRunEntry.getReportEntryType() == ReportEntryType.SUCCESS )
{
totalTimeForSuite = totalTimeForSuite + singleRunEntry.getElapsed();
break;
[2/5] o Update to maven-parent 25,
fix tons of rat and checkstyle errors
Posted by ag...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
index 8957e5a..ad94948 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
@@ -32,7 +32,7 @@ public class DefaultScanResult
{
private final List<String> files;
- private static final String scanResultNo = "tc.";
+ private static final String SCAN_RESULT_NUMBER = "tc.";
public DefaultScanResult( List<String> files )
{
@@ -54,7 +54,7 @@ public class DefaultScanResult
int size = files.size();
for ( int i = 0; i < size; i++ )
{
- properties.setProperty( scanResultNo + i, files.get( i ) );
+ properties.setProperty( SCAN_RESULT_NUMBER + i, files.get( i ) );
}
}
@@ -64,7 +64,7 @@ public class DefaultScanResult
int i = 0;
while ( true )
{
- String item = properties.getProperty( scanResultNo + ( i++ ) );
+ String item = properties.getProperty( SCAN_RESULT_NUMBER + ( i++ ) );
if ( item == null )
{
return new DefaultScanResult( result );
@@ -137,7 +137,8 @@ public class DefaultScanResult
return testClass;
}
- public DefaultScanResult append(DefaultScanResult other){
+ public DefaultScanResult append( DefaultScanResult other )
+ {
if ( other != null )
{
List<String> src = new ArrayList<String>( files );
@@ -150,5 +151,4 @@ public class DefaultScanResult
}
}
-
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
index 19c1c3f..a30ae73 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
@@ -221,6 +221,7 @@ public class ReflectionUtils
return newInstance( constructor, params );
}
+ @SuppressWarnings( "checkstyle:emptyblock" )
public static Class tryLoadClass( ClassLoader classLoader, String className )
{
try
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
index a87712f..bdbc48b 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
@@ -1,23 +1,23 @@
package org.apache.maven.surefire.util;
/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
/**
* @author Kristian Rosenvold
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java
index 97da38b..69da150 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java
@@ -50,11 +50,11 @@ public class ByteBuffer
data[position++] = chararcter;
}
- private static final byte comma = (byte) ',';
+ private static final byte COMMA = (byte) ',';
public void comma()
{
- data[position++] = comma;
+ data[position++] = COMMA;
}
@@ -81,7 +81,7 @@ public class ByteBuffer
int mask = radix - 1;
do
{
- buf[--charPos] = (byte) digits[i & mask];
+ buf[--charPos] = (byte) DIGITS[i & mask];
i >>>= 4;
}
while ( i != 0 );
@@ -89,7 +89,7 @@ public class ByteBuffer
append( buf, charPos, ( 32 - charPos ) );
}
- private final static char[] digits =
+ private static final char[] DIGITS =
{ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
index 34f25fd..f9137cf 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
@@ -126,6 +126,7 @@ public class StringUtils
* @param target target string buffer. The required space will be up to {@code str.getBytes().length * 5} chars.
* @param str String to escape values in, may be {@code null}.
*/
+ @SuppressWarnings( "checkstyle:magicnumber" )
public static void escapeToPrintable( StringBuilder target, CharSequence str )
{
if ( target == null )
@@ -137,7 +138,8 @@ public class StringUtils
return;
}
- for ( int i = 0; i < str.length(); i++ ) {
+ for ( int i = 0; i < str.length(); i++ )
+ {
char c = str.charAt( i );
// handle non-nicely printable chars and the comma
@@ -225,6 +227,7 @@ public class StringUtils
* @param len number of bytes to copy from the input buffer
* @return number of bytes written to {@code out}
*/
+ @SuppressWarnings( "checkstyle:magicnumber" )
public static int escapeBytesToPrintable( byte[] out, int outoff, byte[] input, int off, int len )
{
if ( out == null )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java
index 6ee357a..ab58186 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java
@@ -1,5 +1,24 @@
package org.apache.maven.surefire.report;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.PrintWriter;
import junit.framework.TestCase;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java
index 3c011d1..b4ddc21 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java
@@ -36,7 +36,7 @@ public class RunOrderCalculatorTest
{
getClassesToRun();
TestsToRun testsToRun = new TestsToRun( getClassesToRun() );
- RunOrderCalculator runOrderCalculator = new DefaultRunOrderCalculator( RunOrderParameters.ALPHABETICAL(), 1 );
+ RunOrderCalculator runOrderCalculator = new DefaultRunOrderCalculator( RunOrderParameters.alphabetical(), 1 );
final TestsToRun testsToRun1 = runOrderCalculator.orderTestClasses( testsToRun );
assertEquals( A.class, testsToRun1.iterator().next() );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
index 2f637f0..f55bbb2 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
@@ -25,27 +25,31 @@ package org.apache.maven.surefire.booter;
*
* @author Kristian Rosenvold
*/
-public interface BooterConstants
+public final class BooterConstants
{
- String SPECIFIC_TEST_PROPERTY_PREFIX = "specificTest";
- String INCLUDES_PROPERTY_PREFIX = "includes";
- String EXCLUDES_PROPERTY_PREFIX = "excludes";
- String USESYSTEMCLASSLOADER = "useSystemClassLoader";
- String USEMANIFESTONLYJAR = "useManifestOnlyJar";
- String FAILIFNOTESTS = "failIfNoTests";
- String ISTRIMSTACKTRACE = "isTrimStackTrace";
- String REPORTSDIRECTORY = "reportsDirectory";
- String TESTARTIFACT_VERSION = "testFwJarVersion";
- String TESTARTIFACT_CLASSIFIER = "testFwJarClassifier";
- String REQUESTEDTEST = "requestedTest";
- String REQUESTEDTESTMETHOD = "requestedTestMethod";
- String SOURCE_DIRECTORY = "testSuiteDefinitionTestSourceDirectory";
- String TEST_CLASSES_DIRECTORY = "testClassesDirectory";
- String RUN_ORDER = "runOrder";
- String RUN_STATISTICS_FILE = "runStatisticsFile";
- String TEST_SUITE_XML_FILES = "testSuiteXmlFiles";
- String PROVIDER_CONFIGURATION = "providerConfiguration";
- String FORKTESTSET = "forkTestSet";
- String FORKTESTSET_PREFER_TESTS_FROM_IN_STREAM = "preferTestsFromInStream";
- String RERUN_FAILING_TESTS_COUNT = "rerunFailingTestsCount";
+ private BooterConstants()
+ {
+ }
+
+ public static final String SPECIFIC_TEST_PROPERTY_PREFIX = "specificTest";
+ public static final String INCLUDES_PROPERTY_PREFIX = "includes";
+ public static final String EXCLUDES_PROPERTY_PREFIX = "excludes";
+ public static final String USESYSTEMCLASSLOADER = "useSystemClassLoader";
+ public static final String USEMANIFESTONLYJAR = "useManifestOnlyJar";
+ public static final String FAILIFNOTESTS = "failIfNoTests";
+ public static final String ISTRIMSTACKTRACE = "isTrimStackTrace";
+ public static final String REPORTSDIRECTORY = "reportsDirectory";
+ public static final String TESTARTIFACT_VERSION = "testFwJarVersion";
+ public static final String TESTARTIFACT_CLASSIFIER = "testFwJarClassifier";
+ public static final String REQUESTEDTEST = "requestedTest";
+ public static final String REQUESTEDTESTMETHOD = "requestedTestMethod";
+ public static final String SOURCE_DIRECTORY = "testSuiteDefinitionTestSourceDirectory";
+ public static final String TEST_CLASSES_DIRECTORY = "testClassesDirectory";
+ public static final String RUN_ORDER = "runOrder";
+ public static final String RUN_STATISTICS_FILE = "runStatisticsFile";
+ public static final String TEST_SUITE_XML_FILES = "testSuiteXmlFiles";
+ public static final String PROVIDER_CONFIGURATION = "providerConfiguration";
+ public static final String FORKTESTSET = "forkTestSet";
+ public static final String FORKTESTSET_PREFER_TESTS_FROM_IN_STREAM = "preferTestsFromInStream";
+ public static final String RERUN_FAILING_TESTS_COUNT = "rerunFailingTestsCount";
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
index fce7c42..ae9dbce 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
@@ -29,6 +29,9 @@ import org.apache.maven.surefire.testset.RunOrderParameters;
import org.apache.maven.surefire.testset.TestArtifactInfo;
import org.apache.maven.surefire.testset.TestRequest;
+// CHECKSTYLE_OFF: imports
+import static org.apache.maven.surefire.booter.BooterConstants.*;
+
/**
* Knows how to serialize and deserialize the booter configuration.
* <p/>
@@ -43,7 +46,6 @@ import org.apache.maven.surefire.testset.TestRequest;
* @author Kristian Rosenvold
*/
public class BooterDeserializer
- implements BooterConstants
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/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 536c077..400f141 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
@@ -48,13 +48,20 @@ public class Classpath implements Iterable<String>
public static Classpath join( Classpath firstClasspath, Classpath secondClasspath )
{
LinkedHashSet<String> accumulated = new LinkedHashSet<String>( );
- if (firstClasspath != null) firstClasspath.addTo( accumulated );
- if (secondClasspath != null) secondClasspath.addTo( accumulated );
+ if ( firstClasspath != null )
+ {
+ firstClasspath.addTo( accumulated );
+ }
+ if ( secondClasspath != null )
+ {
+ secondClasspath.addTo( accumulated );
+ }
return new Classpath( accumulated );
}
- private void addTo(Collection<String> c){
+ private void addTo( Collection<String> c )
+ {
c.addAll( unmodifiableElements );
}
@@ -135,8 +142,9 @@ public class Classpath implements Iterable<String>
Classpath classpath = (Classpath) o;
- return !( unmodifiableElements
- != null ? !unmodifiableElements.equals( classpath.unmodifiableElements ) : classpath.unmodifiableElements != null );
+ return !( unmodifiableElements != null
+ ? !unmodifiableElements.equals( classpath.unmodifiableElements )
+ : classpath.unmodifiableElements != null );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
index 5dbf018..d582f3c 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
@@ -57,7 +57,8 @@ public class ClasspathConfiguration
public ClasspathConfiguration( boolean enableAssertions, boolean childDelegation )
{
- this( Classpath.emptyClasspath(), Classpath.emptyClasspath(), Classpath.emptyClasspath(), enableAssertions, childDelegation );
+ this( Classpath.emptyClasspath(), Classpath.emptyClasspath(), Classpath.emptyClasspath(), enableAssertions,
+ childDelegation );
}
ClasspathConfiguration( PropertiesWrapper properties )
@@ -80,7 +81,7 @@ public class ClasspathConfiguration
public ClassLoader createMergedClassLoader()
throws SurefireExecutionException
{
- return Classpath.join( inprocClasspath, classpathUrls)
+ return Classpath.join( inprocClasspath, classpathUrls )
.createClassLoader( null, this.childDelegation, enableAssertions, "test" );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
index 7a3035b..801fb4f 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
@@ -109,14 +109,16 @@ public class ForkedBooter
new LegacyPojoStackTraceWriter( "test subystem", "no method", t.getTargetException() );
StringBuilder stringBuilder = new StringBuilder();
ForkingRunListener.encode( stringBuilder, stackTraceWriter, false );
- originalOut.println( ( (char) ForkingRunListener.BOOTERCODE_ERROR ) + ",0," + stringBuilder.toString() );
+ originalOut.println( ( (char) ForkingRunListener.BOOTERCODE_ERROR )
+ + ",0," + stringBuilder.toString() );
}
catch ( Throwable t )
{
StackTraceWriter stackTraceWriter = new LegacyPojoStackTraceWriter( "test subystem", "no method", t );
StringBuilder stringBuilder = new StringBuilder();
ForkingRunListener.encode( stringBuilder, stackTraceWriter, false );
- originalOut.println( ( (char) ForkingRunListener.BOOTERCODE_ERROR ) + ",0," + stringBuilder.toString() );
+ originalOut.println( ( (char) ForkingRunListener.BOOTERCODE_ERROR )
+ + ",0," + stringBuilder.toString() );
}
// Say bye.
originalOut.println( ( (char) ForkingRunListener.BOOTERCODE_BYE ) + ",0,BYE!" );
@@ -134,7 +136,7 @@ public class ForkedBooter
}
}
- private final static long SYSTEM_EXIT_TIMEOUT = 30 * 1000;
+ private static final long SYSTEM_EXIT_TIMEOUT = 30 * 1000;
private static void exit( final int returnCode )
{
@@ -161,6 +163,7 @@ public class ForkedBooter
return SurefireReflector.createForkingReporterFactoryInCurrentClassLoader( trimStackTrace, originalSystemOut );
}
+ @SuppressWarnings( "checkstyle:emptyblock" )
private static void launchLastDitchDaemonShutdownThread( final int returnCode )
{
Thread lastExit = new Thread( new Runnable()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
index 393dd05..712624c 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
@@ -102,8 +102,6 @@ public class IsolatedClassLoader
public String toString()
{
- return "IsolatedClassLoader{" +
- "roleName='" + roleName + '\'' +
- '}';
+ return "IsolatedClassLoader{roleName='" + roleName + "'}";
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/KeyValueSource.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/KeyValueSource.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/KeyValueSource.java
index dd5e7e3..9decb23 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/KeyValueSource.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/KeyValueSource.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.booter;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java
index ff0f184..9efe8fa 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java
@@ -174,7 +174,8 @@ class LazyTestsToRun
/* (non-Javadoc)
* @see org.apache.maven.surefire.util.TestsToRun#allowEagerReading()
*/
- public boolean allowEagerReading() {
+ public boolean allowEagerReading()
+ {
return false;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/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 7a09352..c5d6b5b 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
@@ -96,12 +96,19 @@ public class PropertiesWrapper
{
String value;
List<String> result = new ArrayList<String>();
- // Whoa, C !!
- for ( int i = 0; ( value = getProperty( propertyPrefix + i ) ) != null; i++ )
+
+ int i = 0;
+ while ( true )
{
+ value = getProperty( propertyPrefix + ( i++ ) );
+
+ if ( value == null )
+ {
+ return result;
+ }
+
result.add( value );
}
- return result;
}
/**
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
index 67747f5..362be85 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
@@ -62,6 +62,7 @@ public class ProviderConfiguration
private final boolean readTestsFromInStream;
+ @SuppressWarnings( "checkstyle:parameternumber" )
public ProviderConfiguration( DirectoryScannerParameters directoryScannerParameters,
RunOrderParameters runOrderParameters, boolean failIfNoTests,
ReporterConfiguration reporterConfiguration, TestArtifactInfo testArtifact,
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
index 02454aa..f75e5a6 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
@@ -25,7 +25,6 @@ import java.lang.reflect.Method;
import java.util.Iterator;
import org.apache.maven.surefire.providerapi.SurefireProvider;
-import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.suite.RunResult;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.util.ReflectionUtils;
@@ -49,7 +48,7 @@ public class ProviderFactory
private final Object reporterManagerFactory;
- private static final Class[] invokeParamaters = new Class[]{ Object.class };
+ private static final Class[] INVOKE_PARAMETERS = new Class[]{ Object.class };
public ProviderFactory( StartupConfiguration startupConfiguration, ProviderConfiguration providerConfiguration,
@@ -117,7 +116,7 @@ public class ProviderFactory
}
- private class ProviderProxy
+ private final class ProviderProxy
implements SurefireProvider
{
private final Object providerInOtherClassLoader;
@@ -145,13 +144,13 @@ public class ProviderFactory
}
public RunResult invoke( Object forkTestSet )
- throws TestSetFailedException, ReporterException, InvocationTargetException
+ throws TestSetFailedException, InvocationTargetException
{
ClassLoader current = swapClassLoader( testsClassLoader );
try
{
final Method invoke =
- ReflectionUtils.getMethod( providerInOtherClassLoader.getClass(), "invoke", invokeParamaters );
+ ReflectionUtils.getMethod( providerInOtherClassLoader.getClass(), "invoke", INVOKE_PARAMETERS );
final Object result = ReflectionUtils.invokeMethodWithArray2( providerInOtherClassLoader, invoke,
new Object[]{ forkTestSet } );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
index 1c454db..ce23d3e 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
@@ -36,7 +36,7 @@ public class StartupConfiguration
private final boolean isInForkedVm;
- private final static String SUREFIRE_TEST_CLASSPATH = "surefire.test.class.path";
+ private static final String SUREFIRE_TEST_CLASSPATH = "surefire.test.class.path";
public StartupConfiguration( String providerClassName, ClasspathConfiguration classpathConfiguration,
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
index 4b0cfb8..59c8cd2 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
@@ -1,23 +1,23 @@
package org.apache.maven.surefire.booter;
/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
import java.io.ByteArrayInputStream;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java
index bda705b..a20f96e 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java
@@ -99,7 +99,9 @@ public class PropertiesWrapperTest
private Classpath createClasspathWithTwoElements()
{
- return Classpath.emptyClasspath().addClassPathElementUrl( FIRST_ELEMENT ).addClassPathElementUrl( SECOND_ELEMENT );
+ return Classpath.emptyClasspath()
+ .addClassPathElementUrl( FIRST_ELEMENT )
+ .addClassPathElementUrl( SECOND_ELEMENT );
}
private Classpath readClasspathFromProperties()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
index cfedc8c..66901f7 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
@@ -2,8 +2,7 @@ package org.apache.maven.surefire.booter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor lice
-nse agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
index 9fbfcf2..1ffc894 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.group.match;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,6 +21,10 @@ package org.apache.maven.surefire.group.match;
import java.util.Collection;
+/**
+ * AND group matcher
+ *
+ */
public class AndGroupMatcher
extends JoinGroupMatcher
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/GroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/GroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/GroupMatcher.java
index 3eba73b..5a75b3f 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/GroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/GroupMatcher.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.group.match;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +19,10 @@ package org.apache.maven.surefire.group.match;
* under the License.
*/
+/**
+ * Group Matcher
+ *
+ */
public interface GroupMatcher
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
index 567c328..fe60869 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.group.match;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,6 +20,10 @@ package org.apache.maven.surefire.group.match;
*/
+/**
+ * Inverse group matcher
+ *
+ */
public class InverseGroupMatcher
implements GroupMatcher
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java
index a96c794..ec8ac76 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.group.match;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +22,10 @@ package org.apache.maven.surefire.group.match;
import java.util.HashSet;
import java.util.Set;
+/**
+ * Joins several group matchers
+ *
+ */
public abstract class JoinGroupMatcher
implements GroupMatcher
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
index 6073b04..65122c7 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.group.match;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,6 +21,10 @@ package org.apache.maven.surefire.group.match;
import java.util.Collection;
+/**
+ * OR group matcher
+ *
+ */
public class OrGroupMatcher
extends JoinGroupMatcher
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
index 86021c9..7107397 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
@@ -18,9 +18,14 @@ package org.apache.maven.surefire.group.match;
* specific language governing permissions and limitations
* under the License.
*/
+
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+/**
+ * Single group matcher
+ *
+ */
public class SingleGroupMatcher
implements GroupMatcher
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
index 5bdc29f..0901d58 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
@@ -1,5 +1,24 @@
package org.apache.maven.surefire.its;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
index def9d8b..b5df941 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
@@ -1,5 +1,24 @@
package org.apache.maven.surefire.its.fixture;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.IOException;
import org.apache.maven.it.VerificationException;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
index cb9c92d..3e53cca 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
@@ -1,5 +1,24 @@
package org.apache.maven.surefire.its.jiras;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
index 9c70e6a..8920b35 100644
--- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
@@ -78,7 +78,8 @@ public class PojoStackTraceWriter
public SafeThrowable getThrowable()
{
- if ( t == null ) {
+ if ( t == null )
+ {
return null;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index d1b3ff2..c97246c 100644
--- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -33,6 +33,8 @@ import org.apache.maven.shared.utils.StringUtils;
public class SmartStackTraceParser
{
+ private static final int MAX_LINE_LENGTH = 77;
+
private final SafeThrowable throwable;
private final StackTraceElement[] stackTrace;
@@ -93,7 +95,7 @@ public class SmartStackTraceParser
if ( stackTraceElements.isEmpty() )
{
result.append( simpleName );
- if (StringUtils.isNotEmpty( testMethodName ))
+ if ( StringUtils.isNotEmpty( testMethodName ) )
{
result.append( "." ).append( testMethodName );
}
@@ -149,7 +151,7 @@ public class SmartStackTraceParser
{
result.append( rootIsInclass() ? " " : " » " );
result.append( getMinimalThrowableMiniMessage( target ) );
- result.append( getTruncatedMessage( 77 - result.length() ) );
+ result.append( getTruncatedMessage( MAX_LINE_LENGTH - result.length() ) );
}
return result.toString();
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java b/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
index eec23d8..f343108 100644
--- a/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
+++ b/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
@@ -25,6 +25,10 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import org.apache.maven.surefire.util.ReflectionUtils;
+/**
+ * Reflection facade for JUnit3 classes
+ *
+ */
public final class JUnit3Reflector
{
private static final String TEST_CASE = "junit.framework.Test";
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
index 0a69703..70ae62a 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
@@ -28,22 +28,26 @@ import org.junit.Ignore;
import org.junit.runner.Description;
import org.junit.runner.Request;
+/**
+ * JUnit4 reflection helper
+ *
+ */
public final class JUnit4Reflector
{
- private static final Class[] params = new Class[]{ Class.class };
+ private static final Class[] PARAMS = new Class[]{ Class.class };
- private static final Class[] ignoreParams = new Class[]{ Ignore.class };
+ private static final Class[] IGNORE_PARAMS = new Class[]{ Ignore.class };
public Ignore getAnnotatedIgnore( Description description )
{
- Method getAnnotation = ReflectionUtils.tryGetMethod( description.getClass(), "getAnnotation", params );
+ Method getAnnotation = ReflectionUtils.tryGetMethod( description.getClass(), "getAnnotation", PARAMS );
if ( getAnnotation == null )
{
return null;
}
- return (Ignore) ReflectionUtils.invokeMethodWithArray( description, getAnnotation, ignoreParams );
+ return (Ignore) ReflectionUtils.invokeMethodWithArray( description, getAnnotation, IGNORE_PARAMS );
}
public String getAnnotatedIgnoreValue( Description description )
@@ -54,13 +58,14 @@ public final class JUnit4Reflector
public Request createRequest( Class<?>... classes )
{
- try {
+ try
+ {
return (Request) Request.class.getDeclaredMethod( "classes", Class[].class )// Since of JUnit 4.5
.invoke( null, new Object[]{ classes } );
}
catch ( NoSuchMethodException e )
{
- return Request.classes( null, classes );// Since of JUnit 4.0
+ return Request.classes( null, classes ); // Since of JUnit 4.0
}
catch ( InvocationTargetException e )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
index f21ab04..b5964a8 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
@@ -31,6 +31,10 @@ import org.junit.runner.notification.Failure;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+/**
+ * RunListener for JUnit4, delegates to our own RunListener
+ *
+ */
public class JUnit4RunListener
extends org.junit.runner.notification.RunListener
{
@@ -188,7 +192,10 @@ public class JUnit4RunListener
{
String displayName = description.getDisplayName();
int i = displayName.indexOf( "(" );
- if (i >= 0 ) return displayName.substring( 0, i );
+ if ( i >= 0 )
+ {
+ return displayName.substring( 0, i );
+ }
return displayName;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnitTestFailureListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnitTestFailureListener.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnitTestFailureListener.java
index 5cca0e8..473082d 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnitTestFailureListener.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnitTestFailureListener.java
@@ -1,5 +1,24 @@
package org.apache.maven.surefire.common.junit4;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.junit.runner.notification.Failure;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java
index 44b12c2..039a118 100644
--- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java
+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java
@@ -47,8 +47,7 @@ public final class JUnit48Reflector
public boolean isCategoryAnnotationPresent( Class clazz )
{
- return ( category != null &&
- ( clazz.getAnnotation( category ) != null
- || ( clazz.getSuperclass() != null && isCategoryAnnotationPresent( clazz.getSuperclass() ) ) ) );
+ return clazz != null && category != null
+ && ( clazz.getAnnotation( category ) != null || isCategoryAnnotationPresent( clazz.getSuperclass() ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java
index 914c587..9da8715 100644
--- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java
+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java
@@ -53,14 +53,16 @@ public class JUnit48TestChecker
@SuppressWarnings( { "unchecked" } )
private boolean isAbstractWithEnclosedRunner( Class testClass )
{
- return jUnit4TestChecker.isRunWithPresentInClassLoader() && isAbstract( testClass ) && isRunWithEnclosedRunner(testClass);
+ return jUnit4TestChecker.isRunWithPresentInClassLoader()
+ && isAbstract( testClass )
+ && isRunWithEnclosedRunner( testClass );
}
- private boolean isRunWithEnclosedRunner(Class testClass )
+ private boolean isRunWithEnclosedRunner( Class testClass )
{
@SuppressWarnings( "unchecked" ) org.junit.runner.RunWith runWithAnnotation =
(org.junit.runner.RunWith) testClass.getAnnotation( org.junit.runner.RunWith.class );
- return ( runWithAnnotation != null && Enclosed.class.equals( runWithAnnotation.value()));
+ return ( runWithAnnotation != null && Enclosed.class.equals( runWithAnnotation.value() ) );
}
private boolean isAbstract( Class testClass )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
index 22e7069..be90068 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
@@ -27,7 +27,6 @@ import org.apache.maven.surefire.providerapi.ProviderParameters;
import org.apache.maven.surefire.report.ConsoleOutputCapture;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.report.ReporterFactory;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.report.SimpleReportEntry;
@@ -72,7 +71,7 @@ public class JUnit3Provider
}
public RunResult invoke( Object forkTestSet )
- throws TestSetFailedException, ReporterException
+ throws TestSetFailedException
{
if ( testsToRun == null )
{
@@ -121,7 +120,7 @@ public class JUnit3Provider
}
private void executeTestSet( SurefireTestSet testSet, RunListener reporter, ClassLoader classLoader )
- throws ReporterException, TestSetFailedException
+ throws TestSetFailedException
{
ReportEntry report = new SimpleReportEntry( this.getClass().getName(), testSet.getName() );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
index d361767..9fbc64b 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
@@ -26,6 +26,10 @@ import org.apache.maven.surefire.common.junit3.JUnit3Reflector;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.testset.TestSetFailedException;
+/**
+ * JUnit3 test set
+ *
+ */
public final class JUnitTestSet
implements SurefireTestSet
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
index 1fe381a..362d615 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
@@ -30,6 +30,10 @@ import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.report.SimpleReportEntry;
import org.apache.maven.surefire.testset.TestSetFailedException;
+/**
+ * Executes a JUnit3 test class
+ *
+ */
public class PojoTestSet
implements SurefireTestSet
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java
index f2d0cdb..5f089bd 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java
@@ -22,6 +22,10 @@ package org.apache.maven.surefire.junit;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.testset.TestSetFailedException;
+/**
+ * Describes a single test set
+ *
+ */
public interface SurefireTestSet
{
void execute( RunListener reportManager, ClassLoader loader )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
index 01e564b..c4c0f51 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
@@ -29,6 +29,10 @@ import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.report.SimpleReportEntry;
+/**
+ * Invocation Handler for TestListener proxies to delegate to our {@link RunListener}
+ *
+ */
public class TestListenerInvocationHandler
implements InvocationHandler
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/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 a9b2799..93922e1 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
@@ -19,6 +19,13 @@ package org.apache.maven.surefire.junit4;
* under the License.
*/
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
import org.apache.maven.shared.utils.io.SelectorUtils;
import org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil;
import org.apache.maven.surefire.common.junit4.JUnit4RunListener;
@@ -31,7 +38,6 @@ import org.apache.maven.surefire.report.ConsoleOutputCapture;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.PojoStackTraceWriter;
import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.report.ReporterFactory;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.report.SimpleReportEntry;
@@ -46,13 +52,6 @@ import org.junit.runner.Request;
import org.junit.runner.Result;
import org.junit.runner.notification.RunNotifier;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
/**
* @author Kristian Rosenvold
*/
@@ -91,7 +90,7 @@ public class JUnit4Provider
}
public RunResult invoke( Object forkTestSet )
- throws TestSetFailedException, ReporterException
+ throws TestSetFailedException
{
if ( testsToRun == null )
{
@@ -145,12 +144,12 @@ public class JUnit4Provider
{
if ( !StringUtils.isBlank( requestedTestMethod ) )
{
- String actualTestMethod = getMethod( clazz, requestedTestMethod );//add by rainLee
+ String actualTestMethod = getMethod( clazz, requestedTestMethod );
String[] testMethods = StringUtils.split( actualTestMethod, "+" );
executeWithRerun( clazz, listeners, testMethods );
}
else
- {//the original way
+ {
executeWithRerun( clazz, listeners, null );
}
}
@@ -224,7 +223,7 @@ public class JUnit4Provider
return runOrderCalculator.orderTestClasses( scannedClasses );
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
private void upgradeCheck()
throws TestSetFailedException
{
@@ -286,11 +285,11 @@ public class JUnit4Provider
}
/**
- * this method retrive testMethods from String like "com.xx.ImmutablePairTest#testBasic,com.xx.StopWatchTest#testLang315+testStopWatchSimpleGet"
- * <br>
+ * this method retrive testMethods from String like
+ * "com.xx.ImmutablePairTest#testBasic,com.xx.StopWatchTest#testLang315+testStopWatchSimpleGet" <br>
* and we need to think about cases that 2 or more method in 1 class. we should choose the correct method
*
- * @param testClass the testclass
+ * @param testClass the testclass
* @param testMethodStr the test method string
* @return a string ;)
*/
@@ -299,14 +298,14 @@ public class JUnit4Provider
final String className = testClass.getName();
if ( !testMethodStr.contains( "#" ) && !testMethodStr.contains( "," ) )
- {//the original way
+ {
return testMethodStr;
}
- testMethodStr += ",";//for the bellow split code
+ testMethodStr += ","; // for the bellow split code
final int beginIndex = testMethodStr.indexOf( className );
final int endIndex = testMethodStr.indexOf( ",", beginIndex );
final String classMethodStr =
- testMethodStr.substring( beginIndex, endIndex );//String like "StopWatchTest#testLang315"
+ testMethodStr.substring( beginIndex, endIndex ); // String like "StopWatchTest#testLang315"
final int index = classMethodStr.indexOf( '#' );
return index >= 0 ? classMethodStr.substring( index + 1, classMethodStr.length() ) : null;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
index f2cc672..a4a5414 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
@@ -34,7 +34,7 @@ import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
import org.junit.runners.model.RunnerScheduler;
-/*
+/**
* @author Kristian Rosenvold
*/
public class ConfigurableParallelComputer
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/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 a145b44..06ebd20 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
@@ -36,7 +36,6 @@ import org.apache.maven.surefire.providerapi.ProviderParameters;
import org.apache.maven.surefire.report.ConsoleLogger;
import org.apache.maven.surefire.report.ConsoleOutputCapture;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
-import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.report.ReporterFactory;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.suite.RunResult;
@@ -89,7 +88,8 @@ public class JUnitCoreProvider
rerunFailingTestsCount = providerParameters.getTestRequest().getRerunFailingTestsCount();
customRunListeners =
- JUnit4RunListenerFactory.createCustomListeners( providerParameters.getProviderProperties().getProperty( "listener" ) );
+ JUnit4RunListenerFactory.createCustomListeners(
+ providerParameters.getProviderProperties().getProperty( "listener" ) );
jUnit48Reflector = new JUnit48Reflector( testClassLoader );
}
@@ -110,7 +110,7 @@ public class JUnitCoreProvider
}
public RunResult invoke( Object forkTestSet )
- throws TestSetFailedException, ReporterException
+ throws TestSetFailedException
{
final ReporterFactory reporterFactory = providerParameters.getReporterFactory();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
index 5c14bfb..665bcb7 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.junitcore;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/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 365f4b1..42e65f5 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
@@ -47,7 +47,7 @@ public class TestSet
private final List<TestMethod> testMethods = Collections.synchronizedList( new ArrayList<TestMethod>() );
- private static final InheritableThreadLocal<TestSet> testSet = new InheritableThreadLocal<TestSet>();
+ private static final InheritableThreadLocal<TestSet> TEST_SET = new InheritableThreadLocal<TestSet>();
private final AtomicBoolean allScheduled = new AtomicBoolean();
@@ -152,12 +152,12 @@ public class TestSet
public void attachToThread()
{
- testSet.set( this );
+ TEST_SET.set( this );
}
public static TestSet getThreadTestSet()
{
- return testSet.get();
+ return TEST_SET.get();
}
public LogicalStream getClassLevelLogicalStream()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java
index 2277bd4..873ccfd 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java
@@ -39,12 +39,12 @@ public interface Balancer
* @return <code>true</code> if current thread is <em>NOT</em> interrupted
* while waiting for a permit.
*/
- public boolean acquirePermit();
+ boolean acquirePermit();
/**
* Releases a permit, returning it to the balancer.
*/
- public void releasePermit();
+ void releasePermit();
- public void releaseAllPermits();
+ void releaseAllPermits();
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java
index 06c328d..6dba00d 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java
@@ -63,7 +63,8 @@ final class InvokerStrategy
protected boolean stopNow()
{
final boolean stopped = disable();
- for ( Thread activeThread; ( activeThread = activeThreads.poll() ) != null; )
+
+ for ( Thread activeThread = activeThreads.poll(); activeThread != null; activeThread = activeThreads.poll() )
{
activeThread.interrupt();
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
index 483e5d9..86c958f 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
@@ -43,6 +43,8 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
public abstract class ParallelComputer
extends Computer
{
+ private static final double NANOS_IN_A_SECOND = 1E9;
+
private final ShutdownStatus shutdownStatus = new ShutdownStatus();
private final ShutdownStatus forcedShutdownStatus = new ShutdownStatus();
@@ -188,7 +190,7 @@ public abstract class ParallelComputer
private double nanosToSeconds( long nanos )
{
- return (double) nanos / 1E9;
+ return (double) nanos / NANOS_IN_A_SECOND;
}
private boolean hasTimeout()
@@ -203,7 +205,7 @@ public abstract class ParallelComputer
private static long secondsToNanos( double seconds )
{
- double nanos = seconds > 0 ? seconds * 1E9 : 0;
+ double nanos = seconds > 0 ? seconds * NANOS_IN_A_SECOND : 0;
return Double.isInfinite( nanos ) || nanos >= Long.MAX_VALUE ? 0 : (long) nanos;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
index 9353349..d18edd7 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
@@ -19,7 +19,21 @@ package org.apache.maven.surefire.junitcore.pc;
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
import net.jcip.annotations.NotThreadSafe;
+
import org.apache.maven.surefire.junitcore.JUnitCoreParameters;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.junit.internal.runners.ErrorReportingRunner;
@@ -33,21 +47,10 @@ import org.junit.runners.Suite;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static org.apache.maven.surefire.junitcore.pc.ParallelComputerUtil.*;
-import static org.apache.maven.surefire.junitcore.pc.Type.*;
+import static org.apache.maven.surefire.junitcore.pc.ParallelComputerUtil.resolveConcurrency;
+import static org.apache.maven.surefire.junitcore.pc.Type.CLASSES;
+import static org.apache.maven.surefire.junitcore.pc.Type.METHODS;
+import static org.apache.maven.surefire.junitcore.pc.Type.SUITES;
/**
* Executing suites, classes and methods with defined concurrency. In this example the threads which completed
@@ -292,7 +295,7 @@ public final class ParallelComputerBuilder
long suitesCount = suites.size();
long classesCount = classes.size() + nestedClasses.size();
long methodsCount = suiteClasses.embeddedChildrenCount + nestedClassesChildren;
- if (!ParallelComputerBuilder.this.runningInTests)
+ if ( !ParallelComputerBuilder.this.runningInTests )
{
determineThreadCounts( suitesCount, classesCount, methodsCount );
}
@@ -344,7 +347,7 @@ public final class ParallelComputerBuilder
allGroups.put( CLASSES, concurrency.classes );
allGroups.put( METHODS, concurrency.methods );
poolCapacity = concurrency.capacity;
- splitPool &= concurrency.capacity <= 0;//fault if negative; should not happen
+ splitPool &= concurrency.capacity <= 0; // fault if negative; should not happen
}
private <T extends Runner> WrappedRunners wrapRunners( Collection<T> runners )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java
index f93e9b6..028b7ba 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java
@@ -66,9 +66,10 @@ final class ParallelComputerUtil
if ( !params.isUseUnlimitedThreads() && !hasThreadCount( params ) && !hasThreadCounts( params ) )
{
- throw new TestSetFailedException( "Unspecified thread-count(s). " +
- "See the parameters " + JUnitCoreParameters.USEUNLIMITEDTHREADS_KEY
- + ", " + JUnitCoreParameters.THREADCOUNT_KEY + ", "
+ throw new TestSetFailedException( "Unspecified thread-count(s). "
+ + "See the parameters "
+ + JUnitCoreParameters.USEUNLIMITEDTHREADS_KEY + ", "
+ + JUnitCoreParameters.THREADCOUNT_KEY + ", "
+ JUnitCoreParameters.THREADCOUNTSUITES_KEY + ", "
+ JUnitCoreParameters.THREADCOUNTCLASSES_KEY + ", "
+ JUnitCoreParameters.THREADCOUNTMETHODS_KEY + "." );
@@ -292,9 +293,9 @@ final class ParallelComputerUtil
private static boolean hasThreadCounts( JUnitCoreParameters jUnitCoreParameters )
{
- return jUnitCoreParameters.isParallelSuites() && jUnitCoreParameters.getThreadCountSuites() > 0 ||
- jUnitCoreParameters.isParallelClasses() && jUnitCoreParameters.getThreadCountClasses() > 0 ||
- jUnitCoreParameters.isParallelMethods() && jUnitCoreParameters.getThreadCountMethods() > 0;
+ return ( jUnitCoreParameters.isParallelSuites() && jUnitCoreParameters.getThreadCountSuites() > 0 )
+ || ( jUnitCoreParameters.isParallelClasses() && jUnitCoreParameters.getThreadCountClasses() > 0 )
+ || ( jUnitCoreParameters.isParallelMethods() && jUnitCoreParameters.getThreadCountMethods() > 0 );
}
private static boolean hasThreadCount( JUnitCoreParameters jUnitCoreParameters )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java
index 1ce744d..1dbbb79 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java
@@ -19,9 +19,6 @@ package org.apache.maven.surefire.junitcore.pc;
* under the License.
*/
-import org.junit.runners.model.RunnerScheduler;
-
-import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
/**
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SharedThreadPoolStrategy.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SharedThreadPoolStrategy.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SharedThreadPoolStrategy.java
index cfe6faa..325d1e9 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SharedThreadPoolStrategy.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SharedThreadPoolStrategy.java
@@ -81,13 +81,13 @@ final class SharedThreadPoolStrategy
}
@Override
- protected final boolean stop()
+ protected boolean stop()
{
return stop( false );
}
@Override
- protected final boolean stopNow()
+ protected boolean stopNow()
{
return stop( true );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java
index cf76166..6708089 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java
@@ -25,6 +25,7 @@ import java.util.Collection;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicReference;
+// CHECKSTYLE_OFF: imports
import static org.apache.maven.surefire.junitcore.pc.ExecutionStatus.*;
/**
[5/5] git commit: o Add Release Notes link and Jira report to the
plugin sites
Posted by ag...@apache.org.
o Add Release Notes link and Jira report to the plugin sites
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/5d61287a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5d61287a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5d61287a
Branch: refs/heads/master
Commit: 5d61287af0a3c5a03761b31d4a65264bcedeba42
Parents: e4ff032
Author: Andreas Gudian <ag...@apache.org>
Authored: Sun Oct 26 00:58:35 2014 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Sun Oct 26 00:58:35 2014 +0200
----------------------------------------------------------------------
maven-failsafe-plugin/pom.xml | 21 +++++++++++++++++++++
maven-surefire-plugin/pom.xml | 21 +++++++++++++++++++++
maven-surefire-plugin/src/site/site.xml | 1 +
maven-surefire-report-plugin/pom.xml | 14 ++++++++++++++
maven-surefire-report-plugin/src/site/site.xml | 1 +
pom.xml | 19 +++++++++++++++++++
6 files changed, 77 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-failsafe-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index b1ff0c0..15cb00e 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -293,5 +293,26 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-surefire-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 6d716f1..f983111 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -163,5 +163,26 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-surefire-plugin/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/site.xml b/maven-surefire-plugin/src/site/site.xml
index d98d763..e67ecb6 100644
--- a/maven-surefire-plugin/src/site/site.xml
+++ b/maven-surefire-plugin/src/site/site.xml
@@ -32,6 +32,7 @@
<item name="API" href="api.html"/>
<item name="FAQ" href="faq.html"/>
<item name="Developing" href="developing.html"/>
+ <item name="Release Notes" href="jira-report.html"/>
<!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
<item name="License" href="http://www.apache.org/licenses/"/>
<item name="Download" href="../download.html"/>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-surefire-report-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index b5d6fcd..0cef841 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -233,6 +233,20 @@
</locales>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
</profile>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/maven-surefire-report-plugin/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/site/site.xml b/maven-surefire-report-plugin/src/site/site.xml
index d638885..8aa02a7 100644
--- a/maven-surefire-report-plugin/src/site/site.xml
+++ b/maven-surefire-report-plugin/src/site/site.xml
@@ -27,6 +27,7 @@
<item name="Goals" href="plugin-info.html"/>
<item name="Usage" href="usage.html"/>
<item name="FAQ" href="faq.html"/>
+ <item name="Release Notes" href="jira-report.html"/>
<!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
<item name="License" href="http://www.apache.org/licenses/"/>
<item name="Download" href="../download.html"/>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5d61287a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 12ee4b3..6788ec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -318,6 +318,7 @@
<exclude>**/*.ipr</exclude>
<exclude>**/*.iws</exclude>
<exclude>**/*.versionsBackup</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>.gitignore</exclude>
<exclude>src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
</exclude>
@@ -407,6 +408,24 @@
</plugins>
</pluginManagement>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.11</version>
+ <configuration>
+ <!-- For JIRA-report -->
+ <columnNames>Type,Priority,Key,Summary,Assignee,Resolution,Fix Version</columnNames>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <resolutionIds>Fixed</resolutionIds>
+ <sortColumnNames>type DESC,Priority DESC,Key</sortColumnNames>
+ <maxEntries>1000</maxEntries>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</profile>
<profile>
<id>m2e</id>
[3/5] o Update to maven-parent 25,
fix tons of rat and checkstyle errors
Posted by ag...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index 7ec390e..b7bcadb 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -63,6 +63,7 @@ public class TestSetRunListener
private final StatisticsReporter statisticsReporter;
+ @SuppressWarnings( "checkstyle:parameternumber" )
public TestSetRunListener( ConsoleReporter consoleReporter, FileReporter fileReporter,
StatelessXmlReporter simpleXMLReporter,
TestcycleConsoleOutputReceiver consoleOutputReceiver,
@@ -169,7 +170,7 @@ public class TestSetRunListener
public void testSucceeded( ReportEntry reportEntry )
{
- WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.success );
+ WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.SUCCESS );
detailsForThis.testSucceeded( wrapped );
if ( statisticsReporter != null )
{
@@ -180,7 +181,7 @@ public class TestSetRunListener
public void testError( ReportEntry reportEntry )
{
- WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.error );
+ WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.ERROR );
detailsForThis.testError( wrapped );
if ( statisticsReporter != null )
{
@@ -191,7 +192,7 @@ public class TestSetRunListener
public void testFailed( ReportEntry reportEntry )
{
- WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.failure );
+ WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.FAILURE );
detailsForThis.testFailure( wrapped );
if ( statisticsReporter != null )
{
@@ -206,7 +207,7 @@ public class TestSetRunListener
public void testSkipped( ReportEntry reportEntry )
{
- WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.skipped );
+ WrappedReportEntry wrapped = wrap( reportEntry, ReportEntryType.SKIPPED );
detailsForThis.testSkipped( wrapped );
if ( statisticsReporter != null )
@@ -224,7 +225,7 @@ public class TestSetRunListener
private WrappedReportEntry wrap( ReportEntry other, ReportEntryType reportEntryType )
{
final int estimatedElapsed;
- if ( reportEntryType != ReportEntryType.skipped )
+ if ( reportEntryType != ReportEntryType.SKIPPED )
{
if ( other.getElapsed() != null )
{
@@ -260,7 +261,7 @@ public class TestSetRunListener
public void addTestMethodStats()
{
- for (WrappedReportEntry reportEntry : detailsForThis.getReportEntries())
+ for ( WrappedReportEntry reportEntry : detailsForThis.getReportEntries() )
{
TestMethodStats methodStats =
new TestMethodStats( reportEntry.getClassMethodName(), reportEntry.getReportEntryType(),
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
index 8391ff9..2ff40ba 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.surefire.report;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -82,12 +83,14 @@ public class TestSetStats
public void testSetStart()
{
- lastStartAt = testSetStartAt = System.currentTimeMillis();
+ testSetStartAt = System.currentTimeMillis();
+ lastStartAt = testSetStartAt;
}
public void testStart()
{
- lastStartAt = testStartAt = System.currentTimeMillis();
+ testStartAt = System.currentTimeMillis();
+ lastStartAt = testStartAt;
}
private long finishTest( WrappedReportEntry reportEntry )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
index af1682f..954a2bb 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
@@ -41,6 +41,7 @@ class Utf8RecodingDeferredFileOutputStream
private static final Charset UTF8 = Charset.forName( "UTF-8" );
+ @SuppressWarnings( "checkstyle:magicnumber" )
public Utf8RecodingDeferredFileOutputStream( String channel )
{
this.deferredFileOutputStream = new DeferredFileOutputStream( 1000000, channel, "deferred", null );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
index ef6961d..f62a917 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
@@ -48,7 +48,8 @@ public class WrappedReportEntry
static final String NL = System.getProperty( "line.separator" );
public WrappedReportEntry( ReportEntry original, ReportEntryType reportEntryType, Integer estimatedElapsed,
- Utf8RecodingDeferredFileOutputStream stdout, Utf8RecodingDeferredFileOutputStream stdErr )
+ Utf8RecodingDeferredFileOutputStream stdout,
+ Utf8RecodingDeferredFileOutputStream stdErr )
{
this.original = original;
this.reportEntryType = reportEntryType;
@@ -165,17 +166,17 @@ public class WrappedReportEntry
public boolean isErrorOrFailure()
{
ReportEntryType thisType = getReportEntryType();
- return ReportEntryType.failure == thisType || ReportEntryType.error == thisType;
+ return ReportEntryType.FAILURE == thisType || ReportEntryType.ERROR == thisType;
}
public boolean isSkipped()
{
- return ReportEntryType.skipped == getReportEntryType();
+ return ReportEntryType.SKIPPED == getReportEntryType();
}
public boolean isSucceeded()
{
- return ReportEntryType.success == getReportEntryType();
+ return ReportEntryType.SUCCESS == getReportEntryType();
}
public String getNameWithGroup()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java
index 636662f..60c1d49 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java
@@ -18,6 +18,7 @@ package org.apache.maven.plugin.surefire.util;
* specific language governing permissions and limitations
* under the License.
*/
+
import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertJarFileResourceToJavaClassName;
import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator;
import static org.apache.maven.plugin.surefire.util.ScannerUtil.processIncludesExcludes;
@@ -40,7 +41,7 @@ import javax.annotation.Nullable;
/**
* Scans dependencies looking for tests.
- *
+ *
* @author Aslak Knutsen
*/
public class DependencyScanner
@@ -50,11 +51,13 @@ public class DependencyScanner
protected final List<String> includes;
+ @SuppressWarnings( "checkstyle:modifierorder" )
protected final @Nonnull List<String> excludes;
protected final List<String> specificTests;
- public DependencyScanner( List<File> dependenciesToScan, List<String> includes, @Nonnull List<String> excludes, List<String> specificTests )
+ public DependencyScanner( List<File> dependenciesToScan, List<String> includes, @Nonnull List<String> excludes,
+ List<String> specificTests )
{
this.dependenciesToScan = dependenciesToScan;
this.includes = includes;
@@ -130,9 +133,8 @@ public class DependencyScanner
String[] groupArtifact = groups.split( ":" );
if ( groupArtifact.length != 2 )
{
- throw new IllegalArgumentException(
- "dependencyToScan argument should be in format 'groupid:artifactid': "
- + groups );
+ throw new IllegalArgumentException( "dependencyToScan argument should be in format"
+ + " 'groupid:artifactid': " + groups );
}
if ( artifact.getGroupId().matches( groupArtifact[0] )
&& artifact.getArtifactId().matches( groupArtifact[1] ) )
@@ -153,7 +155,8 @@ public class DependencyScanner
private SpecificFileFilter specificTestFilter;
- public Matcher( @Nullable List<String> includes, @Nonnull List<String> excludes, @Nullable List<String> specificTests )
+ public Matcher( @Nullable List<String> includes, @Nonnull List<String> excludes,
+ @Nullable List<String> specificTests )
{
String[] specific = specificTests == null ? new String[0] : processIncludesExcludes( specificTests );
specificTestFilter = new SpecificFileFilter( specific );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
index e0cc18d..01fcc51 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
@@ -18,6 +18,7 @@ package org.apache.maven.plugin.surefire.util;
* specific language governing permissions and limitations
* under the License.
*/
+
import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator;
import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertToJavaClassName;
import static org.apache.maven.plugin.surefire.util.ScannerUtil.processIncludesExcludes;
@@ -79,7 +80,9 @@ public class DirectoryScanner
scanner.scan();
for ( String test : scanner.getIncludedFiles() )
{
- if ( specificTestFilter.accept( convertSlashToSystemFileSeparator( stripBaseDir( basedir.getAbsolutePath(), test ) ) ) )
+ if ( specificTestFilter.accept(
+ convertSlashToSystemFileSeparator(
+ stripBaseDir( basedir.getAbsolutePath(), test ) ) ) )
{
result.add( convertToJavaClassName( test ) );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
index d61ee20..eb5964c 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
@@ -30,9 +30,10 @@ import javax.annotation.Nullable;
*/
public class Relocator
{
+ @SuppressWarnings( "checkstyle:modifierorder" )
private final @Nullable String relocation;
- private static final String relocationBase = "org.apache.maven.surefire.";
+ private static final String RELOCATION_BASE = "org.apache.maven.surefire.";
public Relocator( @Nullable String relocation )
@@ -45,11 +46,13 @@ public class Relocator
relocation = "shadefire";
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
private @Nullable String getRelocation()
{
return relocation;
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
public @Nonnull String relocate( @Nonnull String className )
{
if ( relocation == null )
@@ -61,7 +64,7 @@ public class Relocator
return className;
}
String rest = className.substring( "org.apache.maven.surefire.".length() );
- final String s = relocationBase + getRelocation() + ".";
+ final String s = RELOCATION_BASE + getRelocation() + ".";
return s + rest;
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
index 124f656..e3ff45d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
@@ -27,38 +27,46 @@ import org.apache.commons.lang3.StringUtils;
import javax.annotation.Nonnull;
-final class ScannerUtil {
+final class ScannerUtil
+{
- private ScannerUtil() {}
+ private ScannerUtil()
+ {
+ }
private static final String FS = System.getProperty( "file.separator" );
private static final String JAVA_SOURCE_FILE_EXTENSION = ".java";
private static final String JAVA_CLASS_FILE_EXTENSION = ".class";
-
- private static final boolean IS_NON_UNIX_FS = (!FS.equals( "/" ));
+ private static final boolean IS_NON_UNIX_FS = ( !FS.equals( "/" ) );
+
+ @SuppressWarnings( "checkstyle:modifierorder" )
public static @Nonnull String convertToJavaClassName( @Nonnull String test )
{
return StringUtils.removeEnd( test, ".class" ).replace( FS, "." );
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
public static @Nonnull String convertJarFileResourceToJavaClassName( @Nonnull String test )
{
return StringUtils.removeEnd( test, ".class" ).replace( "/", "." );
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
public static @Nonnull String convertSlashToSystemFileSeparator( @Nonnull String path )
{
return ( IS_NON_UNIX_FS ? path.replace( "/", FS ) : path );
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
public static @Nonnull String stripBaseDir( String basedir, String test )
{
return StringUtils.removeStart( test, basedir );
}
+ @SuppressWarnings( "checkstyle:modifierorder" )
public static @Nonnull String[] processIncludesExcludes( @Nonnull List<String> list )
{
List<String> newList = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
index db2d477..f168d32 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
@@ -28,6 +28,10 @@ import org.apache.maven.shared.utils.io.SelectorUtils;
import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator;
+/**
+ * filters file names by a given collection of class name patterns
+ *
+ */
public class SpecificFileFilter
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java b/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
index feba245..d73238a 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
@@ -44,7 +44,8 @@ public class SurefireReportParser
{
private static final String INCLUDES = "*.xml";
- private static final String EXCLUDES = "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml, failsafe-summary*.xml";
+ private static final String EXCLUDES =
+ "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml, failsafe-summary*.xml";
private NumberFormat numberFormat = NumberFormat.getInstance();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java b/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
index 3f600b2..2548b13 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.surefire.report;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.NumberFormat;
import java.text.ParseException;
@@ -125,7 +124,8 @@ public class TestSuiteXmlParser
{
if ( "testsuite".equals( qName ) )
{
- currentSuite = defaultSuite = new ReportTestSuite();
+ defaultSuite = new ReportTestSuite();
+ currentSuite = defaultSuite;
try
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java b/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java
index 926658f..bcd5286 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/RunStatistics.java
@@ -22,13 +22,6 @@ package org.apache.maven.surefire.report;
import org.apache.maven.plugin.surefire.report.TestSetStats;
import org.apache.maven.surefire.suite.RunResult;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* @author Kristian Rosenvold
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
index 5bb1b61..1c18283 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
@@ -1,5 +1,24 @@
package org.apache.maven.plugin.surefire.report;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import junit.framework.TestCase;
import org.apache.maven.plugin.surefire.StartupReportConfiguration;
import org.apache.maven.surefire.report.DefaultDirectConsoleReporter;
@@ -40,29 +59,29 @@ public class DefaultReporterFactoryTest
// First run, four tests failed and one passed
List<TestMethodStats> firstRunStats = new ArrayList<TestMethodStats>();
- firstRunStats.add( new TestMethodStats( TEST_ONE, ReportEntryType.error, new DummyStackTraceWriter( ERROR ) ) );
- firstRunStats.add( new TestMethodStats( TEST_TWO, ReportEntryType.error, new DummyStackTraceWriter( ERROR ) ) );
+ firstRunStats.add( new TestMethodStats( TEST_ONE, ReportEntryType.ERROR, new DummyStackTraceWriter( ERROR ) ) );
+ firstRunStats.add( new TestMethodStats( TEST_TWO, ReportEntryType.ERROR, new DummyStackTraceWriter( ERROR ) ) );
firstRunStats.add(
- new TestMethodStats( TEST_THREE, ReportEntryType.failure, new DummyStackTraceWriter( ASSERTION_FAIL ) ) );
+ new TestMethodStats( TEST_THREE, ReportEntryType.FAILURE, new DummyStackTraceWriter( ASSERTION_FAIL ) ) );
firstRunStats.add(
- new TestMethodStats( TEST_FOUR, ReportEntryType.failure, new DummyStackTraceWriter( ASSERTION_FAIL ) ) );
+ new TestMethodStats( TEST_FOUR, ReportEntryType.FAILURE, new DummyStackTraceWriter( ASSERTION_FAIL ) ) );
firstRunStats.add(
- new TestMethodStats( TEST_FIVE, ReportEntryType.success, null ) );
+ new TestMethodStats( TEST_FIVE, ReportEntryType.SUCCESS, null ) );
// Second run, two tests passed
List<TestMethodStats> secondRunStats = new ArrayList<TestMethodStats>();
secondRunStats.add(
- new TestMethodStats( TEST_ONE, ReportEntryType.failure, new DummyStackTraceWriter( ASSERTION_FAIL ) ) );
- secondRunStats.add( new TestMethodStats( TEST_TWO, ReportEntryType.success, null ) );
+ new TestMethodStats( TEST_ONE, ReportEntryType.FAILURE, new DummyStackTraceWriter( ASSERTION_FAIL ) ) );
+ secondRunStats.add( new TestMethodStats( TEST_TWO, ReportEntryType.SUCCESS, null ) );
secondRunStats.add(
- new TestMethodStats( TEST_THREE, ReportEntryType.error, new DummyStackTraceWriter( ERROR ) ) );
- secondRunStats.add( new TestMethodStats( TEST_FOUR, ReportEntryType.success, null ) );
+ new TestMethodStats( TEST_THREE, ReportEntryType.ERROR, new DummyStackTraceWriter( ERROR ) ) );
+ secondRunStats.add( new TestMethodStats( TEST_FOUR, ReportEntryType.SUCCESS, null ) );
// Third run, another test passed
List<TestMethodStats> thirdRunStats = new ArrayList<TestMethodStats>();
- thirdRunStats.add( new TestMethodStats( TEST_ONE, ReportEntryType.success, null ) );
+ thirdRunStats.add( new TestMethodStats( TEST_ONE, ReportEntryType.SUCCESS, null ) );
thirdRunStats.add(
- new TestMethodStats( TEST_THREE, ReportEntryType.error, new DummyStackTraceWriter( ERROR ) ) );
+ new TestMethodStats( TEST_THREE, ReportEntryType.ERROR, new DummyStackTraceWriter( ERROR ) ) );
TestSetRunListener firstRunListener = mock( TestSetRunListener.class );
TestSetRunListener secondRunListener = mock( TestSetRunListener.class );
@@ -138,33 +157,33 @@ public class DefaultReporterFactoryTest
assertEquals( unknown, factory.getTestResultType( emptyList ) );
List<ReportEntryType> successList = new ArrayList<ReportEntryType>();
- successList.add( ReportEntryType.success );
- successList.add( ReportEntryType.success );
+ successList.add( ReportEntryType.SUCCESS );
+ successList.add( ReportEntryType.SUCCESS );
assertEquals( success, factory.getTestResultType( successList ) );
List<ReportEntryType> failureErrorList = new ArrayList<ReportEntryType>();
- failureErrorList.add( ReportEntryType.failure );
- failureErrorList.add( ReportEntryType.error );
+ failureErrorList.add( ReportEntryType.FAILURE );
+ failureErrorList.add( ReportEntryType.ERROR );
assertEquals( failure, factory.getTestResultType( failureErrorList ) );
List<ReportEntryType> errorFailureList = new ArrayList<ReportEntryType>();
- errorFailureList.add( ReportEntryType.error );
- errorFailureList.add( ReportEntryType.failure );
+ errorFailureList.add( ReportEntryType.ERROR );
+ errorFailureList.add( ReportEntryType.FAILURE );
assertEquals( error, factory.getTestResultType( errorFailureList ) );
List<ReportEntryType> flakeList = new ArrayList<ReportEntryType>();
- flakeList.add( ReportEntryType.success );
- flakeList.add( ReportEntryType.failure );
+ flakeList.add( ReportEntryType.SUCCESS );
+ flakeList.add( ReportEntryType.FAILURE );
assertEquals( flake, factory.getTestResultType( flakeList ) );
flakeList = new ArrayList<ReportEntryType>();
- flakeList.add( ReportEntryType.error );
- flakeList.add( ReportEntryType.success );
- flakeList.add( ReportEntryType.failure );
+ flakeList.add( ReportEntryType.ERROR );
+ flakeList.add( ReportEntryType.SUCCESS );
+ flakeList.add( ReportEntryType.FAILURE );
assertEquals( flake, factory.getTestResultType( flakeList ) );
List<ReportEntryType> skippedList = new ArrayList<ReportEntryType>();
- skippedList.add( ReportEntryType.skipped );
+ skippedList.add( ReportEntryType.SKIPPED );
assertEquals( skipped, factory.getTestResultType( skippedList ) );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
index c6c1d15..4facf9e 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
@@ -82,7 +82,7 @@ public class StatelessXmlReporterTest
String testName = "org.apache.maven.plugin.surefire.report.StatelessXMLReporterTest";
reportEntry = new SimpleReportEntry( this.getClass().getName(), testName, 12 );
WrappedReportEntry testSetReportEntry =
- new WrappedReportEntry( reportEntry, ReportEntryType.success, 12, null, null );
+ new WrappedReportEntry( reportEntry, ReportEntryType.SUCCESS, 12, null, null );
stats.testSucceeded( testSetReportEntry );
reporter.testSetCompleted( testSetReportEntry, stats );
@@ -99,7 +99,7 @@ public class StatelessXmlReporterTest
reportEntry = new SimpleReportEntry( this.getClass().getName(), TEST_ONE, 12 );
WrappedReportEntry testSetReportEntry =
- new WrappedReportEntry( reportEntry, ReportEntryType.success, 12, null, null );
+ new WrappedReportEntry( reportEntry, ReportEntryType.SUCCESS, 12, null, null );
expectedReportFile = new File( reportDir, "TEST-" + TEST_ONE + ".xml" );
stats.testSucceeded( testSetReportEntry );
@@ -128,7 +128,7 @@ public class StatelessXmlReporterTest
stdErr.write( stdErrBytes, 0, stdErrBytes.length );
WrappedReportEntry t2 =
new WrappedReportEntry( new SimpleReportEntry( Inner.class.getName(), TEST_TWO, stackTraceWriter, 13 ),
- ReportEntryType.error, 13, stdOut, stdErr );
+ ReportEntryType.ERROR, 13, stdOut, stdErr );
stats.testSucceeded( t2 );
StatelessXmlReporter reporter = new StatelessXmlReporter( new File( "." ), null, false, 0 );
@@ -171,7 +171,7 @@ public class StatelessXmlReporterTest
reportEntry = new SimpleReportEntry( this.getClass().getName(), TEST_ONE, 12 );
WrappedReportEntry testSetReportEntry =
- new WrappedReportEntry( reportEntry, ReportEntryType.success, 12, null, null );
+ new WrappedReportEntry( reportEntry, ReportEntryType.SUCCESS, 12, null, null );
expectedReportFile = new File( reportDir, "TEST-" + TEST_ONE + ".xml" );
stats.testSucceeded( testSetReportEntry );
@@ -187,22 +187,22 @@ public class StatelessXmlReporterTest
WrappedReportEntry testTwoFirstError =
new WrappedReportEntry( new SimpleReportEntry( Inner.class.getName(), TEST_TWO, stackTraceWriterOne, 5 ),
- ReportEntryType.error, 5, createStdOutput( firstRunOut ),
+ ReportEntryType.ERROR, 5, createStdOutput( firstRunOut ),
createStdOutput( firstRunErr ) );
WrappedReportEntry testTwoSecondError =
new WrappedReportEntry( new SimpleReportEntry( Inner.class.getName(), TEST_TWO, stackTraceWriterTwo, 13 ),
- ReportEntryType.error, 13, createStdOutput( secondRunOut ),
+ ReportEntryType.ERROR, 13, createStdOutput( secondRunOut ),
createStdOutput( secondRunErr ) );
WrappedReportEntry testThreeFirstRun =
new WrappedReportEntry( new SimpleReportEntry( Inner.class.getName(), TEST_THREE, stackTraceWriterOne, 13 ),
- ReportEntryType.failure, 13, createStdOutput( firstRunOut ),
+ ReportEntryType.FAILURE, 13, createStdOutput( firstRunOut ),
createStdOutput( firstRunErr ) );
WrappedReportEntry testThreeSecondRun =
new WrappedReportEntry( new SimpleReportEntry( Inner.class.getName(), TEST_THREE, stackTraceWriterTwo, 2 ),
- ReportEntryType.success, 2, createStdOutput( secondRunOut ),
+ ReportEntryType.SUCCESS, 2, createStdOutput( secondRunOut ),
createStdOutput( secondRunErr ) );
stats.testSucceeded( testTwoFirstError );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
index b2877b1..7c49547 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
@@ -43,7 +43,7 @@ public class FileReporterTest
File reportDir = new File( "target" );
reportEntry = new SimpleReportEntry( this.getClass().getName(), testName );
WrappedReportEntry wrappedReportEntry =
- new WrappedReportEntry( reportEntry, ReportEntryType.success, 12, null, null );
+ new WrappedReportEntry( reportEntry, ReportEntryType.SUCCESS, 12, null, null );
reporter = new FileReporter( reportDir, null );
reporter.testSetCompleted( wrappedReportEntry, createTestSetStats(), new ArrayList<String>() );
@@ -64,7 +64,7 @@ public class FileReporterTest
String suffixText = "sampleSuffixText";
reportEntry = new SimpleReportEntry( this.getClass().getName(), testName );
WrappedReportEntry wrappedReportEntry =
- new WrappedReportEntry( reportEntry, ReportEntryType.success, 12, null, null );
+ new WrappedReportEntry( reportEntry, ReportEntryType.SUCCESS, 12, null, null );
reporter = new FileReporter( reportDir, suffixText );
reporter.testSetCompleted( wrappedReportEntry, createTestSetStats(), new ArrayList<String>() );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
index 0b8d030..ea6f9df 100644
--- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
@@ -64,8 +64,8 @@ public class SurefirePlugin
* This parameter overrides the <code>includes/excludes</code> parameters, and the TestNG <code>suiteXmlFiles</code>
* parameter.
* <p/>
- * Since 2.7.3, you can execute a limited number of methods in the test by adding #myMethod or #my*ethod. For example,
- * "-Dtest=MyTest#myMethod". This is supported for junit 4.x and testNg.
+ * Since 2.7.3, you can execute a limited number of methods in the test by adding #myMethod or #my*ethod. For
+ * example, "-Dtest=MyTest#myMethod". This is supported for junit 4.x and testNg.
*/
@Parameter( property = "test" )
private String test;
@@ -145,7 +145,7 @@ public class SurefirePlugin
*/
@Parameter( property = "surefire.parallel.forcedTimeout" )
private double parallelTestsTimeoutForcedInSeconds;
-
+
/**
* A list of <include> elements specifying the tests (by pattern) that should be included in testing. When not
* specified and when the <code>test</code> parameter is not specified, the default includes will be <code><br/>
@@ -195,7 +195,8 @@ public class SurefirePlugin
@Parameter( property = "surefire.rerunFailingTestsCount", defaultValue = "0" )
protected int rerunFailingTestsCount;
- protected int getRerunFailingTestsCount() {
+ protected int getRerunFailingTestsCount()
+ {
return rerunFailingTestsCount;
}
@@ -341,7 +342,7 @@ public class SurefirePlugin
String singleTest = aTestArray;
int index = singleTest.indexOf( '#' );
if ( index >= 0 )
- {// the way version 2.7.3. support single test method
+ { // the way version 2.7.3. support single test method
singleTest = singleTest.substring( 0, index );
}
tests.append( singleTest );
@@ -368,7 +369,7 @@ public class SurefirePlugin
{
String testStrAfterFirstSharp = this.test.substring( index + 1, this.test.length() );
if ( !testStrAfterFirstSharp.contains( "+" ) )
- {//the original way
+ { //the original way
return testStrAfterFirstSharp;
}
else
@@ -464,19 +465,23 @@ public class SurefirePlugin
this.forkedProcessTimeoutInSeconds = forkedProcessTimeoutInSeconds;
}
- public double getParallelTestsTimeoutInSeconds() {
+ public double getParallelTestsTimeoutInSeconds()
+ {
return parallelTestsTimeoutInSeconds;
}
- public void setParallelTestsTimeoutInSeconds( double parallelTestsTimeoutInSeconds ) {
+ public void setParallelTestsTimeoutInSeconds( double parallelTestsTimeoutInSeconds )
+ {
this.parallelTestsTimeoutInSeconds = parallelTestsTimeoutInSeconds;
}
- public double getParallelTestsTimeoutForcedInSeconds() {
+ public double getParallelTestsTimeoutForcedInSeconds()
+ {
return parallelTestsTimeoutForcedInSeconds;
}
- public void setParallelTestsTimeoutForcedInSeconds( double parallelTestsTimeoutForcedInSeconds ) {
+ public void setParallelTestsTimeoutForcedInSeconds( double parallelTestsTimeoutForcedInSeconds )
+ {
this.parallelTestsTimeoutForcedInSeconds = parallelTestsTimeoutForcedInSeconds;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
index cb76287..7467aa9 100644
--- a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
+++ b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
The 1-line error summary
========================
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
index 25d3468..8235856 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
@@ -49,7 +49,7 @@ public abstract class AbstractSurefireReportMojo
*
* @noinspection UnusedDeclaration
*/
- @Parameter(property = "project.reporting.outputDirectory")
+ @Parameter( property = "project.reporting.outputDirectory" )
private File outputDirectory;
/**
@@ -65,7 +65,7 @@ public abstract class AbstractSurefireReportMojo
*
* @noinspection UnusedDeclaration
*/
- @Parameter(property = "project", required = true, readonly = true)
+ @Parameter( property = "project", required = true, readonly = true )
private MavenProject project;
/**
@@ -73,7 +73,7 @@ public abstract class AbstractSurefireReportMojo
*
* @noinspection UnusedDeclaration
*/
- @Parameter(defaultValue = "true", required = true, property = "showSuccess")
+ @Parameter( defaultValue = "true", required = true, property = "showSuccess" )
private boolean showSuccess;
/**
@@ -85,7 +85,8 @@ public abstract class AbstractSurefireReportMojo
private File[] reportsDirectories;
/**
- * (Deprecated, use reportsDirectories) This directory contains the XML Report files that will be parsed and rendered to HTML format.
+ * (Deprecated, use reportsDirectories) This directory contains the XML Report files that will be parsed and
+ * rendered to HTML format.
*
* @noinspection UnusedDeclaration
*/
@@ -98,7 +99,7 @@ public abstract class AbstractSurefireReportMojo
*
* @noinspection MismatchedQueryAndUpdateOfCollection, UnusedDeclaration
*/
- @Parameter(property = "reactorProjects", readonly = true)
+ @Parameter( property = "reactorProjects", readonly = true )
private List<MavenProject> reactorProjects;
/**
@@ -106,7 +107,7 @@ public abstract class AbstractSurefireReportMojo
*
* @noinspection UnusedDeclaration
*/
- @Parameter(defaultValue = "${project.reporting.outputDirectory}/xref-test")
+ @Parameter( defaultValue = "${project.reporting.outputDirectory}/xref-test" )
private File xrefLocation;
/**
@@ -114,7 +115,7 @@ public abstract class AbstractSurefireReportMojo
*
* @noinspection UnusedDeclaration
*/
- @Parameter(defaultValue = "true", property = "linkXRef")
+ @Parameter( defaultValue = "true", property = "linkXRef" )
private boolean linkXRef;
/**
@@ -122,7 +123,7 @@ public abstract class AbstractSurefireReportMojo
*
* @noinspection UnusedDeclaration
*/
- @Parameter(defaultValue = "false", property = "aggregate")
+ @Parameter( defaultValue = "false", property = "aggregate" )
private boolean aggregate;
/**
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
index 81e08e1..071ac44 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.surefire.report;
import java.io.File;
import java.util.Locale;
import java.util.ResourceBundle;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
@@ -36,7 +35,7 @@ import org.apache.maven.project.MavenProject;
* @author Stephen Connolly
* @since 2.10
*/
-@Mojo(name = "failsafe-report-only")
+@Mojo( name = "failsafe-report-only" )
public class FailsafeReportMojo
extends AbstractSurefireReportMojo
{
@@ -46,7 +45,7 @@ public class FailsafeReportMojo
*
* @noinspection UnusedDeclaration
*/
- @Parameter(defaultValue = "failsafe-report", property = "outputName", required = true)
+ @Parameter( defaultValue = "failsafe-report", property = "outputName", required = true )
private String outputName;
/**
@@ -56,7 +55,7 @@ public class FailsafeReportMojo
* @noinspection UnusedDeclaration
* @since 2.11
*/
- @Parameter(defaultValue = "false", property = "alwaysGenerateFailsafeReport")
+ @Parameter( defaultValue = "false", property = "alwaysGenerateFailsafeReport" )
private boolean alwaysGenerateFailsafeReport;
/**
@@ -65,7 +64,7 @@ public class FailsafeReportMojo
* @noinspection UnusedDeclaration
* @since 2.11
*/
- @Parameter(defaultValue = "false", property = "skipFailsafeReport")
+ @Parameter( defaultValue = "false", property = "skipFailsafeReport" )
private boolean skipFailsafeReport;
protected File getSurefireReportsDirectory( MavenProject subProject )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
index 68a83b2..77a88c2 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
@@ -308,66 +308,70 @@ public class SurefireReportGenerator
{
if ( showSuccess || suite.getNumberOfErrors() != 0 || suite.getNumberOfFailures() != 0 )
{
+ constructTestSuiteSection( sink, numberFormat, suite );
+ }
+ }
- sink.tableRow();
+ sink.tableRows_();
- sink.tableCell();
+ sink.table_();
+ }
- sink.link( "#" + suite.getPackageName() + suite.getName() );
+ sink.section2_();
+ }
- if ( suite.getNumberOfErrors() > 0 )
- {
- sinkIcon( "error", sink );
- }
- else if ( suite.getNumberOfFailures() > 0 )
- {
- sinkIcon( "junit.framework", sink );
- }
- else if ( suite.getNumberOfSkipped() > 0 )
- {
- sinkIcon( "skipped", sink );
- }
- else
- {
- sinkIcon( "success", sink );
- }
+ sinkLineBreak( sink );
- sink.link_();
+ sink.section1_();
+ }
- sink.tableCell_();
+ private void constructTestSuiteSection( Sink sink, NumberFormat numberFormat, ReportTestSuite suite )
+ {
+ sink.tableRow();
- sinkCellLink( sink, suite.getName(), "#" + suite.getPackageName() + suite.getName() );
+ sink.tableCell();
- sinkCell( sink, Integer.toString( suite.getNumberOfTests() ) );
+ sink.link( "#" + suite.getPackageName() + suite.getName() );
- sinkCell( sink, Integer.toString( suite.getNumberOfErrors() ) );
+ if ( suite.getNumberOfErrors() > 0 )
+ {
+ sinkIcon( "error", sink );
+ }
+ else if ( suite.getNumberOfFailures() > 0 )
+ {
+ sinkIcon( "junit.framework", sink );
+ }
+ else if ( suite.getNumberOfSkipped() > 0 )
+ {
+ sinkIcon( "skipped", sink );
+ }
+ else
+ {
+ sinkIcon( "success", sink );
+ }
- sinkCell( sink, Integer.toString( suite.getNumberOfFailures() ) );
+ sink.link_();
- sinkCell( sink, Integer.toString( suite.getNumberOfSkipped() ) );
+ sink.tableCell_();
- String percentage =
- report.computePercentage( suite.getNumberOfTests(), suite.getNumberOfErrors(),
- suite.getNumberOfFailures(), suite.getNumberOfSkipped() );
- sinkCell( sink, percentage + "%" );
+ sinkCellLink( sink, suite.getName(), "#" + suite.getPackageName() + suite.getName() );
- sinkCell( sink, numberFormat.format( suite.getTimeElapsed() ) );
+ sinkCell( sink, Integer.toString( suite.getNumberOfTests() ) );
- sink.tableRow_();
- }
- }
+ sinkCell( sink, Integer.toString( suite.getNumberOfErrors() ) );
- sink.tableRows_();
+ sinkCell( sink, Integer.toString( suite.getNumberOfFailures() ) );
- sink.table_();
- }
+ sinkCell( sink, Integer.toString( suite.getNumberOfSkipped() ) );
- sink.section2_();
- }
+ String percentage =
+ report.computePercentage( suite.getNumberOfTests(), suite.getNumberOfErrors(),
+ suite.getNumberOfFailures(), suite.getNumberOfSkipped() );
+ sinkCell( sink, percentage + "%" );
- sinkLineBreak( sink );
+ sinkCell( sink, numberFormat.format( suite.getTimeElapsed() ) );
- sink.section1_();
+ sink.tableRow_();
}
private void constructTestCasesSection( ResourceBundle bundle, Sink sink )
@@ -418,130 +422,135 @@ public class SurefireReportGenerator
{
if ( testCase.getFailure() != null || showSuccess )
{
- sink.tableRow();
+ constructTestCaseSection( sink, numberFormat, testCase );
+ }
+ }
- sink.tableCell();
+ sink.tableRows_();
- Map<String, Object> failure = testCase.getFailure();
+ sink.table_();
+ }
- if ( failure != null )
- {
- sink.link( "#" + toHtmlId( testCase.getFullName() ) );
+ sink.section2_();
+ }
+ }
- sinkIcon( (String) failure.get( "type" ), sink );
+ sinkLineBreak( sink );
- sink.link_();
- }
- else
- {
- sinkIcon( "success", sink );
- }
+ sink.section1_();
+ }
- sink.tableCell_();
+ private void constructTestCaseSection( Sink sink, NumberFormat numberFormat, ReportTestCase testCase )
+ {
+ sink.tableRow();
- if ( failure != null )
- {
- sink.tableCell();
+ sink.tableCell();
- sinkLink( sink, testCase.getName(), "#" + toHtmlId( testCase.getFullName() ) );
+ Map<String, Object> failure = testCase.getFailure();
- SinkEventAttributeSet atts = new SinkEventAttributeSet();
- atts.addAttribute( SinkEventAttributes.CLASS, "detailToggle" );
- atts.addAttribute( SinkEventAttributes.STYLE, "display:inline" );
- sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
+ if ( failure != null )
+ {
+ sink.link( "#" + toHtmlId( testCase.getFullName() ) );
- sink.link( "javascript:toggleDisplay('" + toHtmlId( testCase.getFullName() ) + "');" );
+ sinkIcon( (String) failure.get( "type" ), sink );
- atts = new SinkEventAttributeSet();
- atts.addAttribute( SinkEventAttributes.STYLE, "display:inline;" );
- atts.addAttribute( SinkEventAttributes.ID, toHtmlId( testCase.getFullName() ) + "off" );
- sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
- sink.text( " + " );
- sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
+ sink.link_();
+ }
+ else
+ {
+ sinkIcon( "success", sink );
+ }
- atts = new SinkEventAttributeSet();
- atts.addAttribute( SinkEventAttributes.STYLE, "display:none;" );
- atts.addAttribute( SinkEventAttributes.ID, toHtmlId( testCase.getFullName() ) + "on" );
- sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
- sink.text( " - " );
- sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
+ sink.tableCell_();
- sink.text( "[ Detail ]" );
- sink.link_();
+ if ( failure != null )
+ {
+ sink.tableCell();
- sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
+ sinkLink( sink, testCase.getName(), "#" + toHtmlId( testCase.getFullName() ) );
- sink.tableCell_();
- }
- else
- {
- sinkCell( sink, testCase.getName() );
- }
+ SinkEventAttributeSet atts = new SinkEventAttributeSet();
+ atts.addAttribute( SinkEventAttributes.CLASS, "detailToggle" );
+ atts.addAttribute( SinkEventAttributes.STYLE, "display:inline" );
+ sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
- sinkCell( sink, numberFormat.format( testCase.getTime() ) );
+ sink.link( "javascript:toggleDisplay('" + toHtmlId( testCase.getFullName() ) + "');" );
- sink.tableRow_();
+ atts = new SinkEventAttributeSet();
+ atts.addAttribute( SinkEventAttributes.STYLE, "display:inline;" );
+ atts.addAttribute( SinkEventAttributes.ID, toHtmlId( testCase.getFullName() ) + "off" );
+ sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
+ sink.text( " + " );
+ sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
- if ( failure != null )
- {
- sink.tableRow();
+ atts = new SinkEventAttributeSet();
+ atts.addAttribute( SinkEventAttributes.STYLE, "display:none;" );
+ atts.addAttribute( SinkEventAttributes.ID, toHtmlId( testCase.getFullName() ) + "on" );
+ sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
+ sink.text( " - " );
+ sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
- sinkCell( sink, "" );
- sinkCell( sink, (String) failure.get( "message" ) );
- sinkCell( sink, "" );
- sink.tableRow_();
+ sink.text( "[ Detail ]" );
+ sink.link_();
- List<String> detail = (List<String>) failure.get( "detail" );
- if ( detail != null )
- {
+ sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
- sink.tableRow();
- sinkCell( sink, "" );
+ sink.tableCell_();
+ }
+ else
+ {
+ sinkCell( sink, testCase.getName() );
+ }
- sink.tableCell();
- SinkEventAttributeSet atts = new SinkEventAttributeSet();
- atts.addAttribute( SinkEventAttributes.ID,
- toHtmlId( testCase.getFullName() ) + "error" );
- atts.addAttribute( SinkEventAttributes.STYLE, "display:none;" );
- sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
+ sinkCell( sink, numberFormat.format( testCase.getTime() ) );
- sink.verbatim( null );
- for ( String line : detail )
- {
- sink.text( line );
- sink.lineBreak();
- }
- sink.verbatim_();
+ sink.tableRow_();
- sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
- sink.tableCell_();
+ if ( failure != null )
+ {
+ sink.tableRow();
- sinkCell( sink, "" );
+ sinkCell( sink, "" );
+ sinkCell( sink, (String) failure.get( "message" ) );
+ sinkCell( sink, "" );
+ sink.tableRow_();
- sink.tableRow_();
- }
- }
- }
- }
+ List<String> detail = (List<String>) failure.get( "detail" );
+ if ( detail != null )
+ {
- sink.tableRows_();
+ sink.tableRow();
+ sinkCell( sink, "" );
- sink.table_();
+ sink.tableCell();
+ SinkEventAttributeSet atts = new SinkEventAttributeSet();
+ atts.addAttribute( SinkEventAttributes.ID,
+ toHtmlId( testCase.getFullName() ) + "error" );
+ atts.addAttribute( SinkEventAttributes.STYLE, "display:none;" );
+ sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
+
+ sink.verbatim( null );
+ for ( String line : detail )
+ {
+ sink.text( line );
+ sink.lineBreak();
}
+ sink.verbatim_();
- sink.section2_();
- }
- }
+ sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
+ sink.tableCell_();
- sinkLineBreak( sink );
+ sinkCell( sink, "" );
- sink.section1_();
+ sink.tableRow_();
+ }
+ }
}
private String toHtmlId( String id )
{
- if ( DoxiaUtils.isValidId(id) )
+ if ( DoxiaUtils.isValidId( id ) )
{
return id;
}
@@ -642,8 +651,8 @@ public class SurefireReportGenerator
{
String path = tCase.getFullClassName().replace( '.', '/' );
- sink.link( xrefLocation + "/" + path + ".html#" +
- getErrorLineNumber( tCase.getFullName(), techMessage ) );
+ sink.link( xrefLocation + "/" + path + ".html#"
+ + getErrorLineNumber( tCase.getFullName(), techMessage ) );
}
sink.text(
tCase.getFullClassName() + ":" + getErrorLineNumber( tCase.getFullName(), techMessage ) );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
index 2bc9b33..964c1c4 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
@@ -32,8 +32,8 @@ import org.apache.maven.project.MavenProject;
*
* @author <a href="mailto:jruiz@exist.com">Johnny R. Ruiz III</a>
*/
-@Mojo(name = "report", inheritByDefault = false)
-@Execute(lifecycle = "surefire", phase = LifecyclePhase.TEST)
+@Mojo( name = "report", inheritByDefault = false )
+@Execute( lifecycle = "surefire", phase = LifecyclePhase.TEST )
public class SurefireReportMojo
extends AbstractSurefireReportMojo
{
@@ -43,7 +43,7 @@ public class SurefireReportMojo
*
* @noinspection UnusedDeclaration
*/
- @Parameter(defaultValue = "surefire-report", property = "outputName", required = true)
+ @Parameter( defaultValue = "surefire-report", property = "outputName", required = true )
private String outputName;
/**
@@ -53,7 +53,7 @@ public class SurefireReportMojo
* @noinspection UnusedDeclaration
* @since 2.11
*/
- @Parameter(defaultValue = "true", property = "alwaysGenerateSurefireReport")
+ @Parameter( defaultValue = "true", property = "alwaysGenerateSurefireReport" )
private boolean alwaysGenerateSurefireReport;
/**
@@ -62,7 +62,7 @@ public class SurefireReportMojo
* @noinspection UnusedDeclaration
* @since 2.11
*/
- @Parameter(defaultValue = "false", property = "skipSurefireReport")
+ @Parameter( defaultValue = "false", property = "skipSurefireReport" )
private boolean skipSurefireReport;
protected File getSurefireReportsDirectory( MavenProject subProject )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
index 0b1fc59..9409498 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
@@ -32,8 +32,8 @@ import org.apache.maven.plugins.annotations.Mojo;
* @author <a href="mailto:baerrach@gmail.com">Barrie Treloar</a>
* @since 2.3
*/
-@Mojo(name = "report-only")
-@Execute(phase = LifecyclePhase.NONE)
+@Mojo( name = "report-only" )
+@Execute( phase = LifecyclePhase.NONE )
public class SurefireReportOnlyMojo
extends SurefireReportMojo
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ef0e009..12ee4b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>24</version>
+ <version>25</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatistics.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatistics.java b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatistics.java
index 73d2adf..7722943 100644
--- a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatistics.java
+++ b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatistics.java
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.surefire.runorder;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java
index 6519ff6..7e77625 100644
--- a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java
+++ b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.surefire.runorder;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java b/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
index 6288e8a..ca98b8c 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,6 +25,10 @@ import java.util.Set;
import org.apache.maven.shared.utils.io.SelectorUtils;
import org.apache.maven.surefire.util.ScannerFilter;
+/**
+ * Filter for test class files
+ *
+ */
public class SpecificTestClassFilter
implements ScannerFilter
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
index dee42aa..92cab09 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
@@ -58,7 +58,7 @@ public class BaseProviderFactory
private TestArtifactInfo testArtifactInfo;
- private static final Integer ROOT_CHANNEl = 0;
+ private static final Integer ROOT_CHANNEL = 0;
private final ReporterFactory reporterFactory;
@@ -128,7 +128,7 @@ public class BaseProviderFactory
{
if ( insideFork )
{
- return new ForkingRunListener( reporterConfiguration.getOriginalSystemOut(), ROOT_CHANNEl,
+ return new ForkingRunListener( reporterConfiguration.getOriginalSystemOut(), ROOT_CHANNEL,
reporterConfiguration.isTrimStackTrace() );
}
return new DefaultDirectConsoleReporter( reporterConfiguration.getOriginalSystemOut() );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
index 0af1e29..a4f4dc1 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
@@ -193,7 +193,7 @@ public class ForkingRunListener
int mask = radix - 1;
do
{
- header[--charPos] = (byte) digits[i & mask];
+ header[--charPos] = (byte) DIGITS[i & mask];
i >>>= 4;
}
while ( i != 0 );
@@ -205,7 +205,7 @@ public class ForkingRunListener
return header;
}
- private final static char[] digits =
+ private static final char[] DIGITS =
{ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
@@ -218,8 +218,8 @@ public class ForkingRunListener
}
StringBuilder sb = new StringBuilder( 7 + message.length() * 5 );
- append( sb, BOOTERCODE_CONSOLE );comma( sb );
- append( sb, Integer.toHexString( testSetChannelId ) );comma( sb );
+ append( sb, BOOTERCODE_CONSOLE ); comma( sb );
+ append( sb, Integer.toHexString( testSetChannelId ) ); comma( sb );
StringUtils.escapeToPrintable( sb, message );
sb.append( '\n' );
@@ -230,8 +230,8 @@ public class ForkingRunListener
{
StringBuilder stringBuilder = new StringBuilder();
- append( stringBuilder, BOOTERCODE_SYSPROPS );comma( stringBuilder );
- append( stringBuilder, Integer.toHexString( testSetChannelId ) );comma( stringBuilder );
+ append( stringBuilder, BOOTERCODE_SYSPROPS ); comma( stringBuilder );
+ append( stringBuilder, Integer.toHexString( testSetChannelId ) ); comma( stringBuilder );
StringUtils.escapeToPrintable( stringBuilder, key );
comma( stringBuilder );
@@ -244,7 +244,7 @@ public class ForkingRunListener
{
StringBuilder stringBuilder = new StringBuilder();
append( stringBuilder, operationCode ); comma( stringBuilder );
- append( stringBuilder, Integer.toHexString( testSetChannelId ) );comma( stringBuilder );
+ append( stringBuilder, Integer.toHexString( testSetChannelId ) ); comma( stringBuilder );
nullableEncoding( stringBuilder, reportEntry.getSourceName() );
comma( stringBuilder );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
index d9e1377..59bddf6 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.booter;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
index 2e4bee4..da7cbc3 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
@@ -154,9 +154,9 @@ public class SurefireReflector
}
Class[] arguments = { List.class, File.class, String.class, String.class, int.class };
Constructor constructor = ReflectionUtils.getConstructor( this.testRequest, arguments );
- return ReflectionUtils.newInstance(constructor, new Object[]{ suiteDefinition.getSuiteXmlFiles(),
+ return ReflectionUtils.newInstance( constructor, new Object[]{ suiteDefinition.getSuiteXmlFiles(),
suiteDefinition.getTestSourceDirectory(), suiteDefinition.getRequestedTest(),
- suiteDefinition.getRequestedTestMethod(), suiteDefinition.getRerunFailingTestsCount() });
+ suiteDefinition.getRequestedTestMethod(), suiteDefinition.getRerunFailingTestsCount() } );
}
@@ -217,7 +217,8 @@ public class SurefireReflector
reporterConfiguration.isTrimStackTrace() } );
}
- public static ReporterFactory createForkingReporterFactoryInCurrentClassLoader( Boolean trimStackTrace, PrintStream originalSystemOut )
+ public static ReporterFactory createForkingReporterFactoryInCurrentClassLoader( Boolean trimStackTrace,
+ PrintStream originalSystemOut )
{
return new ForkingReporterFactory( trimStackTrace, originalSystemOut );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
index bdc543c..46c541b 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
@@ -66,7 +66,7 @@ public interface SurefireProvider
* @throws org.apache.maven.surefire.testset.TestSetFailedException
* When testset fails
*/
-
+ @SuppressWarnings( "checkstyle:redundantthrows" )
RunResult invoke( Object forkTestSet )
throws TestSetFailedException, ReporterException, InvocationTargetException;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleLogger.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleLogger.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleLogger.java
index 4a2e969..4382428 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleLogger.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleLogger.java
@@ -29,5 +29,5 @@ package org.apache.maven.surefire.report;
*/
public interface ConsoleLogger
{
- public void info( String message );
+ void info( String message );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
index dd1d665..7421703 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
@@ -78,7 +78,7 @@ public class ConsoleOutputCapture
}
}
- static final byte[] newline = new byte[]{ (byte) '\n' };
+ static final byte[] NL = new byte[]{ (byte) '\n' };
public void println( String s )
{
@@ -87,7 +87,7 @@ public class ConsoleOutputCapture
s = "null"; // Shamelessly taken from super.print
}
final byte[] bytes = s.getBytes();
- final byte[] join = ByteBuffer.join( bytes, 0, bytes.length, newline, 0, 1 );
+ final byte[] join = ByteBuffer.join( bytes, 0, bytes.length, NL, 0, 1 );
target.writeTestOutput( join, 0, join.length, isStdout );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputReceiverForCurrentThread.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputReceiverForCurrentThread.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputReceiverForCurrentThread.java
index fb0152c..836a499 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputReceiverForCurrentThread.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputReceiverForCurrentThread.java
@@ -24,7 +24,8 @@ package org.apache.maven.surefire.report;
*/
public final class ConsoleOutputReceiverForCurrentThread
{
- private static final ThreadLocal<ConsoleOutputReceiver> current = new InheritableThreadLocal<ConsoleOutputReceiver>();
+ private static final ThreadLocal<ConsoleOutputReceiver> CURRENT
+ = new InheritableThreadLocal<ConsoleOutputReceiver>();
private ConsoleOutputReceiverForCurrentThread()
{
@@ -32,17 +33,17 @@ public final class ConsoleOutputReceiverForCurrentThread
public static ConsoleOutputReceiver get()
{
- return current.get();
+ return CURRENT.get();
}
public static void set( ConsoleOutputReceiver consoleOutputReceiver )
{
- current.set( consoleOutputReceiver );
+ CURRENT.set( consoleOutputReceiver );
}
public static void remove()
{
- current.remove();
+ CURRENT.remove();
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
index caee844..f9273ba 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.report;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
index 3f6a352..aaa7f5a 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
@@ -33,6 +33,8 @@ import org.apache.maven.surefire.util.internal.StringUtils;
public class LegacyPojoStackTraceWriter
implements StackTraceWriter
{
+ private static final int MAX_LINE_LENGTH = 77;
+
private final Throwable t;
private final String testClass;
@@ -67,7 +69,7 @@ public class LegacyPojoStackTraceWriter
if ( throwable.getTarget() instanceof AssertionError )
{
result.append( " " );
- result.append( getTruncatedMessage( throwable.getMessage(), 77 - result.length() ) );
+ result.append( getTruncatedMessage( throwable.getMessage(), MAX_LINE_LENGTH - result.length() ) );
}
else
{
@@ -76,7 +78,7 @@ public class LegacyPojoStackTraceWriter
{
result.append( " " );
result.append( target.getClass().getSimpleName() );
- result.append( getTruncatedMessage( throwable.getMessage(), 77 - result.length() ) );
+ result.append( getTruncatedMessage( throwable.getMessage(), MAX_LINE_LENGTH - result.length() ) );
}
}
return result.toString();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
index 65bcb56..2bc3fcd 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
@@ -19,6 +19,10 @@ package org.apache.maven.surefire.report;
* under the License.
*/
+/**
+ * Describes a single entry for a test report
+ *
+ */
public interface ReportEntry
{
/**
@@ -26,35 +30,35 @@ public interface ReportEntry
*
* @return A string with the class name
*/
- public String getSourceName();
+ String getSourceName();
/**
* The name of the test case
*
* @return A string describing the test case
*/
- public String getName();
+ String getName();
/**
* The group/category of the testcase
*
* @return A string
*/
- public String getGroup();
+ String getGroup();
/**
* The group/category of the testcase
*
* @return A string
*/
- public StackTraceWriter getStackTraceWriter();
+ StackTraceWriter getStackTraceWriter();
/**
* Gets the runtime for the item. Optional parameter. If the value is not set, it will be determined within
* the reporting subsustem. Some providers like to calculate this value themselves, and it gets the
* most accurate value.
*/
- public Integer getElapsed();
+ Integer getElapsed();
/**
@@ -63,12 +67,12 @@ public interface ReportEntry
*
* @return A string that explains an anomaly
*/
- public String getMessage();
+ String getMessage();
/**
* A name of the test case together with the group or category (if any exists).
*
* @return A string with the test case name and group/category, or just the name.
*/
- public String getNameWithGroup();
+ String getNameWithGroup();
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/report/SafeThrowable.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/SafeThrowable.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/SafeThrowable.java
index 1d8d0af..60c7897 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/SafeThrowable.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/SafeThrowable.java
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.report;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/testset/RunOrderParameters.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/RunOrderParameters.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/RunOrderParameters.java
index 57f3f33..9c096f1 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/RunOrderParameters.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/RunOrderParameters.java
@@ -43,7 +43,7 @@ public class RunOrderParameters
this.runStatisticsFile = runStatisticsFile != null ? new File( runStatisticsFile ) : null;
}
- public static RunOrderParameters ALPHABETICAL()
+ public static RunOrderParameters alphabetical()
{
return new RunOrderParameters( new RunOrder[]{ RunOrder.ALPHABETICAL }, null );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4ff0329/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java
index 147c6e7..6651a27 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java
@@ -52,6 +52,7 @@ public class DefaultRunOrderCalculator
this.sortOrder = this.runOrder.length > 0 ? getSortOrderComparator( this.runOrder[0] ) : null;
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
public TestsToRun orderTestClasses( TestsToRun scannedClasses )
{
@@ -85,7 +86,8 @@ public class DefaultRunOrderCalculator
{
RunEntryStatisticsMap runEntryStatisticsMap =
RunEntryStatisticsMap.fromFile( runOrderParameters.getRunStatisticsFile() );
- final List<Class> prioritized = runEntryStatisticsMap.getPrioritizedTestsClassRunTime( testClasses, threadCount );
+ final List<Class> prioritized =
+ runEntryStatisticsMap.getPrioritizedTestsClassRunTime( testClasses, threadCount );
testClasses.clear();
testClasses.addAll( prioritized );