maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1098400 [1/2] - in /maven/surefire/trunk: maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/ maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ maven-surefire-common/src/main/java/org/apache/maven/plug...
Date Sun, 01 May 2011 20:21:05 GMT
Author: krosenvold
Date: Sun May  1 20:21:02 2011
New Revision: 1098400

URL: http://svn.apache.org/viewvc?rev=1098400&view=rev
Log:
o Removed unused code, fixed style warnings

Removed:
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/forking/ForkConfigurationInfo.java
Modified:
    maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
    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/BooterSerializer.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.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/output/ForkClient.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/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/report/AbstractConsoleReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/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/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/TestConsoleOutputRunListener.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.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/internal/ByteBuffer.java
    maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/MockReporter.java
    maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java
    maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java
    maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java
    maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
    maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test/src/test/java/junit/twoTestCases/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/testng/beforeMethodFailure/TestNGSuiteTest.java
    maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
    maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java
    maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
    maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
    maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
    maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
    maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.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/ConfigurableParallelComputerTest.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
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java

Modified: maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java Sun May  1 20:21:02 2011
@@ -124,6 +124,7 @@ public class VerifyMojo
      *
      * @parameter expression="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
      * @required
+     * @noinspection UnusedDeclaration
      */
     private File summaryFile;
 
@@ -132,6 +133,7 @@ public class VerifyMojo
      *
      * @parameter
      * @since 2.6
+     * @noinspection UnusedDeclaration, MismatchedReadAndWriteOfArray
      */
     private File[] summaryFiles;
 
@@ -147,6 +149,7 @@ public class VerifyMojo
      * The character encoding scheme to be applied.
      *
      * @parameter expression="${encoding}" default-value="${project.reporting.outputEncoding}"
+     * @noinspection UnusedDeclaration
      */
     private String encoding;
 

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -31,7 +31,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@@ -92,7 +91,7 @@ public abstract class AbstractSurefireMo
         }
     }
 
-    protected boolean verifyParameters()
+    boolean verifyParameters()
         throws MojoFailureException
     {
         if ( isSkipExecution() )
@@ -158,7 +157,7 @@ public abstract class AbstractSurefireMo
     }
 
 
-    protected final Toolchain getToolchain()
+    final Toolchain getToolchain()
     {
         Toolchain tc = null;
 
@@ -248,12 +247,12 @@ public abstract class AbstractSurefireMo
         return dependencyResolver.isWithinVersionSpec( artifact, "[4.0,)" );
     }
 
-    protected boolean isForkModeNever()
+    boolean isForkModeNever()
     {
         return ForkConfiguration.FORK_NEVER.equals( getForkMode() );
     }
 
-    protected ProviderConfiguration createProviderConfiguration( ForkConfiguration forkConfiguration )
+    protected ProviderConfiguration createProviderConfiguration()
         throws MojoExecutionException, MojoFailureException
     {
         ReporterConfiguration reporterConfiguration =
@@ -310,7 +309,7 @@ public abstract class AbstractSurefireMo
 
         ProviderConfiguration providerConfiguration1 =
             new ProviderConfiguration( directoryScannerParameters, failIfNoTests, reporterConfiguration, testNg,
-                                       testSuiteDefinition, providerProperties, null, forkConfiguration.getForkMode() );
+                                       testSuiteDefinition, providerProperties, null );
 
         Toolchain tc = getToolchain();
 
@@ -334,7 +333,7 @@ public abstract class AbstractSurefireMo
         return providerConfiguration1;
     }
 
-    protected StartupConfiguration createStartupConfiguration( ForkConfiguration forkConfiguration,
+    StartupConfiguration createStartupConfiguration( ForkConfiguration forkConfiguration,
                                                                ProviderInfo provider,
                                                                ClassLoaderConfiguration classLoaderConfiguration )
         throws MojoExecutionException, MojoFailureException
@@ -356,10 +355,6 @@ public abstract class AbstractSurefireMo
             return new StartupConfiguration( providerName, classpathConfiguration, classLoaderConfiguration,
                                              forkConfiguration.getForkMode(), false );
         }
-        catch ( DependencyResolutionRequiredException e )
-        {
-            throw new MojoExecutionException( "Unable to generate classpath: " + e, e );
-        }
         catch ( ArtifactResolutionException e )
         {
             throw new MojoExecutionException( "Unable to generate classpath: " + e, e );
@@ -382,7 +377,7 @@ public abstract class AbstractSurefireMo
                                                getReportsDirectory(), isTrimStackTrace() );
     }
 
-    public void logClasspath( Classpath classpath, String descriptor )
+    void logClasspath( Classpath classpath, String descriptor )
     {
         getLog().debug( descriptor + " classpath:" );
         for ( Iterator i = classpath.getClassPath().iterator(); i.hasNext(); )
@@ -513,7 +508,7 @@ public abstract class AbstractSurefireMo
         StartupConfiguration startupConfiguration =
             createStartupConfiguration( forkConfiguration, provider, classLoaderConfiguration );
         StartupReportConfiguration startupReportConfiguration = getStartupReportConfiguration();
-        ProviderConfiguration providerConfiguration = createProviderConfiguration( forkConfiguration );
+        ProviderConfiguration providerConfiguration = createProviderConfiguration();
         return new ForkStarter( providerConfiguration, startupConfiguration, forkConfiguration,
                                 getForkedProcessTimeoutInSeconds(), startupReportConfiguration );
     }
@@ -719,18 +714,14 @@ public abstract class AbstractSurefireMo
      * Generate the test classpath.
      *
      * @return List containing the classpath elements
-     * @throws org.apache.maven.artifact.DependencyResolutionRequiredException
-     *                                     when dependency resolution fails
-     * @throws org.apache.maven.plugin.MojoExecutionException
-     *                                     upon other problems
      * @throws InvalidVersionSpecificationException
      *                                     when it happens
      * @throws MojoFailureException        when it happens
      * @throws ArtifactNotFoundException   when it happens
      * @throws ArtifactResolutionException when it happens
      */
-    public Classpath generateTestClasspath()
-        throws DependencyResolutionRequiredException, MojoExecutionException, InvalidVersionSpecificationException,
+    Classpath generateTestClasspath()
+        throws InvalidVersionSpecificationException,
         MojoFailureException, ArtifactResolutionException, ArtifactNotFoundException
     {
         List classpath = new ArrayList( 2 + getProject().getArtifacts().size() );
@@ -792,7 +783,7 @@ public abstract class AbstractSurefireMo
         return new Classpath( classpath );
     }
 
-    protected Artifact getTestNgUtilsArtifact()
+    Artifact getTestNgUtilsArtifact()
         throws ArtifactResolutionException, ArtifactNotFoundException
     {
         Artifact surefireArtifact =
@@ -885,7 +876,7 @@ public abstract class AbstractSurefireMo
         return new Classpath( items );
     }
 
-    protected void processSystemProperties( boolean setInSystem )
+    void processSystemProperties( boolean setInSystem )
     {
         copyPropertiesToInternalSystemProperties( getSystemProperties() );
 
@@ -975,7 +966,7 @@ public abstract class AbstractSurefireMo
     }
 
 
-    protected void ensureWorkingDirectoryExists()
+    void ensureWorkingDirectoryExists()
         throws MojoFailureException
     {
         if ( getWorkingDirectory() == null )
@@ -998,7 +989,7 @@ public abstract class AbstractSurefireMo
         }
     }
 
-    protected void ensureParallelRunningCompatibility()
+    void ensureParallelRunningCompatibility()
         throws MojoFailureException
     {
         if ( isMavenParallel() && isForkModeNever() )
@@ -1007,7 +998,7 @@ public abstract class AbstractSurefireMo
         }
     }
 
-    protected void warnIfUselessUseSystemClassLoaderParameter()
+    void warnIfUselessUseSystemClassLoaderParameter()
     {
         if ( isUseSystemClassLoader() && isForkModeNever() )
         {

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java Sun May  1 20:21:02 2011
@@ -49,7 +49,7 @@ import org.apache.maven.surefire.testset
  * @author Kristian Rosenvold
  * @version $Id$
  */
-public class BooterSerializer
+class BooterSerializer
 {
     private final ForkConfiguration forkConfiguration;
 

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java Sun May  1 20:21:02 2011
@@ -34,7 +34,6 @@ import org.apache.maven.surefire.booter.
 import org.apache.maven.surefire.booter.Classpath;
 import org.apache.maven.surefire.booter.ForkedBooter;
 import org.apache.maven.surefire.booter.SurefireBooterForkException;
-import org.apache.maven.surefire.forking.ForkConfigurationInfo;
 import org.apache.maven.surefire.util.Relocator;
 import org.apache.maven.surefire.util.UrlUtils;
 import org.codehaus.plexus.util.StringUtils;
@@ -148,11 +147,6 @@ public class ForkConfiguration
     }
 
 
-    public ForkConfigurationInfo getForkConfigurationInfo( Boolean isInFork )
-    {
-        return new ForkConfigurationInfo( forkMode, isInFork );
-    }
-
     public String getForkMode()
     {
         return forkMode;

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -92,7 +92,7 @@ public class ForkStarter
         final String requestedForkMode = forkConfiguration.getForkMode();
         if ( ForkConfiguration.FORK_NEVER.equals( requestedForkMode ) )
         {
-            SurefireStarter surefireStarter = new SurefireStarter( startupConfiguration, providerConfiguration, false, this.startupReportConfiguration );
+            SurefireStarter surefireStarter = new SurefireStarter( startupConfiguration, providerConfiguration, this.startupReportConfiguration );
             result = surefireStarter.runSuitesInProcess();
         }
         else if ( ForkConfiguration.FORK_ONCE.equals( requestedForkMode ) )
@@ -176,7 +176,7 @@ public class ForkStarter
 
         final ProviderFactory providerFactory =
             new ProviderFactory( startupConfiguration, providerConfiguration, surefireClassLoader, testsClassLoader,
-                                 forkConfiguration.getForkConfigurationInfo( Boolean.FALSE ), reporterFactory );
+                                 reporterFactory );
         SurefireProvider surefireProvider = providerFactory.createProvider();
         return surefireProvider.getSuites();
     }

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java Sun May  1 20:21:02 2011
@@ -62,11 +62,6 @@ public class ForkClient
         this.testVmSystemProperties = testVmSystemProperties;
     }
 
-    public Properties getTestVmSystemProperties()
-    {
-        return testVmSystemProperties;
-    }
-
     public void consumeLine( String s )
     {
         try

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -53,8 +53,7 @@ public class BooterDeserializerProviderC
 
     private final String aUserRequestedTest = "aUserRequestedTest";
 
-    public static ClassLoaderConfiguration getForkConfiguration()
-        throws IOException
+    private static ClassLoaderConfiguration getForkConfiguration()
     {
         return new ClassLoaderConfiguration( true, false );
     }
@@ -177,7 +176,6 @@ public class BooterDeserializerProviderC
     }
 
     private ProviderConfiguration getTestProviderConfiguration( DirectoryScannerParameters directoryScannerParameters )
-        throws IOException
     {
 
         File cwd = new File( "." );
@@ -189,7 +187,7 @@ public class BooterDeserializerProviderC
                              aUserRequestedTestMethod );
         return new ProviderConfiguration( directoryScannerParameters, true, reporterConfiguration,
                                           new TestArtifactInfo( "5.0", "ABC" ), testSuiteDefinition, new Properties(),
-                                          aTest, "never" );
+                                          aTest );
     }
 
     private StartupConfiguration getTestStartupConfiguration( ClassLoaderConfiguration classLoaderConfiguration )

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -106,13 +106,11 @@ public class BooterDeserializerStartupCo
     }
 
     public static ClassLoaderConfiguration getSystemClassLoaderConfiguration()
-        throws IOException
     {
         return new ClassLoaderConfiguration( true, false );
     }
 
     public static ClassLoaderConfiguration getManifestOnlyJarForkConfiguration()
-        throws IOException
     {
         return new ClassLoaderConfiguration( true, true );
     }
@@ -139,7 +137,6 @@ public class BooterDeserializerStartupCo
     }
 
     private ProviderConfiguration getProviderConfiguration()
-        throws IOException
     {
 
         File cwd = new File( "." );
@@ -153,7 +150,7 @@ public class BooterDeserializerStartupCo
                              aUserRequestedTestMethod );
         return new ProviderConfiguration( directoryScannerParameters, true, reporterConfiguration,
                                           new TestArtifactInfo( "5.0", "ABC" ), testSuiteDefinition, new Properties(),
-                                          aTest, "never" );
+                                          aTest );
     }
 
     private StartupConfiguration getTestStartupConfiguration( ClassLoaderConfiguration classLoaderConfiguration )

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -199,12 +199,12 @@ public class ForkingRunListenerTest
         RunListener forkingReporter = createForkingRunListener( defaultChannel );
 
         TestSetMockReporterFactory providerReporterFactory = new TestSetMockReporterFactory();
-        ForkClient forkStreamClient = new ForkClient( providerReporterFactory, new Properties() );
+        final Properties testVmSystemProperties = new Properties();
+        ForkClient forkStreamClient = new ForkClient( providerReporterFactory, testVmSystemProperties );
 
         forkStreamClient.consumeMultiLineContent( content.toString( "utf-8" ) );
 
-        Properties props = forkStreamClient.getTestVmSystemProperties();
-        assert ( props.size() > 1 );
+        assertTrue ( testVmSystemProperties.size() > 1 );
     }
 
     public void testMultipleEntries()
@@ -313,7 +313,7 @@ public class ForkingRunListenerTest
         private MockReporter reporter;
 
         public RunListener run()
-            throws ReporterException, IOException
+            throws ReporterException
         {
             reset();
             return createForkingRunListener( defaultChannel );
@@ -351,6 +351,7 @@ public class ForkingRunListenerTest
             assertEquals( expected.getGroup(), firstData.getGroup() );
             if ( expected.getStackTraceWriter() != null )
             {
+                //noinspection ThrowableResultOfMethodCallIgnored
                 assertEquals( expected.getStackTraceWriter().getThrowable().getLocalizedMessage(),
                               firstData.getStackTraceWriter().getThrowable().getLocalizedMessage() );
                 assertEquals( expected.getStackTraceWriter().writeTraceToString(),

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -53,9 +53,9 @@ public class ReporterManagerFactory
     implements ReporterFactory
 {
 
-    private ClassLoader surefireClassLoader;
+    private final ClassLoader surefireClassLoader;
 
-    private ReporterConfiguration reporterConfiguration;
+    private final ReporterConfiguration reporterConfiguration;
 
     private final RunStatistics globalStats = new RunStatistics();
 

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -20,7 +20,6 @@ package org.apache.maven.surefire.booter
  */
 
 import java.util.Properties;
-import org.apache.maven.surefire.forking.ForkConfigurationInfo;
 import org.apache.maven.surefire.providerapi.ProviderParameters;
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.ReporterFactory;
@@ -49,7 +48,6 @@ public class BaseProviderFactory
 
     private TestArtifactInfo testArtifactInfo;
 
-    private ForkConfigurationInfo forkConfigurationInfo;
 
     private final ReporterFactory reporterFactory;
 
@@ -135,11 +133,4 @@ public class BaseProviderFactory
         this.testArtifactInfo = testArtifactInfo;
     }
 
-    /** @noinspection UnusedDeclaration*/
-    public void setForkConfigurationInfo( ForkConfigurationInfo forkConfigurationInfo )
-    {
-        this.forkConfigurationInfo = 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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -129,7 +129,7 @@ public class ForkingRunListener
         target.print( toString( BOOTERCODE_TEST_SKIPPED, report, testSetChannelId ) );
     }
 
-    public synchronized void sendProps()
+    synchronized void sendProps()
     {
         Properties systemProperties = System.getProperties();
 
@@ -191,7 +191,7 @@ public class ForkingRunListener
         return header;
     }
 
-    final static char[] digits =
+    private final static char[] digits =
         { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
             'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
 

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -27,7 +27,6 @@ import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Properties;
 import org.apache.maven.plugin.surefire.report.ReporterManagerFactory;
-import org.apache.maven.surefire.forking.ForkConfigurationInfo;
 import org.apache.maven.surefire.providerapi.ProviderParameters;
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.ReporterFactory;
@@ -75,8 +74,6 @@ public class SurefireReflector
 
     private final Class reporterFactory;
 
-    private final Class forkConfigurationInfo;
-
     private final Class startupReportConfiguration;
 
     public SurefireReflector( ClassLoader surefireClassLoader )
@@ -96,7 +93,6 @@ public class SurefireReflector
             testClassLoaderAware = surefireClassLoader.loadClass( SurefireClassLoadersAware.class.getName() );
             reporterConfigurationAware = surefireClassLoader.loadClass( ReporterConfigurationAware.class.getName() );
             providerPropertiesAware = surefireClassLoader.loadClass( ProviderPropertiesAware.class.getName() );
-            forkConfigurationInfo = surefireClassLoader.loadClass( ForkConfigurationInfo.class.getName() );
             reporterFactory = surefireClassLoader.loadClass( ReporterFactory.class.getName() );
             runResult = surefireClassLoader.loadClass( RunResult.class.getName() );
             booterParameters = surefireClassLoader.loadClass( ProviderParameters.class.getName() );
@@ -191,19 +187,6 @@ public class SurefireReflector
             testArtifactInfo.getClassifier() } );
     }
 
-    Object createForkConfigurationInfo( ForkConfigurationInfo forkConfigurationInfo )
-    {
-        if ( forkConfigurationInfo == null )
-        {
-            return null;
-        }
-
-        final Class[] arguments = { String.class, Boolean.class };
-        Constructor constructor = ReflectionUtils.getConstructor( this.forkConfigurationInfo, arguments );
-        return ReflectionUtils.newInstance( constructor, new Object[]{ forkConfigurationInfo.getForkMode(),
-            forkConfigurationInfo.getInFork() } );
-    }
-
 
     Object createReporterConfiguration( ReporterConfiguration reporterConfiguration )
     {
@@ -276,16 +259,6 @@ public class SurefireReflector
     }
 
 
-    public void setForkConfigurationInfo( Object o, ForkConfigurationInfo forkConfigurationInfo )
-    {
-        if ( forkConfigurationInfo == null )
-        {
-            throw new IllegalArgumentException( "ForkConfiguration cannot be null" );
-        }
-        final Object forkConfig = createForkConfigurationInfo( forkConfigurationInfo );
-        ReflectionUtils.invokeSetter( o, "setForkConfigurationInfo", this.forkConfigurationInfo, forkConfig );
-    }
-
     public void setTestSuiteDefinitionAware( Object o, TestRequest testSuiteDefinition2 )
     {
         if ( testSuiteDefinitionAware.isAssignableFrom( o.getClass() ) )

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -42,7 +42,7 @@ public abstract class AbstractConsoleRep
 
     private static final PrintStream ORIGINAL_SYSTEM_OUT = System.out;
 
-    public AbstractConsoleReporter( boolean trimStackTrace, String format )
+    AbstractConsoleReporter( boolean trimStackTrace, String format )
     {
         super( getPrintWriter(), trimStackTrace, format);
     }
@@ -67,7 +67,7 @@ public abstract class AbstractConsoleRep
      * @param report report whose test set is starting
      * @return the message
      */
-    public static String getTestSetStartingMessage( ReportEntry report )
+    static String getTestSetStartingMessage( ReportEntry report )
     {
         StringBuffer message = new StringBuffer();
         message.append( TEST_SET_STARTING_PREFIX );
@@ -84,50 +84,4 @@ public abstract class AbstractConsoleRep
         return message.toString();
     }
 
-    /**
-     * Parses a Surefire test set starting message into a {@link ReportEntry} object.
-     * Only name and group will be set if applicable.
-     *
-     * @param message The test starting message
-     * @return the parsed {@link ReportEntry}
-     */
-    public static ReportEntry parseTestSetStartingMessage( String message )
-    {
-        String name;
-        String group = null;
-        int i = message.indexOf( TEST_SET_STARTING_GROUP_PREFIX );
-        int j;
-        if ( i >= 0 )
-        {
-            j = message.indexOf( TEST_SET_STARTING_GROUP_SUFIX );
-            if ( j <= 0 )
-            {
-                throw new RuntimeException( "Message provided can not be parsed" );
-            }
-            group = message.substring( i + TEST_SET_STARTING_GROUP_PREFIX.length(), j );
-        }
-        else
-        {
-            i = message.length();
-            if ( i <= 0 )
-            {
-                throw new RuntimeException( "Message provided can not be parsed" );
-            }
-        }
-        name = message.substring( TEST_SET_STARTING_PREFIX.length(), i );
-        return CategorizedReportEntry.nameGroup( name, group );
-    }
-
-    /**
-     * Check if the String passed as argument is a "test starting" message.
-     * If so it can be passed to {@link #parseTestSetStartingMessage(String)}
-     *
-     * @param message the message to check
-     * @return true if it is a "test starting" message
-     */
-    public static boolean isTestSetStartingMessage( String message )
-    {
-        return message.startsWith( TEST_SET_STARTING_PREFIX );
-    }
-
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java Sun May  1 20:21:02 2011
@@ -36,7 +36,7 @@ public abstract class AbstractFileReport
 
     private final boolean deleteOnStarting;
 
-    protected AbstractFileReporter( boolean trimStackTrace, String format, File reportsDirectory )
+    AbstractFileReporter( boolean trimStackTrace, String format, File reportsDirectory )
     {
         super( trimStackTrace, format );
         this.reportsDirectory = reportsDirectory;

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -32,11 +32,11 @@ import java.util.List;
 public abstract class AbstractTextReporter
     extends AbstractReporter
 {
-    protected static final String BRIEF = "brief";
+    static final String BRIEF = "brief";
 
-    protected static final String PLAIN = "plain";
+    static final String PLAIN = "plain";
 
-    protected static final String SUMMARY = "summary";
+    static final String SUMMARY = "summary";
 
     protected PrintWriter writer;
 
@@ -75,11 +75,6 @@ public abstract class AbstractTextReport
         }
     }
 
-    public void writeDetailMessage( String message )
-    {
-        writeMessage( message );
-    }
-
     public void testSucceeded( ReportEntry report )
     {
         super.testSucceeded( report );

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java Sun May  1 20:21:02 2011
@@ -33,7 +33,4 @@ public class BriefFileReporter
         super( reporterConfiguration, BRIEF );
     }
 
-    public void writeDetailMessage( String message )
-    {
-    }
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java Sun May  1 20:21:02 2011
@@ -34,7 +34,7 @@ public class CategorizedReportEntry
         this.group = group;
     }
 
-    public CategorizedReportEntry( String source, String name, String group, String message )
+    public CategorizedReportEntry( String source, String name, String group )
     {
         this( source, name, group, null, null );
     }
@@ -46,11 +46,6 @@ public class CategorizedReportEntry
         this.group = group;
     }
 
-    public static ReportEntry nameGroup( String name, String group )
-    {
-        return new CategorizedReportEntry( name, group );
-    }
-
     public String getGroup()
     {
         return group;

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -76,10 +76,6 @@ public class ConsoleOutputDirectReporter
         reportsDirectory.write( b, off, len );
     }
 
-    public void writeDetailMessage( String message )
-    {
-    }
-
     public void reset()
     {
     }

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -50,6 +50,7 @@ public class ConsoleOutputFileReporter
 
     /**
      * Create a consumer that will write to a {@link java.io.File} for each test
+     * @param reporterConfiguration The configuration
      */
 
     public ConsoleOutputFileReporter( ReporterConfiguration reporterConfiguration )
@@ -124,24 +125,7 @@ public class ConsoleOutputFileReporter
 
     public void writeMessage( byte[] b, int off, int len )
     {
-        consumeOutputLine( new String( b, off, len ) );
-    }
-
-    public void writeDetailMessage( String message )
-    {
-    }
-
-    public void reset()
-    {
-    }
-
-
-    /**
-     * Write the output to the current test file
-     * <p/>
-     */
-    private void consumeOutputLine( String line )
-    {
+        String line = new String( b, off, len );
         if ( printWriter == null )
         {
             outputBuffer.append( line );
@@ -156,4 +140,7 @@ public class ConsoleOutputFileReporter
         printWriter.write( line );
     }
 
+    public void reset()
+    {
+    }
 }

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -88,13 +88,6 @@ public class MulticastingReporter
         }
     }
 
-    public void writeDetailMessage( String message )
-    {
-        for (int i = 0; i < size; i++){
-            target[i].writeDetailMessage( message );
-        }
-    }
-
     public void writeMessage( String message )
     {
         for (int i = 0; i < size; i++){

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -96,14 +96,6 @@ public interface Reporter
     void writeMessage( byte[] b, int off, int len );
 
     /**
-     * Writes a detailed message that will not necessarily be displayed in all channels.
-     * This is controlled by reportFormat attribute on the plugin.
-     *
-     * @param message The message to write
-     */
-    void writeDetailMessage( String message );
-
-    /**
      * Restores the instance of the reporter, making the instance re-usable for a subsequent run in the
      * same thread.
      */

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestConsoleOutputRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestConsoleOutputRunListener.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestConsoleOutputRunListener.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestConsoleOutputRunListener.java Sun May  1 20:21:02 2011
@@ -48,11 +48,11 @@ public abstract class TestConsoleOutputR
 
     protected abstract RunListener getTestSetRunListener( ReportEntry reportEntry );
 
-    protected abstract void clearTestSetRunListener( ReportEntry reportEntry );
+    protected abstract void clearTestSetRunListener();
 
     protected abstract RunListener getTestMethodRunListener( ReportEntry report );
 
-    protected abstract void clearTestMethodRunListener( ReportEntry reportEntry );
+    protected abstract void clearTestMethodRunListener();
 
     protected abstract ConsoleOutputReceiver getConsoleOutputReceiver();
 
@@ -77,7 +77,7 @@ public abstract class TestConsoleOutputR
         throws ReporterException
     {
         getTestSetRunListener( report ).testSetCompleted( report );
-        clearTestSetRunListener( report );
+        clearTestSetRunListener();
     }
 
     public void testStarting( ReportEntry report )
@@ -88,31 +88,31 @@ public abstract class TestConsoleOutputR
     public void testSucceeded( ReportEntry report )
     {
         getTestMethodRunListener( report ).testSucceeded( report );
-        clearTestMethodRunListener( report );
+        clearTestMethodRunListener();
     }
 
     public void testAssumptionFailure( ReportEntry report )
     {
         getTestMethodRunListener( report ).testAssumptionFailure( report );
-        clearTestMethodRunListener( report );
+        clearTestMethodRunListener();
     }
 
     public void testError( ReportEntry report )
     {
         getTestMethodRunListener( report ).testError( report );
-        clearTestMethodRunListener( report );
+        clearTestMethodRunListener();
     }
 
     public void testFailed( ReportEntry report )
     {
         getTestMethodRunListener( report ).testFailed( report );
-        clearTestMethodRunListener( report );
+        clearTestMethodRunListener();
     }
 
     public void testSkipped( ReportEntry report )
     {
         getTestMethodRunListener( report ).testSkipped( report );
-        clearTestMethodRunListener( report );
+        clearTestMethodRunListener();
     }
 
     public static class OneThreadPerClassConsoleOutputRunListener
@@ -130,12 +130,12 @@ public abstract class TestConsoleOutputR
             return getTestMethodRunListener( reportEntry );
         }
 
-        protected void clearTestSetRunListener( ReportEntry reportEntry )
+        protected void clearTestSetRunListener()
         {
             currentTestMethodListener.remove();
         }
 
-        protected void clearTestMethodRunListener( ReportEntry reportEntry )
+        protected void clearTestMethodRunListener()
         {
             // Dont clear, we do this in testset.
         }
@@ -186,7 +186,7 @@ public abstract class TestConsoleOutputR
             return result;
         }
 
-        protected void clearTestSetRunListener( ReportEntry reportEntry )
+        protected void clearTestSetRunListener()
         {
             currentTestSetListener.remove();
         }
@@ -204,7 +204,7 @@ public abstract class TestConsoleOutputR
             return runListener;
         }
 
-        protected void clearTestMethodRunListener( ReportEntry reportEntry )
+        protected void clearTestMethodRunListener()
         {
             currentTestMethodListener.remove();
         }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetRunListener.java Sun May  1 20:21:02 2011
@@ -81,11 +81,6 @@ public class TestSetRunListener
         multicastingReporter.writeMessage( b, off, len );
     }
 
-    public void writeDetailMessage( String message )
-    {
-        multicastingReporter.writeDetailMessage( message );
-    }
-
     public void writeTestOutput( byte[] buf, int off, int len, boolean stdout )
     {
         ByteBuffer byteBuffer = new ByteBuffer( buf, off, len );

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java Sun May  1 20:21:02 2011
@@ -76,10 +76,6 @@ public class XMLReporter
     {
     }
 
-    public void writeDetailMessage( String message )
-    {
-    }
-
 
     public void testSetStarting( ReportEntry report )
         throws ReporterException

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -63,6 +63,7 @@ public class TestSetFailedException
      * Create a <code>TestFailedException</code> with the specified cause.  The
      * <code>getMessage</code> method of this exception object will return
      * <code>(cause == null ? "" : cause.toString())</code>.
+     * @param cause The cause
      */
     public TestSetFailedException( Throwable cause )
     {

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=1098400&r1=1098399&r2=1098400&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 20:21:02 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()
     {
@@ -169,56 +168,4 @@ public class NestedRuntimeException
             getCause().printStackTrace( pw );
         }
     }
-
-    /**
-     * 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.
-     * <p>Currently just traverses NestedRuntimeException 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 the class is contained
-     */
-    public boolean contains( Class exClass )
-    {
-        if ( exClass == null )
-        {
-            return false;
-        }
-        if ( exClass.isInstance( this ) )
-        {
-            return true;
-        }
-        Throwable cause = getCause();
-        if ( cause instanceof NestedRuntimeException )
-        {
-            return ( (NestedRuntimeException) cause ).contains( exClass );
-        }
-        else
-        {
-            return ( cause != null && exClass.isInstance( cause ) );
-        }
-    }
-
 }
\ No newline at end of file

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -143,11 +143,11 @@ public class ReflectionUtils
         }
     }
 
-    public static Object invokeSetter( Object o, String name, Class value1clazz, Object value )
+    public static void invokeSetter( Object o, String name, Class value1clazz, Object value )
 
     {
         final Method setter = getMethod( o, name, new Class[]{ value1clazz } );
-        return invokeSetter( o, setter, value );
+        invokeSetter( o, setter, value );
     }
 
     public static Object invokeSetter( Object target, Method method, Object value )

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -50,7 +50,7 @@ public class ByteBuffer
         data[position++] = chararcter;
     }
 
-    static final byte comma = (byte) ',';
+    private static final byte comma = (byte) ',';
 
     public void comma()
     {
@@ -88,7 +88,7 @@ public class ByteBuffer
         append( buf, charPos, ( 32 - charPos ) );
     }
 
-    final static char[] digits =
+    private final static char[] digits =
         { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
             'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
 
@@ -119,7 +119,7 @@ public class ByteBuffer
         return combined;
     }
 
-    public void append( byte[] src1, int off1, int len1 )
+    void append( byte[] src1, int off1, int len1 )
     {
         for ( int i = off1; i < off1 + len1; i++ )
         {

Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/MockReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/MockReporter.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/MockReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/MockReporter.java Sun May  1 20:21:02 2011
@@ -67,11 +67,6 @@ public class MockReporter
     {
     }
 
-    public MockReporter( ReporterConfiguration reporterConfiguration )
-    {
-
-    }
-
     public void testSetStarting( ReportEntry report )
     {
         events.add( SET_STARTING );
@@ -120,16 +115,6 @@ public class MockReporter
     }
 
 
-    public List getEvents()
-    {
-        return events;
-    }
-
-    public List getData()
-    {
-        return data;
-    }
-
     public String getFirstEvent()
     {
         return (String) events.get( 0 );
@@ -169,7 +154,7 @@ public class MockReporter
 
     }
 
-    public void writeTestOutput( String output, boolean stdout )
+    public void writeTestOutput()
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }

Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java Sun May  1 20:21:02 2011
@@ -118,7 +118,7 @@ public class PojoStackTraceWriterTest
     
     class MockThrowable extends Throwable {
         private static final long serialVersionUID = 1L;
-        private String stackTrace;
+        private final String stackTrace;
         
         public MockThrowable(String stackTrace) {
             this.stackTrace = stackTrace;

Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java Sun May  1 20:21:02 2011
@@ -19,12 +19,5 @@
 
 package org.apache.maven.surefire.util.testdata;
 
-/**
- * Created by IntelliJ IDEA.
- * User: kristian
- * Date: Jun 21, 2009
- * Time: 8:12:27 PM
- * To change this template use File | Settings | File Templates.
- */
 public class DataZT1A {
 }

Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java Sun May  1 20:21:02 2011
@@ -19,12 +19,6 @@
 
 package org.apache.maven.surefire.util.testdata;
 
-/**
- * Created by IntelliJ IDEA.
- * User: kristian
- * Date: Jun 21, 2009
- * Time: 8:12:27 PM
- * To change this template use File | Settings | File Templates.
- */
+
 public class DataZT2A {
 }

Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java Sun May  1 20:21:02 2011
@@ -19,12 +19,6 @@
 
 package org.apache.maven.surefire.util.testdata;
 
-/**
- * Created by IntelliJ IDEA.
- * User: kristian
- * Date: Jun 21, 2009
- * Time: 8:12:27 PM
- * To change this template use File | Settings | File Templates.
- */
+
 public class DataZT3A {
 }

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java Sun May  1 20:21:02 2011
@@ -56,9 +56,7 @@ public class BooterDeserializer
     }
 
     public ProviderConfiguration deserialize()
-        throws IOException
     {
-
         final File reportsDirectory = new File( properties.getProperty( REPORTSDIRECTORY ) );
         final String testNgVersion = properties.getProperty( TESTARTIFACT_VERSION );
         final String testArtifactClassifier = properties.getProperty( TESTARTIFACT_CLASSIFIER );
@@ -85,14 +83,12 @@ public class BooterDeserializer
         ReporterConfiguration reporterConfiguration =
             new ReporterConfiguration( reportsDirectory, properties.getBooleanObjectProperty( ISTRIMSTACKTRACE ) );
 
-        String forkMode = properties.getProperty( FORKMODE );
         return new ProviderConfiguration( dirScannerParams, properties.getBooleanProperty( FAILIFNOTESTS ),
                                           reporterConfiguration, testNg, testSuiteDefinition,
-                                          properties.getProperties(), testForFork, forkMode );
+                                          properties.getProperties(), testForFork );
     }
 
     public StartupConfiguration getProviderConfiguration()
-        throws IOException
     {
         boolean useSystemClassLoader = properties.getBooleanProperty( USESYSTEMCLASSLOADER );
         boolean useManifestOnlyJar = properties.getBooleanProperty( USEMANIFESTONLYJAR );

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java Sun May  1 20:21:02 2011
@@ -64,7 +64,7 @@ public class ForkedBooter
             final StartupConfiguration providerConfiguration = booterDeserializer.getProviderConfiguration();
 
 
-            SurefireStarter starter = new SurefireStarter( providerConfiguration, booterConfiguration, true, null );
+            SurefireStarter starter = new SurefireStarter( providerConfiguration, booterConfiguration, null );
 
             Object forkedTestSet = booterConfiguration.getTestForFork();
             final RunResult result = forkedTestSet != null

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java Sun May  1 20:21:02 2011
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.booter
 import java.io.File;
 import java.util.List;
 import java.util.Properties;
-import org.apache.maven.surefire.forking.ForkConfigurationInfo;
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.testset.DirectoryScannerParameters;
 import org.apache.maven.surefire.testset.TestArtifactInfo;
@@ -63,12 +62,9 @@ public class ProviderConfiguration
 
     private final Object forkTestSet;
 
-    private final String forkMode;
-
     public ProviderConfiguration( DirectoryScannerParameters directoryScannerParameters, boolean failIfNoTests,
                                   ReporterConfiguration reporterConfiguration, TestArtifactInfo testArtifact,
-                                  TestRequest testSuiteDefinition, Properties providerProperties, Object forkTestSet,
-                                  String forkMode )
+                                  TestRequest testSuiteDefinition, Properties providerProperties, Object forkTestSet )
     {
         this.providerProperties = providerProperties;
         this.reporterConfiguration = reporterConfiguration;
@@ -77,7 +73,6 @@ public class ProviderConfiguration
         this.dirScannerParams = directoryScannerParameters;
         this.failIfNoTests = failIfNoTests;
         this.forkTestSet = forkTestSet;
-        this.forkMode = forkMode;
     }
 
 
@@ -133,11 +128,6 @@ public class ProviderConfiguration
         return forkTestSet;
     }
 
-    public ForkConfigurationInfo getForkConfigurationInfo( boolean isInFork )
-    {
-        return new ForkConfigurationInfo( forkMode, isInFork ? Boolean.TRUE : Boolean.FALSE );
-    }
-
     public String getTestForForkString()
     {
         if ( forkTestSet instanceof File )

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java Sun May  1 20:21:02 2011
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.booter
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import org.apache.maven.surefire.forking.ForkConfigurationInfo;
 import org.apache.maven.surefire.providerapi.SurefireProvider;
 
 /**
@@ -43,21 +42,17 @@ public class ProviderFactory
 
     private final SurefireReflector surefireReflector;
 
-    private final ForkConfigurationInfo forkConfigurationInfo;
-
     private final Object reporterManagerFactory;
 
 
     public ProviderFactory( StartupConfiguration startupConfiguration, ProviderConfiguration providerConfiguration,
-                            ClassLoader surefireClassLoader, ClassLoader testsClassLoader,
-                            ForkConfigurationInfo forkMode, Object reporterManagerFactory )
+                            ClassLoader surefireClassLoader, ClassLoader testsClassLoader, Object reporterManagerFactory )
     {
         this.providerConfiguration = providerConfiguration;
         this.surefireClassLoader = surefireClassLoader;
         this.startupConfiguration = startupConfiguration;
         this.surefireReflector = new SurefireReflector( surefireClassLoader );
         this.testsClassLoader = testsClassLoader;
-        this.forkConfigurationInfo = forkMode;
         this.reporterManagerFactory = reporterManagerFactory;
     }
 
@@ -75,7 +70,6 @@ public class ProviderFactory
         surefireReflector.setTestClassLoaderAware( o, surefireClassLoader, testsClassLoader );
         surefireReflector.setTestArtifactInfoAware( o, providerConfiguration.getTestArtifact() );
         surefireReflector.setIfDirScannerAware( o, providerConfiguration.getDirScannerParams() );
-        surefireReflector.setForkConfigurationInfo( o, this.forkConfigurationInfo );
 
         Object provider = surefireReflector.instantiateProvider( starterConfiguration.getProviderClassName(), o );
         Thread.currentThread().setContextClassLoader( context );

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=1098400&r1=1098399&r2=1098400&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 20:21:02 2011
@@ -19,7 +19,6 @@ package org.apache.maven.surefire.booter
  * under the License.
  */
 
-import java.io.IOException;
 import java.io.PrintStream;
 import org.apache.maven.surefire.providerapi.SurefireProvider;
 import org.apache.maven.surefire.report.ReporterException;
@@ -48,21 +47,18 @@ public class SurefireStarter
 
     private final static String SUREFIRE_TEST_CLASSPATH = "surefire.test.class.path";
 
-    private final boolean inFork;
-
     private final StartupReportConfiguration startupReportConfiguration;
 
     public SurefireStarter( StartupConfiguration startupConfiguration, ProviderConfiguration providerConfiguration,
-                            boolean inFork, StartupReportConfiguration startupReportConfiguration )
+                            StartupReportConfiguration startupReportConfiguration )
     {
         this.providerConfiguration = providerConfiguration;
         this.startupConfiguration = startupConfiguration;
-        this.inFork = inFork;
         this.startupReportConfiguration = startupReportConfiguration;
     }
 
     public RunResult runSuitesInProcessWhenForked( Object testSet )
-        throws SurefireExecutionException, IOException
+        throws SurefireExecutionException
     {
         writeSurefireTestClasspathProperty();
         final ClasspathConfiguration classpathConfiguration = startupConfiguration.getClasspathConfiguration();
@@ -168,7 +164,7 @@ public class SurefireStarter
 
         ProviderFactory providerFactory =
             new ProviderFactory( startupConfiguration, providerConfiguration, surefireClassLoader, testsClassLoader,
-                                 providerConfiguration.getForkConfigurationInfo( inFork ), factory );
+                                 factory );
         final SurefireProvider provider = providerFactory.createProvider();
 
         try

Modified: maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java (original)
+++ maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java Sun May  1 20:21:02 2011
@@ -20,13 +20,12 @@ package org.apache.maven.surefire.booter
  */
 
 
+import java.util.Properties;
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.testset.DirectoryScannerParameters;
 import org.apache.maven.surefire.testset.TestArtifactInfo;
 import org.apache.maven.surefire.testset.TestRequest;
 
-import java.util.Properties;
-
 /**
 * @author Kristian Rosenvold
 */
@@ -59,17 +58,13 @@ public class Foo
     }
 
 
+    /** @noinspection UnusedDeclaration
+     * @return true if it has been callsed */
     public Boolean isCalled()
     {
         return Boolean.valueOf( called);
     }
 
-    public void setTestSuiteDefinition( TestRequest testSuiteDefinition )
-    {
-        this.testSuiteDefinition = testSuiteDefinition;
-        this.called = true;
-    }
-
     public void setProviderProperties( Properties providerProperties )
     {
         this.providerProperties = providerProperties;

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java Sun May  1 20:21:02 2011
@@ -39,9 +39,9 @@ import java.util.List;
 public abstract class AbstractSurefireIntegrationTestClass
     extends TestCase
 {
-    private String surefireVersion = System.getProperty( "surefire.version" );
+    private final String surefireVersion = System.getProperty( "surefire.version" );
 
-    private String testNgVersion = System.getProperty( "testng.version" );
+    private final String testNgVersion = System.getProperty( "testng.version" );
 
     protected List<String> getInitialGoals()
     {

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java Sun May  1 20:21:02 2011
@@ -41,8 +41,6 @@ public class WorkingDirectoryIT
 
     private File childTestDir;
 
-    private File targetDir;
-
     private File outFile;
 
     public void setUp()
@@ -50,8 +48,9 @@ public class WorkingDirectoryIT
     {
         testDir = ResourceExtractor.simpleExtractResources( getClass(), "/working-directory" );
         childTestDir = new File( testDir, "child" );
-        targetDir = new File( childTestDir, "target" );
+        File targetDir = new File( childTestDir, "target" );
         outFile = new File( targetDir, "out.txt" );
+        //noinspection ResultOfMethodCallIgnored
         outFile.delete();
     }
 

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java Sun May  1 20:21:02 2011
@@ -19,18 +19,16 @@ package org.apache.maven.surefire.its.mi
  * under the License.
  */
 
-import org.apache.maven.surefire.its.misc.TestSuiteXmlParser;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.StringUtils;
-
-import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 import java.io.IOException;
-import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.StringUtils;
+
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.xml.sax.SAXException;
 
@@ -39,9 +37,8 @@ import org.xml.sax.SAXException;
  */
 public class SurefireReportParser
 {
-    private NumberFormat numberFormat = NumberFormat.getInstance();
 
-    private List reportsDirectories;
+    private final List reportsDirectories;
 
     private final List testSuites = new ArrayList();
 
@@ -49,7 +46,6 @@ public class SurefireReportParser
     {
         this.reportsDirectories = reportsDirectoriesFiles;
 
-        setLocale( locale );
     }
 
     public List parseXMLReportFiles()
@@ -101,11 +97,6 @@ public class SurefireReportParser
         return testSuites;
     }
 
-    public final void setLocale( Locale locale )
-    {
-        numberFormat = NumberFormat.getInstance( locale );
-    }
-
     private String[] getIncludedFiles( File directory, String includes, String excludes )
     {
         DirectoryScanner scanner = new DirectoryScanner();

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java Sun May  1 20:21:02 2011
@@ -24,7 +24,8 @@ public class BasicTest
         TestSuite suite = new TestSuite();
         Test test = new BasicTest( "testSetUp", "dummy" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -38,8 +39,6 @@ public class BasicTest
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java Sun May  1 20:21:02 2011
@@ -23,7 +23,8 @@ public class AbstractConcreteBasicTest /
         TestSuite suite = new TestSuite();
         Test test = new AbstractConcreteBasicTest( "testSetUp", "dummy" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -37,8 +38,6 @@ public class AbstractConcreteBasicTest /
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()



Mime
View raw message