maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1050534 [1/2] - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ maven-surefire-report-plugin/src/main/java/o...
Date Fri, 17 Dec 2010 23:54:51 GMT
Author: hboutemy
Date: Fri Dec 17 23:54:50 2010
New Revision: 1050534

URL: http://svn.apache.org/viewvc?rev=1050534&view=rev
Log:
code formatting

Modified:
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.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/ForkingStreamConsumer.java
    maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
    maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
    maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
    maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
    maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/DirectoryScannerParametersAware.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.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/providerapi/ProviderParameters.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.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/DefaultReportEntry.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.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/ClasspathConfiguration.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/PropertiesWrapper.java
    maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnit3TestChecker.java
    maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
    maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
    maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestChecker.java
    maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSetReporter.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/ConcurrentPrintStream.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReportingRunListener.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreStackTraceWriter.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
    maven/surefire/trunk/surefire-providers/surefire-junit47/src/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/main/java/org/apache/maven/surefire/junitcore/TestSet.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/SynchronizedReporterManager.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1050534&r1=1050533&r2=1050534&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 Fri Dec 17 23:54:50 2010
@@ -477,8 +477,8 @@ public abstract class AbstractSurefireMo
             if ( !range.containsVersion( new DefaultArtifactVersion( artifact.getVersion() ) ) )
             {
                 throw new MojoFailureException(
-                    "TestNG support requires version 4.7 or above. You have declared version " +
-                        artifact.getVersion() );
+                    "TestNG support requires version 4.7 or above. You have declared version "
+                        + artifact.getVersion() );
             }
         }
         return artifact;
@@ -711,8 +711,8 @@ public abstract class AbstractSurefireMo
             Artifact artifact = (Artifact) i.next();
 
             getLog().debug(
-                "Adding to " + getPluginName() + " booter test classpath: " + artifact.getFile().getAbsolutePath() +
-                    " Scope: " + artifact.getScope() );
+                "Adding to " + getPluginName() + " booter test classpath: " + artifact.getFile().getAbsolutePath()
+                    + " Scope: " + artifact.getScope() );
 
             bootClasspath.addClassPathElementUrl( artifact.getFile().getAbsolutePath() );
         }
@@ -791,8 +791,8 @@ public abstract class AbstractSurefireMo
         }
         catch ( Exception e )
         {
-            String msg = "Build uses Maven 2.0.x, cannot propagate system properties" +
-                " from command line to tests (cf. SUREFIRE-121)";
+            String msg = "Build uses Maven 2.0.x, cannot propagate system properties"
+                + " from command line to tests (cf. SUREFIRE-121)";
             if ( getLog().isDebugEnabled() )
             {
                 getLog().warn( msg, e );

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java Fri Dec 17 23:54:50 2010
@@ -31,13 +31,13 @@ public interface ProviderInfo
 {
     String getProviderName();
 
-    public boolean isApplicable();
+    boolean isApplicable();
 
-    public void addProviderArtifactToBootClasspath( Classpath bootclasspath )
+    void addProviderArtifactToBootClasspath( Classpath bootclasspath )
         throws ArtifactResolutionException, ArtifactNotFoundException;
 
-    public void addProviderArtifactToSurefireClasspath( ClasspathConfiguration bootclasspath )
+    void addProviderArtifactToSurefireClasspath( ClasspathConfiguration bootclasspath )
         throws ArtifactResolutionException, ArtifactNotFoundException;
 
-    public void addProviderProperties();
+    void addProviderProperties();
 }

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java Fri Dec 17 23:54:50 2010
@@ -165,8 +165,8 @@ public class SurefireDependencyResolver
             Artifact artifact = (Artifact) i.next();
 
             log.debug(
-                "Adding to " + pluginName + " test classpath: " + artifact.getFile().getAbsolutePath() + " Scope: " +
-                    artifact.getScope() );
+                "Adding to " + pluginName + " test classpath: " + artifact.getFile().getAbsolutePath() + " Scope: "
+                    + artifact.getScope() );
 
             classpathConfiguration.addSurefireClasspathUrl( artifact.getFile().getAbsolutePath() );
         }
@@ -181,8 +181,8 @@ public class SurefireDependencyResolver
         {
             Artifact artifact = (Artifact) i.next();
 
-            log.debug( "Adding to " + pluginName + " booter test classpath: " + artifact.getFile().getAbsolutePath() +
-                           " Scope: " + artifact.getScope() );
+            log.debug( "Adding to " + pluginName + " booter test classpath: " + artifact.getFile().getAbsolutePath()
+                           + " Scope: " + artifact.getScope() );
 
             bootClasspath.addClassPathElementUrl( artifact.getFile().getAbsolutePath() );
         }

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java Fri Dec 17 23:54:50 2010
@@ -269,7 +269,7 @@ public interface SurefireExecutionParame
 
     boolean isMavenParallel();
 
-    void setRunOrder(String runOrder);
+    void setRunOrder( String runOrder );
 
     String getRunOrder();
 

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=1050534&r1=1050533&r2=1050534&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 Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.plugin.surefire.booterclient;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkingStreamConsumer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkingStreamConsumer.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkingStreamConsumer.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkingStreamConsumer.java Fri Dec 17 23:54:50 2010
@@ -34,11 +34,11 @@ import org.codehaus.plexus.util.cli.Stre
 public class ForkingStreamConsumer
     implements StreamConsumer
 {
-    private final static int STANDARD_PREFIX_LENGTH = ForkingConsoleReporter.FORKING_PREFIX_STANDARD.length();
+    private static final int STANDARD_PREFIX_LENGTH = ForkingConsoleReporter.FORKING_PREFIX_STANDARD.length();
 
-    private final static int HEADING_PREFIX_LENGTH = ForkingConsoleReporter.FORKING_PREFIX_HEADING.length();
+    private static final int HEADING_PREFIX_LENGTH = ForkingConsoleReporter.FORKING_PREFIX_HEADING.length();
 
-    private final static int FOOTER_PREFIX_LENGTH = ForkingConsoleReporter.FORKING_PREFIX_FOOTER.length();
+    private static final int FOOTER_PREFIX_LENGTH = ForkingConsoleReporter.FORKING_PREFIX_FOOTER.length();
 
     private final OutputConsumer outputConsumer;
 

Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java Fri Dec 17 23:54:50 2010
@@ -1,5 +1,24 @@
 package org.apache.maven.plugin.surefire.booterclient;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;

Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java Fri Dec 17 23:54:50 2010
@@ -82,8 +82,14 @@ public class ReportTestSuite
 
     public int getNumberOfTests()
     {
-        if ( numberOfTests != null ) return numberOfTests.intValue();
-        if ( testCases != null ) return testCases.size();
+        if ( numberOfTests != null )
+        {
+            return numberOfTests.intValue();
+        }
+        if ( testCases != null )
+        {
+            return testCases.size();
+        }
         return 0;
     }
 
@@ -153,6 +159,7 @@ public class ReportTestSuite
     /** {@inheritDoc} */
     public String toString()
     {
-        return fullClassName + " ["+getNumberOfTests()+"/"+getNumberOfFailures()+"/"+getNumberOfErrors()+"/"+getNumberOfSkipped()+"]";
+        return fullClassName + " [" + getNumberOfTests() + "/" + getNumberOfFailures() + "/" + getNumberOfErrors()
+            + "/" + getNumberOfSkipped() + "]";
     }
 }

Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java Fri Dec 17 23:54:50 2010
@@ -430,9 +430,9 @@ public class SurefireReportGenerator
 
                             sink.link( "javascript:toggleDisplay('" + testCase.getName() + "');" );
 
-                            sink.rawText( "<span style=\"display: inline;\" " + "id=\"" + testCase.getName() +
-                                "off\">+</span><span id=\"" + testCase.getName() + "on\" " +
-                                "style=\"display: none;\">-</span> " );
+                            sink.rawText( "<span style=\"display: inline;\" " + "id=\"" + testCase.getName()
+                                + "off\">+</span><span id=\"" + testCase.getName() + "on\" "
+                                + "style=\"display: none;\">-</span> " );
                             sink.text( "[ Detail ]" );
                             sink.link_();
 

Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java Fri Dec 17 23:54:50 2010
@@ -70,8 +70,13 @@ public class SurefireReportParser
         for ( int i = 0; i < reportsDirectories.length; i++ )
         {
             File reportsDirectory = reportsDirectories[i];
-            if ( !reportsDirectory.exists() ) continue;
-            String[] xmlReportFiles = getIncludedFiles( reportsDirectory, "*.xml", "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml" );
+            if ( !reportsDirectory.exists() )
+            {
+                continue;
+            }
+            String[] xmlReportFiles =
+                getIncludedFiles( reportsDirectory, "*.xml",
+                                  "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml" );
             for ( int j = 0; j < xmlReportFiles.length; j++ )
             {
                 File xmlReport = new File( reportsDirectory, xmlReportFiles[j] );

Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java Fri Dec 17 23:54:50 2010
@@ -96,7 +96,7 @@ public class TestSuiteXmlParser
                 }
                 catch ( NullPointerException npe )
                 {
-                    System.err.println("WARNING: no time attribute found on testsuite element");
+                    System.err.println( "WARNING: no time attribute found on testsuite element" );
                 }
 
                 //check if group attribute is existing
@@ -152,7 +152,8 @@ public class TestSuiteXmlParser
 
                 testCase.setTime( time.floatValue() );
 
-                if ( currentSuite != defaultSuite ) {
+                if ( currentSuite != defaultSuite )
+                {
                     currentSuite.setTimeElapsed( time.floatValue() + currentSuite.getTimeElapsed() );
                 }
             }
@@ -200,7 +201,8 @@ public class TestSuiteXmlParser
         }
         else if ( "time".equals( qName ) )
         {
-            try {
+            try
+            {
                 Number time = numberFormat.parse( currentElement.toString() );
                 defaultSuite.setTimeElapsed( time.floatValue() );
             }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java Fri Dec 17 23:54:50 2010
@@ -132,8 +132,8 @@ public class Surefire
                         ClassLoader testsClassLoader )
         throws ReporterException, TestSetFailedException
     {
-        return run( reportDefinitions, testSuiteDefinitions, surefireClassLoader, testsClassLoader, Boolean.FALSE ) ==
-            0;
+        return run( reportDefinitions, testSuiteDefinitions, surefireClassLoader, testsClassLoader, Boolean.FALSE )
+            == 0;
     }
 
     public int run( List reportDefinitions, List testSuiteDefinitions, ClassLoader surefireClassLoader,

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/DirectoryScannerParametersAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/DirectoryScannerParametersAware.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/DirectoryScannerParametersAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/DirectoryScannerParametersAware.java Fri Dec 17 23:54:50 2010
@@ -26,5 +26,5 @@ import org.apache.maven.surefire.testset
  */
 interface DirectoryScannerParametersAware
 {
-    public void setDirectoryScannerParameters( DirectoryScannerParameters directoryScanner );
+    void setDirectoryScannerParameters( DirectoryScannerParameters directoryScanner );
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireClassLoadersAware.java Fri Dec 17 23:54:50 2010
@@ -24,5 +24,5 @@ package org.apache.maven.surefire.booter
  */
 public interface SurefireClassLoadersAware
 {
-    void setClassLoaders( ClassLoader surefireClassLoader, ClassLoader testClassLoader);
+    void setClassLoaders( ClassLoader surefireClassLoader, ClassLoader testClassLoader );
 }

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=1050534&r1=1050533&r2=1050534&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 Fri Dec 17 23:54:50 2010
@@ -194,7 +194,8 @@ public class SurefireReflector
 
     public Object instantiateProvider( String providerClassName, Object booterParameters )
     {
-        return ReflectionUtils.instantiateOneArg( classLoader, providerClassName, this.booterParameters, booterParameters );
+        return ReflectionUtils.instantiateOneArg( classLoader, providerClassName, this.booterParameters,
+                                                  booterParameters );
     }
 
 

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=1050534&r1=1050533&r2=1050534&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 Fri Dec 17 23:54:50 2010
@@ -1,5 +1,24 @@
 package org.apache.maven.surefire.providerapi;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.testset.DirectoryScannerParameters;

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java Fri Dec 17 23:54:50 2010
@@ -49,7 +49,7 @@ public interface SurefireProvider
      *
      * @return
      */
-    public Iterator getSuites();
+    Iterator getSuites();
 
     /**
      * The test that will be invoked through a fork; used only for forkmode=pertest, when the classpath
@@ -57,6 +57,6 @@ public interface SurefireProvider
      * and not scan the classpath
      */
 
-    public RunResult invoke( Object forkTestSet )
+    RunResult invoke( Object forkTestSet )
         throws TestSetFailedException, ReporterException;
 }

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=1050534&r1=1050533&r2=1050534&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 Fri Dec 17 23:54:50 2010
@@ -41,12 +41,12 @@ public abstract class AbstractConsoleRep
 
     protected static final int BUFFER_SIZE = 4096;
 
-    private static final PrintStream originalSystemOut = System.out;
+    private static final PrintStream ORIGINAL_SYSTEM_OUT = System.out;
 
     protected AbstractConsoleReporter( String format, ReporterConfiguration reporterConfiguration )
     {
         // TODO: use logger
-        super( new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( originalSystemOut, BUFFER_SIZE ) ) ),
+        super( new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( ORIGINAL_SYSTEM_OUT, BUFFER_SIZE ) ) ),
                format, reporterConfiguration );
     }
 
@@ -56,7 +56,7 @@ public abstract class AbstractConsoleRep
     protected AbstractConsoleReporter( String format, Boolean trimStackTrace )
     {
         // TODO: use logger
-        super( new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( originalSystemOut, BUFFER_SIZE ) ) ),
+        super( new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( ORIGINAL_SYSTEM_OUT, BUFFER_SIZE ) ) ),
                format, trimStackTrace );
     }
 

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultReportEntry.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultReportEntry.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultReportEntry.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultReportEntry.java Fri Dec 17 23:54:50 2010
@@ -27,7 +27,7 @@ public class DefaultReportEntry
 {
     public DefaultReportEntry( String source, String name, String message )
     {
-        super( source, name, null, message, null);
+        super( source, name, null, message, null );
     }
 
     public DefaultReportEntry( String source, String name, String message, Integer elapsed )

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java Fri Dec 17 23:54:50 2010
@@ -63,7 +63,7 @@ public class PojoStackTraceWriter
 
         String marker = "at " + testClass + "." + testMethod;
 
-        String[] lines = StringUtils.split(text, "\n");
+        String[] lines = StringUtils.split( text, "\n" );
         int lastLine = lines.length - 1;
         int causedByLine = -1;
         // skip first

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java Fri Dec 17 23:54:50 2010
@@ -174,7 +174,7 @@ public class ReportEntry
 
     public String toString()
     {
-        return "ReportEntry{" + "source='" + source + '\'' + ", name='" + name + '\'' + ", group='" + group + '\'' +
-            ", message='" + message + '\'' + ", stackTraceWriter=" + stackTraceWriter + ", elapsed=" + elapsed + '}';
+        return "ReportEntry{" + "source='" + source + '\'' + ", name='" + name + '\'' + ", group='" + group + '\''
+            + ", message='" + message + '\'' + ", stackTraceWriter=" + stackTraceWriter + ", elapsed=" + elapsed + '}';
     }
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java Fri Dec 17 23:54:50 2010
@@ -19,24 +19,21 @@ package org.apache.maven.surefire.report
  * under the License.
  */
 
-
 import org.apache.maven.surefire.suite.RunResult;
-import org.apache.maven.surefire.testset.TestSetFailedException;
 
 /**
  * @author Kristian Rosenvold
  */
 public interface ReporterFactory
 {
-    public RunStatistics getGlobalRunStatistics();
+    RunStatistics getGlobalRunStatistics();
 
     /**
      * Creates a (non-thread-safe) reporter
      *
      * @return A reporter instance
      */
-    public Reporter createReporter();
-
-    public RunResult close();
+    Reporter createReporter();
 
+    RunResult close();
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java Fri Dec 17 23:54:50 2010
@@ -78,8 +78,8 @@ public class TestRequest
             Object element;
             for ( int i = 0; i < suiteXmlFiles.size(); i++ )
             {
-                element = suiteXmlFiles.get(i);
-                files.add( element instanceof String ? new File( (String) element ) : (File) element);
+                element = suiteXmlFiles.get( i );
+                files.add( element instanceof String ? new File( (String) element ) : (File) element );
             }
             return files;
         }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java Fri Dec 17 23:54:50 2010
@@ -121,11 +121,12 @@ public class PrettyPrintXMLWriter
     private static String escapeXml( String text )
     {
         StringBuffer sb = new StringBuffer ( text.length() * 2 );
-        for ( int i = 0; i < text.length(); i++ ) {
+        for ( int i = 0; i < text.length(); i++ )
+        {
             char c = text.charAt( i );
             if ( c < 32 )
             {
-                if ( c == '\n' || c == '\r' || c == '\t')
+                if ( c == '\n' || c == '\r' || c == '\t' )
                 {
                     sb.append( c );
                 }
@@ -136,28 +137,28 @@ public class PrettyPrintXMLWriter
                     // we're going to deliberately doubly-XML escape it...
                     // there's nothing better we can do! :-(
                     // SUREFIRE-456
-                    sb.append( "&amp;#" ).append( (int) c).append( ';' );
+                    sb.append( "&amp;#" ).append( (int) c ).append( ';' );
                 }
             }
-            else if ( c == '<')
+            else if ( c == '<' )
             {
                 sb.append( "&lt;" );
             }
-            else if ( c == '>')
+            else if ( c == '>' )
             {
                 sb.append( "&gt;" );
             }
-            else if (c == '&')
+            else if ( c == '&' )
             {
-                sb.append("&amp;");
+                sb.append( "&amp;" );
             }
-            else if (c == '"')
+            else if ( c == '"' )
             {
-                sb.append("&quot;");
+                sb.append( "&quot;" );
             }
-            else if (c == '\'')
+            else if ( c == '\'' )
             {
-                sb.append("&apos;");
+                sb.append( "&apos;" );
             }
             else
             {

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=1050534&r1=1050533&r2=1050534&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 Fri Dec 17 23:54:50 2010
@@ -28,9 +28,9 @@ import java.lang.reflect.Method;
  */
 public class ReflectionUtils
 {
-    private static final Class[] noargs = new Class[0];
+    private static final Class[] NO_ARGS = new Class[0];
 
-    private static final Object[] noargsValues = new Object[0];
+    private static final Object[] NO_ARGS_VALUES = new Object[0];
 
 
     public static Method getMethod( Object instance, String methodName, Class[] parameters )
@@ -47,8 +47,8 @@ public class ReflectionUtils
 
     public static Object invokeGetter( Object instance, String methodName )
     {
-        final Method method = getMethod( instance, methodName, noargs );
-        return invokeMethodWithArray( instance, method, noargsValues );
+        final Method method = getMethod( instance, methodName, NO_ARGS );
+        return invokeMethodWithArray( instance, method, NO_ARGS_VALUES );
     }
 
     public static Constructor getConstructor( Class clazz, Class[] arguments )
@@ -108,7 +108,7 @@ public class ReflectionUtils
 
         try
         {
-            Class aClass = loadClass(classLoader, className );
+            Class aClass = loadClass( classLoader, className );
             Constructor constructor = ReflectionUtils.getConstructor( aClass, new Class[]{ param1Class } );
             return constructor.newInstance( new Object[]{ param1 } );
         }

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=1050534&r1=1050533&r2=1050534&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 Fri Dec 17 23:54:50 2010
@@ -1,57 +1,22 @@
 package org.apache.maven.surefire.util.internal;
 
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.codehaus.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact codehaus@codehaus.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.codehaus.org/>.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import java.util.StringTokenizer;

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=1050534&r1=1050533&r2=1050534&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 Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.booter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -79,13 +80,14 @@ public class BooterDeserializer
 
         DirectoryScannerParameters dirScannerParams =
             new DirectoryScannerParameters( testClassesDirectory, includesList, excludesList,
-                                            valueOf( properties.getBooleanProperty( FAILIFNOTESTS ) ) , runOrder);
+                                            valueOf( properties.getBooleanProperty( FAILIFNOTESTS ) ), runOrder );
 
         TestArtifactInfo testNg = new TestArtifactInfo( testNgVersion, testArtifactClassifier );
         TestRequest testSuiteDefinition = new TestRequest( testSuiteXmlFiles, sourceDirectory, requestedTest );
 
-        ReporterConfiguration reporterConfiguration = new ReporterConfiguration( reports, reportsDirectory, valueOf(
-            properties.getBooleanProperty( ISTRIMSTACKTRACE ) ) );
+        ReporterConfiguration reporterConfiguration =
+            new ReporterConfiguration( reports, reportsDirectory,
+                                       valueOf( properties.getBooleanProperty( ISTRIMSTACKTRACE ) ) );
 
         return new ProviderConfiguration( dirScannerParams, properties.getBooleanProperty( FAILIFNOTESTS ),
                                           reporterConfiguration, testNg, testSuiteDefinition,
@@ -131,7 +133,7 @@ public class BooterDeserializer
 
         List list = new ArrayList();
 
-        String[] stringArray = StringUtils.split(sl, ",");
+        String[] stringArray = StringUtils.split( sl, "," );
 
         for ( int i = 0; i < stringArray.length; i++ )
         {

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java Fri Dec 17 23:54:50 2010
@@ -58,11 +58,11 @@ public class ClasspathConfiguration
 
     public ClasspathConfiguration( boolean enableAssertions, boolean childDelegation )
     {
-        this( new ArrayList(), new ArrayList(), enableAssertions, childDelegation);
+        this( new ArrayList(), new ArrayList(), enableAssertions, childDelegation );
     }
 
     /*
-   * Reads the config from the supplied stream. Closes the stream.
+    * Reads the config from the supplied stream. Closes the stream.
     */
     public ClasspathConfiguration( List classPathUrls, List surefireClassPathUrls, boolean enableAssertions,
                                    boolean childDelegation )

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=1050534&r1=1050533&r2=1050534&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 Fri Dec 17 23:54:50 2010
@@ -60,7 +60,7 @@ public class ForkedBooter
 
             File surefirePropertiesFile = new File( args[0] );
             InputStream stream = surefirePropertiesFile.exists() ? new FileInputStream( surefirePropertiesFile ) : null;
-            BooterDeserializer booterDeserializer = new BooterDeserializer(stream);
+            BooterDeserializer booterDeserializer = new BooterDeserializer( stream );
             ProviderConfiguration booterConfiguration = booterDeserializer.deserialize();
             final StartupConfiguration providerConfiguration = booterDeserializer.getProviderConfiguration();
 

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java Fri Dec 17 23:54:50 2010
@@ -194,7 +194,7 @@ public class PropertiesWrapper
 
         List list = new ArrayList();
 
-        String[] stringArray = StringUtils.split(sl, ",");
+        String[] stringArray = StringUtils.split( sl, "," );
 
         for ( int i = 0; i < stringArray.length; i++ )
         {

Modified: maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnit3TestChecker.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnit3TestChecker.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnit3TestChecker.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnit3TestChecker.java Fri Dec 17 23:54:50 2010
@@ -23,8 +23,6 @@ import org.apache.maven.surefire.NonAbst
 import org.apache.maven.surefire.util.ReflectionUtils;
 import org.apache.maven.surefire.util.ScannerFilter;
 
-import java.lang.reflect.Modifier;
-
 /**
  * @author Kristian Rosenvold
  */

Modified: maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java Fri Dec 17 23:54:50 2010
@@ -57,7 +57,7 @@ public class JUnitDirectoryTestSuite
         {
             testSet = new JUnitTestSet( testClass );
         }
-        else if (classHasPublicNoArgConstructor( testClass ))
+        else if ( classHasPublicNoArgConstructor( testClass ) )
         {
             testSet = new PojoTestSet( testClass );
         }
@@ -75,7 +75,7 @@ public class JUnitDirectoryTestSuite
         {
             junitClass = classLoader.loadClass( Test.class.getName() );
         }
-        catch ( NoClassDefFoundError e)
+        catch ( NoClassDefFoundError e )
         {
             // ignore this
         }

Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java Fri Dec 17 23:54:50 2010
@@ -36,7 +36,6 @@ import org.apache.maven.surefire.util.Te
 import org.junit.runner.notification.RunListener;
 import org.junit.runner.notification.RunNotifier;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -165,8 +164,8 @@ public class JUnit4Provider
     private void upgradeCheck()
         throws TestSetFailedException
     {
-        if ( isJunit4UpgradeCheck() &&
-            ( (DefaultDirectoryScanner) directoryScanner ).getClassesSkippedByValidation().size() > 0 )
+        if ( isJunit4UpgradeCheck()
+            && ( (DefaultDirectoryScanner) directoryScanner ).getClassesSkippedByValidation().size() > 0 )
         {
             StringBuilder reason = new StringBuilder();
             reason.append( "Updated check failed\n" );

Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestChecker.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestChecker.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestChecker.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestChecker.java Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.junit4;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSetReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSetReporter.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSetReporter.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSetReporter.java Fri Dec 17 23:54:50 2010
@@ -44,7 +44,8 @@ public class JUnit4TestSetReporter
     private ReporterManager reportMgr;
 
     /**
-     * This flag is set after a failure has occurred so that a <code>testSucceeded</code> event is not fired.  This is necessary because JUnit4 always fires a <code>testRunFinished</code> event-- even if there was a failure.
+     * This flag is set after a failure has occurred so that a <code>testSucceeded</code> event is not fired.
+     * This is necessary because JUnit4 always fires a <code>testRunFinished</code> event-- even if there was a failure.
      */
     private boolean failureFlag;
 
@@ -169,10 +170,10 @@ public class JUnit4TestSetReporter
     private String extractClassName( Description description )
     {
         String displayName = description.getDisplayName();
-        final Pattern PARENS = Pattern.compile( "^" + "[^\\(\\)]+" + //non-parens
-                                                    "\\((" + // then an open-paren (start matching a group)
-                                                    "[^\\\\(\\\\)]+" + //non-parens
-                                                    ")\\)" + "$" ); // then a close-paren (end group match)
+        final Pattern PARENS = Pattern.compile( "^" + "[^\\(\\)]+" //non-parens
+                                                    + "\\((" // then an open-paren (start matching a group)
+                                                    + "[^\\\\(\\\\)]+" //non-parens
+                                                    + ")\\)" + "$" ); // then a close-paren (end group match)
         Matcher m = PARENS.matcher( displayName );
         if ( !m.find() )
         {

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.junitcore;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentPrintStream.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentPrintStream.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentPrintStream.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentPrintStream.java Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.junitcore;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -33,7 +34,6 @@ class ConcurrentPrintStream
         isStdout = stdout;
     }
 
-
     public void write( byte[] buf, int off, int len )
     {
 
@@ -48,20 +48,17 @@ class ConcurrentPrintStream
         }
     }
 
-    public void writeTo(PrintStream printStream)
+    public void writeTo( PrintStream printStream )
         throws IOException
     {
-         ( (ByteArrayOutputStream) out ).writeTo(  printStream );
+        ( (ByteArrayOutputStream) out ).writeTo( printStream );
     }
 
     public void close()
     {
-
     }
 
     public void flush()
     {
     }
-
-
 }

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReportingRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReportingRunListener.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReportingRunListener.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReportingRunListener.java Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.junitcore;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java Fri Dec 17 23:54:50 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.surefire.junitcore;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.surefire.junitcore;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -57,8 +58,9 @@ public class ConfigurableParallelCompute
         this( true, true, Executors.newCachedThreadPool(), false );
     }
 
-    public ConfigurableParallelComputer(boolean fClasses, boolean fMethods) {
-        this ( fClasses, fMethods, Executors.newCachedThreadPool(), false);
+    public ConfigurableParallelComputer( boolean fClasses, boolean fMethods )
+    {
+        this( fClasses, fMethods, Executors.newCachedThreadPool(), false );
     }
 
     public ConfigurableParallelComputer( boolean fClasses, boolean fMethods, Integer numberOfThreads, boolean perCore )
@@ -144,8 +146,8 @@ public class ConfigurableParallelCompute
     @Override
     public String toString()
     {
-        return "ConfigurableParallelComputer{" + "classes=" + fClasses + ", methods=" + fMethods + ", fixedPool=" +
-            fixedPool + '}';
+        return "ConfigurableParallelComputer{" + "classes=" + fClasses + ", methods=" + fMethods + ", fixedPool="
+            + fixedPool + '}';
     }
 
     public class SynchronousRunner

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java Fri Dec 17 23:54:50 2010
@@ -95,7 +95,7 @@ class JUnitCoreParameters
     @Override
     public String toString()
     {
-        return "parallel='" + parallel + '\'' + ", perCoreThreadCount=" + perCoreThreadCount + ", threadCount=" +
-            threadCount + ", useUnlimitedThreads=" + useUnlimitedThreads;
+        return "parallel='" + parallel + '\'' + ", perCoreThreadCount=" + perCoreThreadCount + ", threadCount="
+            + threadCount + ", useUnlimitedThreads=" + useUnlimitedThreads;
     }
 }

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreStackTraceWriter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreStackTraceWriter.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreStackTraceWriter.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreStackTraceWriter.java Fri Dec 17 23:54:50 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.surefire.junitcore;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,8 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.surefire.junitcore;
-
 
 import org.apache.maven.surefire.report.StackTraceWriter;
 import org.junit.runner.notification.Failure;

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java Fri Dec 17 23:54:50 2010
@@ -86,19 +86,19 @@ class JUnitCoreWrapper
         return getConfigurableParallelComputer( jUnitCoreParameters );
     }
 
-    private static Computer getConfigurableParallelComputer( JUnitCoreParameters JUnitCoreParameters )
+    private static Computer getConfigurableParallelComputer( JUnitCoreParameters jUnitCoreParameters )
         throws TestSetFailedException
     {
-        if ( JUnitCoreParameters.isUseUnlimitedThreads() )
+        if ( jUnitCoreParameters.isUseUnlimitedThreads() )
         {
             return new ConfigurableParallelComputer();
         }
         else
         {
-            return new ConfigurableParallelComputer( JUnitCoreParameters.isParallelClasses(),
-                                                     JUnitCoreParameters.isParallelMethod(),
-                                                     JUnitCoreParameters.getThreadCount(),
-                                                     JUnitCoreParameters.isPerCoreThreadCount() );
+            return new ConfigurableParallelComputer( jUnitCoreParameters.isParallelClasses(),
+                                                     jUnitCoreParameters.isParallelMethod(),
+                                                     jUnitCoreParameters.getThreadCount(),
+                                                     jUnitCoreParameters.isPerCoreThreadCount() );
         }
     }
 }

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.junitcore;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.junitcore;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java Fri Dec 17 23:54:50 2010
@@ -50,9 +50,9 @@ class TestMethod
 
     private volatile Description ignored;
 
-    private static final ResourceBundle bundle = ResourceBundle.getBundle( Surefire.SUREFIRE_BUNDLE_NAME );
+    private static final ResourceBundle BUNDLE = ResourceBundle.getBundle( Surefire.SUREFIRE_BUNDLE_NAME );
 
-    private static final InheritableThreadLocal<TestMethod> testMethod = new InheritableThreadLocal<TestMethod>();
+    private static final InheritableThreadLocal<TestMethod> TEST_METHOD = new InheritableThreadLocal<TestMethod>();
 
     private volatile LogicalStream output;
 
@@ -143,14 +143,14 @@ class TestMethod
 
     private ReportEntry createReportEntry( String rawString2 )
     {
-        String rawString = bundle.getString( rawString2 );
+        String rawString = BUNDLE.getString( rawString2 );
         return new DefaultReportEntry( description.getTestClass().getCanonicalName(), description.getDisplayName(),
                                        rawString, getElapsed() );
     }
 
     private ReportEntry createFailureEntry( Failure failure, String rawString2 )
     {
-        String rawString = bundle.getString( rawString2 );
+        String rawString = BUNDLE.getString( rawString2 );
         return new DefaultReportEntry( failure.getDescription().getTestClass().getCanonicalName(),
                                        failure.getTestHeader(), rawString, new JUnitCoreStackTraceWriter( failure ),
                                        getElapsed() );
@@ -159,17 +159,17 @@ class TestMethod
 
     public void attachToThread()
     {
-        testMethod.set( this );
+        TEST_METHOD.set( this );
     }
 
     public static void detachFromCurrentThread()
     {
-        testMethod.remove();
+        TEST_METHOD.remove();
     }
 
     public static TestMethod getThreadTestMethod()
     {
-        return testMethod.get();
+        return TEST_METHOD.get();
     }
 
     public LogicalStream getLogicalStream()

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.junitcore;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -36,7 +37,7 @@ import java.util.concurrent.atomic.Atomi
  */
 public class TestSet
 {
-    private static ResourceBundle bundle = ResourceBundle.getBundle( Surefire.SUREFIRE_BUNDLE_NAME );
+    private static final ResourceBundle BUNDLE = ResourceBundle.getBundle( Surefire.SUREFIRE_BUNDLE_NAME );
 
     private final Description testSetDescription;
 
@@ -104,11 +105,11 @@ public class TestSet
 
     private ReportEntry createReportEntry( String rawString2, Integer elapsed )
     {
-        String rawString = bundle.getString( rawString2 );
+        String rawString = BUNDLE.getString( rawString2 );
         boolean isJunit3 = testSetDescription.getTestClass() == null;
         String classNameToUse =
             isJunit3 ? testSetDescription.getChildren().get( 0 ).getClassName() : testSetDescription.getClassName();
-        return new DefaultReportEntry( classNameToUse, classNameToUse, rawString, elapsed);
+        return new DefaultReportEntry( classNameToUse, classNameToUse, rawString, elapsed );
     }
 
     public void incrementTestMethodCount()

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/SynchronizedReporterManager.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/SynchronizedReporterManager.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/SynchronizedReporterManager.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/SynchronizedReporterManager.java Fri Dec 17 23:54:50 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.testng;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.testng
  * under the License.
  */
 
-
 import org.apache.maven.surefire.report.ReportEntry;
 import org.apache.maven.surefire.report.ReporterException;
 import org.apache.maven.surefire.report.ReporterManager;

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java Fri Dec 17 23:54:50 2010
@@ -50,7 +50,8 @@ public class TestNGExecutor
     }
 
     public static void run( Class[] testClasses, String testSourceDirectory, Map options, ArtifactVersion version,
-                            String classifier, ReporterManager reportManager, SurefireTestSuite suite, File reportsDirectory )
+                            String classifier, ReporterManager reportManager, SurefireTestSuite suite,
+                            File reportsDirectory )
         throws TestSetFailedException
     {
         TestNG testng = new TestNG( true );
@@ -62,7 +63,8 @@ public class TestNGExecutor
     }
 
     public static void run( List suiteFiles, String testSourceDirectory, Map options, ArtifactVersion version,
-                            String classifier, ReporterManager reportManager, SurefireTestSuite suite, File reportsDirectory )
+                            String classifier, ReporterManager reportManager, SurefireTestSuite suite,
+                            File reportsDirectory )
         throws TestSetFailedException
     {
         TestNG testng = new TestNG( true );
@@ -73,7 +75,8 @@ public class TestNGExecutor
         testng.run();
     }
 
-    private static Configurator getConfigurator( ArtifactVersion version ) throws TestSetFailedException
+    private static Configurator getConfigurator( ArtifactVersion version )
+        throws TestSetFailedException
     {
         try
         {
@@ -123,8 +126,10 @@ public class TestNGExecutor
 
     // If we have access to IResultListener, return a ConfigurationAwareTestNGReporter
     // But don't cause NoClassDefFoundErrors if it isn't available; just return a regular TestNGReporter instead
-    private static TestNGReporter createTestNGReporter( ReporterManager reportManager, SurefireTestSuite suite ) {
-        try {
+    private static TestNGReporter createTestNGReporter( ReporterManager reportManager, SurefireTestSuite suite )
+    {
+        try
+        {
             Class.forName( "org.testng.internal.IResultListener" );
             Class c = Class.forName( "org.apache.maven.surefire.testng.ConfigurationAwareTestNGReporter" );
             try
@@ -134,9 +139,11 @@ public class TestNGExecutor
             }
             catch ( Exception e )
             {
-                throw new RuntimeException("Bug in ConfigurationAwareTestNGReporter", e);
+                throw new RuntimeException( "Bug in ConfigurationAwareTestNGReporter", e );
             }
-        } catch (ClassNotFoundException e) {
+        }
+        catch ( ClassNotFoundException e )
+        {
             return new TestNGReporter( reportManager );
         }
     }
@@ -146,11 +153,15 @@ public class TestNGExecutor
         try
         {
             Class c = Class.forName( className );
-            if (IReporter.class.isAssignableFrom( c )) {
+            if ( IReporter.class.isAssignableFrom( c ) )
+            {
                 testNG.addListener( c.newInstance() );
             }
         }
-        catch ( Exception e ) {} // ignore
+        catch ( Exception e )
+        {
+            // ignore
+        }
     }
 
 }

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java Fri Dec 17 23:54:50 2010
@@ -31,7 +31,6 @@ import org.testng.ISuiteListener;
 import org.testng.ITestContext;
 import org.testng.ITestListener;
 import org.testng.ITestResult;
-import org.testng.TestNG;
 
 /**
  * Listens for and provides and adaptor layer so that

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java Fri Dec 17 23:54:50 2010
@@ -21,7 +21,6 @@ package org.apache.maven.surefire.testng
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -90,7 +89,7 @@ public class TestNGXmlTestSuite
             throw new IllegalStateException( "You must call locateTestSets before calling execute" );
         }
         ReporterManager reporterManager =
-            new SynchronizedReporterManager( reporterManagerFactory.createReporterManager());
+            new SynchronizedReporterManager( reporterManagerFactory.createReporterManager() );
         TestNGDirectoryTestSuite.startTestSuite( reporterManager, this );
         TestNGExecutor.run( this.suiteFilePaths, this.testSourceDirectory, this.options, this.version, 
                             this.classifier, reporterManager, this, reportsDirectory );
@@ -143,9 +142,11 @@ public class TestNGXmlTestSuite
         return this.testSets;
     }
     
-    public String getSuiteName() {
-        String result = (String) options.get("suitename");
-        if (result == null) {
+    public String getSuiteName()
+    {
+        String result = (String) options.get( "suitename" );
+        if ( result == null )
+        {
             result = "TestSuite";
         }
         return result;

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java?rev=1050534&r1=1050533&r2=1050534&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java Fri Dec 17 23:54:50 2010
@@ -46,10 +46,11 @@ public abstract class AbstractDirectConf
         this.setters = options;
     }
 
-    public void configure( TestNG testng, Map options ) throws TestSetFailedException
+    public void configure( TestNG testng, Map options )
+        throws TestSetFailedException
     {
         // kind of ugly, but listeners are configured differently
-        final String listeners = (String) options.remove("listener");
+        final String listeners = (String) options.remove( "listener" );
         // DGF In 4.7, default listeners dump XML files in the surefire-reports directory,
         // confusing the report plugin.  This was fixed in later versions.
         testng.setUseDefaultListeners( false );
@@ -74,18 +75,20 @@ public abstract class AbstractDirectConf
             }
         }
         // TODO: we should have the Profile so that we can decide if this is needed or not
-        testng.setListenerClasses(loadListenerClasses(listeners));
+        testng.setListenerClasses( loadListenerClasses( listeners ) );
     }
 
-    public static List loadListenerClasses(String listenerClasses) throws TestSetFailedException
+    public static List loadListenerClasses( String listenerClasses )
+        throws TestSetFailedException
     {
-        if (listenerClasses == null || "".equals(listenerClasses.trim())) {
+        if ( listenerClasses == null || "".equals( listenerClasses.trim() ) )
+        {
             return new ArrayList();
         }
 
         List classes = new ArrayList();
-        String[] classNames = listenerClasses.split(" *, *");
-        for(int i = 0; i < classNames.length; i++)
+        String[] classNames = listenerClasses.split( " *, *" );
+        for ( int i = 0; i < classNames.length; i++ )
         {
             String className = classNames[i];
             Class clazz = loadClass( className );
@@ -95,16 +98,16 @@ public abstract class AbstractDirectConf
         return classes;
     }
 
-    public static Class loadClass(String className )
+    public static Class loadClass( String className )
         throws TestSetFailedException
     {
         try
         {
             return Class.forName( className );
         }
-        catch(Exception ex)
+        catch ( Exception ex )
         {
-            throw new TestSetFailedException("Cannot find listener class " + className, ex);
+            throw new TestSetFailedException( "Cannot find listener class " + className, ex );
         }
     }
 
@@ -123,10 +126,10 @@ public abstract class AbstractDirectConf
         public void invoke( Object target, Object value )
             throws Exception
         {
-            Method setter = target.getClass().getMethod( this.setterName, new Class[]{this.paramClass} );
+            Method setter = target.getClass().getMethod( this.setterName, new Class[] { this.paramClass } );
             if ( setter != null )
             {
-                setter.invoke( target, new Object[]{convertValue( value )} );
+                setter.invoke( target, new Object[] { convertValue( value ) } );
             }
         }
 



Mime
View raw message