maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1039806 [1/2] - in /maven/surefire/trunk: surefire-api/src/main/java/org/apache/maven/surefire/ surefire-api/src/main/java/org/apache/maven/surefire/booter/ surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ surefire-api/src...
Date Sun, 28 Nov 2010 00:44:47 GMT
Author: hboutemy
Date: Sun Nov 28 00:44:45 2010
New Revision: 1039806

URL: http://svn.apache.org/viewvc?rev=1039806&view=rev
Log:
o removed unused imports
o fixed typos
o fixed code formatting convention

Modified:
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ApiReflector.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassScannerFilter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ProviderInvoker.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/SurefireReflector.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ApiSerializer.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/DirectoryScannerParametersAware.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/FileScanningProvider.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterManagerFactoryAware.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReportingAware.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/providerapi/TestArtifactInfoAware.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestClassLoaderAware.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestSuiteDefinitionAware.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/MulticastingReporter.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/ReporterConfiguration.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory2.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/SystemStreamCapturer.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/SuiteDefinition.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestArtifactInfo.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSuiteDefinition.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScannerFilter.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConfiguration.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/ProviderFactory.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StringUtils.java
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
    maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ApiReflector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ApiReflector.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ApiReflector.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ApiReflector.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassScannerFilter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassScannerFilter.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassScannerFilter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassScannerFilter.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,6 +18,7 @@ package org.apache.maven.surefire;
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import org.apache.maven.surefire.util.ScannerFilter;
 
 import java.lang.reflect.Modifier;

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ProviderInvoker.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ProviderInvoker.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ProviderInvoker.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/ProviderInvoker.java Sun Nov 28 00:44:45 2010
@@ -1,113 +1,112 @@
-package org.apache.maven.surefire;
-
-/*
- * 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.booter.SurefireReflector;
-import org.apache.maven.surefire.providerapi.ProviderConfiguration;
-import org.apache.maven.surefire.providerapi.ReporterManagerFactoryAware;
-import org.apache.maven.surefire.providerapi.SurefireProvider;
-import org.apache.maven.surefire.report.ReporterConfiguration;
-import org.apache.maven.surefire.report.ReporterException;
-import org.apache.maven.surefire.report.ReporterManagerFactory;
-import org.apache.maven.surefire.report.ReporterManagerFactory2;
-import org.apache.maven.surefire.report.RunStatistics;
-import org.apache.maven.surefire.suite.RunResult;
-import org.apache.maven.surefire.suite.SuiteDefinition;
-import org.apache.maven.surefire.testset.DirectoryScannerParameters;
-import org.apache.maven.surefire.testset.TestArtifactInfo;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.apache.maven.surefire.testset.TestSuiteDefinition;
-
-import java.util.List;
-import java.util.Properties;
-
-/**
- * Just outside the actual provider, always in the same classloader as the provider
- *
- * @author Jason van Zyl
- * @author Kristian Rosenvold
- * @version $Id$
- */
-public class ProviderInvoker
-{
-
-    private static final int NO_TESTS = 254;
-
-    public int run( ReporterConfiguration reporterConfiguration, List reportDefinitions,
-                    ClassLoader surefireClassLoader, ClassLoader testsClassLoader, Properties results,
-                    Boolean failIfNoTests, TestSuiteDefinition testSuiteDefinition, TestArtifactInfo testArtifactInfo,
-                    ProviderConfiguration providerConfiguration, DirectoryScannerParameters directoryScannerParameters )
-        throws ReporterException, TestSetFailedException
-    {
-        ReporterManagerFactory reporterManagerFactory =
-            new ReporterManagerFactory2( reportDefinitions, surefireClassLoader, reporterConfiguration );
-
-        RunStatistics runStatistics = reporterManagerFactory.getGlobalRunStatistics();
-        if ( results != null )
-        {
-            runStatistics.initResultsFromProperties( results );
-        }
-
-        int totalTests = 0;
-
-        SurefireReflector surefireReflector = new SurefireReflector( surefireClassLoader );
-        Object o = surefireReflector.newInstance( providerConfiguration );
-        SurefireProvider provider = (SurefireProvider) o;
-        surefireReflector.setIfDirScannerAware( o, directoryScannerParameters );
-        surefireReflector.setTestSuiteDefinitionAware( o, testSuiteDefinition );
-        surefireReflector.setProviderPropertiesAware( o, results );
-        surefireReflector.setReporterConfigurationAware( o, reporterConfiguration );
-        if ( o instanceof ReporterManagerFactoryAware )
-        {
-            ( (ReporterManagerFactoryAware) o ).setReporterManagerFactory( reporterManagerFactory );
-        }
-        surefireReflector.setTestClassLoaderAware( o, testsClassLoader );
-        surefireReflector.setTestArtifactInfoAware( o, testArtifactInfo );
-
-        RunResult invoke = provider.invoke();
-        int testCount = invoke.getCompletedCount(); // TODO: Verify that this is correct digit
-        if ( testCount > 0 )
-        {
-            totalTests += testCount;
-        }
-
-        if ( totalTests == 0 )
-        {
-            reporterManagerFactory.createReporterManager().writeMessage( "There are no tests to run." );
-        }
-
-        reporterManagerFactory.close();
-
-        if ( results != null )
-        {
-            runStatistics.updateResultsProperties( results );
-        }
-
-        if ( failIfNoTests.booleanValue() )
-        {
-            if ( runStatistics.getCompletedCount() == 0 )
-            {
-                return NO_TESTS;
-            }
-        }
-
-        return runStatistics.getRunResult().getBooterCode();
-    }
-}
+package org.apache.maven.surefire;
+
+/*
+ * 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.booter.SurefireReflector;
+import org.apache.maven.surefire.providerapi.ProviderConfiguration;
+import org.apache.maven.surefire.providerapi.ReporterManagerFactoryAware;
+import org.apache.maven.surefire.providerapi.SurefireProvider;
+import org.apache.maven.surefire.report.ReporterConfiguration;
+import org.apache.maven.surefire.report.ReporterException;
+import org.apache.maven.surefire.report.ReporterManagerFactory;
+import org.apache.maven.surefire.report.ReporterManagerFactory2;
+import org.apache.maven.surefire.report.RunStatistics;
+import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.testset.DirectoryScannerParameters;
+import org.apache.maven.surefire.testset.TestArtifactInfo;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+import org.apache.maven.surefire.testset.TestSuiteDefinition;
+
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * Just outside the actual provider, always in the same classloader as the provider
+ *
+ * @author Jason van Zyl
+ * @author Kristian Rosenvold
+ * @version $Id$
+ */
+public class ProviderInvoker
+{
+
+    private static final int NO_TESTS = 254;
+
+    public int run( ReporterConfiguration reporterConfiguration, List reportDefinitions,
+                    ClassLoader surefireClassLoader, ClassLoader testsClassLoader, Properties results,
+                    Boolean failIfNoTests, TestSuiteDefinition testSuiteDefinition, TestArtifactInfo testArtifactInfo,
+                    ProviderConfiguration providerConfiguration, DirectoryScannerParameters directoryScannerParameters )
+        throws ReporterException, TestSetFailedException
+    {
+        ReporterManagerFactory reporterManagerFactory =
+            new ReporterManagerFactory2( reportDefinitions, surefireClassLoader, reporterConfiguration );
+
+        RunStatistics runStatistics = reporterManagerFactory.getGlobalRunStatistics();
+        if ( results != null )
+        {
+            runStatistics.initResultsFromProperties( results );
+        }
+
+        int totalTests = 0;
+
+        SurefireReflector surefireReflector = new SurefireReflector( surefireClassLoader );
+        Object o = surefireReflector.newInstance( providerConfiguration );
+        SurefireProvider provider = (SurefireProvider) o;
+        surefireReflector.setIfDirScannerAware( o, directoryScannerParameters );
+        surefireReflector.setTestSuiteDefinitionAware( o, testSuiteDefinition );
+        surefireReflector.setProviderPropertiesAware( o, results );
+        surefireReflector.setReporterConfigurationAware( o, reporterConfiguration );
+        if ( o instanceof ReporterManagerFactoryAware )
+        {
+            ( (ReporterManagerFactoryAware) o ).setReporterManagerFactory( reporterManagerFactory );
+        }
+        surefireReflector.setTestClassLoaderAware( o, testsClassLoader );
+        surefireReflector.setTestArtifactInfoAware( o, testArtifactInfo );
+
+        RunResult invoke = provider.invoke();
+        int testCount = invoke.getCompletedCount(); // TODO: Verify that this is correct digit
+        if ( testCount > 0 )
+        {
+            totalTests += testCount;
+        }
+
+        if ( totalTests == 0 )
+        {
+            reporterManagerFactory.createReporterManager().writeMessage( "There are no tests to run." );
+        }
+
+        reporterManagerFactory.close();
+
+        if ( results != null )
+        {
+            runStatistics.updateResultsProperties( results );
+        }
+
+        if ( failIfNoTests.booleanValue() )
+        {
+            if ( runStatistics.getCompletedCount() == 0 )
+            {
+                return NO_TESTS;
+            }
+        }
+
+        return runStatistics.getRunResult().getBooterCode();
+    }
+}

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=1039806&r1=1039805&r2=1039806&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 Sun Nov 28 00:44:45 2010
@@ -1,217 +1,218 @@
-package org.apache.maven.surefire;
-
-/*
- * 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.ReporterException;
-import org.apache.maven.surefire.report.ReporterManagerFactory;
-import org.apache.maven.surefire.report.RunStatistics;
-import org.apache.maven.surefire.suite.SuiteDefinition;
-import org.apache.maven.surefire.suite.SurefireTestSuite;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @author Jason van Zyl
- * @version $Id$
- */
-// todo: Remove once we build with 2.7
-public class Surefire
-{
-
-    private static final int SUCCESS = 0;
-
-    private static final int NO_TESTS = 254;
-
-    private static final int FAILURE = 255;
-
-    public static final String SUREFIRE_BUNDLE_NAME = "org.apache.maven.surefire.surefire";
-
-    // DGF backwards compatibility
-    public boolean run( List reportDefinitions, Object[] testSuiteDefinition, String testSetName,
-                        ClassLoader surefireClassLoader, ClassLoader testsClassLoader )
-        throws ReporterException, TestSetFailedException
-    {
-        return run( reportDefinitions, testSuiteDefinition, testSetName, surefireClassLoader, testsClassLoader, null,
-                    Boolean.FALSE ) == 0;
-    }
-
-    public int run( List reportDefinitions, Object[] testSuiteDefinition, String testSetName,
-                    ClassLoader surefireClassLoader, ClassLoader testsClassLoader, Boolean failIfNoTests )
-        throws ReporterException, TestSetFailedException
-    {
-        return run( reportDefinitions, testSuiteDefinition, testSetName, surefireClassLoader, testsClassLoader, null,
-                    failIfNoTests );
-    }
-
-    // DGF backwards compatibility
-    public boolean run( List reportDefinitions, Object[] testSuiteDefinition, String testSetName,
-                        ClassLoader surefireClassLoader, ClassLoader testsClassLoader, Properties results )
-        throws ReporterException, TestSetFailedException
-    {
-        return run( reportDefinitions, testSuiteDefinition, testSetName, surefireClassLoader, testsClassLoader, results,
-                    Boolean.FALSE ) == 0;
-    }
-
-    public int run( List reportDefinitions, Object[] testSuiteDefinition, String testSetName,
-                    ClassLoader surefireClassLoader, ClassLoader testsClassLoader, Properties results,
-                    Boolean failIfNoTests )
-        throws ReporterException, TestSetFailedException
-    {
-        ReporterManagerFactory reporterManagerFactory =
-            new ReporterManagerFactory( reportDefinitions, surefireClassLoader );
-
-        SuiteDefinition suiteDefinition =
-            SuiteDefinition.fromBooterFormat( Collections.singletonList( testSuiteDefinition ) );
-
-        RunStatistics runStatistics = reporterManagerFactory.getGlobalRunStatistics();
-        if ( results != null )
-        {
-            runStatistics.initResultsFromProperties( results );
-        }
-
-        int totalTests = 0;
-
-        SurefireTestSuite suite = createSuiteFromDefinition( suiteDefinition, surefireClassLoader, testsClassLoader );
-
-        int testCount = suite.getNumTests();
-        if ( testCount > 0 )
-        {
-            totalTests += testCount;
-        }
-
-        if ( totalTests == 0 )
-        {
-            reporterManagerFactory.createReporterManager().writeMessage( "There are no tests to run." );
-        }
-        else
-        {
-            suite.execute( testSetName, reporterManagerFactory, testsClassLoader );
-        }
-
-        reporterManagerFactory.close();
-
-        if ( results != null )
-        {
-            runStatistics.updateResultsProperties( results );
-        }
-
-        if ( failIfNoTests.booleanValue() )
-        {
-            if ( runStatistics.getCompletedCount() == 0 )
-            {
-                return NO_TESTS;
-            }
-        }
-
-        return runStatistics.isProblemFree() ? SUCCESS : FAILURE;
-
-    }
-
-    public boolean run( List reportDefinitions, List testSuiteDefinitions, ClassLoader surefireClassLoader,
-                        ClassLoader testsClassLoader )
-        throws ReporterException, TestSetFailedException
-    {
-        return run( reportDefinitions, testSuiteDefinitions, surefireClassLoader, testsClassLoader, Boolean.FALSE ) ==
-            0;
-    }
-
-    public int run( List reportDefinitions, List testSuiteDefinitions, ClassLoader surefireClassLoader,
-                    ClassLoader testsClassLoader, Boolean failIfNoTests )
-        throws ReporterException, TestSetFailedException
-    {
-        ReporterManagerFactory reporterManagerFactory =
-            new ReporterManagerFactory( reportDefinitions, surefireClassLoader );
-
-        RunStatistics runStatistics = reporterManagerFactory.getGlobalRunStatistics();
-
-        int totalTests = 0;
-        SuiteDefinition definition = SuiteDefinition.fromBooterFormat( testSuiteDefinitions );
-        SurefireTestSuite suite = createSuiteFromDefinition( definition, surefireClassLoader, testsClassLoader );
-
-        int testCount = suite.getNumTests();
-        if ( testCount > 0 )
-        {
-            totalTests += testCount;
-        }
-
-        if ( totalTests == 0 ){
-            reporterManagerFactory.createReporterManager().writeMessage( "There are no tests to run." );
-        }
-        else
-        {
-            suite.execute( reporterManagerFactory, testsClassLoader );
-        }
-
-        reporterManagerFactory.close();
-        if ( failIfNoTests.booleanValue() )
-        {
-            if ( runStatistics.getCompletedCount() == 0 )
-            {
-                return NO_TESTS;
-            }
-        }
-
-        return runStatistics.isProblemFree() ? SUCCESS : FAILURE;
-    }
-
-    private SurefireTestSuite createSuiteFromDefinition( SuiteDefinition definition, ClassLoader surefireClassLoader,
-                                                         ClassLoader testsClassLoader )
-        throws TestSetFailedException
-    {
-        SurefireTestSuite suite = definition.newInstance( surefireClassLoader );
-
-        suite.locateTestSets( testsClassLoader );
-
-        // Todo: Make this not ugly OR just leave it here as a transitional feature for a few versions
-        // I will move this into the JUnit4DirectoryTestSuite when fixing SUREFIRE-141 RSN
-        // SUREFIRE-141 will require loosening the relationship between surefire and the providers,
-        // which is basically way too constrained and locked into a design that is only correct for
-        // junit3 with the AbstractDirectoryTestSuite.
-        // This same constraint is making it hard to put this code in the proper place.
-        if ( isJunit4UpgradeCheck() && suite.getClassesSkippedByValidation().size() > 0 &&
-            suite.getClass().getName().equals( "org.apache.maven.surefire.junit4.JUnit4DirectoryTestSuite" ) )
-        {
-
-            StringBuilder reason = new StringBuilder();
-            reason.append( "Updated check failed\n" );
-            reason.append( "There are tests that would be run with junit4 / surefire 2.6 but not with [2.7,):\n" );
-            for ( Iterator i = suite.getClassesSkippedByValidation().iterator(); i.hasNext(); )
-            {
-                Class testClass = (Class) i.next();
-                reason.append( "   " );
-                reason.append( testClass.getCanonicalName() );
-                reason.append( "\n" );
-            }
-            throw new TestSetFailedException( reason.toString() );
-        }
-
-        return suite;
-    }
-
-    private boolean isJunit4UpgradeCheck()
-    {
-        final String property = System.getProperty( "surefire.junit4.upgradecheck" );
-        return property != null;
-    }
-}
+package org.apache.maven.surefire;
+
+/*
+ * 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.ReporterException;
+import org.apache.maven.surefire.report.ReporterManagerFactory;
+import org.apache.maven.surefire.report.RunStatistics;
+import org.apache.maven.surefire.suite.SuiteDefinition;
+import org.apache.maven.surefire.suite.SurefireTestSuite;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @author Jason van Zyl
+ * @version $Id$
+ */
+// todo: Remove once we build with 2.7
+public class Surefire
+{
+
+    private static final int SUCCESS = 0;
+
+    private static final int NO_TESTS = 254;
+
+    private static final int FAILURE = 255;
+
+    public static final String SUREFIRE_BUNDLE_NAME = "org.apache.maven.surefire.surefire";
+
+    // DGF backwards compatibility
+    public boolean run( List reportDefinitions, Object[] testSuiteDefinition, String testSetName,
+                        ClassLoader surefireClassLoader, ClassLoader testsClassLoader )
+        throws ReporterException, TestSetFailedException
+    {
+        return run( reportDefinitions, testSuiteDefinition, testSetName, surefireClassLoader, testsClassLoader, null,
+                    Boolean.FALSE ) == 0;
+    }
+
+    public int run( List reportDefinitions, Object[] testSuiteDefinition, String testSetName,
+                    ClassLoader surefireClassLoader, ClassLoader testsClassLoader, Boolean failIfNoTests )
+        throws ReporterException, TestSetFailedException
+    {
+        return run( reportDefinitions, testSuiteDefinition, testSetName, surefireClassLoader, testsClassLoader, null,
+                    failIfNoTests );
+    }
+
+    // DGF backwards compatibility
+    public boolean run( List reportDefinitions, Object[] testSuiteDefinition, String testSetName,
+                        ClassLoader surefireClassLoader, ClassLoader testsClassLoader, Properties results )
+        throws ReporterException, TestSetFailedException
+    {
+        return run( reportDefinitions, testSuiteDefinition, testSetName, surefireClassLoader, testsClassLoader, results,
+                    Boolean.FALSE ) == 0;
+    }
+
+    public int run( List reportDefinitions, Object[] testSuiteDefinition, String testSetName,
+                    ClassLoader surefireClassLoader, ClassLoader testsClassLoader, Properties results,
+                    Boolean failIfNoTests )
+        throws ReporterException, TestSetFailedException
+    {
+        ReporterManagerFactory reporterManagerFactory =
+            new ReporterManagerFactory( reportDefinitions, surefireClassLoader );
+
+        SuiteDefinition suiteDefinition =
+            SuiteDefinition.fromBooterFormat( Collections.singletonList( testSuiteDefinition ) );
+
+        RunStatistics runStatistics = reporterManagerFactory.getGlobalRunStatistics();
+        if ( results != null )
+        {
+            runStatistics.initResultsFromProperties( results );
+        }
+
+        int totalTests = 0;
+
+        SurefireTestSuite suite = createSuiteFromDefinition( suiteDefinition, surefireClassLoader, testsClassLoader );
+
+        int testCount = suite.getNumTests();
+        if ( testCount > 0 )
+        {
+            totalTests += testCount;
+        }
+
+        if ( totalTests == 0 )
+        {
+            reporterManagerFactory.createReporterManager().writeMessage( "There are no tests to run." );
+        }
+        else
+        {
+            suite.execute( testSetName, reporterManagerFactory, testsClassLoader );
+        }
+
+        reporterManagerFactory.close();
+
+        if ( results != null )
+        {
+            runStatistics.updateResultsProperties( results );
+        }
+
+        if ( failIfNoTests.booleanValue() )
+        {
+            if ( runStatistics.getCompletedCount() == 0 )
+            {
+                return NO_TESTS;
+            }
+        }
+
+        return runStatistics.isProblemFree() ? SUCCESS : FAILURE;
+
+    }
+
+    public boolean run( List reportDefinitions, List testSuiteDefinitions, ClassLoader surefireClassLoader,
+                        ClassLoader testsClassLoader )
+        throws ReporterException, TestSetFailedException
+    {
+        return run( reportDefinitions, testSuiteDefinitions, surefireClassLoader, testsClassLoader, Boolean.FALSE ) ==
+            0;
+    }
+
+    public int run( List reportDefinitions, List testSuiteDefinitions, ClassLoader surefireClassLoader,
+                    ClassLoader testsClassLoader, Boolean failIfNoTests )
+        throws ReporterException, TestSetFailedException
+    {
+        ReporterManagerFactory reporterManagerFactory =
+            new ReporterManagerFactory( reportDefinitions, surefireClassLoader );
+
+        RunStatistics runStatistics = reporterManagerFactory.getGlobalRunStatistics();
+
+        int totalTests = 0;
+        SuiteDefinition definition = SuiteDefinition.fromBooterFormat( testSuiteDefinitions );
+        SurefireTestSuite suite = createSuiteFromDefinition( definition, surefireClassLoader, testsClassLoader );
+
+        int testCount = suite.getNumTests();
+        if ( testCount > 0 )
+        {
+            totalTests += testCount;
+        }
+
+        if ( totalTests == 0 )
+        {
+            reporterManagerFactory.createReporterManager().writeMessage( "There are no tests to run." );
+        }
+        else
+        {
+            suite.execute( reporterManagerFactory, testsClassLoader );
+        }
+
+        reporterManagerFactory.close();
+        if ( failIfNoTests.booleanValue() )
+        {
+            if ( runStatistics.getCompletedCount() == 0 )
+            {
+                return NO_TESTS;
+            }
+        }
+
+        return runStatistics.isProblemFree() ? SUCCESS : FAILURE;
+    }
+
+    private SurefireTestSuite createSuiteFromDefinition( SuiteDefinition definition, ClassLoader surefireClassLoader,
+                                                         ClassLoader testsClassLoader )
+        throws TestSetFailedException
+    {
+        SurefireTestSuite suite = definition.newInstance( surefireClassLoader );
+
+        suite.locateTestSets( testsClassLoader );
+
+        // Todo: Make this not ugly OR just leave it here as a transitional feature for a few versions
+        // I will move this into the JUnit4DirectoryTestSuite when fixing SUREFIRE-141 RSN
+        // SUREFIRE-141 will require loosening the relationship between surefire and the providers,
+        // which is basically way too constrained and locked into a design that is only correct for
+        // junit3 with the AbstractDirectoryTestSuite.
+        // This same constraint is making it hard to put this code in the proper place.
+        if ( isJunit4UpgradeCheck() && suite.getClassesSkippedByValidation().size() > 0 &&
+            suite.getClass().getName().equals( "org.apache.maven.surefire.junit4.JUnit4DirectoryTestSuite" ) )
+        {
+
+            StringBuilder reason = new StringBuilder();
+            reason.append( "Updated check failed\n" );
+            reason.append( "There are tests that would be run with junit4 / surefire 2.6 but not with [2.7,):\n" );
+            for ( Iterator i = suite.getClassesSkippedByValidation().iterator(); i.hasNext(); )
+            {
+                Class testClass = (Class) i.next();
+                reason.append( "   " );
+                reason.append( testClass.getCanonicalName() );
+                reason.append( "\n" );
+            }
+            throw new TestSetFailedException( reason.toString() );
+        }
+
+        return suite;
+    }
+
+    private boolean isJunit4UpgradeCheck()
+    {
+        final String property = System.getProperty( "surefire.junit4.upgradecheck" );
+        return property != null;
+    }
+}

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=1039806&r1=1039805&r2=1039806&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 Nov 28 00:44:45 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

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ApiSerializer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ApiSerializer.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ApiSerializer.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ApiSerializer.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/DirectoryScannerParametersAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/DirectoryScannerParametersAware.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/DirectoryScannerParametersAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/DirectoryScannerParametersAware.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,13 +20,11 @@ package org.apache.maven.surefire.provid
  */
 
 import org.apache.maven.surefire.testset.DirectoryScannerParameters;
-import org.apache.maven.surefire.util.DirectoryScanner;
 
 /**
  * @author Kristian Rosenvold
  */
 public interface DirectoryScannerParametersAware
 {
-    public void setDirectoryScannerParameters(
-        org.apache.maven.surefire.testset.DirectoryScannerParameters directoryScanner );
+    public void setDirectoryScannerParameters( DirectoryScannerParameters directoryScanner );
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/FileScanningProvider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/FileScanningProvider.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/FileScanningProvider.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/FileScanningProvider.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -31,7 +32,8 @@ import org.apache.maven.surefire.util.Di
  * @author Kristian Rosenvold
  */
 public class FileScanningProvider
-    implements DirectoryScannerParametersAware, ReportingAware, TestClassLoaderAware, TestSuiteDefinitionAware,ReporterManagerFactoryAware
+    implements DirectoryScannerParametersAware, ReportingAware, TestClassLoaderAware, TestSuiteDefinitionAware,
+    ReporterManagerFactoryAware
 {
     private DirectoryScannerParameters directoryScannerParameters;
 

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -26,5 +27,4 @@ import java.util.Properties;
 public interface ProviderPropertiesAware
 {
     void setProviderProperties( Properties providerProperties );
-
 }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,7 +20,6 @@ package org.apache.maven.surefire.provid
  */
 
 import org.apache.maven.surefire.report.ReporterConfiguration;
-import org.apache.maven.surefire.testset.TestSuiteDefinition;
 
 /**
  * @author Kristian Rosenvold

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterManagerFactoryAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterManagerFactoryAware.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterManagerFactoryAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterManagerFactoryAware.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReportingAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReportingAware.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReportingAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReportingAware.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

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=1039806&r1=1039805&r2=1039806&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 Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -25,7 +26,7 @@ import org.apache.maven.surefire.testset
 import java.util.Iterator;
 
 /**
- * Interface to be implemented by all surefire providers.
+ * Interface to be implemented by all Surefire providers.
  *
  * @author Kristian Rosenvold
  */

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestArtifactInfoAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestArtifactInfoAware.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestArtifactInfoAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestArtifactInfoAware.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,7 +20,6 @@ package org.apache.maven.surefire.provid
  */
 
 import org.apache.maven.surefire.testset.TestArtifactInfo;
-import org.apache.maven.surefire.testset.TestSuiteDefinition;
 
 /**
  * @author Kristian Rosenvold

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestClassLoaderAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestClassLoaderAware.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestClassLoaderAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestClassLoaderAware.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +19,6 @@ package org.apache.maven.surefire.provid
  * under the License.
  */
 
-import org.apache.maven.surefire.suite.SuiteDefinition;
-
 /**
  * @author Kristian Rosenvold
  */

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestSuiteDefinitionAware.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestSuiteDefinitionAware.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestSuiteDefinitionAware.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestSuiteDefinitionAware.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.providerapi;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

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=1039806&r1=1039805&r2=1039806&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 Nov 28 00:44:45 2010
@@ -42,7 +42,7 @@ public abstract class AbstractConsoleRep
 
     private static final PrintStream originalSystemOut = System.out;
 
-    protected AbstractConsoleReporter( String format, ReporterConfiguration reporterConfiguration)
+    protected AbstractConsoleReporter( String format, ReporterConfiguration reporterConfiguration )
     {
         // TODO: use logger
         super( new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( originalSystemOut, BUFFER_SIZE ) ) ), format,

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java Sun Nov 28 00:44:45 2010
@@ -56,7 +56,7 @@ public abstract class AbstractReporter
     // ----------------------------------------------------------------------
 
 
-    protected AbstractReporter( ReporterConfiguration reporterConfiguration)
+    protected AbstractReporter( ReporterConfiguration reporterConfiguration )
     {
         this.trimStackTrace = reporterConfiguration.isTrimStackTrace().booleanValue();
     }
@@ -197,7 +197,6 @@ public abstract class AbstractReporter
         {
             return null;
         }
-        return trimStackTrace ? writer.writeTrimmedTraceToString()
-            : writer.writeTraceToString();
+        return trimStackTrace ? writer.writeTrimmedTraceToString() : writer.writeTraceToString();
     }
 }

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=1039806&r1=1039805&r2=1039806&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 Nov 28 00:44:45 2010
@@ -53,7 +53,7 @@ public abstract class AbstractTextReport
         this.format = format;
     }
 
-    /** @deprecated Can be removed once we build surfire with 2.7 */
+    /** @deprecated Can be removed once we build Surefire with 2.7 */
     protected AbstractTextReporter( String format, Boolean trimStackTrace )
     {
         super( trimStackTrace );
@@ -61,7 +61,7 @@ public abstract class AbstractTextReport
         this.format = format;
     }
 
-    /** @deprecated Can be removed once we build surfire with 2.7 */
+    /** @deprecated Can be removed once we build Surefire with 2.7 */
     protected AbstractTextReporter( PrintWriter writer, String format, Boolean trimStackTrace )
     {
         super( trimStackTrace );

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java Sun Nov 28 00:44:45 2010
@@ -29,12 +29,12 @@ package org.apache.maven.surefire.report
 public class BriefConsoleReporter
     extends AbstractConsoleReporter
 {
-    public BriefConsoleReporter( ReporterConfiguration reporterConfiguration)
+    public BriefConsoleReporter( ReporterConfiguration reporterConfiguration )
     {
         super( BRIEF, reporterConfiguration );
     }
 
-    /** @deprecated Can be removed once we build surfire with 2.7 */
+    /** @deprecated Can be removed once we build Surefire with 2.7 */
     public BriefConsoleReporter( Boolean trimStackTrace )
     {
         super( BRIEF, trimStackTrace );

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=1039806&r1=1039805&r2=1039806&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 Nov 28 00:44:45 2010
@@ -30,12 +30,12 @@ import java.io.File;
 public class BriefFileReporter
     extends AbstractFileReporter
 {
-    public BriefFileReporter( ReporterConfiguration reporterConfiguration)
+    public BriefFileReporter( ReporterConfiguration reporterConfiguration )
     {
-        super( reporterConfiguration, BRIEF);
+        super( reporterConfiguration, BRIEF );
     }
 
-    /** @deprecated Can be removed once we build surfire with 2.7 */
+    /** @deprecated Can be removed once we build Surefire with 2.7 */
     public BriefFileReporter( File reportsDirectory, Boolean trimStackTrace )
     {
         super( reportsDirectory, BRIEF, trimStackTrace );

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java Sun Nov 28 00:44:45 2010
@@ -32,7 +32,8 @@ public class ConsoleReporter
     {
         super( SUMMARY, reporterConfiguration );
     }
-    /** @deprecated Can be removed once we build surfire with 2.7 */
+
+    /** @deprecated Can be removed once we build Surefire with 2.7 */
     public ConsoleReporter( Boolean trimStackTrace )
     {
         super( SUMMARY, trimStackTrace );

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java Sun Nov 28 00:44:45 2010
@@ -28,11 +28,12 @@ package org.apache.maven.surefire.report
 public class DetailedConsoleReporter
     extends AbstractConsoleReporter
 {
-    public DetailedConsoleReporter( ReporterConfiguration reporterConfiguration)
+    public DetailedConsoleReporter( ReporterConfiguration reporterConfiguration )
     {
         super( PLAIN, reporterConfiguration );
     }
-    /** @deprecated Can be removed once we build surfire with 2.7 */
+
+    /** @deprecated Can be removed once we build Surefire with 2.7 */
     public DetailedConsoleReporter( Boolean trimStackTrace )
     {
         super( PLAIN, trimStackTrace );

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/FileReporter.java Sun Nov 28 00:44:45 2010
@@ -30,12 +30,12 @@ import java.io.File;
 public class FileReporter
     extends AbstractFileReporter
 {
-    public FileReporter( ReporterConfiguration reporterConfiguration)
+    public FileReporter( ReporterConfiguration reporterConfiguration )
     {
         super( reporterConfiguration, PLAIN );
     }
 
-    /** @deprecated Can be removed once we build surfire with 2.7 */
+    /** @deprecated Can be removed once we build Surefire with 2.7 */
     public FileReporter( File reportsDirectory, Boolean trimStackTrace )
     {
         super( reportsDirectory, PLAIN, trimStackTrace );

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java Sun Nov 28 00:44:45 2010
@@ -48,7 +48,7 @@ public class ForkingConsoleReporter
         super( reporterConfiguration );
     }
 
-    /** @deprecated Can be removed once we build surfire with 2.7 */
+    /** @deprecated Can be removed once we build Surefire with 2.7 */
     public ForkingConsoleReporter( Boolean trimStackTrace )
     {
         super( trimStackTrace );

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=1039806&r1=1039805&r2=1039806&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 Nov 28 00:44:45 2010
@@ -126,8 +126,9 @@ public class MulticastingReporter
         {
             Reporter reporter = ( (Reporter) it.next() );
             // Todo: Really need to find out how the surefire4.x provider manages to avoid printing to this one.
-            if (!(reporter instanceof BriefFileReporter)){
-               reporter.writeMessage( message);
+            if ( !( reporter instanceof BriefFileReporter ) )
+            {
+                reporter.writeMessage( message );
             }
         }
     }

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=1039806&r1=1039805&r2=1039806&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 Sun Nov 28 00:44:45 2010
@@ -160,7 +160,7 @@ public class ReportEntry
 
     public boolean equals( Object obj )
     {
-        if ( !(obj instanceof ReportEntry ) )
+        if ( !( obj instanceof ReportEntry ) )
         {
             return false;
         }

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.report;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory.java Sun Nov 28 00:44:45 2010
@@ -19,7 +19,6 @@ package org.apache.maven.surefire.report
  * under the License.
  */
 
-
 import org.apache.maven.surefire.testset.TestSetFailedException;
 
 import java.lang.reflect.Constructor;

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory2.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory2.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory2.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterManagerFactory2.java Sun Nov 28 00:44:45 2010
@@ -19,7 +19,6 @@ package org.apache.maven.surefire.report
  * under the License.
  */
 
-
 import org.apache.maven.surefire.report.Reporter;
 import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.ReporterManager;

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/RunStatistics.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.report;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -28,8 +29,6 @@ import java.util.Collections;
 public class RunStatistics
     extends TestSetStatistics
 {
-
-
     /**
      * Holds the source(s) that causes the error(s).
      */

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/SystemStreamCapturer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/SystemStreamCapturer.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/SystemStreamCapturer.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/SystemStreamCapturer.java Sun Nov 28 00:44:45 2010
@@ -30,7 +30,7 @@ import java.io.PrintStream;
  * <p/>
  * Please note that this design is inherently single-threaded test-linear, and is intended only
  * for use with ReporterManager, which is also test-linear. While it will capture
- * output in a multi-threaded scenario, there's no way to associate ouput with the correct
+ * output in a multi-threaded scenario, there's no way to associate output with the correct
  * test/thread.
  * <p/>
  * Note; this class does not need synchronization because all of these methods are serially invoked on

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestSetStatistics.java Sun Nov 28 00:44:45 2010
@@ -111,14 +111,15 @@ public class TestSetStatistics
     }
 
 
-    public synchronized RunResult getRunResult(){
+    public synchronized RunResult getRunResult()
+    {
         return new RunResult( completedCount, errors, failures, skipped );
     }
 
     public synchronized String getSummary()
     {
-        return "Tests run: " + completedCount + ", Failures: " + failures + ", Errors: " + errors + ", Skipped: " +
-            skipped;
+        return "Tests run: " + completedCount + ", Failures: " + failures + ", Errors: " + errors + ", Skipped: "
+            + skipped;
     }
 
 }

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=1039806&r1=1039805&r2=1039806&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 Nov 28 00:44:45 2010
@@ -39,7 +39,6 @@ import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomWriter;
 
-
 /**
  * XML format reporter.
  *
@@ -55,7 +54,7 @@ public class XMLReporter
 
     private List results = Collections.synchronizedList( new ArrayList() );
 
-    public XMLReporter( ReporterConfiguration reporterConfiguration)
+    public XMLReporter( ReporterConfiguration reporterConfiguration )
     {
         super( reporterConfiguration );
 

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.suite;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/SuiteDefinition.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/SuiteDefinition.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/SuiteDefinition.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/SuiteDefinition.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.suite;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.testset;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,7 +20,6 @@ package org.apache.maven.surefire.testse
  */
 
 import java.io.File;
-import java.lang.reflect.Field;
 import java.util.List;
 
 /**

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestArtifactInfo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestArtifactInfo.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestArtifactInfo.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestArtifactInfo.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.testset;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSuiteDefinition.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSuiteDefinition.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSuiteDefinition.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSuiteDefinition.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.testset;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,10 +19,7 @@ package org.apache.maven.surefire.util;
  * under the License.
  */
 
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
 import java.io.File;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +19,6 @@ package org.apache.maven.surefire.util;
  * under the License.
  */
 
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
 /**
  * @author Kristian Rosenvold
  */

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScannerFilter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScannerFilter.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScannerFilter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScannerFilter.java Sun Nov 28 00:44:45 2010
@@ -1,4 +1,5 @@
 package org.apache.maven.surefire.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConfiguration.java?rev=1039806&r1=1039805&r2=1039806&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConfiguration.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConfiguration.java Sun Nov 28 00:44:45 2010
@@ -21,7 +21,6 @@ package org.apache.maven.surefire.booter
 
 import org.apache.maven.surefire.providerapi.ProviderConfiguration;
 import org.apache.maven.surefire.report.ReporterConfiguration;
-import org.apache.maven.surefire.suite.SuiteDefinition;
 import org.apache.maven.surefire.testset.DirectoryScannerParameters;
 import org.apache.maven.surefire.testset.TestArtifactInfo;
 import org.apache.maven.surefire.testset.TestSuiteDefinition;

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=1039806&r1=1039805&r2=1039806&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 Nov 28 00:44:45 2010
@@ -101,17 +101,17 @@ public class BooterDeserializer
         {
             String name = (String) e.nextElement();
 
-            if (name.startsWith(REPORT_PROPERTY_PREFIX) && !isTypeHolderProperty(name))
+            if ( name.startsWith( REPORT_PROPERTY_PREFIX ) && !isTypeHolderProperty( name ) )
             {
                 String className = properties.getProperty( name );
                 reportsMap.put( name, className );
             }
-            else if ( name.startsWith( INCLUDES_PROPERTY_PREFIX ) && !isTypeHolderProperty(name)  )
+            else if ( name.startsWith( INCLUDES_PROPERTY_PREFIX ) && !isTypeHolderProperty( name ) )
             {
                 String className = properties.getProperty( name );
                 includes.put( name, className );
             }
-            else if ( name.startsWith( EXCLUDES_PROPERTY_PREFIX) && !isTypeHolderProperty(name) )
+            else if ( name.startsWith( EXCLUDES_PROPERTY_PREFIX ) && !isTypeHolderProperty( name ) )
             {
                 String className = properties.getProperty( name );
                 excludes.put( name, className );
@@ -183,7 +183,8 @@ public class BooterDeserializer
             }
             else if ( "testClassesDirectory".equals( name ) )
             {
-                testClassesDirectory = (File) getParamValue( properties.getProperty( "testClassesDirectory"), File.class.getName() );
+                testClassesDirectory =
+                    (File) getParamValue( properties.getProperty( "testClassesDirectory" ), File.class.getName() );
             }
             else if ( "testSuiteXmlFiles".equals( name ) )
             {
@@ -197,8 +198,9 @@ public class BooterDeserializer
         }
 
 
-        dirScannerParams = new DirectoryScannerParameters( testClassesDirectory, new ArrayList(includes.values()) ,new ArrayList(excludes.values()), Boolean.valueOf(failIfNotests));
-
+        dirScannerParams =
+            new DirectoryScannerParameters( testClassesDirectory, new ArrayList( includes.values() ),
+                                            new ArrayList( excludes.values() ), Boolean.valueOf( failIfNotests ) );
 
         TestArtifactInfo testNg = new TestArtifactInfo( testNgVersion, testNgClassifier );
         TestSuiteDefinition testSuiteDefinition = new TestSuiteDefinition( testSuiteXmlFiles, testForFork,
@@ -221,8 +223,9 @@ public class BooterDeserializer
                                         testSuiteDefinition, providerConfigurationObj );
     }
 
-    private boolean isTypeHolderProperty(String name) {
-        return name.endsWith(PARAMS_SUFIX) || name.endsWith(TYPES_SUFIX);
+    private boolean isTypeHolderProperty( String name )
+    {
+        return name.endsWith( PARAMS_SUFIX ) || name.endsWith( TYPES_SUFIX );
     }
 
     void writePropertiesFile( File file, String name, Properties properties )
@@ -297,7 +300,7 @@ public class BooterDeserializer
         {
             outputStream.close();
         }
-        catch( IOException ex )
+        catch ( IOException ex )
         {
             // ignore
         }

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=1039806&r1=1039805&r2=1039806&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 Sun Nov 28 00:44:45 2010
@@ -64,7 +64,7 @@ public class ClasspathConfiguration
 
 
 
-    public ClasspathConfiguration( boolean enableAssertions, boolean childDelegation)
+    public ClasspathConfiguration( boolean enableAssertions, boolean childDelegation )
     {
         this.enableAssertions = enableAssertions;
         this.childDelegation = 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=1039806&r1=1039805&r2=1039806&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 Nov 28 00:44:45 2010
@@ -29,7 +29,7 @@ import java.util.Properties;
  * <p/>
  * Deals with deserialization of the booter wire-level protocol
  *
- * Todo: Look at releationship between this class and BooterSerializer (BooterDeserializer?)
+ * Todo: Look at relationship between this class and BooterSerializer (BooterDeserializer?)
  *
  * @author Jason van Zyl
  * @author Emmanuel Venisse
@@ -72,7 +72,7 @@ public class ForkedBooter
             }
             else
             {
-                result = booter.runSuitesInProcess(p);
+                result = booter.runSuitesInProcess( p );
             }
 
             booterDeserializer.writePropertiesFile( surefirePropertiesFile, "surefire", p );

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=1039806&r1=1039805&r2=1039806&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 Nov 28 00:44:45 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
@@ -64,11 +65,12 @@ public class ProviderFactory
         surefireReflector.setReporterConfigurationAware( o, booterConfiguration.getReporterConfiguration() );
         surefireReflector.setTestClassLoaderAware( o, testClassLoader );
         surefireReflector.setTestArtifactInfoAware( o, booterConfiguration.getTestNg() );
-/*
 
-        if (o instanceof ReportingAware ){
-            ReporterManagerFactory reporterManagerFactory = new ReporterManagerFactory2( booterConfiguration.getReports(),  surefireClassLoader, booterConfiguration.getReporterConfiguration());
-            ((ReportingAware)o).setReporterManagerFactory( reporterManagerFactory );
+        /*
+        if ( o instanceof ReportingAware )
+        {
+            ReporterManagerFactory reporterManagerFactory = new ReporterManagerFactory2( booterConfiguration.getReports(), surefireClassLoader, booterConfiguration.getReporterConfiguration() );
+            ((ReportingAware) o).setReporterManagerFactory( reporterManagerFactory );
         }
 
         Thread.currentThread().setContextClassLoader( context );*/



Mime
View raw message