Author: krosenvold
Date: Sun May 1 19:13:32 2011
New Revision: 1098389
URL: http://svn.apache.org/viewvc?rev=1098389&view=rev
Log:
o Removed even more unused code
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/ForkStarter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/report/ReporterManagerFactory.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/TestConsoleOutputRunListenerTest.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.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=1098389&r1=1098388&r2=1098389&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
Sun May 1 19:13:32 2011
@@ -54,15 +54,7 @@ import org.apache.maven.surefire.booter.
import org.apache.maven.surefire.booter.ProviderConfiguration;
import org.apache.maven.surefire.booter.StartupConfiguration;
import org.apache.maven.surefire.booter.StartupReportConfiguration;
-import org.apache.maven.surefire.report.BriefConsoleReporter;
-import org.apache.maven.surefire.report.BriefFileReporter;
-import org.apache.maven.surefire.report.ConsoleOutputDirectReporter;
-import org.apache.maven.surefire.report.ConsoleOutputFileReporter;
-import org.apache.maven.surefire.report.ConsoleReporter;
-import org.apache.maven.surefire.report.DetailedConsoleReporter;
-import org.apache.maven.surefire.report.FileReporter;
import org.apache.maven.surefire.report.ReporterConfiguration;
-import org.apache.maven.surefire.report.XMLReporter;
import org.apache.maven.surefire.testset.DirectoryScannerParameters;
import org.apache.maven.surefire.testset.TestArtifactInfo;
import org.apache.maven.surefire.testset.TestRequest;
@@ -81,10 +73,6 @@ public abstract class AbstractSurefireMo
implements SurefireExecutionParameters
{
- private static final String BRIEF_REPORT_FORMAT =
StartupReportConfiguration.BRIEF_REPORT_FORMAT;
-
- private static final String PLAIN_REPORT_FORMAT =
StartupReportConfiguration.PLAIN_REPORT_FORMAT;
-
// common field getters/setters
// common code
@@ -268,15 +256,8 @@ public abstract class AbstractSurefireMo
protected ProviderConfiguration createProviderConfiguration(
ForkConfiguration forkConfiguration )
throws MojoExecutionException, MojoFailureException
{
- final String consoleReporter = getConsoleResultSummaryReporter();
- final String fileReporter = getFileReporter();
- final String xmlReporterName = getXmlReporterName();
- final String consoleOutputFileReporterName =
getConsoleOutputReporterName();
- Integer timeoutSet =
- getForkedProcessTimeoutInSeconds() > 0 ? Integer.valueOf(
getForkedProcessTimeoutInSeconds() ) : null;
ReporterConfiguration reporterConfiguration =
- new ReporterConfiguration( getReportsDirectory(), Boolean.valueOf(
isTrimStackTrace() ), consoleReporter,
- fileReporter, xmlReporterName,
consoleOutputFileReporterName );
+ new ReporterConfiguration( getReportsDirectory(), Boolean.valueOf(
isTrimStackTrace() ) );
Artifact testNgArtifact;
try
@@ -373,8 +354,7 @@ public abstract class AbstractSurefireMo
isChildDelegation() );
return new StartupConfiguration( providerName,
classpathConfiguration, classLoaderConfiguration,
- forkConfiguration.getForkMode(),
false, isRedirectTestOutputToFile()
- );
+ forkConfiguration.getForkMode(),
false );
}
catch ( DependencyResolutionRequiredException e )
{
@@ -399,7 +379,7 @@ public abstract class AbstractSurefireMo
{
return new StartupReportConfiguration( isUseFile(), isPrintSummary(),
getReportFormat(),
isRedirectTestOutputToFile(),
isDisableXmlReport(),
- getReportsDirectory() );
+ getReportsDirectory(),
isTrimStackTrace() );
}
public void logClasspath( Classpath classpath, String descriptor )
@@ -994,69 +974,6 @@ public abstract class AbstractSurefireMo
return props;
}
- private String getXmlReporterName()
- {
- if ( !isDisableXmlReport() )
- {
- return XMLReporter.class.getName();
- }
- return null;
- }
-
- private String getFileReporter()
- {
- if ( isUseFile() )
- {
- if ( BRIEF_REPORT_FORMAT.equals( getReportFormat() ) )
- {
- return BriefFileReporter.class.getName();
- }
- else if ( PLAIN_REPORT_FORMAT.equals( getReportFormat() ) )
- {
- return FileReporter.class.getName();
- }
- }
- return null;
- }
-
- /**
- * Returns the reporter that will write to the console
- *
- * @return a console reporter of null if no console reporting
- */
- private String getConsoleResultSummaryReporter()
- {
- if ( isUseFile() )
- {
- return isPrintSummary() ? ConsoleReporter.class.getName() : null;
- }
- else if ( isRedirectTestOutputToFile() || BRIEF_REPORT_FORMAT.equals(
getReportFormat() ) )
- {
- return BriefConsoleReporter.class.getName();
- }
- else if ( PLAIN_REPORT_FORMAT.equals( getReportFormat() ) )
- {
- return DetailedConsoleReporter.class.getName();
- }
-/* if (isRedirectTestOutputToFile())
- {
- return null;
- }*/
- return null;
- }
-
- private String getConsoleOutputReporterName()
- {
- if ( isRedirectTestOutputToFile() )
- {
- return ConsoleOutputFileReporter.class.getName();
- }
- else
- {
- return ConsoleOutputDirectReporter.class.getName();
- }
- }
-
protected void ensureWorkingDirectoryExists()
throws MojoFailureException
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
Sun May 1 19:13:32 2011
@@ -114,8 +114,7 @@ public class ForkStarter
throws SurefireBooterForkException
{
final ReporterManagerFactory testSetReporterFactory =
- new ReporterManagerFactory(
Thread.currentThread().getContextClassLoader(),
-
providerConfiguration.getReporterConfiguration(), startupReportConfiguration );
+ new ReporterManagerFactory(
Thread.currentThread().getContextClassLoader(), startupReportConfiguration );
try
{
return fork( null, providerConfiguration.getProviderProperties(),
testSetReporterFactory );
@@ -150,8 +149,7 @@ public class ForkStarter
Properties properties = new Properties();
final ReporterManagerFactory testSetReporterFactory =
- new ReporterManagerFactory(
Thread.currentThread().getContextClassLoader(),
-
providerConfiguration.getReporterConfiguration(), startupReportConfiguration );
+ new ReporterManagerFactory(
Thread.currentThread().getContextClassLoader(), startupReportConfiguration );
try
{
while ( suites.hasNext() )
@@ -174,7 +172,7 @@ public class ForkStarter
{
SurefireReflector surefireReflector = new SurefireReflector(
surefireClassLoader );
Object reporterFactory =
- surefireReflector.createReportingReporterFactory(
this.providerConfiguration.getReporterConfiguration(),
startupReportConfiguration );
+ surefireReflector.createReportingReporterFactory(
startupReportConfiguration );
final ProviderFactory providerFactory =
new ProviderFactory( startupConfiguration, providerConfiguration,
surefireClassLoader, testsClassLoader,
@@ -227,7 +225,7 @@ public class ForkStarter
}
ForkClient out = new ForkClient( testSetReporterFactory,
-
providerConfiguration.getReporterConfiguration().getTestVmSystemProperties() );
+
startupReportConfiguration.getTestVmSystemProperties() );
ThreadedStreamConsumer threadedStreamConsumer2 = new
ThreadedStreamConsumer( out );
if ( forkConfiguration.isDebug() )
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
Sun May 1 19:13:32 2011
@@ -25,7 +25,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.DirectConsoleReporter;
import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.ReporterConfiguration;
import org.apache.maven.surefire.report.RunListener;
/**
@@ -66,17 +65,10 @@ public class MockReporter
private final AtomicInteger testFailed = new AtomicInteger();
- private final AtomicInteger testError = new AtomicInteger();
-
public MockReporter()
{
}
- public MockReporter( ReporterConfiguration reporterConfiguration )
- {
-
- }
-
public void testSetStarting( ReportEntry report )
{
events.add( SET_STARTING );
@@ -145,26 +137,6 @@ public class MockReporter
return (ReportEntry) data.get( 0 );
}
- public String getFirstStringData()
- {
- return (String) data.get( 0 );
- }
-
- public int getTestSucceeded()
- {
- return testSucceeded.get();
- }
-
- public int getTestIgnored()
- {
- return testIgnored.get();
- }
-
- public int getTestFailed()
- {
- return testFailed.get();
- }
-
public void testAssumptionFailure( ReportEntry report )
{
@@ -174,11 +146,6 @@ public class MockReporter
}
- public void writeTestOutput( String output, boolean stdout )
- {
- //To change body of implemented methods use File | Settings | File
Templates.
- }
-
public void writeMessage( String message )
{
events.add( CONSOLE_OUTPUT );
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
Sun May 1 19:13:32 2011
@@ -19,12 +19,10 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import java.io.File;
import org.apache.maven.plugin.surefire.report.ReporterManagerFactory;
import org.apache.maven.surefire.booter.StartupReportConfiguration;
import org.apache.maven.surefire.report.DefaultConsoleReporter;
import org.apache.maven.surefire.report.DirectConsoleReporter;
-import org.apache.maven.surefire.report.ReporterConfiguration;
import org.apache.maven.surefire.report.RunListener;
/**
@@ -35,8 +33,7 @@ public class TestSetMockReporterFactory
{
public TestSetMockReporterFactory()
{
- super( Thread.currentThread().getContextClassLoader(),
- new ReporterConfiguration( new File( "." ), Boolean.TRUE ),
StartupReportConfiguration.defaultValue() );
+ super( Thread.currentThread().getContextClassLoader(),
StartupReportConfiguration.defaultValue() );
}
public DirectConsoleReporter createConsoleReporter()
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
Sun May 1 19:13:32 2011
@@ -40,8 +40,6 @@ public class ThreadedStreamConsumer
private final Pumper pumper;
- private final long start = System.currentTimeMillis();
-
static class Pumper
implements Runnable
{
Modified:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
Sun May 1 19:13:32 2011
@@ -182,7 +182,7 @@ public class BooterDeserializerProviderC
File cwd = new File( "." );
ReporterConfiguration reporterConfiguration =
- new ReporterConfiguration( cwd, Boolean.TRUE, "abc", "cde", "efg",
"hij" );
+ new ReporterConfiguration( cwd, Boolean.TRUE );
String aUserRequestedTestMethod = "aUserRequestedTestMethod";
TestRequest testSuiteDefinition =
new TestRequest( getSuiteXmlFileStrings(),
getTestSourceDirectory(), aUserRequestedTest,
@@ -197,7 +197,7 @@ public class BooterDeserializerProviderC
ClasspathConfiguration classpathConfiguration = new
ClasspathConfiguration( true, true );
return new StartupConfiguration( "com.provider",
classpathConfiguration, classLoaderConfiguration, "never",
- false, false );
+ false );
}
private File getTestSourceDirectory()
Modified:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
Sun May 1 19:13:32 2011
@@ -159,7 +159,7 @@ public class BooterDeserializerStartupCo
private StartupConfiguration getTestStartupConfiguration(
ClassLoaderConfiguration classLoaderConfiguration )
{
return new StartupConfiguration( "com.provider",
classpathConfiguration, classLoaderConfiguration, "never",
- false, false );
+ false );
}
private File getTestSourceDirectory()
Modified:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
Sun May 1 19:13:32 2011
@@ -339,11 +339,6 @@ public class ForkingRunListenerTest
return (ReportEntry) reporter.getData().get( 0 );
}
- public String getFirstStringData()
- {
- return (String) reporter.getData().get( 0 );
- }
-
private void assertExpected( String actionCode, ReportEntry expected )
throws IOException, ReporterException
{
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
(original)
+++
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
Sun May 1 19:13:32 2011
@@ -51,6 +51,7 @@ public class SurefireReportMojo
* Location where generated html will be created.
*
* @parameter expression="${project.reporting.outputDirectory}"
+ * @noinspection UnusedDeclaration
*/
private File outputDirectory;
@@ -58,6 +59,7 @@ public class SurefireReportMojo
* Doxia Site Renderer
*
* @component
+ * @noinspection UnusedDeclaration
*/
private Renderer siteRenderer;
@@ -66,6 +68,7 @@ public class SurefireReportMojo
*
* @parameter expression="${project}"
* @required @readonly
+ * @noinspection UnusedDeclaration
*/
private MavenProject project;
@@ -74,6 +77,7 @@ public class SurefireReportMojo
*
* @parameter expression="${showSuccess}" default-value="true"
* @required
+ * @noinspection UnusedDeclaration
*/
private boolean showSuccess;
@@ -81,6 +85,7 @@ public class SurefireReportMojo
* Directories containing the XML Report files that will be parsed and
rendered to HTML format.
*
* @parameter
+ * @noinspection UnusedDeclaration
*/
private File[] reportsDirectories;
@@ -89,6 +94,7 @@ public class SurefireReportMojo
*
* @parameter
* @deprecated
+ * @noinspection UnusedDeclaration
*/
private File reportsDirectory;
@@ -98,6 +104,7 @@ public class SurefireReportMojo
*
* @parameter expression="${reactorProjects}"
* @readonly
+ * @noinspection MismatchedQueryAndUpdateOfCollection, UnusedDeclaration
*/
private List reactorProjects;
@@ -106,6 +113,7 @@ public class SurefireReportMojo
*
* @parameter expression="${outputName}" default-value="surefire-report"
* @required
+ * @noinspection UnusedDeclaration
*/
private String outputName;
@@ -113,6 +121,7 @@ public class SurefireReportMojo
* Location of the Xrefs to link.
*
* @parameter
default-value="${project.reporting.outputDirectory}/xref-test"
+ * @noinspection UnusedDeclaration
*/
private File xrefLocation;
@@ -120,6 +129,7 @@ public class SurefireReportMojo
* Whether to link the XRef if found.
*
* @parameter expression="${linkXRef}" default-value="true"
+ * @noinspection UnusedDeclaration
*/
private boolean linkXRef;
@@ -127,6 +137,7 @@ public class SurefireReportMojo
* Whether to build an aggregated report at the root, or build individual
reports.
*
* @parameter expression="${aggregate}" default-value="false"
+ * @noinspection UnusedDeclaration
*/
private boolean aggregate;
@@ -142,8 +153,10 @@ public class SurefireReportMojo
{
reportsDirectoryList.addAll( Arrays.asList( reportsDirectories ) );
}
+ //noinspection deprecation
if ( reportsDirectory != null )
{
+ //noinspection deprecation
reportsDirectoryList.add( reportsDirectory );
}
if ( aggregate )
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/report/ReporterManagerFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/report/ReporterManagerFactory.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/report/ReporterManagerFactory.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/report/ReporterManagerFactory.java
Sun May 1 19:13:32 2011
@@ -63,16 +63,20 @@ public class ReporterManagerFactory
private final StartupReportConfiguration reportConfiguration;
- public ReporterManagerFactory( ClassLoader surefireClassLoader,
ReporterConfiguration reporterConfiguration,
- StartupReportConfiguration
reportConfiguration )
+ public ReporterManagerFactory( ClassLoader surefireClassLoader,
StartupReportConfiguration reportConfiguration )
{
- this.reporterConfiguration = reporterConfiguration;
- this.surefireClassLoader = surefireClassLoader;
this.reportConfiguration = reportConfiguration;
+ this.reporterConfiguration = getReporterConfiguration( );
+ this.surefireClassLoader = surefireClassLoader;
multicastingReporter = new MulticastingReporter( instantiateReports()
);
runStarting();
}
+ private ReporterConfiguration getReporterConfiguration( )
+ {
+ return new ReporterConfiguration(
reportConfiguration.getReportsDirectory(), new Boolean(
reportConfiguration.isTrimStackTrace() ));
+ }
+
public RunListener createReporter()
{
return new TestSetRunListener( instantiateConsoleReporter(),
instantiateFileReporter(),
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/StartupReportConfiguration.java
Sun May 1 19:13:32 2011
@@ -22,6 +22,7 @@ package org.apache.maven.surefire.booter
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import org.apache.maven.surefire.report.BriefConsoleReporter;
import org.apache.maven.surefire.report.BriefFileReporter;
import org.apache.maven.surefire.report.ConsoleOutputDirectReporter;
@@ -52,6 +53,9 @@ public class StartupReportConfiguration
private final File reportsDirectory;
+ private final boolean trimStackTrace;
+
+ private final Properties testVmSystemProperties = new Properties( );
public static final String BRIEF_REPORT_FORMAT = "brief";
@@ -59,7 +63,7 @@ public class StartupReportConfiguration
public StartupReportConfiguration( boolean useFile, boolean printSummary,
String reportFormat,
boolean redirectTestOutputToFile,
boolean disableXmlReport,
- File reportsDirectory )
+ File reportsDirectory, boolean
trimStackTrace )
{
this.useFile = useFile;
this.printSummary = printSummary;
@@ -67,18 +71,19 @@ public class StartupReportConfiguration
this.redirectTestOutputToFile = redirectTestOutputToFile;
this.disableXmlReport = disableXmlReport;
this.reportsDirectory = reportsDirectory;
+ this.trimStackTrace = trimStackTrace;
}
public static StartupReportConfiguration defaultValue()
{
File target = new File( "./target" );
- return new StartupReportConfiguration( true, true, "PLAIN", false,
false, target );
+ return new StartupReportConfiguration( true, true, "PLAIN", false,
false, target, false );
}
public static StartupReportConfiguration defaultNoXml()
{
File target = new File( "./target" );
- return new StartupReportConfiguration( true, true, "PLAIN", false,
true, target );
+ return new StartupReportConfiguration( true, true, "PLAIN", false,
true, target, false );
}
public boolean isUseFile()
@@ -199,5 +204,14 @@ public class StartupReportConfiguration
}
}
+ public Properties getTestVmSystemProperties()
+ {
+ return testVmSystemProperties;
+ }
+
+ public boolean isTrimStackTrace()
+ {
+ return trimStackTrace;
+ }
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
Sun May 1 19:13:32 2011
@@ -208,10 +208,9 @@ public class SurefireReflector
Object createReporterConfiguration( ReporterConfiguration
reporterConfiguration )
{
Constructor constructor = ReflectionUtils.getConstructor(
this.reporterConfiguration,
- new Class[]{
File.class, Boolean.class, String.class,
-
String.class, String.class, String.class } );
+ new Class[]{
File.class, Boolean.class } );
return ReflectionUtils.newInstance( constructor, new Object[]{
reporterConfiguration.getReportsDirectory(),
- reporterConfiguration.isTrimStackTrace(), null, null, null, null }
);
+ reporterConfiguration.isTrimStackTrace()} );
}
Object createStartupReportConfiguration( StartupReportConfiguration
reporterConfiguration )
@@ -219,14 +218,15 @@ public class SurefireReflector
Constructor constructor = ReflectionUtils.getConstructor(
this.startupReportConfiguration,
new Class[]{
boolean.class, boolean.class,
String.class, boolean.class, boolean.class,
-
File.class } );
+
File.class, boolean.class } );
//noinspection BooleanConstructorCall
final Object[] params =
{ new Boolean( reporterConfiguration.isUseFile() ), new Boolean(
reporterConfiguration.isPrintSummary() ),
reporterConfiguration.getReportFormat(),
new Boolean(
reporterConfiguration.isRedirectTestOutputToFile() ),
new Boolean( reporterConfiguration.isDisableXmlReport() ),
- reporterConfiguration.getReportsDirectory() };
+ reporterConfiguration.getReportsDirectory(),
+ new Boolean( reporterConfiguration.isTrimStackTrace())};
return ReflectionUtils.newInstance( constructor, params );
}
@@ -238,14 +238,12 @@ public class SurefireReflector
surefireClassLoader );
}
- public Object createReportingReporterFactory( ReporterConfiguration
reporterConfiguration,
- StartupReportConfiguration
startupReportConfiguration )
+ public Object createReportingReporterFactory( StartupReportConfiguration
startupReportConfiguration )
{
Class[] args =
- new Class[]{ ClassLoader.class, this.reporterConfiguration,
this.startupReportConfiguration };
- Object report = createReporterConfiguration( reporterConfiguration );
+ new Class[]{ ClassLoader.class, this.startupReportConfiguration };
Object src = createStartupReportConfiguration(
startupReportConfiguration );
- Object[] params = new Object[]{ this.surefireClassLoader, report, src
};
+ Object[] params = new Object[]{ this.surefireClassLoader, src };
return ReflectionUtils.instantiateObject(
ReporterManagerFactory.class.getName(), args, params,
surefireClassLoader );
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
Sun May 1 19:13:32 2011
@@ -21,15 +21,11 @@ package org.apache.maven.surefire.report
import java.io.File;
import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
/**
* The configuration of the reporter. Most of this stuff is not relevant for
the providers
* and should be moved out of the api.
* <p/>
- * TODO: Split this class in 2, or more. Extract classnames of reporters to
somewhere else.
* This class seems to be the focal point of all the bad code smells left in
reporting ;)
*
* @author Kristian Rosenvold
@@ -40,45 +36,24 @@ public class ReporterConfiguration
private final PrintStream originalSystemOut;
- private final Properties testVmSystemProperties;
-
- private final String consoleReporter;
-
- private final String fileReporter;
-
- private final String xmlReporter;
-
- private final String consoleOutputFileReporterName;
-
/**
* A non-null Boolean value
*/
private final Boolean trimStackTrace;
- public ReporterConfiguration( File reportsDirectory, Boolean
trimStackTrace, String consoleReporter,
- String fileReporter, String xmlReporter,
String consoleOutputFileReporterName )
+ public ReporterConfiguration( File reportsDirectory, Boolean
trimStackTrace )
{
this.reportsDirectory = reportsDirectory;
- this.consoleReporter = consoleReporter;
- this.fileReporter = fileReporter;
- this.xmlReporter = xmlReporter;
this.trimStackTrace = trimStackTrace;
- this.consoleOutputFileReporterName = consoleOutputFileReporterName;
- testVmSystemProperties = new Properties();
/*
- * While this may seem slightly odd, when this object is constructted
no user code has been run
+ * While this may seem slightly odd, when this object is constructed no
user code has been run
* (including classloading), and we can be guaranteed that no-one has
modified System.out/System.err.
* As soon as we start loading user code, all h*ll breaks loose in this
respect.
*/
this.originalSystemOut = System.out;
}
- public ReporterConfiguration( File reportsDirectory, Boolean
trimStackTrace )
- {
- this( reportsDirectory, trimStackTrace, null, null, null, null );
- }
-
/**
* The directory where reports will be created, normally
${project.build.directory}/surefire-reports
*
@@ -100,34 +75,6 @@ public class ReporterConfiguration
}
/**
- * A list of classnames representing runnable reports for this test-run.
- *
- * @return A list of strings, each string is a classname of a class
- * implementing the org.apache.maven.surefire.report.Reporter
interface
- */
- public List getReports()
- {
- ArrayList reports = new ArrayList();
- if ( consoleReporter != null )
- {
- reports.add( consoleReporter );
- }
- if ( fileReporter != null )
- {
- reports.add( fileReporter );
- }
- if ( xmlReporter != null )
- {
- reports.add( xmlReporter );
- }
- if ( consoleOutputFileReporterName != null )
- {
- reports.add( consoleOutputFileReporterName );
- }
- return reports;
- }
-
- /**
* The original system out belonging to the (possibly forked) surefire
process.
* Note that users of Reporter/ReporterFactory should normally not be
using this.
*
@@ -137,9 +84,4 @@ public class ReporterConfiguration
{
return originalSystemOut;
}
-
- public Properties getTestVmSystemProperties()
- {
- return testVmSystemProperties;
- }
}
Modified:
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/TestConsoleOutputRunListenerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/TestConsoleOutputRunListenerTest.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/TestConsoleOutputRunListenerTest.java
(original)
+++
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/TestConsoleOutputRunListenerTest.java
Sun May 1 19:13:32 2011
@@ -51,13 +51,12 @@ public class TestConsoleOutputRunListene
private ReporterFactory createReporterFactory()
{
ReporterConfiguration reporterConfiguration =
getTestReporterConfiguration();
- return new ReporterManagerFactory( this.getClass().getClassLoader(),
reporterConfiguration,
-
StartupReportConfiguration.defaultValue() );
+ return new ReporterManagerFactory( this.getClass().getClassLoader(),
StartupReportConfiguration.defaultValue() );
}
public static ReporterConfiguration getTestReporterConfiguration()
{
- return new ReporterConfiguration( new File( "." ), Boolean.TRUE,
ConsoleReporter.class.getName(), null, null, null );
+ return new ReporterConfiguration( new File( "." ), Boolean.TRUE );
}
}
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
Sun May 1 19:13:32 2011
@@ -29,8 +29,6 @@ public interface BooterConstants
{
String INCLUDES_PROPERTY_PREFIX = "includes";
String EXCLUDES_PROPERTY_PREFIX = "excludes";
- String PARAMS_SUFIX = ".params";
- String TYPES_SUFIX = ".types";
String USESYSTEMCLASSLOADER = "useSystemClassLoader";
String USEMANIFESTONLYJAR = "useManifestOnlyJar";
String FAILIFNOTESTS = "failIfNoTests";
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
Sun May 1 19:13:32 2011
@@ -36,20 +36,15 @@ public class StartupConfiguration
private final boolean isInForkedVm;
- private final boolean redirectTestOutputToFile;
-
public StartupConfiguration( String providerClassName,
ClasspathConfiguration classpathConfiguration,
- ClassLoaderConfiguration
classLoaderConfiguration, String forkMode, boolean inForkedVm,
- boolean redirectTestOutputToFile )
+ ClassLoaderConfiguration
classLoaderConfiguration, String forkMode, boolean inForkedVm )
{
this.providerClassName = providerClassName;
this.classpathConfiguration = classpathConfiguration;
this.classLoaderConfiguration = classLoaderConfiguration;
- String forkMode1 = forkMode;
isForkRequested = !"never".equals( forkMode );
isInForkedVm = inForkedVm;
- this.redirectTestOutputToFile = redirectTestOutputToFile;
}
public static StartupConfiguration inForkedVm( String providerClassName,
@@ -57,7 +52,7 @@ public class StartupConfiguration
ClassLoaderConfiguration
classLoaderConfiguration, String forkMode )
{
return new StartupConfiguration( providerClassName,
classpathConfiguration, classLoaderConfiguration, forkMode,
- true, false );
+ true );
}
public ClasspathConfiguration getClasspathConfiguration()
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
Sun May 1 19:13:32 2011
@@ -84,9 +84,9 @@ public class SurefireStarter
private Object createForkingReporterFactory( SurefireReflector
surefireReflector )
{
- return surefireReflector.createForkingReporterFactory(
-
this.providerConfiguration.getReporterConfiguration().isTrimStackTrace(),
-
this.providerConfiguration.getReporterConfiguration().getOriginalSystemOut() );
+ final Boolean trimStackTrace =
this.providerConfiguration.getReporterConfiguration().isTrimStackTrace();
+ final PrintStream originalSystemOut =
this.providerConfiguration.getReporterConfiguration().getOriginalSystemOut();
+ return surefireReflector.createForkingReporterFactory( trimStackTrace,
originalSystemOut );
}
// todo: Fix duplication in this method and runSuitesInProcess
@@ -119,7 +119,7 @@ public class SurefireStarter
SurefireReflector surefireReflector = new SurefireReflector(
surefireClassLoader );
final Object factory =
- surefireReflector.createReportingReporterFactory(
this.providerConfiguration.getReporterConfiguration(),
startupReportConfiguration );
+ surefireReflector.createReportingReporterFactory(
startupReportConfiguration );
return invokeProvider( null, testsClassLoader, surefireClassLoader,
factory );
}
Modified:
maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
(original)
+++
maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
Sun May 1 19:13:32 2011
@@ -18,10 +18,11 @@ package org.apache.maven.surefire.junit4
* under the License.
*/
-import junit.framework.TestCase;
-import junit.framework.TestResult;
import org.apache.maven.surefire.common.junit4.JUnit4TestChecker;
import org.apache.maven.surefire.testset.TestSetFailedException;
+
+import junit.framework.TestCase;
+import junit.framework.TestResult;
import org.junit.Test;
import org.junit.internal.runners.InitializationError;
import org.junit.runner.Description;
@@ -153,6 +154,7 @@ public class JUnit4TestCheckerTest
}
+ @SuppressWarnings( { "UnusedDeclaration" } )
public static class NotValidTest
{
public void testSomething()
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
Sun May 1 19:13:32 2011
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.junitc
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
-import org.apache.maven.surefire.report.Reporter;
import org.apache.maven.surefire.util.internal.ByteBuffer;
/**
@@ -50,23 +49,6 @@ public class LogicalStream
this.len = len;
}
- public boolean isStdout()
- {
- return stdout;
- }
-
- public void writeTo( StringBuilder stringBuilder )
- {
- final String str = new String( b, off, len );
- stringBuilder.append( str );
- }
-
-
- public void writeDetails( Reporter reporter )
- {
- final String str = new String( b, off, len );
- reporter.writeDetailMessage( str );
- }
public void writeDetails( ConsoleOutputReceiver outputReceiver )
{
@@ -103,16 +85,4 @@ public class LogicalStream
}
- public String getOutput( boolean stdOut )
- {
- StringBuilder stringBuilder = new StringBuilder();
- for ( Entry entry : output )
- {
- if ( stdOut == entry.isStdout() )
- {
- entry.writeTo( stringBuilder );
- }
- }
- return stringBuilder.toString();
- }
}
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
Sun May 1 19:13:32 2011
@@ -402,8 +402,7 @@ public class ConcurrentReporterManagerTe
private ReporterFactory createReporterFactory()
{
ReporterConfiguration reporterConfiguration =
getTestReporterConfiguration();
- return new ReporterManagerFactory( this.getClass().getClassLoader(),
reporterConfiguration,
-
StartupReportConfiguration.defaultNoXml() );
+ return new ReporterManagerFactory( this.getClass().getClassLoader(),
StartupReportConfiguration.defaultNoXml() );
}
public static ReporterConfiguration getTestReporterConfiguration()
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java
Sun May 1 19:13:32 2011
@@ -19,12 +19,12 @@
package org.apache.maven.surefire.junitcore;
-import org.junit.runner.notification.RunListener;
-import org.junit.runner.notification.Failure;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.junit.runner.Description;
import org.junit.runner.Result;
-
-import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
/*
* @author Kristian Rosenvold, kristianAzeniorD0Tno
*/
@@ -39,26 +39,6 @@ public class DiagnosticRunListener exten
private final RunListener target;
- public AtomicInteger getNumTestStarted() {
- return numTestStarted;
- }
-
- public AtomicInteger getNumTestFailed() {
- return numTestFailed;
- }
-
- public AtomicInteger getNumTestAssumptionsFailed() {
- return numTestAssumptionsFailed;
- }
-
- public AtomicInteger getNumTestFinished() {
- return numTestFinished;
- }
-
- public AtomicInteger getNumTestIgnored() {
- return numTestIgnored;
- }
-
private void print(String event, Description description) {
if (printToConsole)
System.out.println(Thread.currentThread().toString() + ", event = " + event +
", " + description);
}
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java?rev=1098389&r1=1098388&r2=1098389&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
Sun May 1 19:13:32 2011
@@ -120,8 +120,7 @@ public class MavenSurefireJUnit47RunnerT
ReporterConfiguration reporterConfiguration =
ConcurrentReporterManagerTest.getTestReporterConfiguration();
ReporterFactory reporterManagerFactory =
- new ReporterManagerFactory( this.getClass().getClassLoader(),
reporterConfiguration,
-
StartupReportConfiguration.defaultNoXml() );
+ new ReporterManagerFactory( this.getClass().getClassLoader(),
StartupReportConfiguration.defaultNoXml() );
final HashMap<String, TestSet> classMethodCounts = new HashMap<String,
TestSet>();
RunListener reporter = ConcurrentReporterManager.createInstance(
classMethodCounts, reporterManagerFactory,
