Author: krosenvold
Date: Wed Jan 26 22:04:57 2011
New Revision: 1063892
URL: http://svn.apache.org/viewvc?rev=1063892&view=rev
Log:
o Fixed idea style analysis stuff
Removed:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultReportEntry.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/TeeStream.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
maven/surefire/trunk/surefire-integration-tests/pom.xml
maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Wed Jan 26 22:04:57 2011
@@ -89,7 +89,7 @@ public abstract class AbstractSurefireMo
protected abstract String getPluginName();
- protected SurefireDependencyResolver dependencyResolver;
+ private SurefireDependencyResolver dependencyResolver;
protected abstract boolean verifyParameters()
throws MojoFailureException;
@@ -97,7 +97,7 @@ public abstract class AbstractSurefireMo
private Artifact surefireArtifact;
- ProviderList wellKnownProviders;
+ private ProviderList wellKnownProviders;
protected List initialize()
throws MojoFailureException
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
Wed Jan 26 22:04:57 2011
@@ -39,7 +39,7 @@ public class ChecksumCalculator
{
private static final String HEX = "0123456789ABCDEF";
- List checksumItems = new ArrayList();
+ private final List checksumItems = new ArrayList();
private void appendObject( Object item )
{
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
(original)
+++
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
Wed Jan 26 22:04:57 2011
@@ -36,13 +36,13 @@ import java.util.StringTokenizer;
*/
public class SurefireReportGenerator
{
- private SurefireReportParser report;
+ private final SurefireReportParser report;
private List testSuites;
- private boolean showSuccess;
+ private final boolean showSuccess;
- private String xrefLocation;
+ private final String xrefLocation;
public SurefireReportGenerator( List reportsDirectories, Locale locale,
boolean showSuccess, String xrefLocation )
{
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
(original)
+++
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
Wed Jan 26 22:04:57 2011
@@ -47,7 +47,7 @@ public class SurefireReportParser
private List reportsDirectories;
- private List testSuites = new ArrayList();
+ private final List testSuites = new ArrayList();
private static final int PCENT = 100;
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
(original)
+++
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
Wed Jan 26 22:04:57 2011
@@ -47,7 +47,7 @@ public class TestSuiteXmlParser
private ReportTestSuite defaultSuite;
private ReportTestSuite currentSuite;
private Map classesToSuites;
- private NumberFormat numberFormat = NumberFormat.getInstance();
+ private final NumberFormat numberFormat = NumberFormat.getInstance();
/**
* @noinspection StringBufferField
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
Wed Jan 26 22:04:57 2011
@@ -39,11 +39,11 @@ public abstract class AbstractConsoleRep
private static final String TEST_SET_STARTING_GROUP_SUFIX = ")";
- protected static final int BUFFER_SIZE = 4096;
+ private static final int BUFFER_SIZE = 4096;
private static final PrintStream ORIGINAL_SYSTEM_OUT = System.out;
- protected AbstractConsoleReporter( String format, ReporterConfiguration
reporterConfiguration )
+ AbstractConsoleReporter( String format, ReporterConfiguration
reporterConfiguration )
{
// TODO: use logger
super(
@@ -67,7 +67,7 @@ public abstract class AbstractConsoleRep
writeHeading(
"-------------------------------------------------------" );
}
- public void writeHeading( String message )
+ void writeHeading( String message )
{
writer.println( message );
writer.flush();
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
Wed Jan 26 22:04:57 2011
@@ -32,11 +32,11 @@ import java.io.PrintWriter;
public abstract class AbstractFileReporter
extends AbstractTextReporter
{
- private File reportsDirectory;
+ private final File reportsDirectory;
private final boolean deleteOnStarting;
- protected AbstractFileReporter( ReporterConfiguration
reporterConfiguration, String format )
+ AbstractFileReporter( ReporterConfiguration reporterConfiguration, String
format )
{
super( reporterConfiguration, format );
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
Wed Jan 26 22:04:57 2011
@@ -30,27 +30,27 @@ import java.util.Locale;
public abstract class AbstractReporter
implements Reporter, ReportWriter
{
- protected int completedCount;
+ int completedCount;
- protected int errors;
+ int errors;
- protected int failures;
+ int failures;
private long startTime;
private long endTime;
- private NumberFormat numberFormat = NumberFormat.getInstance(
Locale.ENGLISH );
+ private final NumberFormat numberFormat = NumberFormat.getInstance(
Locale.ENGLISH );
- protected static final String NL = System.getProperty( "line.separator" );
+ static final String NL = System.getProperty( "line.separator" );
private static final int MS_PER_SEC = 1000;
- protected long testSetStartTime;
+ long testSetStartTime;
- protected int skipped;
+ int skipped;
- private boolean trimStackTrace;
+ private final boolean trimStackTrace;
private final ReporterConfiguration reporterConfiguration;
@@ -59,19 +59,13 @@ public abstract class AbstractReporter
// ----------------------------------------------------------------------
- protected AbstractReporter( ReporterConfiguration reporterConfiguration )
+ AbstractReporter( ReporterConfiguration reporterConfiguration )
{
this.reporterConfiguration = reporterConfiguration;
this.trimStackTrace =
reporterConfiguration.isTrimStackTrace().booleanValue();
}
- protected AbstractReporter( Boolean trimStackTrace )
- {
- this.trimStackTrace = trimStackTrace.booleanValue();
- this.reporterConfiguration = null;
- }
-
- protected boolean isTimedOut()
+ boolean isTimedOut()
{
return reporterConfiguration.isTimedOut();
}
@@ -150,22 +144,22 @@ public abstract class AbstractReporter
// Counters
// ----------------------------------------------------------------------
- public int getNumErrors()
+ int getNumErrors()
{
return errors;
}
- public int getNumSkipped()
+ int getNumSkipped()
{
return skipped;
}
- public int getNumFailures()
+ int getNumFailures()
{
return failures;
}
- public int getNumTests()
+ int getNumTests()
{
return completedCount;
}
@@ -190,7 +184,7 @@ public abstract class AbstractReporter
//
// ----------------------------------------------------------------------
- protected String elapsedTimeAsString( long runTime )
+ String elapsedTimeAsString( long runTime )
{
return numberFormat.format( (double) runTime / MS_PER_SEC );
}
@@ -201,7 +195,7 @@ public abstract class AbstractReporter
* @param report ReportEntry object.
* @return stacktrace as string.
*/
- protected String getStackTrace( ReportEntry report )
+ String getStackTrace( ReportEntry report )
{
StackTraceWriter writer = report.getStackTraceWriter();
if ( writer == null )
@@ -211,7 +205,7 @@ public abstract class AbstractReporter
return trimStackTrace ? writer.writeTrimmedTraceToString() :
writer.writeTraceToString();
}
- protected long getActualRunTime( ReportEntry reportEntry )
+ long getActualRunTime( ReportEntry reportEntry )
{
final Integer clientSpecifiedElapsed = reportEntry.getElapsed();
return clientSpecifiedElapsed != null ?
clientSpecifiedElapsed.intValue() : endTime - startTime;
@@ -232,7 +226,7 @@ public abstract class AbstractReporter
{
}
- protected void deleteIfExisting( File reportFile )
+ void deleteIfExisting( File reportFile )
{
if ( reportFile.exists() )
{
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
Wed Jan 26 22:04:57 2011
@@ -28,7 +28,7 @@ public class CategorizedReportEntry
{
private final String group;
- protected CategorizedReportEntry( String name, String group )
+ private CategorizedReportEntry( String name, String group )
{
super( name );
this.group = group;
@@ -39,7 +39,7 @@ public class CategorizedReportEntry
this( source, name, group, message, null, null );
}
- public CategorizedReportEntry( String source, String name, String group,
String message,
+ private CategorizedReportEntry( String source, String name, String group,
String message,
StackTraceWriter stackTraceWriter, Integer
elapsed )
{
super( source, name, stackTraceWriter, elapsed );
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java
Wed Jan 26 22:04:57 2011
@@ -51,7 +51,7 @@ public class ForkingConsoleReporter
/**
* Write a header line prepending {@link #FORKING_PREFIX_HEADING}
*/
- public void writeHeading( String message )
+ void writeHeading( String message )
{
writer.print( FORKING_PREFIX_HEADING );
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java
Wed Jan 26 22:04:57 2011
@@ -48,17 +48,17 @@ import java.util.Timer;
public class ReporterManagerFactory
implements ReporterFactory
{
- protected final List reportDefinitions;
+ private final List reportDefinitions;
- protected final ClassLoader surefireClassLoader;
+ private final ClassLoader surefireClassLoader;
- protected final RunStatistics globalRunStatistics = new RunStatistics();
+ private final RunStatistics globalRunStatistics = new RunStatistics();
private final ReporterConfiguration reporterConfiguration;
- protected RunReporter first;
+ private RunReporter first;
- protected final Object lock = new Object();
+ private final Object lock = new Object();
private List reports;
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java
Wed Jan 26 22:04:57 2011
@@ -41,13 +41,13 @@ public class TestSetStatistics
private static final String RESULTS_SKIPPED = "skipped";
- protected int completedCount;
+ private int completedCount;
- protected int errors;
+ private int errors;
- protected int failures;
+ private int failures;
- protected int skipped;
+ private int skipped;
public synchronized void incrementCompletedCount()
{
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
Wed Jan 26 22:04:57 2011
@@ -50,12 +50,11 @@ public class XMLReporter
{
private static final String LS = System.getProperty( "line.separator" );
- private File reportsDirectory;
+ private final File reportsDirectory;
private final boolean deleteOnStarting;
-
- private List results = Collections.synchronizedList( new ArrayList() );
+ private final List results = Collections.synchronizedList( new ArrayList()
);
public XMLReporter( ReporterConfiguration reporterConfiguration )
{
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
Wed Jan 26 22:04:57 2011
@@ -34,7 +34,7 @@ public class RunResult
private final int skipped;
- public static final int SUCCESS = 0;
+ private static final int SUCCESS = 0;
public static final int FAILURE = 255;
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java
Wed Jan 26 22:04:57 2011
@@ -27,11 +27,11 @@ import java.util.List;
*/
public class DirectoryScannerParameters
{
- final File testClassesDirectory;
+ private final File testClassesDirectory;
- final List includes;
+ private final List includes;
- final List excludes;
+ private final List excludes;
private final Boolean failIfNoTests;
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
Wed Jan 26 22:04:57 2011
@@ -97,7 +97,7 @@ public class DefaultDirectoryScanner
return new TestsToRun( result );
}
- public static Class loadClass( ClassLoader classLoader, String className )
+ private static Class loadClass( ClassLoader classLoader, String className )
{
Class testClass;
try
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java
Wed Jan 26 22:04:57 2011
@@ -75,7 +75,7 @@ public class NestedRuntimeException
/**
* Root cause of this nested exception
*/
- private Throwable cause;
+ private final Throwable cause;
/**
* Construct a <code>NestedRuntimeException</code> with the specified
detail message
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
Wed Jan 26 22:04:57 2011
@@ -27,19 +27,19 @@ import java.util.LinkedList;
public class PrettyPrintXMLWriter
implements XMLWriter
{
- private PrintWriter writer;
+ private final PrintWriter writer;
- private LinkedList elementStack = new LinkedList();
+ private final LinkedList elementStack = new LinkedList();
private boolean tagInProgress;
private int depth;
- private String lineIndenter;
+ private final String lineIndenter;
- private String encoding;
+ private final String encoding;
- private String docType;
+ private final String docType;
private boolean readyForNewLine;
@@ -50,7 +50,7 @@ public class PrettyPrintXMLWriter
this( writer, null, null );
}
- public PrettyPrintXMLWriter( PrintWriter writer, String lineIndenter,
String encoding, String doctype )
+ private PrettyPrintXMLWriter( PrintWriter writer, String lineIndenter,
String encoding, String doctype )
{
this.writer = writer;
@@ -66,7 +66,7 @@ public class PrettyPrintXMLWriter
}
}
- public PrettyPrintXMLWriter( PrintWriter writer, String encoding, String
doctype )
+ private PrettyPrintXMLWriter( PrintWriter writer, String encoding, String
doctype )
{
this( writer, " ", encoding, doctype );
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/TeeStream.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/TeeStream.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/TeeStream.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/TeeStream.java
Wed Jan 26 22:04:57 2011
@@ -28,7 +28,7 @@ import java.io.PrintStream;
public class TeeStream
extends PrintStream
{
- private PrintStream tee;
+ private final PrintStream tee;
public TeeStream( PrintStream out1, PrintStream out2 )
{
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
Wed Jan 26 22:04:57 2011
@@ -48,7 +48,7 @@ public class BooterDeserializer
{
- final PropertiesWrapper properties;
+ private final PropertiesWrapper properties;
public BooterDeserializer( InputStream inputStream )
throws IOException
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
Wed Jan 26 22:04:57 2011
@@ -30,9 +30,9 @@ import java.util.Set;
public class IsolatedClassLoader
extends URLClassLoader
{
- private ClassLoader parent = ClassLoader.getSystemClassLoader();
+ private final ClassLoader parent = ClassLoader.getSystemClassLoader();
- private Set urls = new HashSet();
+ private final Set urls = new HashSet();
private boolean childDelegation = true;
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
Wed Jan 26 22:04:57 2011
@@ -57,7 +57,7 @@ public class ProviderConfiguration
private final TestRequest testSuiteDefinition;
- private Properties providerProperties;
+ private final Properties providerProperties;
private final boolean failIfNoTests;
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Wed Jan 26 22:04:57
2011
@@ -96,11 +96,6 @@
<version>2.8</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified:
maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
(original)
+++
maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
Wed Jan 26 22:04:57 2011
@@ -102,7 +102,7 @@ public final class JUnit3Reflector
}
}
- public static Method getMethod( Class clazz, String methodName, Class[]
parameters )
+ private static Method getMethod( Class clazz, String methodName, Class[]
parameters )
{
try
{
@@ -144,7 +144,7 @@ public final class JUnit3Reflector
return testObject;
}
- static Object createInstanceFromSuiteMethod( Class testClass )
+ private static Object createInstanceFromSuiteMethod( Class testClass )
throws IllegalAccessException, InvocationTargetException
{
Object testObject = null;
@@ -164,7 +164,7 @@ public final class JUnit3Reflector
return testObject;
}
- static Constructor getTestConstructor( Class testClass )
+ private static Constructor getTestConstructor( Class testClass )
throws NoSuchMethodException
{
Constructor constructor;
Modified:
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
(original)
+++
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
Wed Jan 26 22:04:57 2011
@@ -32,7 +32,7 @@ public class JUnit4StackTraceWriter
implements StackTraceWriter
{
// Member Variables
- private Failure junitFailure;
+ private final Failure junitFailure;
/**
* Constructor.
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
Wed Jan 26 22:04:57 2011
@@ -41,7 +41,7 @@ public class TestListenerInvocationHandl
private static final String END_TEST = "endTest";
- private Set failedTestsSet = new HashSet();
+ private final Set failedTestsSet = new HashSet();
private Reporter reporter;
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
Wed Jan 26 22:04:57 2011
@@ -35,21 +35,21 @@ import java.util.Map;
public abstract class ConcurrentReporterManager
implements Reporter
{
- protected Map<String, TestSet> classMethodCounts;
+ private final Map<String, TestSet> classMethodCounts;
private final ReporterConfiguration reporterConfiguration;
private final ThreadLocal<Reporter> reporterManagerThreadLocal = new
ThreadLocal<Reporter>();
- protected final boolean reportImmediately;
+ private final boolean reportImmediately;
private final ConcurrentPrintStream out = new ConcurrentPrintStream( true
);
private final ConcurrentPrintStream err = new ConcurrentPrintStream( false
);
- private ReporterFactory reporterFactory;
+ private final ReporterFactory reporterFactory;
- public ConcurrentReporterManager( ReporterFactory reporterFactory, boolean
reportImmediately,
+ ConcurrentReporterManager( ReporterFactory reporterFactory, boolean
reportImmediately,
ReporterConfiguration
reporterConfiguration,
Map<String, TestSet> classMethodCounts )
throws TestSetFailedException
@@ -140,7 +140,7 @@ public abstract class ConcurrentReporter
return testSet.createTestMethod( description );
}
- public abstract void checkIfTestSetCanBeReported( TestSet testSetForTest );
+ protected abstract void checkIfTestSetCanBeReported( TestSet
testSetForTest );
public void writeFooter( String footer )
{
@@ -172,22 +172,22 @@ public abstract class ConcurrentReporter
throw new UnsupportedOperationException();
}
- protected TestMethod getTestMethod()
+ TestMethod getTestMethod()
{
return TestMethod.getThreadTestMethod();
}
- protected void detachTestMethodFromThread()
+ void detachTestMethodFromThread()
{
TestMethod.detachFromCurrentThread();
}
- protected TestSet getTestSet( ReportEntry description )
+ TestSet getTestSet( ReportEntry description )
{
return classMethodCounts.get( description.getSourceName() );
}
- protected Reporter getReporterManager()
+ Reporter getReporterManager()
{
Reporter reporterManager = reporterManagerThreadLocal.get();
if ( reporterManager == null )
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
Wed Jan 26 22:04:57 2011
@@ -150,7 +150,7 @@ public class ConfigurableParallelCompute
+ fixedPool + '}';
}
- public class SynchronousRunner
+ private class SynchronousRunner
implements RunnerScheduler
{
public void schedule( final Runnable childStatement )
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
Wed Jan 26 22:04:57 2011
@@ -39,7 +39,7 @@ public class TestSet
{
private final Description testSetDescription;
- private AtomicInteger numberOfCompletedChildren = new AtomicInteger( 0 );
+ private final AtomicInteger numberOfCompletedChildren = new AtomicInteger(
0 );
// While the two parameters below may seem duplicated, it is not entirely
the case,
// since numberOfTests has the correct value from the start, while
testMethods grows as method execution starts.
@@ -50,9 +50,9 @@ public class TestSet
private static final InheritableThreadLocal<TestSet> testSet = new
InheritableThreadLocal<TestSet>();
- private AtomicBoolean allScheduled = new AtomicBoolean();
+ private final AtomicBoolean allScheduled = new AtomicBoolean();
- private AtomicBoolean played = new AtomicBoolean();
+ private final AtomicBoolean played = new AtomicBoolean();
public TestSet( Description testSetDescription )
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
Wed Jan 26 22:04:57 2011
@@ -53,36 +53,29 @@ import java.util.TreeMap;
public class TestNGDirectoryTestSuite
implements TestNgTestSuite
{
- private ArtifactVersion version;
+ private final ArtifactVersion version;
- private Map options;
+ private final Map options;
- private String testSourceDirectory;
+ private final String testSourceDirectory;
- private File reportsDirectory;
+ private final File reportsDirectory;
- protected SortedMap testSets;
+ private SortedMap testSets;
private final DirectoryScanner surefireDirectoryScanner;
public TestNGDirectoryTestSuite( File basedir, ArrayList includes,
ArrayList excludes, String testSourceDirectory,
String artifactVersion, Properties
confOptions, File reportsDirectory )
{
- this( basedir, includes, excludes, testSourceDirectory, new
DefaultArtifactVersion( artifactVersion ),
- confOptions, reportsDirectory );
- }
- public TestNGDirectoryTestSuite( File basedir, List includes, List
excludes, String testSourceDirectory,
- ArtifactVersion artifactVersion, Map
confOptions, File reportsDirectory )
- {
this.surefireDirectoryScanner = new DefaultDirectoryScanner( basedir,
includes, excludes, "filesystem" );
this.options = confOptions;
this.testSourceDirectory = testSourceDirectory;
this.reportsDirectory = reportsDirectory;
- this.version = artifactVersion;
-
+ this.version = new DefaultArtifactVersion( artifactVersion );
}
public void execute( TestsToRun testsToRun, ReporterFactory
reporterManagerFactory )
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
Wed Jan 26 22:04:57 2011
@@ -46,12 +46,12 @@ import org.testng.TestNG;
public class TestNGReporter
implements ITestListener, ISuiteListener
{
- private ResourceBundle bundle = ResourceBundle.getBundle(
Surefire.SUREFIRE_BUNDLE_NAME );
+ private final ResourceBundle bundle = ResourceBundle.getBundle(
Surefire.SUREFIRE_BUNDLE_NAME );
/**
* core Surefire reporting
*/
- protected Reporter reporter;
+ private final Reporter reporter;
/**
* Constructs a new instance that will listen to
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
Wed Jan 26 22:04:57 2011
@@ -43,17 +43,17 @@ import java.util.Properties;
public class TestNGXmlTestSuite
implements TestNgTestSuite
{
- private List suiteFiles;
+ private final List suiteFiles;
private List suiteFilePaths;
- private String testSourceDirectory;
+ private final String testSourceDirectory;
- private ArtifactVersion version;
+ private final ArtifactVersion version;
- private Map options;
+ private final Map options;
- private File reportsDirectory;
+ private final File reportsDirectory;
// Not really used
private Map testSets;
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java?rev=1063892&r1=1063891&r2=1063892&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
Wed Jan 26 22:04:57 2011
@@ -33,9 +33,9 @@ import org.testng.TestNG;
public abstract class AbstractDirectConfigurator
implements Configurator
{
- protected final Map setters;
+ final Map setters;
- protected AbstractDirectConfigurator()
+ AbstractDirectConfigurator()
{
Map options = new HashMap();
options.put( "groups", new Setter( "setGroups", String.class ) );
@@ -133,7 +133,7 @@ public abstract class AbstractDirectConf
}
}
- protected Object convertValue( Object value )
+ Object convertValue( Object value )
{
if ( value == null )
{
