You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/08/05 15:17:06 UTC
svn commit: r1369576 [1/2] - in /maven/surefire/trunk:
maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/
maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/
maven-failsafe-plugin/src/it/multiple-summaries-fai...
Author: krosenvold
Date: Sun Aug 5 13:17:04 2012
New Revision: 1369576
URL: http://svn.apache.org/viewvc?rev=1369576&view=rev
Log:
o Reformatted to code style
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java
maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java
maven/surefire/trunk/maven-failsafe-plugin/src/it/working-directory/src/test/java/MyIT.java
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/OrderedProperties.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/OrderedPropertiesTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScanResult.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.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/JUnitCoreProvider.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG652Configurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG652ConfiguratorTest.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNGMapConfiguratorTest.java
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-failing/src/test/java/basic/BasicIT.java Sun Aug 5 13:17:04 2012
@@ -19,13 +19,12 @@ package basic;
* under the License.
*/
-import java.util.Properties;
import java.io.IOException;
-
-import junit.framework.*;
+import java.util.Properties;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import junit.framework.TestCase;
public class BasicIT
extends TestCase
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-passing/src/test/java/basic/BasicIT.java Sun Aug 5 13:17:04 2012
@@ -19,13 +19,12 @@ package basic;
* under the License.
*/
-import java.util.Properties;
import java.io.IOException;
-
-import junit.framework.*;
+import java.util.Properties;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import junit.framework.TestCase;
public class BasicIT
extends TestCase
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java Sun Aug 5 13:17:04 2012
@@ -16,10 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
+
import junit.framework.TestCase;
-public class MyAT extends TestCase {
- public void testSomething() {
- assertTrue(false);
+public class MyAT
+ extends TestCase
+{
+ public void testSomething()
+ {
+ assertTrue( false );
}
}
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java Sun Aug 5 13:17:04 2012
@@ -19,8 +19,11 @@
import junit.framework.TestCase;
-public class MyIT extends TestCase {
- public void testSomething() {
- assertTrue(true);
+public class MyIT
+ extends TestCase
+{
+ public void testSomething()
+ {
+ assertTrue( true );
}
}
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java Sun Aug 5 13:17:04 2012
@@ -19,8 +19,11 @@
import junit.framework.TestCase;
-public class MyIT extends TestCase {
- public void testSomething() {
- assertTrue(true);
+public class MyIT
+ extends TestCase
+{
+ public void testSomething()
+ {
+ assertTrue( true );
}
}
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/it/working-directory/src/test/java/MyIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/working-directory/src/test/java/MyIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/working-directory/src/test/java/MyIT.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/working-directory/src/test/java/MyIT.java Sun Aug 5 13:17:04 2012
@@ -19,8 +19,11 @@
import junit.framework.TestCase;
-public class MyIT extends TestCase {
- public void testSomething() {
- assertTrue(true);
+public class MyIT
+ extends TestCase
+{
+ public void testSomething()
+ {
+ assertTrue( true );
}
}
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java Sun Aug 5 13:17:04 2012
@@ -19,19 +19,22 @@ package org.apache.maven.plugin.failsafe
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.execution.MavenSession;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.List;
+import java.util.Properties;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
import org.apache.maven.plugin.surefire.Summary;
import org.apache.maven.plugin.surefire.booterclient.ChecksumCalculator;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -42,25 +45,10 @@ import org.apache.maven.surefire.failsaf
import org.apache.maven.surefire.failsafe.model.io.xpp3.FailsafeSummaryXpp3Reader;
import org.apache.maven.surefire.failsafe.model.io.xpp3.FailsafeSummaryXpp3Writer;
import org.apache.maven.surefire.suite.RunResult;
-import org.apache.maven.toolchain.ToolchainManager;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import static org.codehaus.plexus.util.IOUtil.close;
/**
@@ -161,7 +149,6 @@ public class IntegrationTestMojo
private int forkedProcessTimeoutInSeconds;
-
private Properties originalSystemProperties;
/**
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java Sun Aug 5 13:17:04 2012
@@ -19,6 +19,12 @@ package org.apache.maven.plugin.failsafe
* under the License.
*/
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -34,13 +40,6 @@ import org.codehaus.plexus.util.ReaderFa
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
/**
* Verify integration tests ran using Surefire.
*
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=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java Sun Aug 5 13:17:04 2012
@@ -19,6 +19,20 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -43,8 +57,6 @@ import org.apache.maven.plugin.surefire.
import org.apache.maven.plugin.surefire.booterclient.ForkConfiguration;
import org.apache.maven.plugin.surefire.booterclient.ForkStarter;
import org.apache.maven.plugin.surefire.util.DirectoryScanner;
-import org.apache.maven.surefire.util.DefaultScanResult;
-import org.apache.maven.surefire.util.ScanResult;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
@@ -63,27 +75,14 @@ import org.apache.maven.surefire.testset
import org.apache.maven.surefire.testset.RunOrderParameters;
import org.apache.maven.surefire.testset.TestArtifactInfo;
import org.apache.maven.surefire.testset.TestRequest;
+import org.apache.maven.surefire.util.DefaultScanResult;
import org.apache.maven.surefire.util.NestedRuntimeException;
import org.apache.maven.surefire.util.RunOrder;
+import org.apache.maven.surefire.util.ScanResult;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
/**
* Abstract base class for running tests using Surefire.
*
@@ -276,7 +275,6 @@ public abstract class AbstractSurefireMo
/**
* Map of plugin artifacts.
- *
*/
// olamy: would make more sense using defaultValue but doesn't work with maven 2.x
@Parameter( property = "plugin.artifactMap", required = true, readonly = true )
@@ -571,19 +569,21 @@ public abstract class AbstractSurefireMo
{
if ( verifyParameters() && !hasExecutedBefore() )
{
- DirectoryScanner directoryScanner = new DirectoryScanner( getTestClassesDirectory(), getIncludeList(), getExcludeList(),
- getSpecificTests() );
+ DirectoryScanner directoryScanner =
+ new DirectoryScanner( getTestClassesDirectory(), getIncludeList(), getExcludeList(),
+ getSpecificTests() );
DefaultScanResult scan = directoryScanner.scan();
if ( scan.isEmpty() )
{
if ( getEffectiveFailIfNoTests() )
{
- throw new MojoFailureException( "No tests were executed! (Set -DfailIfNoTests=false to ignore this error.)" );
+ throw new MojoFailureException(
+ "No tests were executed! (Set -DfailIfNoTests=false to ignore this error.)" );
}
return;
}
logReportsDirectory();
- executeAfterPreconditionsChecked(scan);
+ executeAfterPreconditionsChecked( scan );
}
}
@@ -616,11 +616,11 @@ public abstract class AbstractSurefireMo
protected abstract boolean isSkipExecution();
- protected void executeAfterPreconditionsChecked(DefaultScanResult scanResult)
+ protected void executeAfterPreconditionsChecked( DefaultScanResult scanResult )
throws MojoExecutionException, MojoFailureException
{
createDependencyResolver();
- Summary summary = executeAllProviders(scanResult);
+ Summary summary = executeAllProviders( scanResult );
restoreOriginalSystemPropertiesWhenNotForking( summary );
handleSummary( summary );
}
@@ -654,7 +654,7 @@ public abstract class AbstractSurefireMo
}
}
- private Summary executeAllProviders(DefaultScanResult scanResult)
+ private Summary executeAllProviders( DefaultScanResult scanResult )
throws MojoExecutionException, MojoFailureException
{
List<ProviderInfo> providers = createProviders();
@@ -667,7 +667,7 @@ public abstract class AbstractSurefireMo
return summary;
}
- private void executeProvider(ProviderInfo provider, DefaultScanResult scanResult, Summary summary)
+ private void executeProvider( ProviderInfo provider, DefaultScanResult scanResult, Summary summary )
throws MojoExecutionException, MojoFailureException
{
ForkConfiguration forkConfiguration = getForkConfiguration();
@@ -685,11 +685,12 @@ public abstract class AbstractSurefireMo
InPluginVMSurefireStarter surefireStarter =
createInprocessStarter( provider, forkConfiguration, classLoaderConfiguration, runOrderParameters,
scanResult );
- result = surefireStarter.runSuitesInProcess(scanResult);
+ result = surefireStarter.runSuitesInProcess( scanResult );
}
else
{
- ForkStarter forkStarter = createForkStarter( provider, forkConfiguration, classLoaderConfiguration, runOrderParameters );
+ ForkStarter forkStarter =
+ createForkStarter( provider, forkConfiguration, classLoaderConfiguration, runOrderParameters );
result = forkStarter.run( scanResult );
}
summary.registerRunResult( result );
@@ -832,7 +833,8 @@ public abstract class AbstractSurefireMo
return runOrders.contains( RunOrder.BALANCED ) || runOrders.contains( RunOrder.FAILEDFIRST );
}
- private boolean getEffectiveFailIfNoTests(){
+ private boolean getEffectiveFailIfNoTests()
+ {
if ( isSpecificTestSpecified() )
{
if ( getFailIfNoSpecifiedTests() != null )
@@ -1132,7 +1134,7 @@ public abstract class AbstractSurefireMo
createStartupConfiguration( forkConfiguration, provider, classLoaderConfiguration );
String configChecksum = getConfigChecksum();
StartupReportConfiguration startupReportConfiguration = getStartupReportConfiguration( configChecksum );
- ProviderConfiguration providerConfiguration = createProviderConfiguration( runOrderParameters);
+ ProviderConfiguration providerConfiguration = createProviderConfiguration( runOrderParameters );
return new ForkStarter( providerConfiguration, startupConfiguration, forkConfiguration,
getForkedProcessTimeoutInSeconds(), startupReportConfiguration );
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/OrderedProperties.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/OrderedProperties.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/OrderedProperties.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/OrderedProperties.java Sun Aug 5 13:17:04 2012
@@ -18,7 +18,10 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import java.util.*;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Properties;
/**
* A properties implementation that preserves insertion order.
@@ -36,7 +39,7 @@ public class OrderedProperties
{
if ( source != null )
{
- this.putAll( source );
+ this.putAll( source );
}
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java Sun Aug 5 13:17:04 2012
@@ -36,7 +36,6 @@ import org.apache.maven.plugin.surefire.
import org.apache.maven.plugin.surefire.booterclient.output.ForkClient;
import org.apache.maven.plugin.surefire.booterclient.output.ThreadedStreamConsumer;
import org.apache.maven.plugin.surefire.report.FileReporterFactory;
-import org.apache.maven.surefire.util.DefaultScanResult;
import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.ClasspathConfiguration;
import org.apache.maven.surefire.booter.ProviderConfiguration;
@@ -48,6 +47,7 @@ import org.apache.maven.surefire.booter.
import org.apache.maven.surefire.providerapi.SurefireProvider;
import org.apache.maven.surefire.report.RunStatistics;
import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.util.DefaultScanResult;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineTimeOutException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -113,8 +113,7 @@ public class ForkStarter
{
final ForkClient forkClient =
new ForkClient( fileReporterFactory, startupReportConfiguration.getTestVmSystemProperties() );
- result = fork( null, providerProperties, forkClient,
- fileReporterFactory.getGlobalRunStatistics() );
+ result = fork( null, providerProperties, forkClient, fileReporterFactory.getGlobalRunStatistics() );
}
else if ( ForkConfiguration.FORK_ALWAYS.equals( requestedForkMode ) )
{
@@ -122,8 +121,7 @@ public class ForkStarter
}
else if ( ForkConfiguration.FORK_PERTHREAD.equals( requestedForkMode ) )
{
- result = runSuitesForkPerTestSet( providerProperties,
- forkConfiguration.getThreadCount() );
+ result = runSuitesForkPerTestSet( providerProperties, forkConfiguration.getThreadCount() );
}
else
{
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java Sun Aug 5 13:17:04 2012
@@ -240,9 +240,11 @@ public class ForkClient
public void close()
{
- if (!saidGoodBye){
- throw new RuntimeException( "The forked VM terminated without saying properly goodbye. VM crash or System.exit called ?" );
+ if ( !saidGoodBye )
+ {
+ throw new RuntimeException(
+ "The forked VM terminated without saying properly goodbye. VM crash or System.exit called ?" );
}
}
-
+
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java Sun Aug 5 13:17:04 2012
@@ -19,13 +19,12 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.surefire.util.DefaultScanResult;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.maven.surefire.util.DefaultScanResult;
/**
* Scans directories looking for tests.
@@ -50,7 +49,7 @@ public class DirectoryScanner
private final List<String> specificTests;
- public DirectoryScanner(File basedir, List<String> includes, List<String> excludes, List<String> specificTests)
+ public DirectoryScanner( File basedir, List<String> includes, List<String> excludes, List<String> specificTests )
{
this.basedir = basedir;
this.includes = includes;
@@ -81,31 +80,35 @@ public class DirectoryScanner
}
scanner.scan();
- for (String test : scanner.getIncludedFiles() ){
- if (specificTestFilter.accept(stripBaseDir(basedir.getAbsolutePath(), test))){
- result.add( convertToJavaClassName(test));
+ for ( String test : scanner.getIncludedFiles() )
+ {
+ if ( specificTestFilter.accept( stripBaseDir( basedir.getAbsolutePath(), test ) ) )
+ {
+ result.add( convertToJavaClassName( test ) );
}
}
}
- return new DefaultScanResult( result);
+ return new DefaultScanResult( result );
}
private String convertToJavaClassName( String test )
{
- return StringUtils.removeEnd(test, ".class").replace( FS, "." );
+ return StringUtils.removeEnd( test, ".class" ).replace( FS, "." );
}
- private String stripBaseDir( String basedir, String test){
- return StringUtils.removeStart( test, basedir );
+ private String stripBaseDir( String basedir, String test )
+ {
+ return StringUtils.removeStart( test, basedir );
}
private static String[] processIncludesExcludes( List<String> list )
{
List<String> newList = new ArrayList<String>();
- for (Object aList : list) {
+ for ( Object aList : list )
+ {
String include = (String) aList;
- String[] includes = include.split(",");
- Collections.addAll(newList, includes);
+ String[] includes = include.split( "," );
+ Collections.addAll( newList, includes );
}
String[] incs = new String[newList.size()];
@@ -115,7 +118,7 @@ public class DirectoryScanner
String inc = newList.get( i );
if ( inc.endsWith( JAVA_SOURCE_FILE_EXTENSION ) )
{
- inc = StringUtils.removeEnd(inc, JAVA_SOURCE_FILE_EXTENSION) + JAVA_CLASS_FILE_EXTENSION;
+ inc = StringUtils.removeEnd( inc, JAVA_SOURCE_FILE_EXTENSION ) + JAVA_CLASS_FILE_EXTENSION;
}
incs[i] = inc;
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java Sun Aug 5 13:17:04 2012
@@ -18,13 +18,11 @@ package org.apache.maven.plugin.surefire
* specific language governing permissions and limitations
* under the License.
*/
-import org.codehaus.plexus.util.SelectorUtils;
-import java.io.File;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
+import org.codehaus.plexus.util.SelectorUtils;
public class SpecificFileFilter
{
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/OrderedPropertiesTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/OrderedPropertiesTest.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/OrderedPropertiesTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/OrderedPropertiesTest.java Sun Aug 5 13:17:04 2012
@@ -18,49 +18,56 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import junit.framework.TestCase;
-
import java.util.Enumeration;
import java.util.Properties;
+import junit.framework.TestCase;
+
/**
* Tests the insertion-order preserving properties collection
*/
-public class OrderedPropertiesTest extends TestCase {
-
- public void testKeys() throws Exception {
- OrderedProperties orderedProperties = new OrderedProperties(null);
- orderedProperties.setProperty("abc", "1");
- orderedProperties.setProperty("xyz", "1");
- orderedProperties.setProperty("efg", "1");
+public class OrderedPropertiesTest
+ extends TestCase
+{
+
+ public void testKeys()
+ throws Exception
+ {
+ OrderedProperties orderedProperties = new OrderedProperties( null );
+ orderedProperties.setProperty( "abc", "1" );
+ orderedProperties.setProperty( "xyz", "1" );
+ orderedProperties.setProperty( "efg", "1" );
Enumeration<Object> keys = orderedProperties.keys();
- assertEquals("abc", keys.nextElement());
- assertEquals("xyz", keys.nextElement());
+ assertEquals( "abc", keys.nextElement() );
+ assertEquals( "xyz", keys.nextElement() );
assertEquals( "efg", keys.nextElement() );
}
- public void testKeysReinsert() throws Exception {
- OrderedProperties orderedProperties = new OrderedProperties(null);
- orderedProperties.setProperty("abc", "1");
- orderedProperties.setProperty("xyz", "1");
- orderedProperties.setProperty("efg", "1");
- orderedProperties.setProperty("abc", "2");
+ public void testKeysReinsert()
+ throws Exception
+ {
+ OrderedProperties orderedProperties = new OrderedProperties( null );
+ orderedProperties.setProperty( "abc", "1" );
+ orderedProperties.setProperty( "xyz", "1" );
+ orderedProperties.setProperty( "efg", "1" );
+ orderedProperties.setProperty( "abc", "2" );
orderedProperties.remove( "xyz" );
orderedProperties.setProperty( "xyz", "1" );
Enumeration<Object> keys = orderedProperties.keys();
- assertEquals("abc", keys.nextElement());
- assertEquals("efg", keys.nextElement());
- assertEquals("xyz", keys.nextElement());
+ assertEquals( "abc", keys.nextElement() );
+ assertEquals( "efg", keys.nextElement() );
+ assertEquals( "xyz", keys.nextElement() );
}
- public void testConstructWithOther(){
- Properties src = new Properties( );
- src.setProperty( "a" , "1");
- src.setProperty( "b" , "2");
- OrderedProperties orderedProperties = new OrderedProperties(src);
+ public void testConstructWithOther()
+ {
+ Properties src = new Properties();
+ src.setProperty( "a", "1" );
+ src.setProperty( "b", "2" );
+ OrderedProperties orderedProperties = new OrderedProperties( src );
// Cannot make assumptions about insertion order
assertEquals( 2, orderedProperties.size() );
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java Sun Aug 5 13:17:04 2012
@@ -19,20 +19,25 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import junit.framework.TestCase;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.util.ScanResult;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
+import junit.framework.TestCase;
/**
* @author Kristian Rosenvold
*/
-public class DirectoryScannerTest extends TestCase {
+public class DirectoryScannerTest
+ extends TestCase
+{
public void testLocateTestClasses()
- throws IOException, TestSetFailedException
+ throws IOException, TestSetFailedException
{
// use target as people can configure ide to compile in an other place than maven
File baseDir = new File( new File( "target/test-classes" ).getCanonicalPath() );
@@ -40,15 +45,16 @@ public class DirectoryScannerTest extend
include.add( "**/*ZT*A.java" );
List<String> exclude = new ArrayList<String>();
- DirectoryScanner surefireDirectoryScanner = new DirectoryScanner( baseDir, include, exclude, new ArrayList<String>() );
+ DirectoryScanner surefireDirectoryScanner =
+ new DirectoryScanner( baseDir, include, exclude, new ArrayList<String>() );
ScanResult classNames = surefireDirectoryScanner.scan();
assertNotNull( classNames );
- System.out.println( "classNames " + Arrays.asList(classNames) );
- assertEquals(3, classNames.size());
+ System.out.println( "classNames " + Arrays.asList( classNames ) );
+ assertEquals( 3, classNames.size() );
Properties props = new Properties();
- classNames.writeTo( props);
- assertEquals(3, props.size());
+ classNames.writeTo( props );
+ assertEquals( 3, props.size() );
}
}
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java Sun Aug 5 13:17:04 2012
@@ -20,43 +20,44 @@ package org.apache.maven.plugin.surefire
*/
import junit.framework.TestCase;
-import org.apache.maven.plugin.surefire.util.SpecificFileFilter;
-
-import java.io.File;
/**
* @author Kristian Rosenvold
*/
-public class SpecificFileFilterTest extends TestCase {
+public class SpecificFileFilterTest
+ extends TestCase
+{
public void testMatchSingleCharacterWildcard()
{
- SpecificFileFilter filter = createFileFilter("org/apache/maven/surefire/?pecificTestClassFilter.class");
- assertTrue( filter.accept(getFile()) );
+ SpecificFileFilter filter = createFileFilter( "org/apache/maven/surefire/?pecificTestClassFilter.class" );
+ assertTrue( filter.accept( getFile() ) );
}
public void testMatchSingleSegmentWordWildcard()
{
- SpecificFileFilter filter = createFileFilter("org/apache/maven/surefire/*TestClassFilter.class");
- assertTrue( filter.accept(getFile()) );
+ SpecificFileFilter filter = createFileFilter( "org/apache/maven/surefire/*TestClassFilter.class" );
+ assertTrue( filter.accept( getFile() ) );
}
public void testMatchMultiSegmentWildcard()
{
- SpecificFileFilter filter = createFileFilter("org/**/SpecificTestClassFilter.class");
- assertTrue( filter.accept(getFile()) );
+ SpecificFileFilter filter = createFileFilter( "org/**/SpecificTestClassFilter.class" );
+ assertTrue( filter.accept( getFile() ) );
}
public void testMatchSingleSegmentWildcard()
{
- SpecificFileFilter filter = createFileFilter("org/*/maven/surefire/SpecificTestClassFilter.class");
- assertTrue( filter.accept(getFile()) );
+ SpecificFileFilter filter = createFileFilter( "org/*/maven/surefire/SpecificTestClassFilter.class" );
+ assertTrue( filter.accept( getFile() ) );
}
- private SpecificFileFilter createFileFilter(String s) {
- return new SpecificFileFilter( new String[]{s} );
+ private SpecificFileFilter createFileFilter( String s )
+ {
+ return new SpecificFileFilter( new String[]{ s } );
}
- private String getFile() {
+ private String getFile()
+ {
return "org/apache/maven/surefire/SpecificTestClassFilter.class";
}
}
Modified: maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java Sun Aug 5 13:17:04 2012
@@ -19,32 +19,19 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.execution.MavenSession;
+import java.io.File;
+import java.util.List;
+import java.util.Properties;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.surefire.booterclient.ChecksumCalculator;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.surefire.suite.RunResult;
-import org.apache.maven.toolchain.ToolchainManager;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
/**
* Run tests using Surefire.
*
@@ -426,6 +413,7 @@ public class SurefirePlugin
{
this.internalSystemProperties = internalSystemProperties;
}
+
public boolean isUseSystemClassLoader()
{
return useSystemClassLoader;
@@ -445,6 +433,7 @@ public class SurefirePlugin
{
this.useManifestOnlyJar = useManifestOnlyJar;
}
+
public Boolean getFailIfNoSpecifiedTests()
{
return failIfNoSpecifiedTests;
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=1369576&r1=1369575&r2=1369576&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 Sun Aug 5 13:17:04 2012
@@ -129,7 +129,7 @@ public class SurefireReportGenerator
sink.table();
- sink.tableRows( new int[]{LEFT, LEFT, LEFT, LEFT, LEFT, LEFT}, true );
+ sink.tableRows( new int[]{ LEFT, LEFT, LEFT, LEFT, LEFT, LEFT }, true );
sink.tableRow();
@@ -195,7 +195,7 @@ public class SurefireReportGenerator
sink.table();
- sink.tableRows( new int[]{LEFT, LEFT, LEFT, LEFT, LEFT, LEFT, LEFT}, true );
+ sink.tableRows( new int[]{ LEFT, LEFT, LEFT, LEFT, LEFT, LEFT, LEFT }, true );
sink.tableRow();
@@ -289,88 +289,88 @@ public class SurefireReportGenerator
if ( showTable )
{
- sink.table();
-
- sink.tableRows( new int[]{LEFT, LEFT, LEFT, LEFT, LEFT, LEFT, LEFT, LEFT}, true );
+ sink.table();
- sink.tableRow();
+ sink.tableRows( new int[]{ LEFT, LEFT, LEFT, LEFT, LEFT, LEFT, LEFT, LEFT }, true );
- sinkHeader( sink, "" );
+ sink.tableRow();
- sinkHeader( sink, bundle.getString( "report.surefire.label.class" ) );
+ sinkHeader( sink, "" );
- sinkHeader( sink, bundle.getString( "report.surefire.label.tests" ) );
+ sinkHeader( sink, bundle.getString( "report.surefire.label.class" ) );
- sinkHeader( sink, bundle.getString( "report.surefire.label.errors" ) );
+ sinkHeader( sink, bundle.getString( "report.surefire.label.tests" ) );
- sinkHeader( sink, bundle.getString( "report.surefire.label.failures" ) );
+ sinkHeader( sink, bundle.getString( "report.surefire.label.errors" ) );
- sinkHeader( sink, bundle.getString( "report.surefire.label.skipped" ) );
+ sinkHeader( sink, bundle.getString( "report.surefire.label.failures" ) );
- sinkHeader( sink, bundle.getString( "report.surefire.label.successrate" ) );
+ sinkHeader( sink, bundle.getString( "report.surefire.label.skipped" ) );
- sinkHeader( sink, bundle.getString( "report.surefire.label.time" ) );
+ sinkHeader( sink, bundle.getString( "report.surefire.label.successrate" ) );
- sink.tableRow_();
+ sinkHeader( sink, bundle.getString( "report.surefire.label.time" ) );
- while ( suiteIterator.hasNext() )
- {
- ReportTestSuite suite = (ReportTestSuite) suiteIterator.next();
+ sink.tableRow_();
- if ( showSuccess || suite.getNumberOfErrors() != 0 || suite.getNumberOfFailures() != 0 )
+ while ( suiteIterator.hasNext() )
{
+ ReportTestSuite suite = (ReportTestSuite) suiteIterator.next();
- sink.tableRow();
+ if ( showSuccess || suite.getNumberOfErrors() != 0 || suite.getNumberOfFailures() != 0 )
+ {
- sink.tableCell();
+ sink.tableRow();
- sink.link( "#" + suite.getPackageName() + suite.getName() );
+ sink.tableCell();
- if ( suite.getNumberOfErrors() > 0 )
- {
- sinkIcon( "error", sink );
- }
- else if ( suite.getNumberOfFailures() > 0 )
- {
- sinkIcon( "junit.framework", sink );
- }
- else if ( suite.getNumberOfSkipped() > 0 )
- {
- sinkIcon( "skipped", sink );
- }
- else
- {
- sinkIcon( "success", sink );
- }
+ sink.link( "#" + suite.getPackageName() + suite.getName() );
- sink.link_();
+ if ( suite.getNumberOfErrors() > 0 )
+ {
+ sinkIcon( "error", sink );
+ }
+ else if ( suite.getNumberOfFailures() > 0 )
+ {
+ sinkIcon( "junit.framework", sink );
+ }
+ else if ( suite.getNumberOfSkipped() > 0 )
+ {
+ sinkIcon( "skipped", sink );
+ }
+ else
+ {
+ sinkIcon( "success", sink );
+ }
- sink.tableCell_();
+ sink.link_();
+
+ sink.tableCell_();
- sinkCellLink( sink, suite.getName(), "#" + suite.getPackageName() + suite.getName() );
+ sinkCellLink( sink, suite.getName(), "#" + suite.getPackageName() + suite.getName() );
- sinkCell( sink, Integer.toString( suite.getNumberOfTests() ) );
+ sinkCell( sink, Integer.toString( suite.getNumberOfTests() ) );
- sinkCell( sink, Integer.toString( suite.getNumberOfErrors() ) );
+ sinkCell( sink, Integer.toString( suite.getNumberOfErrors() ) );
- sinkCell( sink, Integer.toString( suite.getNumberOfFailures() ) );
+ sinkCell( sink, Integer.toString( suite.getNumberOfFailures() ) );
- sinkCell( sink, Integer.toString( suite.getNumberOfSkipped() ) );
+ sinkCell( sink, Integer.toString( suite.getNumberOfSkipped() ) );
- String percentage = report.computePercentage( suite.getNumberOfTests(), suite.getNumberOfErrors(),
- suite.getNumberOfFailures(),
- suite.getNumberOfSkipped() );
- sinkCell( sink, percentage + "%" );
+ String percentage =
+ report.computePercentage( suite.getNumberOfTests(), suite.getNumberOfErrors(),
+ suite.getNumberOfFailures(), suite.getNumberOfSkipped() );
+ sinkCell( sink, percentage + "%" );
- sinkCell( sink, numberFormat.format( suite.getTimeElapsed() ) );
+ sinkCell( sink, numberFormat.format( suite.getTimeElapsed() ) );
- sink.tableRow_();
+ sink.tableRow_();
+ }
}
- }
- sink.tableRows_();
+ sink.tableRows_();
- sink.table_();
+ sink.table_();
}
sink.section2_();
@@ -427,127 +427,127 @@ public class SurefireReportGenerator
if ( showTable )
{
- sink.table();
+ sink.table();
- sink.tableRows( new int[]{LEFT, LEFT, LEFT}, true );
+ sink.tableRows( new int[]{ LEFT, LEFT, LEFT }, true );
- while ( caseIterator.hasNext() )
- {
- ReportTestCase testCase = (ReportTestCase) caseIterator.next();
-
- if ( testCase.getFailure() != null || showSuccess )
+ while ( caseIterator.hasNext() )
{
- sink.tableRow();
+ ReportTestCase testCase = (ReportTestCase) caseIterator.next();
- sink.tableCell();
+ if ( testCase.getFailure() != null || showSuccess )
+ {
+ sink.tableRow();
- Map failure = testCase.getFailure();
+ sink.tableCell();
- if ( failure != null )
- {
- sink.link( "#" + testCase.getFullName() );
+ Map failure = testCase.getFailure();
- sinkIcon( (String) failure.get( "type" ), sink );
+ if ( failure != null )
+ {
+ sink.link( "#" + testCase.getFullName() );
- sink.link_();
- }
- else
- {
- sinkIcon( "success", sink );
- }
+ sinkIcon( (String) failure.get( "type" ), sink );
- sink.tableCell_();
+ sink.link_();
+ }
+ else
+ {
+ sinkIcon( "success", sink );
+ }
- if ( failure != null )
- {
- sink.tableCell();
+ sink.tableCell_();
- sinkLink( sink, testCase.getName(), "#" + testCase.getFullName() );
+ if ( failure != null )
+ {
+ sink.tableCell();
- SinkEventAttributeSet atts = new SinkEventAttributeSet();
- atts.addAttribute( SinkEventAttributes.CLASS, "detailToggle" );
- atts.addAttribute( SinkEventAttributes.STYLE, "display:inline" );
- sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
-
- sink.link( "javascript:toggleDisplay('" + toHtmlId( testCase.getFullName() ) + "');" );
-
- atts = new SinkEventAttributeSet();
- atts.addAttribute( SinkEventAttributes.STYLE, "display:inline;" );
- atts.addAttribute( SinkEventAttributes.ID, toHtmlId( testCase.getFullName() ) + "off" );
- sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
- sink.text( " + " );
- sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
-
- atts = new SinkEventAttributeSet();
- atts.addAttribute( SinkEventAttributes.STYLE, "display:none;" );
- atts.addAttribute( SinkEventAttributes.ID, toHtmlId( testCase.getFullName() ) + "on" );
- sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
- sink.text( " - " );
- sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
+ sinkLink( sink, testCase.getName(), "#" + testCase.getFullName() );
- sink.text( "[ Detail ]" );
- sink.link_();
+ SinkEventAttributeSet atts = new SinkEventAttributeSet();
+ atts.addAttribute( SinkEventAttributes.CLASS, "detailToggle" );
+ atts.addAttribute( SinkEventAttributes.STYLE, "display:inline" );
+ sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
- sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
+ sink.link( "javascript:toggleDisplay('" + toHtmlId( testCase.getFullName() ) + "');" );
- sink.tableCell_();
- }
- else
- {
- sinkCell( sink, testCase.getName() );
- }
+ atts = new SinkEventAttributeSet();
+ atts.addAttribute( SinkEventAttributes.STYLE, "display:inline;" );
+ atts.addAttribute( SinkEventAttributes.ID, toHtmlId( testCase.getFullName() ) + "off" );
+ sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
+ sink.text( " + " );
+ sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
- sinkCell( sink, numberFormat.format( testCase.getTime() ) );
+ atts = new SinkEventAttributeSet();
+ atts.addAttribute( SinkEventAttributes.STYLE, "display:none;" );
+ atts.addAttribute( SinkEventAttributes.ID, toHtmlId( testCase.getFullName() ) + "on" );
+ sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
+ sink.text( " - " );
+ sink.unknown( "span", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
- sink.tableRow_();
+ sink.text( "[ Detail ]" );
+ sink.link_();
- if ( failure != null )
- {
- sink.tableRow();
+ sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
+
+ sink.tableCell_();
+ }
+ else
+ {
+ sinkCell( sink, testCase.getName() );
+ }
+
+ sinkCell( sink, numberFormat.format( testCase.getTime() ) );
- sinkCell( sink, "" );
- sinkCell( sink, (String) failure.get( "message" ) );
- sinkCell( sink, "" );
sink.tableRow_();
- List detail = (List) failure.get( "detail" );
- if ( detail != null )
+ if ( failure != null )
{
-
sink.tableRow();
+
+ sinkCell( sink, "" );
+ sinkCell( sink, (String) failure.get( "message" ) );
sinkCell( sink, "" );
+ sink.tableRow_();
- sink.tableCell();
- SinkEventAttributeSet atts = new SinkEventAttributeSet();
- atts.addAttribute( SinkEventAttributes.ID,
- toHtmlId( testCase.getFullName() ) + "error" );
- atts.addAttribute( SinkEventAttributes.STYLE, "display:none;" );
- sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
+ List detail = (List) failure.get( "detail" );
+ if ( detail != null )
+ {
- Iterator it = detail.iterator();
+ sink.tableRow();
+ sinkCell( sink, "" );
- sink.verbatim( null );
- while ( it.hasNext() )
- {
- sink.text( it.next().toString() );
- sink.lineBreak();
- }
- sink.verbatim_();
+ sink.tableCell();
+ SinkEventAttributeSet atts = new SinkEventAttributeSet();
+ atts.addAttribute( SinkEventAttributes.ID,
+ toHtmlId( testCase.getFullName() ) + "error" );
+ atts.addAttribute( SinkEventAttributes.STYLE, "display:none;" );
+ sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_START }, atts );
+
+ Iterator it = detail.iterator();
+
+ sink.verbatim( null );
+ while ( it.hasNext() )
+ {
+ sink.text( it.next().toString() );
+ sink.lineBreak();
+ }
+ sink.verbatim_();
- sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
- sink.tableCell_();
+ sink.unknown( "div", new Object[]{ HtmlMarkup.TAG_TYPE_END }, null );
+ sink.tableCell_();
- sinkCell( sink, "" );
+ sinkCell( sink, "" );
- sink.tableRow_();
+ sink.tableRow_();
+ }
}
}
}
- }
- sink.tableRows_();
+ sink.tableRows_();
- sink.table_();
+ sink.table_();
}
sink.section2_();
@@ -584,7 +584,7 @@ public class SurefireReportGenerator
sink.table();
- sink.tableRows( new int[]{LEFT, LEFT}, true );
+ sink.tableRows( new int[]{ LEFT, LEFT }, true );
while ( failIter.hasNext() )
{
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java Sun Aug 5 13:17:04 2012
@@ -42,8 +42,9 @@ public class SpecificTestClassFilter
for ( Iterator it = names.iterator(); it.hasNext(); )
{
String pattern = (String) it.next();
- if ('\\' == FS){
- pattern = pattern.replace('/', FS);
+ if ( '\\' == FS )
+ {
+ pattern = pattern.replace( '/', FS );
}
// This is the same utility used under the covers in the plexus DirectoryScanner, and
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java Sun Aug 5 13:17:04 2012
@@ -84,7 +84,8 @@ public class BaseProviderFactory
directoryScannerParameters.getSpecificTests() );
}
- public ScanResult getScanResult() {
+ public ScanResult getScanResult()
+ {
return DefaultScanResult.from( providerProperties );
}
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=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java Sun Aug 5 13:17:04 2012
@@ -45,8 +45,9 @@ public interface ProviderParameters
/**
* Provides a directory scanner that enforces the includes/excludes parameters that were passed to surefire.
* See #getDirectoryScannerParameters for details
- * @deprecated Use scanresult instead, as of version 2.12.2. Will be removed in next major version.
+ *
* @return The directory scanner
+ * @deprecated Use scanresult instead, as of version 2.12.2. Will be removed in next major version.
*/
DirectoryScanner getDirectoryScanner();
@@ -85,8 +86,8 @@ public interface ProviderParameters
/**
* The raw parameters used in creating the directory scanner
*
- * @deprecated Use scanresult instead, as of version 2.12.2. Will be removed in next major version.
* @return The parameters
+ * @deprecated Use scanresult instead, as of version 2.12.2. Will be removed in next major version.
*/
DirectoryScannerParameters getDirectoryScannerParameters();
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java Sun Aug 5 13:17:04 2012
@@ -27,93 +27,115 @@ import java.util.Properties;
/**
* @author Kristian Rosenvold
*/
-public class DefaultScanResult implements ScanResult {
+public class DefaultScanResult
+ implements ScanResult
+{
private final List files;
+
private static final String scanResultNo = "tc.";
- public DefaultScanResult(List files) {
+ public DefaultScanResult( List files )
+ {
this.files = files;
}
- public int size() {
+ public int size()
+ {
return files.size();
}
- public String getClassName(int index) {
- return (String) files.get(index);
+ public String getClassName( int index )
+ {
+ return (String) files.get( index );
}
- public void writeTo(Properties properties) {
+ public void writeTo( Properties properties )
+ {
int size = files.size();
- for (int i = 0; i < size; i++) {
- properties.setProperty(scanResultNo + i, (String) files.get(i));
+ for ( int i = 0; i < size; i++ )
+ {
+ properties.setProperty( scanResultNo + i, (String) files.get( i ) );
}
}
- public static DefaultScanResult from(Properties properties) {
+ public static DefaultScanResult from( Properties properties )
+ {
List result = new ArrayList();
int i = 0;
- while (true) {
- String item = properties.getProperty(scanResultNo + (i++));
- if (item == null) {
- return new DefaultScanResult(result);
+ while ( true )
+ {
+ String item = properties.getProperty( scanResultNo + ( i++ ) );
+ if ( item == null )
+ {
+ return new DefaultScanResult( result );
}
- result.add(item);
+ result.add( item );
}
}
- public boolean isEmpty() {
+ public boolean isEmpty()
+ {
return files.isEmpty();
}
- public List getFiles() {
- return Collections.unmodifiableList(files);
+ public List getFiles()
+ {
+ return Collections.unmodifiableList( files );
}
- public TestsToRun applyFilter(ScannerFilter scannerFilter, ClassLoader testClassLoader) {
+ public TestsToRun applyFilter( ScannerFilter scannerFilter, ClassLoader testClassLoader )
+ {
List result = new ArrayList();
int size = size();
- for (int i = 0; i < size; i++) {
- String className = getClassName(i);
-
- Class testClass = loadClass(testClassLoader, className);
-
- if (scannerFilter == null || scannerFilter.accept(testClass)) {
- result.add(testClass);
+ for ( int i = 0; i < size; i++ )
+ {
+ String className = getClassName( i );
+
+ Class testClass = loadClass( testClassLoader, className );
+
+ if ( scannerFilter == null || scannerFilter.accept( testClass ) )
+ {
+ result.add( testClass );
}
}
- return new TestsToRun(result);
+ return new TestsToRun( result );
}
- public List getClassesSkippedByValidation(ScannerFilter scannerFilter, ClassLoader testClassLoader) {
+ public List getClassesSkippedByValidation( ScannerFilter scannerFilter, ClassLoader testClassLoader )
+ {
List result = new ArrayList();
int size = size();
- for (int i = 0; i < size; i++) {
- String className = getClassName(i);
-
- Class testClass = loadClass(testClassLoader, className);
-
- if (scannerFilter != null && !scannerFilter.accept(testClass)) {
- result.add(testClass);
+ for ( int i = 0; i < size; i++ )
+ {
+ String className = getClassName( i );
+
+ Class testClass = loadClass( testClassLoader, className );
+
+ if ( scannerFilter != null && !scannerFilter.accept( testClass ) )
+ {
+ result.add( testClass );
}
}
return result;
}
- private static Class loadClass(ClassLoader classLoader, String className) {
+ private static Class loadClass( ClassLoader classLoader, String className )
+ {
Class testClass;
- try {
- testClass = classLoader.loadClass(className);
- } catch (ClassNotFoundException e) {
- throw new NestedRuntimeException("Unable to create test class '" + className + "'", e);
+ try
+ {
+ testClass = classLoader.loadClass( className );
+ }
+ catch ( ClassNotFoundException e )
+ {
+ throw new NestedRuntimeException( "Unable to create test class '" + className + "'", e );
}
return testClass;
}
-
}
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScanResult.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScanResult.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScanResult.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ScanResult.java Sun Aug 5 13:17:04 2012
@@ -25,14 +25,15 @@ import java.util.Properties;
/**
* @author Kristian Rosenvold
*/
-public interface ScanResult {
+public interface ScanResult
+{
int size();
- String getClassName(int index);
+ String getClassName( int index );
- TestsToRun applyFilter(ScannerFilter scannerFilter, ClassLoader testClassLoader);
+ TestsToRun applyFilter( ScannerFilter scannerFilter, ClassLoader testClassLoader );
- List getClassesSkippedByValidation(ScannerFilter scannerFilter, ClassLoader testClassLoader);
+ List getClassesSkippedByValidation( ScannerFilter scannerFilter, ClassLoader testClassLoader );
- void writeTo(Properties properties);
+ void writeTo( Properties properties );
}
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java Sun Aug 5 13:17:04 2012
@@ -19,26 +19,30 @@ package org.apache.maven.surefire.util;
* under the License.
*/
-import junit.framework.TestCase;
-
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
+import junit.framework.TestCase;
+
/**
* @author Kristian Rosenvold
*/
-public class ScanResultTest extends TestCase {
- public void testWriteTo() throws Exception {
- List files = Arrays.asList(new String[]{"abc","cde"});
- DefaultScanResult scanResult = new DefaultScanResult(files);
+public class ScanResultTest
+ extends TestCase
+{
+ public void testWriteTo()
+ throws Exception
+ {
+ List files = Arrays.asList( new String[]{ "abc", "cde" } );
+ DefaultScanResult scanResult = new DefaultScanResult( files );
Properties serialized = new Properties();
- scanResult.writeTo(serialized);
+ scanResult.writeTo( serialized );
- DefaultScanResult read = DefaultScanResult.from(serialized);
+ DefaultScanResult read = DefaultScanResult.from( serialized );
List files1 = read.getFiles();
- assertEquals(2, files1.size());
- assertTrue(files1.contains("abc"));
- assertTrue( files1.contains("cde"));
+ assertEquals( 2, files1.size() );
+ assertTrue( files1.contains( "abc" ) );
+ assertTrue( files1.contains( "cde" ) );
}
}
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=1369576&r1=1369575&r2=1369576&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 Aug 5 13:17:04 2012
@@ -168,7 +168,8 @@ public class ProviderFactory
}
finally
{
- if ( System.getSecurityManager() == null){
+ if ( System.getSecurityManager() == null )
+ {
Thread.currentThread().setContextClassLoader( current );
}
}
Modified: maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java (original)
+++ maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java Sun Aug 5 13:17:04 2012
@@ -65,7 +65,7 @@ public class SingleGroupMatcher
{
for ( Class<?> cls : cats )
{
- if ( enabledClass != null && enabledClass.isAssignableFrom(cls) )
+ if ( enabledClass != null && enabledClass.isAssignableFrom( cls ) )
{
return true;
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java Sun Aug 5 13:17:04 2012
@@ -55,7 +55,7 @@ public class CheckSingleTestIT
final OutputValidator output =
unpack().setTestToRun( "DoesNotExist" ).failIfNoTests( false ).executeTest().verifyErrorFreeLog();
output.getTargetFile( "surefire-reports" );
- // assertFalse( "Unexpected reports directory", reportsDir.exists() ); Hmpf. Not really a good test
+ // assertFalse( "Unexpected reports directory", reportsDir.exists() ); Hmpf. Not really a good test
}
private SurefireLauncher unpack()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java Sun Aug 5 13:17:04 2012
@@ -50,7 +50,8 @@ public class TestSingleMethodIT
public void testJunit48parallel()
throws Exception
{
- unpack( "junit48-single-method" ).parallelClasses().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack( "junit48-single-method" ).parallelClasses().executeTest().verifyErrorFreeLog().assertTestSuiteResults(
+ 1, 0, 0, 0 );
}
public void testTestNg()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java Sun Aug 5 13:17:04 2012
@@ -19,17 +19,16 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-
/**
* Test working directory configuration, SUREFIRE-416
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java Sun Aug 5 13:17:04 2012
@@ -19,14 +19,13 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import java.io.File;
+import java.util.List;
import org.apache.maven.surefire.its.fixture.HelperAssertions;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.ReportTestSuite;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import java.io.File;
-import java.util.List;
-
/**
* Test reported runtime
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java Sun Aug 5 13:17:04 2012
@@ -19,6 +19,12 @@ package org.apache.maven.surefire.its.fi
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.apache.commons.lang.text.StrSubstitutor;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -29,13 +35,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.FileUtils;
import org.apache.maven.it.util.ResourceExtractor;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* Encapsulate all needed features to start a surefire run
* <p/>
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java Sun Aug 5 13:17:04 2012
@@ -23,7 +23,13 @@ import java.io.File;
import java.io.IOException;
import java.text.NumberFormat;
import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
@@ -45,7 +51,7 @@ public class TestSuiteXmlParser
private Map<String, ReportTestSuite> classesToSuites;
- private final NumberFormat numberFormat = NumberFormat.getInstance(Locale.US);
+ private final NumberFormat numberFormat = NumberFormat.getInstance( Locale.US );
/**
* @noinspection StringBufferField
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java?rev=1369576&r1=1369575&r2=1369576&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java Sun Aug 5 13:17:04 2012
@@ -21,7 +21,6 @@ package org.apache.maven.surefire.its.ji
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.TestFile;
/**
* Asserts that console output always goes somewhere ;)