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/01/27 21:50:40 UTC
svn commit: r1236883 [4/5] - in /maven/surefire/trunk:
maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/
maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/
maven-surefire-common/src/main/java/org/apache/maven/plug...
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java Fri Jan 27 20:50:34 2012
@@ -19,11 +19,10 @@ package org.apache.maven.surefire.its.fi
* under the License.
*/
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-
import java.io.File;
import java.util.List;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
/**
* A specialized verifier that enforces a standard use case for surefire IT's
@@ -33,13 +32,13 @@ import java.util.List;
public class OutputValidator
{
protected final Verifier verifier;
-
+
protected final File baseDir;
public OutputValidator( Verifier verifier )
{
this.verifier = verifier;
- this.baseDir = new File( verifier.getBasedir());
+ this.baseDir = new File( verifier.getBasedir() );
}
@@ -70,7 +69,7 @@ public class OutputValidator
return this;
}
- public OutputValidator verifyErrorFree(int total)
+ public OutputValidator verifyErrorFree( int total )
{
try
{
@@ -135,7 +134,7 @@ public class OutputValidator
return verifier.getArtifactPath( org, name, version, ext );
}
-
+
public OutputValidator assertTestSuiteResults( int total, int errors, int failures, int skipped )
{
HelperAssertions.assertTestSuiteResults( total, errors, failures, skipped, baseDir );
@@ -151,30 +150,29 @@ public class OutputValidator
public TestFile getTargetFile( String fileName )
{
File targetDir = getSubFile( "target" );
- return new TestFile(new File( targetDir, fileName ), this);
+ return new TestFile( new File( targetDir, fileName ), this );
}
public TestFile getSurefireReportsFile( String fileName )
{
File targetDir = getSubFile( "target/surefire-reports" );
- return new TestFile(new File( targetDir, fileName ), this);
+ return new TestFile( new File( targetDir, fileName ), this );
}
public TestFile getSiteFile( String fileName )
{
File targetDir = getSubFile( "target/site" );
- return new TestFile(new File( targetDir, fileName ), this);
+ return new TestFile( new File( targetDir, fileName ), this );
}
-
public File getBaseDir()
{
return baseDir;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
private List<String> getLog()
throws VerificationException
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java Fri Jan 27 20:50:34 2012
@@ -101,7 +101,9 @@ public class ReportTestCase
failure.put( "type", type );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String toString()
{
return fullName;
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java Fri Jan 27 20:50:34 2012
@@ -156,10 +156,12 @@ public class ReportTestSuite
this.testCases = testCases;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String toString()
{
- return fullClassName + " [" + getNumberOfTests() + "/" + getNumberOfFailures() + "/" + getNumberOfErrors()
- + "/" + getNumberOfSkipped() + "]";
+ return fullClassName + " [" + getNumberOfTests() + "/" + getNumberOfFailures() + "/" + getNumberOfErrors() + "/"
+ + getNumberOfSkipped() + "]";
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java Fri Jan 27 20:50:34 2012
@@ -37,7 +37,8 @@ import junit.framework.TestCase;
public abstract class SurefireIntegrationTestCase
extends TestCase
{
- public OutputValidator executeErrorFreeTest( String sourceName, int total ){
+ public OutputValidator executeErrorFreeTest( String sourceName, int total )
+ {
return unpack( sourceName ).executeTest().verifyErrorFree( total );
}
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=1236883&r1=1236882&r2=1236883&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 Fri Jan 27 20:50:34 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.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -28,13 +34,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/>
@@ -79,16 +78,19 @@ public class SurefireLauncher
cliOptions.clear();
}
- private static Verifier createVerifier(Class testClass, String resourceName)
+ private static Verifier createVerifier( Class testClass, String resourceName )
throws IOException, VerificationException
{
- return new Verifier( simpleExtractResources( testClass, resourceName).getAbsolutePath() );
+ return new Verifier( simpleExtractResources( testClass, resourceName ).getAbsolutePath() );
}
private static File simpleExtractResources( Class<?> cl, String resourcePath )
throws IOException
{
- if (!resourcePath.startsWith( "/" )) resourcePath = "/" + resourcePath;
+ if ( !resourcePath.startsWith( "/" ) )
+ {
+ resourcePath = "/" + resourcePath;
+ }
String tempDirPath = System.getProperty( "maven.test.tmpdir", System.getProperty( "java.io.tmpdir" ) );
File tempDir = new File( tempDirPath, cl.getSimpleName() );
File testDir = new File( tempDir, resourcePath );
@@ -104,20 +106,21 @@ public class SurefireLauncher
cliOptions.clear();
}
- public SurefireLauncher getSubProjectLauncher(String subProject)
+ public SurefireLauncher getSubProjectLauncher( String subProject )
throws VerificationException
{
final File subFile = surefireVerifier.getSubFile( subProject );
- return new SurefireLauncher( new Verifier( subFile.getAbsolutePath() ));
+ return new SurefireLauncher( new Verifier( subFile.getAbsolutePath() ) );
}
+
public OutputValidator getSubProjectValidator( String subProject )
throws VerificationException
{
final File subFile = surefireVerifier.getSubFile( subProject );
- return new OutputValidator( new Verifier( subFile.getAbsolutePath() ));
+ return new OutputValidator( new Verifier( subFile.getAbsolutePath() ) );
}
- public SurefireLauncher addEnvVar(String key, String value)
+ public SurefireLauncher addEnvVar( String key, String value )
{
envvars.put( key, value );
return this;
@@ -174,17 +177,17 @@ public class SurefireLauncher
}
this.goals.clear();
- this.goals.addAll( goals );
+ this.goals.addAll( goals );
return this;
}
public SurefireLauncher assertNotPresent( String subFile )
{
- verifier.assertFileNotPresent( surefireVerifier.getSubFile( subFile ).getAbsolutePath());
+ verifier.assertFileNotPresent( surefireVerifier.getSubFile( subFile ).getAbsolutePath() );
return this;
}
-
+
public SurefireLauncher showErrorStackTraces()
{
cliOptions.add( "-e" );
@@ -204,12 +207,14 @@ public class SurefireLauncher
}
- public SurefireLauncher skipClean(){
+ public SurefireLauncher skipClean()
+ {
goals.add( "-Dclean.skip=true" );
return this;
}
-
- public SurefireLauncher groups(String groups){
+
+ public SurefireLauncher groups( String groups )
+ {
goals.add( "-Dgroups=" + groups );
return this;
}
@@ -234,9 +239,12 @@ public class SurefireLauncher
public OutputValidator executeTestWithFailure()
{
- try {
+ try
+ {
execute( "test" );
- } catch (SurefireVerifierException ignore) {
+ }
+ catch ( SurefireVerifierException ignore )
+ {
return surefireVerifier;
}
throw new RuntimeException( "Expecting build failure, got none!" );
@@ -244,9 +252,12 @@ public class SurefireLauncher
public OutputValidator executeVerifyWithFailure()
{
- try {
+ try
+ {
executeVerify();
- } catch (SurefireVerifierException ignore) {
+ }
+ catch ( SurefireVerifierException ignore )
+ {
return surefireVerifier;
}
throw new RuntimeException( "Expecting build failure, got none!" );
@@ -313,6 +324,7 @@ public class SurefireLauncher
{
return forkMode( "always" );
}
+
public SurefireLauncher forkPerTest()
{
return forkMode( "pertest" );
@@ -322,9 +334,10 @@ public class SurefireLauncher
{
return addGoal( "-DforkMode=" + forkMode );
}
+
public SurefireLauncher runOrder( String runOrder )
{
- return addGoal( "-DrunOrder=" + runOrder);
+ return addGoal( "-DrunOrder=" + runOrder );
}
public SurefireLauncher failIfNoTests( boolean fail )
@@ -339,7 +352,7 @@ public class SurefireLauncher
return addGoal( "-Dsurefire.failIfNoSpecifiedTests=" + fail );
}
- public SurefireLauncher useSystemClassLoader( boolean useSystemClassLoader)
+ public SurefireLauncher useSystemClassLoader( boolean useSystemClassLoader )
{
return addGoal( "-DuseSystemClassLoader=" + useSystemClassLoader );
}
@@ -376,9 +389,10 @@ public class SurefireLauncher
{
return addGoal( "-D" + variable + "=" + value );
}
-
- public SurefireLauncher setJUnitVersion(String version){
- addD( "junit.version", version);
+
+ public SurefireLauncher setJUnitVersion( String version )
+ {
+ addD( "junit.version", version );
return this;
}
@@ -403,47 +417,53 @@ public class SurefireLauncher
{
return failIfNoTests;
}
-
- public File getUnpackLocation(){
- return new File(verifier.getBasedir());
+
+ public File getUnpackLocation()
+ {
+ return new File( verifier.getBasedir() );
}
public SurefireLauncher addFailsafeReportOnlyGoal()
{
- goals.add( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":failsafe-report-only");
+ goals.add(
+ "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":failsafe-report-only" );
return this;
}
public SurefireLauncher addSurefireReportGoal()
{
- goals.add( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report");
+ goals.add( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report" );
return this;
}
public SurefireLauncher addSurefireReportOnlyGoal()
{
- goals.add( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report-only");
+ goals.add( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report-only" );
return this;
}
-
+
public SurefireLauncher deleteSiteDir()
{
- try {
- FileUtils.deleteDirectory( surefireVerifier.getSubFile( "site" ));
- } catch (IOException e) {
- throw new SurefireVerifierException(e);
+ try
+ {
+ FileUtils.deleteDirectory( surefireVerifier.getSubFile( "site" ) );
+ }
+ catch ( IOException e )
+ {
+ throw new SurefireVerifierException( e );
}
return this;
}
public SurefireLauncher setTestToRun( String basicTest )
{
- addD( "test", basicTest);
+ addD( "test", basicTest );
return this;
}
- public OutputValidator getSurefireVerifier() {
+ public OutputValidator getSurefireVerifier()
+ {
return surefireVerifier;
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java Fri Jan 27 20:50:34 2012
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java Fri Jan 27 20:50:34 2012
@@ -22,7 +22,8 @@ package org.apache.maven.surefire.its.fi
/**
* @author Kristian Rosenvold
*/
-public class SurefireVerifierException extends RuntimeException
+public class SurefireVerifierException
+ extends RuntimeException
{
public SurefireVerifierException( Throwable cause )
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java Fri Jan 27 20:50:34 2012
@@ -27,7 +27,6 @@ import java.io.FileReader;
import java.io.IOException;
import java.net.URI;
import java.util.List;
-
import org.apache.commons.io.FileUtils;
import junit.framework.Assert;
@@ -105,10 +104,11 @@ public class TestFile
}
- public String readFileToString(){
+ public String readFileToString()
+ {
try
{
- return FileUtils.readFileToString(file);
+ return FileUtils.readFileToString( file );
}
catch ( IOException e )
{
@@ -135,7 +135,8 @@ public class TestFile
return null;
}
- public URI toURI() {
+ public URI toURI()
+ {
return file.toURI();
}
}
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=1236883&r1=1236882&r2=1236883&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 Fri Jan 27 20:50:34 2012
@@ -34,8 +34,6 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.maven.surefire.its.fixture.ReportTestCase;
-import org.apache.maven.surefire.its.fixture.ReportTestSuite;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -47,8 +45,11 @@ public class TestSuiteXmlParser
extends DefaultHandler
{
private ReportTestSuite defaultSuite;
+
private ReportTestSuite currentSuite;
+
private Map<String, ReportTestSuite> classesToSuites;
+
private final NumberFormat numberFormat = NumberFormat.getInstance();
/**
@@ -80,7 +81,9 @@ public class TestSuiteXmlParser
return classesToSuites.values();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void startElement( String uri, String localName, String qName, Attributes attributes )
throws SAXException
{
@@ -181,7 +184,9 @@ public class TestSuiteXmlParser
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void endElement( String uri, String localName, String qName )
throws SAXException
{
@@ -216,7 +221,9 @@ public class TestSuiteXmlParser
// TODO extract real skipped reasons
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void characters( char[] ch, int start, int length )
throws SAXException
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java Fri Jan 27 20:50:34 2012
@@ -34,9 +34,8 @@ public class Surefire141PluggableProvide
{
unpack( "surefire-141-pluggableproviders/test-provider" ).executeInstall();
- unpack( "surefire-141-pluggableproviders/test" ).setEOption().executeTest()
- .verifyTextInLog( "Using configured provider org.apache.maven.surefire.testprovider.TestProvider" )
- .verifyTextInLog( "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" )
- .verifyErrorFreeLog();
+ unpack( "surefire-141-pluggableproviders/test" ).setEOption().executeTest().verifyTextInLog(
+ "Using configured provider org.apache.maven.surefire.testprovider.TestProvider" ).verifyTextInLog(
+ "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" ).verifyErrorFreeLog();
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java Fri Jan 27 20:50:34 2012
@@ -21,8 +21,8 @@ package org.apache.maven.surefire.its.ji
import java.io.File;
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.codehaus.plexus.util.FileUtils;
/**
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java Fri Jan 27 20:50:34 2012
@@ -19,13 +19,13 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.*;
+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.ReportTestCase;
import org.apache.maven.surefire.its.fixture.ReportTestSuite;
-
-import java.io.File;
-import java.util.List;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test Surefire-224 (XML test reports are not well-formed when failure message contains quotes)
@@ -41,7 +41,8 @@ public class Surefire224WellFormedXmlFai
outputValidator.assertTestSuiteResults( 4, 0, 4, 0 );
- ReportTestSuite suite = HelperAssertions.extractReports( ( new File[]{ outputValidator.getBaseDir() } ) ).get( 0 );
+ ReportTestSuite suite =
+ HelperAssertions.extractReports( ( new File[]{ outputValidator.getBaseDir() } ) ).get( 0 );
List<ReportTestCase> testCases = suite.getTestCases();
assertEquals( "Wrong number of test case objects", 4, testCases.size() );
ReportTestCase testQuote = null, testLower = null, testGreater = null, testU0000 = null;
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java Fri Jan 27 20:50:34 2012
@@ -32,7 +32,8 @@ public class Surefire257NotRerunningTest
public void testShouldNotRerun()
throws Exception
{
- unpack( "/surefire-257-rerunningTests" ).addSurefireReportGoal().addSurefireReportGoal().executeCurrentGoals()
- .verifyTextInLog( "Skipping execution of surefire because it has already been run for this configuration" );
+ unpack(
+ "/surefire-257-rerunningTests" ).addSurefireReportGoal().addSurefireReportGoal().executeCurrentGoals().verifyTextInLog(
+ "Skipping execution of surefire because it has already been run for this configuration" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java Fri Jan 27 20:50:34 2012
@@ -21,8 +21,10 @@ package org.apache.maven.surefire.its.ji
import java.io.IOException;
import java.net.URI;
-
-import org.apache.maven.surefire.its.fixture.*;
+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 com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java Fri Jan 27 20:50:34 2012
@@ -31,8 +31,7 @@ public class Surefire408ManualProviderSe
{
public void testPaallelBuildResultCount()
{
- unpack( "/surefire-408-manual-provider-selection" ).showErrorStackTraces()
- .executeTest()
- .verifyTextInLog( "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" );
+ unpack( "/surefire-408-manual-provider-selection" ).showErrorStackTraces().executeTest().verifyTextInLog(
+ "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
@@ -34,13 +34,13 @@ public class Surefire510TestClassPathFor
public void testForkAlways()
{
unpack().forkAlways().executeTest().
- verifyTextInLog( "tcp is set" );
+ verifyTextInLog( "tcp is set" );
}
public void testForkOnce()
{
unpack().forkOnce().executeTest().
- verifyTextInLog( "tcp is set" );
+ verifyTextInLog( "tcp is set" );
}
public SurefireLauncher unpack()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java Fri Jan 27 20:50:34 2012
@@ -20,8 +20,8 @@ package org.apache.maven.surefire.its.ji
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java Fri Jan 27 20:50:34 2012
@@ -31,7 +31,7 @@ public class Surefire621TestCountingJuni
{
public void testJunit3ParallelBuildResultCount()
{
- unpack( "surefire-621-testCounting-junit3-in-parallel" ).failNever().execute( "install" )
- .assertTestSuiteResults(6, 0, 0, 0);
+ unpack( "surefire-621-testCounting-junit3-in-parallel" ).failNever().execute(
+ "install" ).assertTestSuiteResults( 6, 0, 0, 0 );
}
}
\ No newline at end of file
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=1236883&r1=1236882&r2=1236883&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 Fri Jan 27 20:50:34 2012
@@ -34,8 +34,8 @@ public class Surefire628ConsoleOutputBef
public void testJunit3ParallelBuildResultCount()
{
- OutputValidator validator = unpack( "surefire-628-consoleoutputbeforeandafterclass" )
- .failNever().parallelMethods().executeTest();
+ OutputValidator validator =
+ unpack( "surefire-628-consoleoutputbeforeandafterclass" ).failNever().parallelMethods().executeTest();
validator.verifyTextInLog( "628Test1" );
validator.verifyTextInLog( "Before628Test1" );
@@ -47,13 +47,13 @@ public class Surefire628ConsoleOutputBef
public void testProperBeforeAndAfterClassCapture()
{
- OutputValidator validator = unpack( "surefire-628-consoleoutputbeforeandafterclass" )
- .failNever().redirectToFile( true ).parallelClasses().executeTest();
+ OutputValidator validator =
+ unpack( "surefire-628-consoleoutputbeforeandafterclass" ).failNever().redirectToFile(
+ true ).parallelClasses().executeTest();
final TestFile surefireReportsFile = validator.getSurefireReportsFile( "surefire628.Test2-output.txt" );
- surefireReportsFile.assertContainsText( "628Test2" )
- .assertContainsText( "BeforeClass628Test2" )
- .assertContainsText( "AfterClass628Test2" );
+ surefireReportsFile.assertContainsText( "628Test2" ).assertContainsText(
+ "BeforeClass628Test2" ).assertContainsText( "AfterClass628Test2" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java Fri Jan 27 20:50:34 2012
@@ -31,7 +31,7 @@ public class Surefire634UnsettableSystem
{
public void testJunit3ParallelBuildResultCount()
{
- unpack( "/surefire-634-systemPropertiesWarning" ).executeTest()
- .verifyTextInLog( "java.library.path cannot be set as system property" );
+ unpack( "/surefire-634-systemPropertiesWarning" ).executeTest().verifyTextInLog(
+ "java.library.path cannot be set as system property" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java Fri Jan 27 20:50:34 2012
@@ -31,7 +31,6 @@ public class Surefire674BuildFailingWhen
{
public void testBuildFailingWhenErrors()
{
- unpack( "/failsafe-buildfail" ).executeVerifyWithFailure()
- .verifyTextInLog( "BUILD FAILURE" );
+ unpack( "/failsafe-buildfail" ).executeVerifyWithFailure().verifyTextInLog( "BUILD FAILURE" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java Fri Jan 27 20:50:34 2012
@@ -23,7 +23,7 @@ import org.apache.maven.surefire.its.fix
/**
* SUREFIRE-697 Asserts proper truncation of long exception messages Some say testing this is a bit over the top.
- *
+ *
* @author Kristian Rosenvold
*/
public class Surefire697NiceSummaryIT
@@ -31,7 +31,7 @@ public class Surefire697NiceSummaryIT
{
public void testBuildFailingWhenErrors()
{
- unpack( "/surefire-697-niceSummary" ).failNever().executeTest()
- .verifyTextInLog( "testShortMultiline(junit.surefire697.BasicTest): A very short multiline message" );
+ unpack( "/surefire-697-niceSummary" ).failNever().executeTest().verifyTextInLog(
+ "testShortMultiline(junit.surefire697.BasicTest): A very short multiline message" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java Fri Jan 27 20:50:34 2012
@@ -31,10 +31,7 @@ public class Surefire705ParallelForkTime
{
public void testTimeoutForked()
{
- unpack( "/fork-timeout" ).setJUnitVersion( "4.8.1" )
- .addGoal( "-Djunit.version=4.8.1" )
- .addGoal( "-Djunit.parallel=classes" )
- .addGoal( "-DtimeOut=1" )
- .executeTestWithFailure();
+ unpack( "/fork-timeout" ).setJUnitVersion( "4.8.1" ).addGoal( "-Djunit.version=4.8.1" ).addGoal(
+ "-Djunit.parallel=classes" ).addGoal( "-DtimeOut=1" ).executeTestWithFailure();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* @author Kristian Rosenvold
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java Fri Jan 27 20:50:34 2012
@@ -33,9 +33,8 @@ public class Surefire740TruncatedCommaIT
{
public void testRussianLocaleReport()
{
- OutputValidator validator = unpack( "/surefire-740-comma-truncated" )
- .addEnvVar( "MAVEN_OPTS", "-Duser.language=ru -Duser.country=RU" )
- .failNever().addSurefireReportGoal().executeCurrentGoals();
+ OutputValidator validator = unpack( "/surefire-740-comma-truncated" ).addEnvVar( "MAVEN_OPTS",
+ "-Duser.language=ru -Duser.country=RU" ).failNever().addSurefireReportGoal().executeCurrentGoals();
TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* @author Kristian Rosenvold
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java Fri Jan 27 20:50:34 2012
@@ -20,8 +20,8 @@ package org.apache.maven.surefire.its.ji
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -41,10 +41,8 @@ public class Surefire772BothReportsIT
public void testReportGeneration()
throws Exception
{
- OutputValidator outputValidator = unpack()
- .addFailsafeReportOnlyGoal()
- .addSurefireReportOnlyGoal()
- .executeCurrentGoals();
+ OutputValidator outputValidator =
+ unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
TestFile siteFile = outputValidator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
@@ -59,8 +57,8 @@ public class Surefire772BothReportsIT
throws Exception
{
OutputValidator validator = unpack().
- activateProfile( "skipFailsafe" )
- .addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ activateProfile(
+ "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
@@ -75,8 +73,8 @@ public class Surefire772BothReportsIT
throws Exception
{
OutputValidator validator = unpack().failNever().
- activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal()
- .addSurefireReportOnlyGoal().executeCurrentGoals();
+ activateProfile(
+ "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java Fri Jan 27 20:50:34 2012
@@ -22,8 +22,8 @@ package org.apache.maven.surefire.its.ji
import java.io.IOException;
import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -48,8 +48,8 @@ public class Surefire772NoFailsafeReport
public void testSkippedFailsafeReportGeneration()
throws Exception
{
- final OutputValidator validator =
- unpack().activateProfile( "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ final OutputValidator validator = unpack().activateProfile(
+ "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
assertSurefireReportPresent( validator );
assertNoFailsefeReport( validator );
@@ -58,8 +58,8 @@ public class Surefire772NoFailsafeReport
public void testForcedFailsafeReportGeneration()
throws Exception
{
- final OutputValidator validator =
- unpack().activateProfile( "forceFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ final OutputValidator validator = unpack().activateProfile(
+ "forceFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
assertSurefireReportPresent( validator );
assertFailsafeReport( validator );
}
@@ -67,8 +67,8 @@ public class Surefire772NoFailsafeReport
public void testSkipForcedFailsafeReportGeneration()
throws Exception
{
- final OutputValidator validator =
- unpack().activateProfile( "forceFailsafe" ).activateProfile( "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ final OutputValidator validator = unpack().activateProfile( "forceFailsafe" ).activateProfile(
+ "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
assertSurefireReportPresent( validator );
assertNoFailsefeReport( validator );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java Fri Jan 27 20:50:34 2012
@@ -20,8 +20,8 @@ package org.apache.maven.surefire.its.ji
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -48,8 +48,8 @@ public class Surefire772NoSurefireReport
public void testSkippedSurefireReportGeneration()
{
- OutputValidator validator =
- unpack().activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator = unpack().activateProfile(
+ "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
@@ -62,8 +62,8 @@ public class Surefire772NoSurefireReport
public void testOptionalSurefireReportGeneration()
{
- OutputValidator validator =
- unpack().activateProfile( "optionalSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator = unpack().activateProfile(
+ "optionalSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
@@ -76,8 +76,8 @@ public class Surefire772NoSurefireReport
public void testSkipOptionalSurefireReportGeneration()
{
- OutputValidator validator =
- unpack().activateProfile( "optionalSurefire" ).activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator = unpack().activateProfile( "optionalSurefire" ).activateProfile(
+ "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java Fri Jan 27 20:50:34 2012
@@ -20,8 +20,8 @@ package org.apache.maven.surefire.its.ji
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -34,7 +34,8 @@ public class Surefire772SpecifiedReports
{
public void testReportGeneration()
{
- OutputValidator validator = unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator =
+ unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
@@ -47,8 +48,8 @@ public class Surefire772SpecifiedReports
public void testSkippedFailsafeReportGeneration()
{
- OutputValidator validator =
- unpack().activateProfile( "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator = unpack().activateProfile(
+ "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
@@ -61,8 +62,8 @@ public class Surefire772SpecifiedReports
public void testSkippedSurefireReportGeneration()
{
- OutputValidator validator =
- unpack().activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator = unpack().activateProfile(
+ "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java Fri Jan 27 20:50:34 2012
@@ -9,10 +9,9 @@ public class Surefire803MultiFailsafeExe
public void testSecondExecutionRunsAfterFirstExecutionFails()
{
- unpack( "/surefire-803-multiFailsafeExec-failureInFirst" ).executeVerifyWithFailure().assertIntegrationTestSuiteResults( 4,
- 0,
- 2,
- 0 );
+ unpack(
+ "/surefire-803-multiFailsafeExec-failureInFirst" ).executeVerifyWithFailure().assertIntegrationTestSuiteResults(
+ 4, 0, 2, 0 );
}
public void testOneExecutionRunInTwoBuilds()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java Fri Jan 27 20:50:34 2012
@@ -8,17 +8,20 @@ public class Surefire806SpecifiedTestCon
public void testSingleTestInOneExecutionOfMultiExecutionProject()
{
- unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun( "FirstTest" ).failIfNoSpecifiedTests( false ).executeTest().verifyErrorFree( 1 );
+ unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun( "FirstTest" ).failIfNoSpecifiedTests(
+ false ).executeTest().verifyErrorFree( 1 );
}
public void testTwoSpecifiedTestExecutionsInCorrectExecutionBlocks()
{
- unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun( "FirstTest,SecondTest" ).executeTest().verifyErrorFree( 2 );
+ unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun(
+ "FirstTest,SecondTest" ).executeTest().verifyErrorFree( 2 );
}
public void testSingleTestInSingleExecutionProject()
{
- unpack( "/surefire-806-specifiedTests-single" ).setTestToRun( "ThirdTest" ).failIfNoSpecifiedTests( false ).executeTest().verifyErrorFree( 1 );
+ unpack( "/surefire-806-specifiedTests-single" ).setTestToRun( "ThirdTest" ).failIfNoSpecifiedTests(
+ false ).executeTest().verifyErrorFree( 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java Fri Jan 27 20:50:34 2012
@@ -23,7 +23,7 @@ import org.apache.maven.surefire.its.fix
/**
* SUREFIRE-818
- *
+ *
* @author Kristian Rosenvold
*/
public class Surefire818NpeIgnoresTestsIT
Modified: maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java Fri Jan 27 20:50:34 2012
@@ -19,13 +19,12 @@ package org.apache.maven.surefire.common
* under the License.
*/
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import org.apache.maven.surefire.NonAbstractClassFilter;
import org.apache.maven.surefire.util.ReflectionUtils;
import org.apache.maven.surefire.util.ScannerFilter;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
/**
* Missing tests ? This class is basically a subset of the JUnit4TestChecker, which is tested
* to boredom and back. Unfortunately we don't have any common module between these providers,
Modified: maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java Fri Jan 27 20:50:34 2012
@@ -28,7 +28,8 @@ import junit.framework.TestResult;
* @author Kristian Rosenvold
*/
public class JUnit3TestCheckerTest
- extends TestCase {
+ extends TestCase
+{
private final JUnit3TestChecker jUnit3TestChecker = new JUnit3TestChecker( this.getClass().getClassLoader() );
public void testValidJunit4Annotated()
@@ -70,9 +71,10 @@ public class JUnit3TestCheckerTest
assertTrue( jUnit3TestChecker.accept( CustomSuiteOnlyTest.class ) );
}
- public void testIinnerClassNotAutomaticallyTc(){
- assertTrue( jUnit3TestChecker.accept( NestedTC.class));
- assertFalse( jUnit3TestChecker.accept( NestedTC.Inner.class));
+ public void testIinnerClassNotAutomaticallyTc()
+ {
+ assertTrue( jUnit3TestChecker.accept( NestedTC.class ) );
+ assertFalse( jUnit3TestChecker.accept( NestedTC.Inner.class ) );
}
@@ -117,15 +119,20 @@ public class JUnit3TestCheckerTest
public static class NotValidTest
{
- /** @noinspection UnusedDeclaration*/
+ /**
+ * @noinspection UnusedDeclaration
+ */
public void testSomething()
{
}
}
- public abstract static class BaseClassWithTest extends TestCase
+ public abstract static class BaseClassWithTest
+ extends TestCase
{
- /** @noinspection UnusedDeclaration*/
+ /**
+ * @noinspection UnusedDeclaration
+ */
public void testWeAreAlsoATest()
{
}
@@ -136,8 +143,11 @@ public class JUnit3TestCheckerTest
{
}
- class NestedTC extends TestCase {
- public class Inner {
+ class NestedTC
+ extends TestCase
+ {
+ public class Inner
+ {
}
}
Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java Fri Jan 27 20:50:34 2012
@@ -45,7 +45,7 @@ public final class JUnit4Reflector
public String getAnnotatedIgnoreValue( Description description )
{
- final Ignore ignore = getAnnotatedIgnore( description );
+ final Ignore ignore = getAnnotatedIgnore( description );
return ignore != null ? ignore.value() : null;
}
Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java Fri Jan 27 20:50:34 2012
@@ -38,7 +38,7 @@ public class JUnit4RunListener
// then an open-paren (start matching a group)
+ "[^\\\\(\\\\)]+" //non-parens
+ ")\\)" + "$" );
- // then a close-paren (end group match)
+ // then a close-paren (end group match)
protected final RunListener reporter;
@@ -97,9 +97,9 @@ public class JUnit4RunListener
public void testFailure( Failure failure )
throws Exception
{
- ReportEntry report = new SimpleReportEntry( extractClassName( failure.getDescription() ),
- failure.getTestHeader(),
- new JUnit4StackTraceWriter( failure ) );
+ ReportEntry report =
+ new SimpleReportEntry( extractClassName( failure.getDescription() ), failure.getTestHeader(),
+ new JUnit4StackTraceWriter( failure ) );
if ( failure.getException() instanceof AssertionError )
{
@@ -137,8 +137,7 @@ public class JUnit4RunListener
private SimpleReportEntry createReportEntry( Description description )
{
- return new SimpleReportEntry( extractClassName( description ),
- description.getDisplayName() );
+ return new SimpleReportEntry( extractClassName( description ), description.getDisplayName() );
}
Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java Fri Jan 27 20:50:34 2012
@@ -19,11 +19,11 @@ package org.apache.maven.surefire.common
* under the License.
*/
-import org.apache.maven.surefire.util.ReflectionUtils;
-import org.junit.runner.notification.RunListener;
-
import java.util.LinkedList;
import java.util.List;
+import org.apache.maven.surefire.util.ReflectionUtils;
+
+import org.junit.runner.notification.RunListener;
/**
* @author Kristian Rosenvold
Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java Fri Jan 27 20:50:34 2012
@@ -81,7 +81,7 @@ public class JUnit4StackTraceWriter
*/
public SafeThrowable getThrowable()
{
- return new SafeThrowable( junitFailure.getException());
+ return new SafeThrowable( junitFailure.getException() );
}
}
Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java Fri Jan 27 20:50:34 2012
@@ -19,14 +19,13 @@ package org.apache.maven.surefire.common
* under the License.
*/
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
import org.apache.maven.surefire.NonAbstractClassFilter;
import org.apache.maven.surefire.common.junit3.JUnit3TestChecker;
import org.apache.maven.surefire.util.ReflectionUtils;
import org.apache.maven.surefire.util.ScannerFilter;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
/**
* @author Kristian Rosenvold
*/
Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java Fri Jan 27 20:50:34 2012
@@ -40,8 +40,7 @@ public class JUnit4RunListenerTest
public void testTestStarted()
throws Exception
{
- RunListener jUnit4TestSetReporter =
- new JUnit4RunListener( new MockReporter( ) );
+ RunListener jUnit4TestSetReporter = new JUnit4RunListener( new MockReporter() );
Runner junitTestRunner = Request.classes( "abc", STest1.class, STest2.class ).getRunner();
RunNotifier runNotifier = new RunNotifier();
runNotifier.addListener( jUnit4TestSetReporter );
@@ -60,13 +59,14 @@ public class JUnit4RunListenerTest
jUnit4TestSetReporter.testStarted( testSomething );
- new Thread(new Runnable(){
+ new Thread( new Runnable()
+ {
public void run()
{
try
{
- jUnit4TestSetReporter.testStarted( testSomething2 );
- jUnit4TestSetReporter.testFailure( new Failure( testSomething2, new AssertionError( "Fud" ) ));
+ jUnit4TestSetReporter.testStarted( testSomething2 );
+ jUnit4TestSetReporter.testFailure( new Failure( testSomething2, new AssertionError( "Fud" ) ) );
jUnit4TestSetReporter.testFinished( testSomething2 );
countDownLatch.countDown();
}
@@ -75,7 +75,7 @@ public class JUnit4RunListenerTest
throw new RuntimeException( e );
}
}
- }).start();
+ } ).start();
countDownLatch.await();
jUnit4TestSetReporter.testFinished( testSomething );
Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java Fri Jan 27 20:50:34 2012
@@ -109,9 +109,10 @@ public class JUnit4TestCheckerTest
}
@Test
- public void innerClassNotAutomaticallyTc(){
- assertTrue( jUnit4TestChecker.accept( NestedTC.class));
- assertFalse( jUnit4TestChecker.accept( NestedTC.Inner.class));
+ public void innerClassNotAutomaticallyTc()
+ {
+ assertTrue( jUnit4TestChecker.accept( NestedTC.class ) );
+ assertFalse( jUnit4TestChecker.accept( NestedTC.Inner.class ) );
}
@@ -228,8 +229,11 @@ public class JUnit4TestCheckerTest
}
}
- class NestedTC extends TestCase {
- public class Inner {
+ class NestedTC
+ extends TestCase
+ {
+ public class Inner
+ {
}
}
Modified: maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java Fri Jan 27 20:50:34 2012
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-
import org.apache.maven.surefire.booter.ProviderParameterNames;
import org.apache.maven.surefire.group.match.AndGroupMatcher;
import org.apache.maven.surefire.group.match.GroupMatcher;
@@ -35,6 +34,7 @@ import org.apache.maven.surefire.group.m
import org.apache.maven.surefire.group.parse.GroupMatcherParser;
import org.apache.maven.surefire.group.parse.ParseException;
import org.codehaus.plexus.util.SelectorUtils;
+
import org.junit.experimental.categories.Category;
import org.junit.runner.Description;
import org.junit.runner.manipulation.Filter;
@@ -65,8 +65,8 @@ public class FilterFactory
}
catch ( ParseException e )
{
- throw new IllegalArgumentException( "Invalid group expression: '" + groups + "'. Reason: "
- + e.getMessage(), e );
+ throw new IllegalArgumentException(
+ "Invalid group expression: '" + groups + "'. Reason: " + e.getMessage(), e );
}
}
@@ -79,8 +79,8 @@ public class FilterFactory
}
catch ( ParseException e )
{
- throw new IllegalArgumentException( "Invalid group expression: '" + excludedGroups + "'. Reason: "
- + e.getMessage(), e );
+ throw new IllegalArgumentException(
+ "Invalid group expression: '" + excludedGroups + "'. Reason: " + e.getMessage(), e );
}
}
@@ -152,10 +152,11 @@ public class FilterFactory
{
for ( Description o : description.getChildren() )
{
- if (isDescriptionMatch( o )){
+ if ( isDescriptionMatch( o ) )
+ {
return true;
}
-
+
}
return isDescriptionMatch( description );
}
@@ -170,7 +171,7 @@ public class FilterFactory
@Override
public String describe()
{
- return "By method" + requestedTestMethod;
+ return "By method" + requestedTestMethod;
}
}
@@ -203,9 +204,9 @@ public class FilterFactory
@Override
public boolean shouldRun( Description description )
{
- return shouldRun( description,
- ( description.getMethodName() == null ? null
- : Description.createSuiteDescription( description.getTestClass() ) ) );
+ return shouldRun( description, ( description.getMethodName() == null
+ ? null
+ : Description.createSuiteDescription( description.getTestClass() ) ) );
}
private boolean shouldRun( Description description, Description parent )
@@ -246,7 +247,7 @@ public class FilterFactory
// System.out.println( "Checking " + cats.size() + " categories..." );
//
// System.out.println( "Enabled? " + ( matcher.enabled( cats.toArray( new Class<?>[] {} ) ) ) + "\n\n" );
- result = matcher.enabled( cats.toArray( new Class<?>[] {} ) );
+ result = matcher.enabled( cats.toArray( new Class<?>[]{ } ) );
if ( parent == null )
{
Modified: maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java Fri Jan 27 20:50:34 2012
@@ -27,6 +27,7 @@ import org.apache.maven.surefire.util.Re
public final class JUnit48Reflector
{
private static final String CATEGORIES = "org.junit.experimental.categories.Categories";
+
private static final String CATEGORY = "org.junit.experimental.categories.Category";
private final Class categories;
@@ -43,8 +44,9 @@ public final class JUnit48Reflector
{
return categories != null;
}
-
- public boolean isCategoryAnnotationPresent(Class clazz){
+
+ public boolean isCategoryAnnotationPresent( Class clazz )
+ {
return category != null && clazz.getAnnotation( category ) != null;
}
}
Modified: maven/surefire/trunk/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/JUnit48ReflectorTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/JUnit48ReflectorTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/JUnit48ReflectorTest.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/JUnit48ReflectorTest.java Fri Jan 27 20:50:34 2012
@@ -31,26 +31,31 @@ public class JUnit48ReflectorTest
public void testIsJUnit48Available()
throws Exception
{
- JUnit48Reflector jUnit48Reflector = new JUnit48Reflector( this.getClass().getClassLoader() );
- assertTrue( jUnit48Reflector.isJUnit48Available() );
+ JUnit48Reflector jUnit48Reflector = new JUnit48Reflector( this.getClass().getClassLoader() );
+ assertTrue( jUnit48Reflector.isJUnit48Available() );
}
public void testCategoryAnnotation()
throws Exception
{
- JUnit48Reflector jUnit48Reflector = new JUnit48Reflector( this.getClass().getClassLoader() );
- assertTrue( jUnit48Reflector.isCategoryAnnotationPresent(Test1.class) );
- assertFalse( jUnit48Reflector.isCategoryAnnotationPresent(Test2.class) );
+ JUnit48Reflector jUnit48Reflector = new JUnit48Reflector( this.getClass().getClassLoader() );
+ assertTrue( jUnit48Reflector.isCategoryAnnotationPresent( Test1.class ) );
+ assertFalse( jUnit48Reflector.isCategoryAnnotationPresent( Test2.class ) );
}
-
- interface Foo{
-
+
+ interface Foo
+ {
+
}
- @Category(Foo.class)
- private class Test1 {
-
+
+ @Category( Foo.class )
+ private class Test1
+ {
+
}
- private class Test2 {
+
+ private class Test2
+ {
}
Modified: maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java Fri Jan 27 20:50:34 2012
@@ -60,7 +60,7 @@ public class JUnit3Provider
private TestsToRun testsToRun;
- public JUnit3Provider( ProviderParameters booterParameters )
+ public JUnit3Provider( ProviderParameters booterParameters )
{
this.providerParameters = booterParameters;
this.testClassLoader = booterParameters.getTestClassLoader();
@@ -126,7 +126,7 @@ public class JUnit3Provider
private TestsToRun scanClassPath()
{
final TestsToRun scanResult = directoryScanner.locateTestClasses( testClassLoader, testChecker );
- return runOrderCalculator.orderTestClasses( scanResult );
+ return runOrderCalculator.orderTestClasses( scanResult );
}
public Iterator getSuites()
Modified: maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java Fri Jan 27 20:50:34 2012
@@ -19,13 +19,12 @@ package org.apache.maven.surefire.junit;
* under the License.
*/
-import org.apache.maven.surefire.common.junit3.JUnit3Reflector;
-import org.apache.maven.surefire.report.RunListener;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import org.apache.maven.surefire.common.junit3.JUnit3Reflector;
+import org.apache.maven.surefire.report.RunListener;
+import org.apache.maven.surefire.testset.TestSetFailedException;
public final class JUnitTestSet
implements SurefireTestSet