maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1098345 - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ surefire-api/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ surefire-api/src/main/java/org/apache/m...
Date Sun, 01 May 2011 14:56:15 GMT
Author: krosenvold
Date: Sun May  1 14:56:14 2011
New Revision: 1098345

URL: http://svn.apache.org/viewvc?rev=1098345&view=rev
Log:
o Removed more unused code

Removed:
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/FileOutputConsumerProxy.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkTimeoutException.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultConsoleOutputReceiver.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForwardingRunListener.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/SystemConsoleOutputReceiver.java
Modified:
    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/TestSetMockReporterFactory.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/BaseProviderFactory.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.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/forking/ForkConfigurationInfo.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.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/AbstractReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/Reporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.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/suite/RunResult.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.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/NestedCheckedException.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/ReflectionUtils.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/Relocator.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
    maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/TestConsoleOutputRunListenerTest.java
    maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
    maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.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/MavenSurefireJUnit47RunnerTest.java

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=1098345&r1=1098344&r2=1098345&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 14:56:14 2011
@@ -115,9 +115,7 @@ public class ForkStarter
     {
         final ReporterManagerFactory testSetReporterFactory =
             new ReporterManagerFactory( Thread.currentThread().getContextClassLoader(),
-                                        providerConfiguration.getReporterConfiguration(),
-                                        providerConfiguration.getReporterConfiguration().getReports(),
-                                        startupReportConfiguration );
+                                        providerConfiguration.getReporterConfiguration(), startupReportConfiguration );
         try
         {
             return fork( null, providerConfiguration.getProviderProperties(), testSetReporterFactory );
@@ -153,9 +151,7 @@ public class ForkStarter
 
         final ReporterManagerFactory testSetReporterFactory =
             new ReporterManagerFactory( Thread.currentThread().getContextClassLoader(),
-                                        providerConfiguration.getReporterConfiguration(),
-                                        providerConfiguration.getReporterConfiguration().getReports(),
-                                        startupReportConfiguration );
+                                        providerConfiguration.getReporterConfiguration(), startupReportConfiguration );
         try
         {
             while ( suites.hasNext() )

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=1098345&r1=1098344&r2=1098345&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 14:56:14 2011
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.surefire
  */
 
 import java.io.File;
-import java.util.ArrayList;
 import org.apache.maven.plugin.surefire.report.ReporterManagerFactory;
 import org.apache.maven.surefire.booter.StartupReportConfiguration;
 import org.apache.maven.surefire.report.DefaultConsoleReporter;
@@ -37,8 +36,7 @@ public class TestSetMockReporterFactory
     public TestSetMockReporterFactory()
     {
         super( Thread.currentThread().getContextClassLoader(),
-               new ReporterConfiguration( new File( "." ), Boolean.TRUE ), new ArrayList(),
-               StartupReportConfiguration.defaultValue() );
+               new ReporterConfiguration( new File( "." ), Boolean.TRUE ), StartupReportConfiguration.defaultValue() );
     }
 
     public DirectConsoleReporter createConsoleReporter()

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=1098345&r1=1098344&r2=1098345&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 14:56:14 2011
@@ -64,7 +64,7 @@ public class ReporterManagerFactory
     private final StartupReportConfiguration reportConfiguration;
 
     public ReporterManagerFactory( ClassLoader surefireClassLoader, ReporterConfiguration reporterConfiguration,
-                                   List reportDefinitions, StartupReportConfiguration reportConfiguration )
+                                   StartupReportConfiguration reportConfiguration )
     {
         this.reporterConfiguration = reporterConfiguration;
         this.surefireClassLoader = surefireClassLoader;

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java Sun May  1 14:56:14 2011
@@ -142,8 +142,4 @@ public class BaseProviderFactory
     }
 
 
-    public ForkConfigurationInfo getForkConfiguration()
-    {
-        return forkConfigurationInfo;
-    }
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java Sun May  1 14:56:14 2011
@@ -113,11 +113,6 @@ public class ForkingRunListener
         target.print( toString( BOOTERCODE_TEST_ASSUMPTIONFAILURE, report, testSetChannelId ) );
     }
 
-    public void testAssumptionFailure( Integer channel, ReportEntry report )
-    {
-        target.print( toString( BOOTERCODE_TEST_ASSUMPTIONFAILURE, report, channel ) );
-    }
-
     public void testError( ReportEntry report )
     {
         target.print( toString( BOOTERCODE_TEST_ERROR, report, testSetChannelId ) );
@@ -134,19 +129,6 @@ public class ForkingRunListener
         target.print( toString( BOOTERCODE_TEST_SKIPPED, report, testSetChannelId ) );
     }
 
-    public void writeTestOutputA( byte[] buf, int off, int len, boolean stdout )
-    {
-        ByteBuffer byteBuffer = new ByteBuffer( buf.length + 20 );
-        byteBuffer.append( stdout ? BOOTERCODE_STDOUT : BOOTERCODE_STDERR );
-        byteBuffer.comma();
-        byteBuffer.append( testSetChannelId );
-        byteBuffer.comma();
-        final int i = StringUtils.escapeJavaStyleString( byteBuffer.getData(), byteBuffer.getlength(), buf, off, len );
-        byteBuffer.advance( i );
-        byteBuffer.append( '\n' );
-        target.write( byteBuffer.getData(), 0, byteBuffer.getlength() );
-    }
-
     public synchronized void sendProps()
     {
         Properties systemProperties = System.getProperties();

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=1098345&r1=1098344&r2=1098345&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 14:56:14 2011
@@ -242,10 +242,10 @@ public class SurefireReflector
                                                   StartupReportConfiguration startupReportConfiguration )
     {
         Class[] args =
-            new Class[]{ ClassLoader.class, this.reporterConfiguration, List.class, this.startupReportConfiguration };
+            new Class[]{ ClassLoader.class, this.reporterConfiguration, this.startupReportConfiguration };
         Object report = createReporterConfiguration( reporterConfiguration );
         Object src = createStartupReportConfiguration( startupReportConfiguration );
-        Object[] params = new Object[]{ this.surefireClassLoader, report, reporterConfiguration.getReports(), src };
+        Object[] params = new Object[]{ this.surefireClassLoader, report,  src };
         return ReflectionUtils.instantiateObject( ReporterManagerFactory.class.getName(), args, params,
                                                   surefireClassLoader );
 

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/forking/ForkConfigurationInfo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/forking/ForkConfigurationInfo.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/forking/ForkConfigurationInfo.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/forking/ForkConfigurationInfo.java Sun May  1 14:56:14 2011
@@ -44,13 +44,4 @@ public class ForkConfigurationInfo
         return isInFork;
     }
 
-    public boolean isInFork()
-    {
-        return isInFork.booleanValue();
-    }
-
-    public boolean isForking()
-    {
-        return !"never".equals( forkMode );
-    }
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java Sun May  1 14:56:14 2011
@@ -20,7 +20,6 @@ package org.apache.maven.surefire.provid
  */
 
 import java.util.Properties;
-import org.apache.maven.surefire.forking.ForkConfigurationInfo;
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.testset.DirectoryScannerParameters;
@@ -98,10 +97,4 @@ public interface ProviderParameters
      */
     TestArtifactInfo getTestArtifactInfo();
 
-    /**
-     * Information about the current fork settings.
-     *
-     * @return A forkConfigurationInfo, never null
-     */
-    ForkConfigurationInfo getForkConfiguration();
 }

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=1098345&r1=1098344&r2=1098345&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 Sun May  1 14:56:14 2011
@@ -47,11 +47,6 @@ public abstract class AbstractConsoleRep
         super( getPrintWriter(), trimStackTrace, format);
     }
 
-    AbstractConsoleReporter( String format, ReporterConfiguration reporterConfiguration )
-    {
-        super( getPrintWriter(), reporterConfiguration.isTrimStackTrace().booleanValue(), format);
-    }
-
     private static PrintWriter getPrintWriter()
     {
         return new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( ORIGINAL_SYSTEM_OUT, BUFFER_SIZE ) ) );

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=1098345&r1=1098344&r2=1098345&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 Sun May  1 14:56:14 2011
@@ -198,18 +198,6 @@ public abstract class AbstractReporter
         return clientSpecifiedElapsed != null ? clientSpecifiedElapsed.intValue() : endTime - startTime;
     }
 
-    public void testError( ReportEntry report )
-    {
-        ++errors;
-        endTest();
-    }
-
-    public void testFailed( ReportEntry report )
-    {
-        ++failures;
-        endTest();
-    }
-
     void deleteIfExisting( File reportFile )
     {
         if ( reportFile.exists() )

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java Sun May  1 14:56:14 2011
@@ -114,20 +114,6 @@ public abstract class AbstractTextReport
         testResults.add( getOutput( report, "FAILURE" ) );
     }
 
-    public void testError( ReportEntry report )
-    {
-        super.testError( report );
-
-        testResults.add( getOutput( report, "ERROR" ) );
-    }
-
-    public void testFailed( ReportEntry report )
-    {
-        super.testFailed( report );
-
-        testResults.add( getOutput( report, "FAILURE" ) );
-    }
-
     public void testSetStarting( ReportEntry report )
         throws ReporterException
     {

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java Sun May  1 14:56:14 2011
@@ -31,6 +31,6 @@ public class BriefConsoleReporter
 {
     public BriefConsoleReporter( ReporterConfiguration reporterConfiguration )
     {
-        super( BRIEF, reporterConfiguration );
+        super( reporterConfiguration.isTrimStackTrace().booleanValue(), BRIEF );
     }
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputDirectReporter.java Sun May  1 14:56:14 2011
@@ -55,14 +55,6 @@ public class ConsoleOutputDirectReporter
     {
     }
 
-    public void testError( ReportEntry report )
-    {
-    }
-
-    public void testFailed( ReportEntry report )
-    {
-    }
-
     public void testSkipped( ReportEntry report )
     {
     }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputFileReporter.java Sun May  1 14:56:14 2011
@@ -106,14 +106,6 @@ public class ConsoleOutputFileReporter
     {
     }
 
-    public void testError( ReportEntry report )
-    {
-    }
-
-    public void testFailed( ReportEntry report )
-    {
-    }
-
     public void testSkipped( ReportEntry report )
     {
     }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java Sun May  1 14:56:14 2011
@@ -30,7 +30,7 @@ public class ConsoleReporter
 {
     public ConsoleReporter( ReporterConfiguration reporterConfiguration )
     {
-        super( SUMMARY, reporterConfiguration );
+        super( reporterConfiguration.isTrimStackTrace().booleanValue(), SUMMARY);
     }
 
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java Sun May  1 14:56:14 2011
@@ -30,6 +30,6 @@ public class DetailedConsoleReporter
 {
     public DetailedConsoleReporter( ReporterConfiguration reporterConfiguration )
     {
-        super( PLAIN, reporterConfiguration );
+        super( reporterConfiguration.isTrimStackTrace().booleanValue(), PLAIN);
     }
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.java Sun May  1 14:56:14 2011
@@ -116,21 +116,4 @@ public class MulticastingReporter
         }
     }
 
-    public void testError( ReportEntry report )
-    {
-        for (int i = 0; i < size; i++){
-            target[i].testError( report );
-        }
-    }
-
-    public void testFailed( ReportEntry report )
-    {
-        for (int i = 0; i < size; i++){
-            target[i].testFailed( report );
-        }
-    }
-
-
-    public void close(){
-    }
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/Reporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/Reporter.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/Reporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/Reporter.java Sun May  1 14:56:14 2011
@@ -63,20 +63,6 @@ public interface Reporter
      */
     void testSucceeded( ReportEntry report );
 
-    /**
-     * Event fired when a test ended with an error (non anticipated problem)
-     *
-     * @param report The report entry to log for
-     */
-    void testError( ReportEntry report );
-
-    /**
-     * Event fired when a test ended with a failure (anticipated problem)
-     *
-     * @param report The report entry to log for
-     */
-    void testFailed( ReportEntry report );
-
 
     void testSkipped( ReportEntry report );
 

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.java Sun May  1 14:56:14 2011
@@ -41,23 +41,11 @@ public class RunStatistics
     private final Sources failureSources = new Sources();
 
 
-    // Todo remove when building with 2.7.2
-    public void addErrorSource( String errorSource )
-    {
-        errorSources.addSource( errorSource );
-    }
-
     public void addErrorSource( String errorSource, StackTraceWriter stackTraceWriter )
     {
         errorSources.addSource( errorSource, stackTraceWriter );
     }
 
-    // Todo remove when building with 2.7.2
-    public void addFailureSource( String failureSource )
-    {
-        failureSources.addSource( failureSource );
-    }
-
     public void addFailureSource( String failureSource, StackTraceWriter stackTraceWriter )
     {
         failureSources.addSource( failureSource, stackTraceWriter );

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=1098345&r1=1098344&r2=1098345&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 Sun May  1 14:56:14 2011
@@ -19,7 +19,6 @@ package org.apache.maven.surefire.report
  * under the License.
  */
 
-import java.util.Properties;
 import org.apache.maven.surefire.suite.RunResult;
 
 /**
@@ -31,15 +30,6 @@ import org.apache.maven.surefire.suite.R
  */
 public class TestSetStatistics
 {
-    private static final String RESULTS_ERRORS = "errors";
-
-    private static final String RESULTS_COMPLETED_COUNT = "completedCount";
-
-    private static final String RESULTS_FAILURES = "failures";
-
-    private static final String RESULTS_SKIPPED = "skipped";
-
-
     private int completedCount;
 
     private int errors;
@@ -104,15 +94,6 @@ public class TestSetStatistics
         this.skipped += testSetStatistics.skipped;
     }
 
-    public synchronized void initResultsFromProperties( Properties results )
-    {
-        errors = Integer.valueOf( results.getProperty( RESULTS_ERRORS, "0" ) ).intValue();
-        skipped = Integer.valueOf( results.getProperty( RESULTS_SKIPPED, "0" ) ).intValue();
-        failures = Integer.valueOf( results.getProperty( RESULTS_FAILURES, "0" ) ).intValue();
-        completedCount = Integer.valueOf( results.getProperty( RESULTS_COMPLETED_COUNT, "0" ) ).intValue();
-    }
-
-
     public synchronized RunResult getRunResult()
     {
         return new RunResult( completedCount, errors, failures, skipped );

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=1098345&r1=1098344&r2=1098345&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 Sun May  1 14:56:14 2011
@@ -46,11 +46,6 @@ public class RunResult
 
     public static final int NO_TESTS = 254;
 
-
-    public static final RunResult Failure = new RunResult( 0, 0, 0, 0, true, false );
-
-    public static final RunResult Success = new RunResult( 0, 0, 0, 0 );
-
     public static final RunResult Timeout = new RunResult( 0, 0, 0, 0, false, true );
 
     public RunResult( int completedCount, int errors, int failures, int skipped )

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java Sun May  1 14:56:14 2011
@@ -29,12 +29,6 @@ import org.apache.maven.surefire.util.Ne
 public class TestSetFailedException
     extends NestedCheckedException
 {
-    /**
-     * Create a <code>TestFailedException</code> with no detail message.
-     */
-    public TestSetFailedException()
-    {
-    }
 
     /**
      * Create a <code>TestFailedException</code> with a detail message.

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=1098345&r1=1098344&r2=1098345&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 Sun May  1 14:56:14 2011
@@ -164,16 +164,6 @@ public class DefaultDirectoryScanner
         return incs;
     }
 
-    public List getIncludes()
-    {
-        return includes;
-    }
-
-    public List getExcludes()
-    {
-        return excludes;
-    }
-
     public List getClassesSkippedByValidation()
     {
         return classesSkippedByValidation;

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedCheckedException.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedCheckedException.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedCheckedException.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedCheckedException.java Sun May  1 14:56:14 2011
@@ -78,14 +78,6 @@ public class NestedCheckedException
     private Throwable cause;
 
     /**
-     * Construct a <code>NestedCheckedException</code> with no message or exception
-     */
-    public NestedCheckedException()
-    {
-        super();
-    }
-
-    /**
      * Construct a <code>NestedCheckedException</code> with the specified detail message.
      *
      * @param msg the detail message
@@ -172,42 +164,4 @@ public class NestedCheckedException
             getCause().printStackTrace( pw );
         }
     }
-
-    /**
-     * Check whether this exception contains an exception of the given class:
-     * either it is of the given class itself or it contains a nested cause
-     * of the given class.
-     * <p>Currently just traverses NestedCheckedException causes. Will use
-     * the JDK 1.4 exception cause mechanism once Spring requires JDK 1.4.
-     *
-     * @param exClass the exception class to look for
-     * @return true if it is contained
-     */
-    public boolean contains( Class exClass )
-    {
-        if ( exClass == null )
-        {
-            return false;
-        }
-        Throwable ex = this;
-        while ( ex != null )
-        {
-            if ( exClass.isInstance( ex ) )
-            {
-                return true;
-            }
-            if ( ex instanceof NestedCheckedException )
-            {
-                // Cast is necessary on JDK 1.3, where Throwable does not
-                // provide a "getCause" method itself.
-                ex = ex.getCause();
-            }
-            else
-            {
-                ex = null;
-            }
-        }
-        return false;
-    }
-
 }

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=1098345&r1=1098344&r2=1098345&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 Sun May  1 14:56:14 2011
@@ -106,7 +106,6 @@ public class NestedRuntimeException
      * <p>Note that this will only check one level of nesting.
      * Use <code>getRootCause()</code> to retrieve the innermost cause.
      *
-     * @see #getRootCause()
      */
     public Throwable getCause()
     {
@@ -171,26 +170,6 @@ public class NestedRuntimeException
     }
 
     /**
-     * Retrieve the innermost cause of this exception, if any.
-     * <p>Currently just traverses NestedRuntimeException causes. Will use
-     * the JDK 1.4 exception cause mechanism once Spring requires JDK 1.4.
-     *
-     * @return the innermost exception, or <code>null</code> if none
-     */
-    public Throwable getRootCause()
-    {
-        Throwable cause = getCause();
-        if ( cause instanceof NestedRuntimeException )
-        {
-            return ( (NestedRuntimeException) cause ).getRootCause();
-        }
-        else
-        {
-            return cause;
-        }
-    }
-
-    /**
      * Check whether this exception contains an exception of the given class:
      * either it is of the given class itself or it contains a nested cause
      * of the given class.

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java Sun May  1 14:56:14 2011
@@ -174,50 +174,6 @@ public class ReflectionUtils
 
     }
 
-    public static Object instantiateObject( String className, Object[] params, ClassLoader classLoader )
-    {
-        try
-        {
-            Class clazz = loadClass( classLoader, className );
-
-            Object object;
-            if ( params != null )
-            {
-                Class[] paramTypes = new Class[params.length];
-
-                for ( int j = 0; j < params.length; j++ )
-                {
-                    if ( params[j] == null )
-                    {
-                        paramTypes[j] = String.class;
-                    }
-                    else
-                    {
-                        paramTypes[j] = params[j].getClass();
-                    }
-                }
-
-                Constructor constructor = getConstructor( clazz, paramTypes );
-
-                object = newInstance( constructor, params );
-            }
-            else
-            {
-                object = clazz.newInstance();
-            }
-            return object;
-
-        }
-        catch ( IllegalAccessException e )
-        {
-            throw new SurefireReflectionException( e );
-        }
-        catch ( InstantiationException e )
-        {
-            throw new SurefireReflectionException( e );
-        }
-    }
-
     public static Object instantiateObject( String className, Class[] types, Object[] params, ClassLoader classLoader )
     {
         Class clazz = loadClass( classLoader, className );

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/Relocator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/Relocator.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/Relocator.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/Relocator.java Sun May  1 14:56:14 2011
@@ -19,10 +19,6 @@ package org.apache.maven.surefire.util;
  * under the License.
  */
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Relocates class names when running with relocated provider
  *
@@ -45,16 +41,6 @@ public class Relocator
         relocation = "shadefire";
     }
 
-    public List relocateReports( List original )
-    {
-        List result = new ArrayList();
-        for ( Iterator iter = original.iterator(); iter.hasNext(); )
-        {
-            result.add( relocate( (String) iter.next() ) );
-        }
-        return result;
-    }
-
     private String getRelocation()
     {
         return relocation;

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java Sun May  1 14:56:14 2011
@@ -19,8 +19,6 @@ package org.apache.maven.surefire.util.i
  * under the License.
  */
 
-import java.io.PrintStream;
-
 /**
  * @author Kristian Rosenvold
  */
@@ -72,6 +70,7 @@ public class ByteBuffer
 
     /**
      * Convert the integer to an unsigned number.
+     * @param i the value
      */
     private void toHex( int i )
     {
@@ -109,16 +108,6 @@ public class ByteBuffer
         return new String( data, 0, position );
     }
 
-    public void append( ByteBuffer other )
-    {
-        byte[] src = other.getData();
-        final int length = src.length;
-        for ( int i = 0; i < length; i++ )
-        {
-            data[position++] = src[i];
-        }
-    }
-
     public static byte[] copy( byte[] src1, int off1, int len1 )
     {
         byte[] combined = new byte[len1];
@@ -153,19 +142,4 @@ public class ByteBuffer
         return combined;
     }
 
-    public void print( PrintStream printStream )
-    {
-        printStream.write( data, 0, position );
-    }
-
-    public static char[] toChar( byte[] b, int off, int len )
-    {
-        char[] result = new char[len];
-        int pos = 0;
-        for ( int i = off; i < off + len; i++ )
-        {
-            result[pos++] = (char) b[i];
-        }
-        return result;
-    }
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java Sun May  1 14:56:14 2011
@@ -106,43 +106,6 @@ public class StringUtils
         return list;
     }
 
-    // Replacing
-    //--------------------------------------------------------------------------
-
-    /**
-     * <p>Replace all occurrences of a String within another String.</p>
-     * <p/>
-     * <p>A <code>null</code> reference passed to this method is a no-op.</p>
-     *
-     * @param text text to search and replace in
-     * @param repl String to search for
-     * @param with String to replace with
-     * @return the text with any replacements processed
-     */
-    public static String replace( String text, String repl, String with )
-    {
-        int max = -1;
-        if ( ( text == null ) || ( repl == null ) || ( with == null ) || ( repl.length() == 0 ) )
-        {
-            return text;
-        }
-
-        StringBuffer buf = new StringBuffer( text.length() );
-        int start = 0, end;
-        while ( ( end = text.indexOf( repl, start ) ) != -1 )
-        {
-            buf.append( text.substring( start, end ) ).append( with );
-            start = end + repl.length();
-
-            if ( --max == 0 )
-            {
-                break;
-            }
-        }
-        buf.append( text.substring( start ) );
-        return buf.toString();
-    }
-
 
     /**
      * <p>Checks if a (trimmed) String is <code>null</code> or blank.</p>

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=1098345&r1=1098344&r2=1098345&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 14:56:14 2011
@@ -20,7 +20,6 @@ package org.apache.maven.surefire.report
  */
 
 import java.io.File;
-import java.util.ArrayList;
 import org.apache.maven.plugin.surefire.report.ReporterManagerFactory;
 import org.apache.maven.surefire.booter.StartupReportConfiguration;
 
@@ -52,7 +51,7 @@ public class TestConsoleOutputRunListene
     private ReporterFactory createReporterFactory()
     {
         ReporterConfiguration reporterConfiguration = getTestReporterConfiguration();
-        return new ReporterManagerFactory( this.getClass().getClassLoader(), reporterConfiguration, new ArrayList(),
+        return new ReporterManagerFactory( this.getClass().getClassLoader(), reporterConfiguration,
                                            StartupReportConfiguration.defaultValue() );
     }
 

Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java Sun May  1 14:56:14 2011
@@ -19,15 +19,15 @@ package org.apache.maven.surefire.common
  * under the License.
  */
 
-import org.apache.maven.surefire.report.RunListener;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.report.SimpleReportEntry;
+
 import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 public class JUnit4RunListener
     extends org.junit.runner.notification.RunListener
 {
@@ -76,7 +76,7 @@ public class JUnit4RunListener
         throws Exception
     {
         reporter.testStarting( createReportEntry( description ) );
-        failureFlag.remove( );
+        failureFlag.remove();
     }
 
     /**
@@ -103,6 +103,7 @@ public class JUnit4RunListener
         failureFlag.set( Boolean.TRUE );
     }
 
+    @SuppressWarnings( { "UnusedDeclaration" } )
     public void testAssumptionFailure( Failure failure )
     {
         this.reporter.testAssumptionFailure( createReportEntry( failure.getDescription() ) );

Modified: maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java?rev=1098345&r1=1098344&r2=1098345&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java Sun May  1 14:56:14 2011
@@ -120,9 +120,4 @@ public class JUnit3Provider
         testsToRun = scanClassPath();
         return testsToRun.iterator();
     }
-
-    public Boolean isRunnable()
-    {
-        return Boolean.TRUE;
-    }
 }

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=1098345&r1=1098344&r2=1098345&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 14:56:14 2011
@@ -23,7 +23,6 @@ package org.apache.maven.surefire.junitc
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.PrintStream;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.maven.plugin.surefire.report.ReporterManagerFactory;
@@ -403,7 +402,7 @@ public class ConcurrentReporterManagerTe
     private ReporterFactory createReporterFactory()
     {
         ReporterConfiguration reporterConfiguration = getTestReporterConfiguration();
-        return new ReporterManagerFactory( this.getClass().getClassLoader(), reporterConfiguration, Arrays.asList(),
+        return new ReporterManagerFactory( this.getClass().getClassLoader(), reporterConfiguration,
                                            StartupReportConfiguration.defaultNoXml() );
     }
 

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=1098345&r1=1098344&r2=1098345&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 14:56:14 2011
@@ -17,7 +17,6 @@
 package org.apache.maven.surefire.junitcore;
 
 import java.io.File;
-import java.util.Arrays;
 import java.util.HashMap;
 import org.apache.maven.plugin.surefire.report.ReporterManagerFactory;
 import org.apache.maven.surefire.booter.StartupReportConfiguration;
@@ -121,7 +120,7 @@ public class MavenSurefireJUnit47RunnerT
         ReporterConfiguration reporterConfiguration = ConcurrentReporterManagerTest.getTestReporterConfiguration();
 
         ReporterFactory reporterManagerFactory =
-            new ReporterManagerFactory( this.getClass().getClassLoader(), reporterConfiguration, Arrays.asList(),
+            new ReporterManagerFactory( this.getClass().getClassLoader(), reporterConfiguration,
                                         StartupReportConfiguration.defaultNoXml() );
 
         final HashMap<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();



Mime
View raw message