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 [2/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/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java Fri Jan 27 20:50:34 2012
@@ -40,10 +40,10 @@ public class XMLReporterTest
throws Exception
{
super.setUp();
- reporter = new XMLReporter( true, new File( "." ));
+ reporter = new XMLReporter( true, new File( "." ) );
message = "junit.framework.AssertionFailedError";
reportEntry = new SimpleReportEntry( this.getClass().getName(), "XMLReporterTest",
- new PojoStackTraceWriter( "", "", new AssertionFailedError() ) ,
+ new PojoStackTraceWriter( "", "", new AssertionFailedError() ),
new Integer( 17 ) );
}
@@ -79,12 +79,13 @@ public class XMLReporterTest
{
File reportDir = new File( "." );
String testName = "org.apache.maven.surefire.report.XMLReporterTest";
- reportEntry = new SimpleReportEntry( this.getClass().getName(), testName, new Integer( 12) );
+ reportEntry = new SimpleReportEntry( this.getClass().getName(), testName, new Integer( 12 ) );
reporter = new XMLReporter( true, reportDir, null );
reporter.testSetCompleted( reportEntry );
File expectedReportFile = new File( reportDir, "TEST-" + testName + ".xml" );
- assertTrue("Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist", expectedReportFile.exists() );
+ assertTrue( "Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist",
+ expectedReportFile.exists() );
expectedReportFile.delete();
}
@@ -101,7 +102,8 @@ public class XMLReporterTest
reporter.testSetCompleted( reportEntry );
File expectedReportFile = new File( reportDir, "TEST-" + testName + "-" + suffixText + ".xml" );
- assertTrue("Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist", expectedReportFile.exists() );
+ assertTrue( "Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist",
+ expectedReportFile.exists() );
expectedReportFile.delete();
}
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java Fri Jan 27 20:50:34 2012
@@ -30,14 +30,17 @@ public class RelocatorTest
extends TestCase
{
- public void testFoo(){
+ public void testFoo()
+ {
Relocator relocator = new Relocator( "shadefire" );
String cn = "org.apache.maven.surefire.report.ForkingConsoleReporter";
- assertEquals( "org.apache.maven.surefire.shadefire.report.ForkingConsoleReporter", relocator.relocate( cn ));
+ assertEquals( "org.apache.maven.surefire.shadefire.report.ForkingConsoleReporter", relocator.relocate( cn ) );
}
- public void testRelocation(){
+
+ public void testRelocation()
+ {
Relocator relocator = new Relocator( "shadefire" );
String org1 = "org.apache.maven.surefire.fooz.Baz";
- assertEquals( "org.apache.maven.surefire.shadefire.fooz.Baz", relocator.relocate( org1 ));
+ assertEquals( "org.apache.maven.surefire.shadefire.fooz.Baz", relocator.relocate( org1 ) );
}
}
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java Fri Jan 27 20:50:34 2012
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.FutureTask;
import java.util.concurrent.LinkedBlockingQueue;
-
import org.apache.maven.plugin.surefire.util.internal.BlockingQueue;
import org.apache.maven.plugin.surefire.util.internal.FunkyTwoThreadBlockingQueue;
import org.apache.maven.plugin.surefire.util.internal.TwoThreadBlockingQueue;
@@ -114,7 +113,7 @@ public class TwoThreadBlockingQueueTest
futureTask.get();
- // System.out.println( "TwoThreadBlockingQueue produced and taken " + num + " elements in = " + elapsed );
+ // System.out.println( "TwoThreadBlockingQueue produced and taken " + num + " elements in = " + elapsed );
System.gc();
}
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=1236883&r1=1236882&r2=1236883&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 Fri Jan 27 20:50:34 2012
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -59,7 +58,7 @@ public class SurefirePlugin
/**
* Information about this plugin, mainly used to lookup this plugin's configuration from the currently executing
* project.
- *
+ *
* @parameter default-value="${plugin}"
* @readonly
* @since 2.12
@@ -69,7 +68,7 @@ public class SurefirePlugin
/**
* Set this to "true" to skip running tests, but still compile them. Its use is NOT RECOMMENDED, but quite
* convenient on occasion.
- *
+ *
* @parameter default-value="false" expression="${skipTests}"
* @since 2.4
*/
@@ -246,7 +245,7 @@ public class SurefirePlugin
* @parameter
* @since 2.5
*/
- private Map<String,String> systemPropertyVariables;
+ private Map<String, String> systemPropertyVariables;
/**
* List of System properties, loaded from a file, to pass to the JUnit tests.
@@ -272,7 +271,7 @@ public class SurefirePlugin
* @required
* @readonly
*/
- private Map<String,Artifact> pluginArtifactMap;
+ private Map<String, Artifact> pluginArtifactMap;
/**
* Map of project artifacts.
@@ -281,7 +280,7 @@ public class SurefirePlugin
* @required
* @readonly
*/
- private Map<String,Artifact> projectArtifactMap;
+ private Map<String, Artifact> projectArtifactMap;
/**
* Option to print summary of test suites or just print the test cases that have errors.
@@ -334,7 +333,7 @@ public class SurefirePlugin
/**
* Set this to "true" to cause a failure if the none of the tests specified in -Dtest=... are run. Defaults to
* "true".
- *
+ *
* @parameter expression="${surefire.failIfNoSpecifiedTests}"
* @since 2.12
*/
@@ -393,7 +392,7 @@ public class SurefirePlugin
* @parameter
* @since 2.1.3
*/
- private Map<String,String> environmentVariables = new HashMap<String,String>();
+ private Map<String, String> environmentVariables = new HashMap<String, String>();
/**
* Command line working directory.
@@ -909,12 +908,12 @@ public class SurefirePlugin
this.systemProperties = systemProperties;
}
- public Map<String,String> getSystemPropertyVariables()
+ public Map<String, String> getSystemPropertyVariables()
{
return systemPropertyVariables;
}
- public void setSystemPropertyVariables( Map<String,String> systemPropertyVariables )
+ public void setSystemPropertyVariables( Map<String, String> systemPropertyVariables )
{
this.systemPropertyVariables = systemPropertyVariables;
}
@@ -939,22 +938,22 @@ public class SurefirePlugin
this.properties = properties;
}
- public Map<String,Artifact> getPluginArtifactMap()
+ public Map<String, Artifact> getPluginArtifactMap()
{
return pluginArtifactMap;
}
- public void setPluginArtifactMap( Map<String,Artifact> pluginArtifactMap )
+ public void setPluginArtifactMap( Map<String, Artifact> pluginArtifactMap )
{
this.pluginArtifactMap = pluginArtifactMap;
}
- public Map<String,Artifact> getProjectArtifactMap()
+ public Map<String, Artifact> getProjectArtifactMap()
{
return projectArtifactMap;
}
- public void setProjectArtifactMap( Map<String,Artifact> projectArtifactMap )
+ public void setProjectArtifactMap( Map<String, Artifact> projectArtifactMap )
{
this.projectArtifactMap = projectArtifactMap;
}
@@ -1079,12 +1078,12 @@ public class SurefirePlugin
this.forkedProcessTimeoutInSeconds = forkedProcessTimeoutInSeconds;
}
- public Map<String,String> getEnvironmentVariables()
+ public Map<String, String> getEnvironmentVariables()
{
return environmentVariables;
}
- public void setEnvironmentVariables( Map<String,String> environmentVariables )
+ public void setEnvironmentVariables( Map<String, String> environmentVariables )
{
this.environmentVariables = environmentVariables;
}
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java Fri Jan 27 20:50:34 2012
@@ -70,8 +70,8 @@ public abstract class AbstractSurefireRe
* (Deprecated, use reportsDirectories) This directory contains the XML Report files that will be parsed and rendered to HTML format.
*
* @parameter
- * @deprecated
* @noinspection UnusedDeclaration
+ * @deprecated
*/
private File reportsDirectory;
@@ -262,6 +262,7 @@ public abstract class AbstractSurefireRe
/**
* Gets the default surefire reports directory for the specified project.
+ *
* @param subProject the project to query.
* @return the default surefire reports directory for the specified project.
*/
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java Fri Jan 27 20:50:34 2012
@@ -104,12 +104,12 @@ public class FailsafeReportMojo
{
return getBundle( locale ).getString( "report.failsafe.description" );
}
-
+
/*
- * This is currently a copy of the getBundle() method of the AbstractSurefireReportMojo class,
- * cause the failsafe report only different in two names for the bundles.
- */
+ * This is currently a copy of the getBundle() method of the AbstractSurefireReportMojo class,
+ * cause the failsafe report only different in two names for the bundles.
+ */
private ResourceBundle getBundle( Locale locale )
{
return ResourceBundle.getBundle( "surefire-report", locale, this.getClass().getClassLoader() );
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/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/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java Fri 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/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=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java Fri Jan 27 20:50:34 2012
@@ -47,7 +47,8 @@ public class SurefireReportGenerator
private final String xrefLocation;
- public SurefireReportGenerator( List<File> reportsDirectories, Locale locale, boolean showSuccess, String xrefLocation )
+ public SurefireReportGenerator( List<File> reportsDirectories, Locale locale, boolean showSuccess,
+ String xrefLocation )
{
report = new SurefireReportParser( reportsDirectories, locale );
@@ -327,8 +328,8 @@ public class SurefireReportGenerator
sinkCell( sink, Integer.toString( suite.getNumberOfSkipped() ) );
String percentage = report.computePercentage( suite.getNumberOfTests(), suite.getNumberOfErrors(),
- suite.getNumberOfFailures(), suite
- .getNumberOfSkipped() );
+ suite.getNumberOfFailures(),
+ suite.getNumberOfSkipped() );
sinkCell( sink, percentage + "%" );
sinkCell( sink, numberFormat.format( suite.getTimeElapsed() ) );
@@ -503,9 +504,11 @@ public class SurefireReportGenerator
}
- private String toHtmlId(String id){
- return id.replace(".", "_");
+ private String toHtmlId( String id )
+ {
+ return id.replace( ".", "_" );
}
+
private void constructFailureDetails( Sink sink, ResourceBundle bundle, List failureList )
{
Iterator failIter = failureList.iterator();
@@ -598,7 +601,7 @@ public class SurefireReportGenerator
String path = tCase.getFullClassName().replace( '.', '/' );
sink.link( xrefLocation + "/" + path + ".html#" +
- getErrorLineNumber( tCase.getFullName(), techMessage ) );
+ getErrorLineNumber( tCase.getFullName(), techMessage ) );
}
sink.text(
tCase.getFullClassName() + ":" + getErrorLineNumber( tCase.getFullName(), techMessage ) );
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java Fri Jan 27 20:50:34 2012
@@ -59,7 +59,7 @@ public class SurefireReportParser
{
}
- public SurefireReportParser( List<File> reportsDirectoriesFiles , Locale locale )
+ public SurefireReportParser( List<File> reportsDirectoriesFiles, Locale locale )
{
this.reportsDirectories = reportsDirectoriesFiles;
@@ -128,7 +128,7 @@ public class SurefireReportParser
public Map getSummary( List suites )
{
- Map<String,String> totalSummary = new HashMap<String,String>();
+ Map<String, String> totalSummary = new HashMap<String, String>();
ListIterator iter = suites.listIterator();
@@ -194,7 +194,7 @@ public class SurefireReportParser
{
ListIterator iter = testSuitesList.listIterator();
- Map<String,List<ReportTestSuite>> suitePackage = new HashMap<String,List<ReportTestSuite>>();
+ Map<String, List<ReportTestSuite>> suitePackage = new HashMap<String, List<ReportTestSuite>>();
while ( iter.hasNext() )
{
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java Fri Jan 27 20:50:34 2012
@@ -46,9 +46,12 @@ public class TestSuiteXmlParser
extends DefaultHandler
{
private ReportTestSuite defaultSuite;
+
private ReportTestSuite currentSuite;
- private Map<String,ReportTestSuite> classesToSuites;
- private final NumberFormat numberFormat = NumberFormat.getInstance( Locale.ENGLISH);
+
+ private Map<String, ReportTestSuite> classesToSuites;
+
+ private final NumberFormat numberFormat = NumberFormat.getInstance( Locale.ENGLISH );
/**
* @noinspection StringBufferField
@@ -64,7 +67,7 @@ public class TestSuiteXmlParser
SAXParser saxParser = factory.newSAXParser();
- classesToSuites = new HashMap<String,ReportTestSuite>();
+ classesToSuites = new HashMap<String, ReportTestSuite>();
saxParser.parse( new File( xmlPath ), this );
@@ -79,7 +82,9 @@ public class TestSuiteXmlParser
return classesToSuites.values();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void startElement( String uri, String localName, String qName, Attributes attributes )
throws SAXException
{
@@ -181,7 +186,9 @@ public class TestSuiteXmlParser
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void endElement( String uri, String localName, String qName )
throws SAXException
{
@@ -216,7 +223,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/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java Fri Jan 27 20:50:34 2012
@@ -30,7 +30,9 @@ public class ReportTestCaseTest
{
private ReportTestCase tCase;
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected void setUp()
throws Exception
{
@@ -39,7 +41,9 @@ public class ReportTestCaseTest
tCase = new ReportTestCase();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected void tearDown()
throws Exception
{
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java Fri Jan 27 20:50:34 2012
@@ -19,11 +19,11 @@ package org.apache.maven.plugins.surefir
* under the License.
*/
-import junit.framework.TestCase;
-
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
+
/**
* @version $Id$
*/
@@ -32,7 +32,9 @@ public class ReportTestSuiteTest
{
private ReportTestSuite tSuite;
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected void setUp()
throws Exception
{
@@ -41,7 +43,9 @@ public class ReportTestSuiteTest
tSuite = new ReportTestSuite();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected void tearDown()
throws Exception
{
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java Fri Jan 27 20:50:34 2012
@@ -26,7 +26,6 @@ import java.io.Writer;
import java.net.URL;
import java.net.URLDecoder;
import java.util.Locale;
-
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
@@ -94,7 +93,8 @@ public class SurefireReportMojoTest
assertTrue( idx >= 0 );
}
- private File getUnitBaseDir() throws UnsupportedEncodingException
+ private File getUnitBaseDir()
+ throws UnsupportedEncodingException
{
URL resource = getClass().getResource( "/unit" );
// URLDecoder.decode necessary for JDK 1.5+, where spaces are escaped to %20
@@ -187,10 +187,10 @@ public class SurefireReportMojoTest
/**
* Renderer the sink from the report mojo.
*
- * @param mojo not null
+ * @param mojo not null
* @param outputHtml not null
* @throws RendererException if any
- * @throws IOException if any
+ * @throws IOException if any
*/
private void renderer( SurefireReportMojo mojo, File outputHtml )
throws RendererException, IOException
@@ -206,8 +206,7 @@ public class SurefireReportMojoTest
outputHtml.getParentFile().mkdirs();
writer = WriterFactory.newXmlWriter( outputHtml );
- mojo.getSiteRenderer().generateDocument( writer, (SiteRendererSink) mojo.getSink(),
- context );
+ mojo.getSiteRenderer().generateDocument( writer, (SiteRendererSink) mojo.getSink(), context );
}
finally
{
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java Fri Jan 27 20:50:34 2012
@@ -19,9 +19,6 @@ package org.apache.maven.plugins.surefir
* under the License.
*/
-import junit.framework.TestCase;
-import org.apache.maven.reporting.MavenReportException;
-
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URL;
@@ -32,6 +29,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import org.apache.maven.reporting.MavenReportException;
+
+import junit.framework.TestCase;
/**
* @version $Id$
@@ -41,7 +41,9 @@ public class SurefireReportParserTest
{
private SurefireReportParser report;
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected void setUp()
throws Exception
{
@@ -52,7 +54,9 @@ public class SurefireReportParserTest
report.setLocale( Locale.ENGLISH );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected void tearDown()
throws Exception
{
@@ -148,11 +152,9 @@ public class SurefireReportParserTest
NumberFormat numberFormat = report.getNumberFormat();
- assertEquals( 2.0f, numberFormat.parse( testMap.get( "totalElapsedTime" ).toString() )
- .floatValue(), 0.0f );
+ assertEquals( 2.0f, numberFormat.parse( testMap.get( "totalElapsedTime" ).toString() ).floatValue(), 0.0f );
- assertEquals( 68.00f, numberFormat.parse( (String) testMap.get( "totalPercentage" ) )
- .floatValue(), 0 );
+ assertEquals( 68.00f, numberFormat.parse( (String) testMap.get( "totalPercentage" ) ).floatValue(), 0 );
}
public void testGetSuitesGroupByPackage()
@@ -193,8 +195,7 @@ public class SurefireReportParserTest
{
NumberFormat numberFormat = report.getNumberFormat();
- assertEquals( 70.00f, numberFormat.parse( report.computePercentage( 100, 20, 10, 0 ) )
- .floatValue(), 0 );
+ assertEquals( 70.00f, numberFormat.parse( report.computePercentage( 100, 20, 10, 0 ) ).floatValue(), 0 );
}
public void testGetFailureDetails()
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java Fri Jan 27 20:50:34 2012
@@ -19,13 +19,12 @@ package org.apache.maven.plugins.surefir
* under the License.
*/
+import java.util.List;
import org.apache.maven.model.Model;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Reporting;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import java.util.List;
-
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
* @version $Id$
@@ -33,7 +32,9 @@ import java.util.List;
public class SurefireRepMavenProjectStub
extends MavenProjectStub
{
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public List getReportPlugins()
{
Reporting reporting = new Reporting();
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java Fri Jan 27 20:50:34 2012
@@ -19,10 +19,9 @@ package org.apache.maven.plugins.surefir
* under the License.
*/
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
@@ -31,7 +30,9 @@ import java.util.List;
public class SurefireRepMavenProjectStub2
extends MavenProjectStub
{
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public List getReportPlugins()
{
return new ArrayList();
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/PrioritizedTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/PrioritizedTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/PrioritizedTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/PrioritizedTest.java Fri Jan 27 20:50:34 2012
@@ -25,6 +25,7 @@ package org.apache.maven.plugin.surefire
public class PrioritizedTest
{
private final Class clazz;
+
private final Priority priority;
public PrioritizedTest( Class clazz, Priority pri )
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java Fri Jan 27 20:50:34 2012
@@ -25,8 +25,11 @@ package org.apache.maven.plugin.surefire
public class Priority
{
private final String className;
+
int priority;
+
int totalRuntime = 0;
+
int minSuccessRate = Integer.MAX_VALUE;
public Priority( String className )
@@ -34,7 +37,8 @@ public class Priority
this.className = className;
}
- public static Priority lowest(String className){
+ public static Priority lowest( String className )
+ {
Priority priority1 = new Priority( className );
priority1.setPriority( Integer.MAX_VALUE );
priority1.minSuccessRate = 0;
@@ -44,7 +48,7 @@ public class Priority
public void addItem( RunEntryStatistics itemStat )
{
totalRuntime += itemStat.getRunTime();
- minSuccessRate = Math.min( minSuccessRate, itemStat.getSuccessfulBuilds());
+ minSuccessRate = Math.min( minSuccessRate, itemStat.getSuccessfulBuilds() );
}
public int getTotalRuntime()
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassFilter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassFilter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassFilter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassFilter.java Fri Jan 27 20:50:34 2012
@@ -19,9 +19,8 @@ package org.apache.maven.surefire;
* under the License.
*/
-import org.apache.maven.surefire.util.ScannerFilter;
-
import java.lang.reflect.Modifier;
+import org.apache.maven.surefire.util.ScannerFilter;
/**
* @author Kristian Rosenvold
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=1236883&r1=1236882&r2=1236883&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 Fri Jan 27 20:50:34 2012
@@ -3,7 +3,6 @@ package org.apache.maven.surefire;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-
import org.apache.maven.surefire.util.ScannerFilter;
import org.codehaus.plexus.util.SelectorUtils;
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java Fri Jan 27 20:50:34 2012
@@ -24,8 +24,11 @@ package org.apache.maven.surefire.booter
public class ProviderParameterNames
{
public static final String TESTNG_EXCLUDEDGROUPS_PROP = "excludegroups";
+
public static final String TESTNG_GROUPS_PROP = "groups";
+
public static final String THREADCOUNT_PROP = "threadcount";
+
public static final String PARALLEL_PROP = "parallel";
}
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=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java Fri Jan 27 20:50:34 2012
@@ -51,6 +51,7 @@ public interface ProviderParameters
/**
* Provides a service to calculate run order of tests. Applied after directory scanning.
+ *
* @return A RunOrderCalculator
*/
RunOrderCalculator getRunOrderCalculator();
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java Fri Jan 27 20:50:34 2012
@@ -19,20 +19,19 @@ package org.apache.maven.surefire.provid
* under the License.
*/
+import java.util.Iterator;
import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.suite.RunResult;
import org.apache.maven.surefire.testset.TestSetFailedException;
-import java.util.Iterator;
-
/**
* Interface to be implemented by all Surefire providers.
- *
+ * <p/>
* NOTE: This class is part of the proposed public api for surefire providers for 2.7. It may
* still be subject to changes, even for minor revisions.
- *
+ * <p/>
* The api covers this interface and all the types reachable from it. And nothing else.
- *
+ * <p/>
* <p/>
* Called in one of three ways:
* Forkmode = never: getSuites is not called, invoke is called with null parameter
@@ -46,7 +45,7 @@ public interface SurefireProvider
{
/**
* Determines the number of forks.
- *
+ * <p/>
* Called when forkmode is different from "never" or "always", allows the provider to define
* how to behave for the fork.
*
@@ -56,12 +55,15 @@ public interface SurefireProvider
/**
* Runs a forked test
+ *
* @param forkTestSet An item from the iterator in #getSuites. Will be null for forkmode never or always.
* When this is non-null, the forked process will run only that test
* and probably not scan the classpath
* @return A result of the invocation
- * @throws org.apache.maven.surefire.report.ReporterException When reporting fails
- * @throws org.apache.maven.surefire.testset.TestSetFailedException When testset fails
+ * @throws org.apache.maven.surefire.report.ReporterException
+ * When reporting fails
+ * @throws org.apache.maven.surefire.testset.TestSetFailedException
+ * When testset fails
*/
RunResult invoke( Object forkTestSet )
@@ -70,14 +72,14 @@ public interface SurefireProvider
/**
* Makes an attempt at cancelling the current run, giving the provider a chance to notify
* reporting that the remaining tests have been cancelled due to timeout.
- *
+ * <p/>
* If the provider thinks it can terminate properly it is the responsibility of
* the invoke method to return a RunResult with a booter code of failure.
- *
+ * <p/>
* It is up to the provider to find out how to implement this method properly.
* A provider may also choose to not do anything at all in this method,
* which means surefire will kill the forked process soon afterwards anyway.
- *
+ * <p/>
* Will be called on a different thread than the one calling invoke.
*/
// Todo: Need to think a lot closer about how/if this works and if there is a use case for it.
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java Fri Jan 27 20:50:34 2012
@@ -33,13 +33,15 @@ public class CategorizedReportEntry
this( source, name, group, null, null );
}
- public CategorizedReportEntry( String source, String name, String group, StackTraceWriter stackTraceWriter, Integer elapsed )
+ public CategorizedReportEntry( String source, String name, String group, StackTraceWriter stackTraceWriter,
+ Integer elapsed )
{
super( source, name, stackTraceWriter, elapsed );
this.group = group;
}
- public CategorizedReportEntry( String source, String name, String group, StackTraceWriter stackTraceWriter, Integer elapsed, String message )
+ public CategorizedReportEntry( String source, String name, String group, StackTraceWriter stackTraceWriter,
+ Integer elapsed, String message )
{
super( source, name, stackTraceWriter, elapsed, message );
this.group = group;
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java Fri Jan 27 20:50:34 2012
@@ -80,7 +80,8 @@ public class ConsoleOutputCapture
public void println( String s )
{
- if (s == null){
+ if ( s == null )
+ {
s = "null"; // Shamelessy taken from super.print
}
final byte[] bytes = s.getBytes();
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java Fri Jan 27 20:50:34 2012
@@ -10,11 +10,13 @@ public class DefaultDirectConsoleReporte
{
private final PrintStream systemOut;
- public DefaultDirectConsoleReporter( PrintStream systemOut ) {
+ public DefaultDirectConsoleReporter( PrintStream systemOut )
+ {
this.systemOut = systemOut;
}
- public void info( String message ) {
- systemOut.println(message);
+ public void info( String message )
+ {
+ systemOut.println( message );
}
}
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java Fri Jan 27 20:50:34 2012
@@ -20,10 +20,9 @@ package org.apache.maven.surefire.report
*/
-import org.apache.maven.surefire.util.internal.StringUtils;
-
import java.io.PrintWriter;
import java.io.StringWriter;
+import org.apache.maven.surefire.util.internal.StringUtils;
/**
* Write the trace out for a POJO test.
@@ -101,6 +100,6 @@ public class PojoStackTraceWriter
public SafeThrowable getThrowable()
{
- return new SafeThrowable( t);
+ return new SafeThrowable( t );
}
}
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java Fri Jan 27 20:50:34 2012
@@ -23,37 +23,42 @@ public interface ReportEntry
{
/**
* The class name of the test
+ *
* @return A string with the class name
*/
public String getSourceName();
/**
* The name of the test case
+ *
* @return A string describing the test case
*/
public String getName();
/**
* The group/category of the testcase
+ *
* @return A string
*/
public String getGroup();
/**
* The group/category of the testcase
+ *
* @return A string
*/
public StackTraceWriter getStackTraceWriter();
/**
* @deprecated
- **/
+ */
public Integer getElapsed();
/**
* A message relating to a non-successful termination.
* May be the "message" from an exception or the reason for a test being ignored
+ *
* @return A string that explains an anomaly
*/
public String getMessage();
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java Fri Jan 27 20:50:34 2012
@@ -41,8 +41,7 @@ public class DirectoryScannerParameters
private final RunOrder[] runOrder;
private DirectoryScannerParameters( File testClassesDirectory, List includes, List excludes, List specificTests,
- Boolean failIfNoTests,
- RunOrder[] runOrder )
+ Boolean failIfNoTests, RunOrder[] runOrder )
{
this.testClassesDirectory = testClassesDirectory;
this.includes = includes;
@@ -53,8 +52,7 @@ public class DirectoryScannerParameters
}
public DirectoryScannerParameters( File testClassesDirectory, List includes, List excludes, List specificTests,
- Boolean failIfNoTests,
- String runOrder )
+ Boolean failIfNoTests, String runOrder )
{
this( testClassesDirectory, includes, excludes, specificTests, failIfNoTests,
runOrder == null ? RunOrder.DEFAULT : RunOrder.valueOfMulti( runOrder ) );
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java Fri Jan 27 20:50:34 2012
@@ -35,7 +35,7 @@ public class TestRequest
private final File testSourceDirectory;
private final String requestedTest;
-
+
/**
* @since 2.7.3
*/
@@ -45,7 +45,7 @@ public class TestRequest
{
this( suiteXmlFiles, testSourceDirectory, requestedTest, null );
}
-
+
/**
* @since 2.7.3
*/
@@ -59,6 +59,7 @@ public class TestRequest
/**
* Represents suitexmlfiles that define the test-run request
+ *
* @return A list of java.io.File objects.
*/
public List getSuiteXmlFiles()
@@ -68,6 +69,7 @@ public class TestRequest
/**
* Test source directory, normally ${project.build.testSourceDirectory}
+ *
* @return A file pointing to test sources
*/
public File getTestSourceDirectory()
@@ -77,22 +79,24 @@ public class TestRequest
/**
* A specific test request issued with -Dtest= from the command line.
+ *
* @return The string specified at the command line
*/
public String getRequestedTest()
{
return requestedTest;
}
-
+
/**
* A specific test request method issued with -Dtest=class#method from the command line.
+ *
* @return The string specified at the command line
* @since 2.7.3
- */
+ */
public String getRequestedTestMethod()
{
return requestedTestMethod;
- }
+ }
private static List createFiles( List suiteXmlFiles )
{
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java Fri Jan 27 20:50:34 2012
@@ -63,6 +63,7 @@ public class TestSetFailedException
* Create a <code>TestFailedException</code> with the specified cause. The
* <code>getMessage</code> method of this exception object will return
* <code>(cause == null ? "" : cause.toString())</code>.
+ *
* @param cause The cause
*/
public TestSetFailedException( Throwable cause )
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java Fri Jan 27 20:50:34 2012
@@ -23,12 +23,11 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.apache.maven.surefire.SpecificTestClassFilter;
/**
* Scans directories looking for tests.
- *
+ *
* @author Karl M. Davis
* @author Kristian Rosenvold
*/
@@ -145,10 +144,10 @@ public class DefaultDirectoryScanner
{
List newList = new ArrayList();
Iterator iter = list.iterator();
- while (iter.hasNext())
+ while ( iter.hasNext() )
{
String include = (String) iter.next();
- String [] includes = include.split( "," );
+ String[] includes = include.split( "," );
for ( int i = 0; i < includes.length; ++i )
{
newList.add( includes[i] );
@@ -162,10 +161,10 @@ public class DefaultDirectoryScanner
String inc = (String) newList.get( i );
if ( inc.endsWith( JAVA_SOURCE_FILE_EXTENSION ) )
{
- inc =
- new StringBuffer( inc.length() - JAVA_SOURCE_FILE_EXTENSION.length()
- + JAVA_CLASS_FILE_EXTENSION.length() ).append( inc.substring( 0,
- inc.lastIndexOf( JAVA_SOURCE_FILE_EXTENSION ) ) ).append( JAVA_CLASS_FILE_EXTENSION ).toString();
+ inc = new StringBuffer(
+ inc.length() - JAVA_SOURCE_FILE_EXTENSION.length() + JAVA_CLASS_FILE_EXTENSION.length() ).append(
+ inc.substring( 0, inc.lastIndexOf( JAVA_SOURCE_FILE_EXTENSION ) ) ).append(
+ JAVA_CLASS_FILE_EXTENSION ).toString();
}
incs[i] = inc;
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java Fri Jan 27 20:50:34 2012
@@ -105,7 +105,6 @@ public class NestedRuntimeException
* Return the nested cause, or <code>null</code> if none.
* <p>Note that this will only check one level of nesting.
* Use <code>getRootCause()</code> to retrieve the innermost cause.
- *
*/
public Throwable getCause()
{
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java Fri Jan 27 20:50:34 2012
@@ -142,8 +142,9 @@ public class ReflectionUtils
throw new SurefireReflectionException( e );
}
}
+
public static Object instantiateTwoArgs( ClassLoader classLoader, String className, Class param1Class,
- Object param1, Class param2Class, Object param2 )
+ Object param1, Class param2Class, Object param2 )
{
try
@@ -165,8 +166,8 @@ public class ReflectionUtils
throw new SurefireReflectionException( e );
}
}
-
-
+
+
public static void invokeSetter( Object o, String name, Class value1clazz, Object value )
{
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java Fri Jan 27 20:50:34 2012
@@ -1,24 +1,23 @@
package org.apache.maven.surefire.util;
-
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
/**
* @author Kristian Rosenvold
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java Fri Jan 27 20:50:34 2012
@@ -33,6 +33,7 @@ public class SurefireReflectionException
* Create a <code>SurefireReflectionException</code> with the specified cause. The
* <code>getMessage</code> method of this exception object will return
* <code>(cause == null ? "" : cause.toString())</code>.
+ *
* @param cause The cause of this exception
*/
public SurefireReflectionException( Throwable cause )
Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java Fri Jan 27 20:50:34 2012
@@ -70,6 +70,7 @@ public class ByteBuffer
/**
* Convert the integer to an unsigned number.
+ *
* @param i the value
*/
private void toHex( int i )
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/SpecificTestClassFilterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/SpecificTestClassFilterTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/SpecificTestClassFilterTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/SpecificTestClassFilterTest.java Fri Jan 27 20:50:34 2012
@@ -9,7 +9,7 @@ public class SpecificTestClassFilterTest
public void testMatchSingleCharacterWildcard()
{
SpecificTestClassFilter filter =
- new SpecificTestClassFilter( new String[] { "org/apache/maven/surefire/?pecificTestClassFilter.class" } );
+ new SpecificTestClassFilter( new String[]{ "org/apache/maven/surefire/?pecificTestClassFilter.class" } );
assertTrue( filter.accept( SpecificTestClassFilter.class ) );
}
@@ -17,7 +17,7 @@ public class SpecificTestClassFilterTest
public void testMatchSingleSegmentWordWildcard()
{
SpecificTestClassFilter filter =
- new SpecificTestClassFilter( new String[] { "org/apache/maven/surefire/*TestClassFilter.class" } );
+ new SpecificTestClassFilter( new String[]{ "org/apache/maven/surefire/*TestClassFilter.class" } );
assertTrue( filter.accept( SpecificTestClassFilter.class ) );
}
@@ -25,7 +25,7 @@ public class SpecificTestClassFilterTest
public void testMatchMultiSegmentWildcard()
{
SpecificTestClassFilter filter =
- new SpecificTestClassFilter( new String[] { "org/**/SpecificTestClassFilter.class" } );
+ new SpecificTestClassFilter( new String[]{ "org/**/SpecificTestClassFilter.class" } );
assertTrue( filter.accept( SpecificTestClassFilter.class ) );
}
@@ -33,7 +33,7 @@ public class SpecificTestClassFilterTest
public void testMatchSingleSegmentWildcard()
{
SpecificTestClassFilter filter =
- new SpecificTestClassFilter( new String[] { "org/*/maven/surefire/SpecificTestClassFilter.class" } );
+ new SpecificTestClassFilter( new String[]{ "org/*/maven/surefire/SpecificTestClassFilter.class" } );
assertTrue( filter.accept( SpecificTestClassFilter.class ) );
}
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/booter/ForkingRunListenerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/booter/ForkingRunListenerTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/booter/ForkingRunListenerTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/booter/ForkingRunListenerTest.java Fri Jan 27 20:50:34 2012
@@ -1,20 +1,24 @@
package org.apache.maven.surefire.booter;
-import junit.framework.TestCase;
-
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
+import junit.framework.TestCase;
+
/**
* @author <a href="mailto:kristian.rosenvold@gmail.com">Kristian Rosenvold</a>
*/
-public class ForkingRunListenerTest extends TestCase {
- public void testInfo() throws Exception {
+public class ForkingRunListenerTest
+ extends TestCase
+{
+ public void testInfo()
+ throws Exception
+ {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- PrintStream target = new PrintStream(byteArrayOutputStream);
- ForkingRunListener forkingRunListener = new ForkingRunListener(target, 1, true);
- forkingRunListener.info(new String(new byte[]{65}));
- forkingRunListener.info(new String(new byte[]{}));
+ PrintStream target = new PrintStream( byteArrayOutputStream );
+ ForkingRunListener forkingRunListener = new ForkingRunListener( target, 1, true );
+ forkingRunListener.info( new String( new byte[]{ 65 } ) );
+ forkingRunListener.info( new String( new byte[]{ } ) );
}
}
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java Fri Jan 27 20:50:34 2012
@@ -29,101 +29,110 @@ public class PojoStackTraceWriterTest
public void testWriteTrimmedTraceToString()
{
- String stackTrace = "junit.framework.AssertionFailedError: blah\n" +
- " at junit.framework.Assert.fail(Assert.java:47)\n" +
- " at TestSurefire3.testQuote(TestSurefire3.java:23)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
- " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
- " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
- " at junit.framework.TestCase.runTest(TestCase.java:154)\n" +
- " at junit.framework.TestCase.runBare(TestCase.java:127)\n" +
- " at junit.framework.TestResult$1.protect(TestResult.java:106)\n" +
- " at junit.framework.TestResult.runProtected(TestResult.java:124)\n" +
- " at junit.framework.TestResult.run(TestResult.java:109)\n" +
- " at junit.framework.TestCase.run(TestCase.java:118)\n" +
- " at junit.framework.TestSuite.runTest(TestSuite.java:208)\n" +
- " at junit.framework.TestSuite.run(TestSuite.java:203)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
- " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
- " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
- " at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)\n" +
- " at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)\n" +
- " at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)\n" +
- " at org.apache.maven.surefire.Surefire.run(Surefire.java:132)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
- " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
- " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
- " at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:318)\n" +
- " at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:956)\n";
- MockThrowable t = new MockThrowable(stackTrace);
- PojoStackTraceWriter w = new PojoStackTraceWriter("TestSurefire3", "testQuote", t);
+ String stackTrace = "junit.framework.AssertionFailedError: blah\n" +
+ " at junit.framework.Assert.fail(Assert.java:47)\n" +
+ " at TestSurefire3.testQuote(TestSurefire3.java:23)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
+ " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
+ " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
+ " at junit.framework.TestCase.runTest(TestCase.java:154)\n" +
+ " at junit.framework.TestCase.runBare(TestCase.java:127)\n" +
+ " at junit.framework.TestResult$1.protect(TestResult.java:106)\n" +
+ " at junit.framework.TestResult.runProtected(TestResult.java:124)\n" +
+ " at junit.framework.TestResult.run(TestResult.java:109)\n" +
+ " at junit.framework.TestCase.run(TestCase.java:118)\n" +
+ " at junit.framework.TestSuite.runTest(TestSuite.java:208)\n" +
+ " at junit.framework.TestSuite.run(TestSuite.java:203)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
+ " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
+ " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
+ " at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)\n" +
+ " at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)\n"
+ +
+ " at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)\n"
+ +
+ " at org.apache.maven.surefire.Surefire.run(Surefire.java:132)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
+ " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
+ " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
+ " at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:318)\n" +
+ " at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:956)\n";
+ MockThrowable t = new MockThrowable( stackTrace );
+ PojoStackTraceWriter w = new PojoStackTraceWriter( "TestSurefire3", "testQuote", t );
String out = w.writeTrimmedTraceToString();
- String expected = "junit.framework.AssertionFailedError: blah\n" +
- " at junit.framework.Assert.fail(Assert.java:47)\n" +
- " at TestSurefire3.testQuote(TestSurefire3.java:23)\n";
+ String expected = "junit.framework.AssertionFailedError: blah\n" +
+ " at junit.framework.Assert.fail(Assert.java:47)\n" +
+ " at TestSurefire3.testQuote(TestSurefire3.java:23)\n";
assertEquals( expected, out );
}
- public void testCausedBy() {
- String stackTrace = "java.lang.RuntimeException: blah\n" +
- " at TestSurefire3.testBlah(TestSurefire3.java:45)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
- " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
- " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
- " at junit.framework.TestCase.runTest(TestCase.java:154)\n" +
- " at junit.framework.TestCase.runBare(TestCase.java:127)\n" +
- " at junit.framework.TestResult$1.protect(TestResult.java:106)\n" +
- " at junit.framework.TestResult.runProtected(TestResult.java:124)\n" +
- " at junit.framework.TestResult.run(TestResult.java:109)\n" +
- " at junit.framework.TestCase.run(TestCase.java:118)\n" +
- " at junit.framework.TestSuite.runTest(TestSuite.java:208)\n" +
- " at junit.framework.TestSuite.run(TestSuite.java:203)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
- " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
- " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
- " at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)\n" +
- " at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)\n" +
- " at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)\n" +
- " at org.apache.maven.surefire.Surefire.run(Surefire.java:132)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
- " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
- " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
- " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
- " at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:318)\n" +
- " at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:956)\n" +
- "Caused by: junit.framework.AssertionFailedError: \"\n" +
- " at junit.framework.Assert.fail(Assert.java:47)\n" +
- " at TestSurefire3.testQuote(TestSurefire3.java:23)\n" +
- " at TestSurefire3.testBlah(TestSurefire3.java:43)\n" +
- " at TestSurefire3.testBlah(TestSurefire3.java:43)\n" +
- " ... 26 more\n";
- MockThrowable t = new MockThrowable(stackTrace);
- PojoStackTraceWriter w = new PojoStackTraceWriter("TestSurefire3", "testBlah", t);
+ public void testCausedBy()
+ {
+ String stackTrace = "java.lang.RuntimeException: blah\n" +
+ " at TestSurefire3.testBlah(TestSurefire3.java:45)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
+ " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
+ " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
+ " at junit.framework.TestCase.runTest(TestCase.java:154)\n" +
+ " at junit.framework.TestCase.runBare(TestCase.java:127)\n" +
+ " at junit.framework.TestResult$1.protect(TestResult.java:106)\n" +
+ " at junit.framework.TestResult.runProtected(TestResult.java:124)\n" +
+ " at junit.framework.TestResult.run(TestResult.java:109)\n" +
+ " at junit.framework.TestCase.run(TestCase.java:118)\n" +
+ " at junit.framework.TestSuite.runTest(TestSuite.java:208)\n" +
+ " at junit.framework.TestSuite.run(TestSuite.java:203)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
+ " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
+ " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
+ " at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)\n" +
+ " at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)\n"
+ +
+ " at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)\n"
+ +
+ " at org.apache.maven.surefire.Surefire.run(Surefire.java:132)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
+ " at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n" +
+ " at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n" +
+ " at java.lang.reflect.Method.invoke(Method.java:585)\n" +
+ " at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:318)\n" +
+ " at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:956)\n" +
+ "Caused by: junit.framework.AssertionFailedError: \"\n" +
+ " at junit.framework.Assert.fail(Assert.java:47)\n" +
+ " at TestSurefire3.testQuote(TestSurefire3.java:23)\n" +
+ " at TestSurefire3.testBlah(TestSurefire3.java:43)\n" +
+ " at TestSurefire3.testBlah(TestSurefire3.java:43)\n" +
+ " ... 26 more\n";
+ MockThrowable t = new MockThrowable( stackTrace );
+ PojoStackTraceWriter w = new PojoStackTraceWriter( "TestSurefire3", "testBlah", t );
String out = w.writeTrimmedTraceToString();
- String expected = "java.lang.RuntimeException: blah\n" +
- " at TestSurefire3.testBlah(TestSurefire3.java:45)\n" +
- "Caused by: junit.framework.AssertionFailedError: \"\n" +
- " at junit.framework.Assert.fail(Assert.java:47)\n" +
- " at TestSurefire3.testQuote(TestSurefire3.java:23)\n" +
- " at TestSurefire3.testBlah(TestSurefire3.java:43)\n" +
- " at TestSurefire3.testBlah(TestSurefire3.java:43)\n" +
- " ... 26 more\n";
+ String expected = "java.lang.RuntimeException: blah\n" +
+ " at TestSurefire3.testBlah(TestSurefire3.java:45)\n" +
+ "Caused by: junit.framework.AssertionFailedError: \"\n" +
+ " at junit.framework.Assert.fail(Assert.java:47)\n" +
+ " at TestSurefire3.testQuote(TestSurefire3.java:23)\n" +
+ " at TestSurefire3.testBlah(TestSurefire3.java:43)\n" +
+ " at TestSurefire3.testBlah(TestSurefire3.java:43)\n" +
+ " ... 26 more\n";
assertEquals( expected, out );
}
-
- class MockThrowable extends Throwable {
+
+ class MockThrowable
+ extends Throwable
+ {
private static final long serialVersionUID = 1L;
+
private final String stackTrace;
-
- public MockThrowable(String stackTrace) {
+
+ public MockThrowable( String stackTrace )
+ {
this.stackTrace = stackTrace;
}
-
+
public void printStackTrace( PrintWriter s )
{
s.write( stackTrace );
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java Fri Jan 27 20:50:34 2012
@@ -1,6 +1,7 @@
package org.apache.maven.surefire.report;
import java.util.Collection;
+
import junit.framework.TestCase;
/*
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java Fri Jan 27 20:50:34 2012
@@ -36,15 +36,16 @@ public class RunResultTest
public void testFromString()
throws Exception
{
- RunResult original = new RunResult( 4,3,2,1, true,false);
+ RunResult original = new RunResult( 4, 3, 2, 1, true, false );
final String asString = original.getAsString();
final RunResult runResult = RunResult.fromString( asString );
verifySame( original, runResult );
}
+
public void testFromString2()
throws Exception
{
- RunResult original = new RunResult( 5,6,7,8, false,true );
+ RunResult original = new RunResult( 5, 6, 7, 8, false, true );
final String asString = original.getAsString();
final RunResult runResult = RunResult.fromString( asString );
verifySame( original, runResult );
@@ -52,11 +53,11 @@ public class RunResultTest
private void verifySame( RunResult original, RunResult runResult )
{
- assertEquals( original.getCompletedCount(), runResult.getCompletedCount());
+ assertEquals( original.getCompletedCount(), runResult.getCompletedCount() );
assertEquals( original.getErrors(), runResult.getErrors() );
- assertEquals( original.getFailures(), runResult.getFailures());
- assertEquals( original.getSkipped(), runResult.getSkipped());
- assertEquals( original.isFailure(), runResult.isFailure());
- assertEquals( original.isTimeout(), runResult.isTimeout());
+ assertEquals( original.getFailures(), runResult.getFailures() );
+ assertEquals( original.getSkipped(), runResult.getSkipped() );
+ assertEquals( original.isFailure(), runResult.isFailure() );
+ assertEquals( original.isTimeout(), runResult.isTimeout() );
}
}
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java Fri Jan 27 20:50:34 2012
@@ -19,14 +19,14 @@ package org.apache.maven.surefire.util;
* under the License.
*/
-import junit.framework.TestCase;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+
+import junit.framework.TestCase;
/**
* Test of the directory scanner.
@@ -48,7 +48,7 @@ public class DefaultDirectoryScannerTest
String[] classNames = surefireDirectoryScanner.collectTests();
assertNotNull( classNames );
- System.out.println("classNames " + Arrays.asList( classNames ));
+ System.out.println( "classNames " + Arrays.asList( classNames ) );
assertEquals( 4, classNames.length );
}
}
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java Fri Jan 27 20:50:34 2012
@@ -19,13 +19,13 @@ package org.apache.maven.surefire.util;
* under the License.
*/
-import junit.framework.TestCase;
-
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.net.URL;
+import junit.framework.TestCase;
+
/**
* Test the URL utilities.
*/
@@ -67,12 +67,12 @@ public class UrlUtilsTest
Object uri = toURI.invoke( u, null );
// use reflection to do "File urlFile = new File( uri )" if JDK 1.4+
- Constructor newFile = File.class.getConstructor( new Class[] { uri.getClass() } );
- File urlFile = (File) newFile.newInstance( new Object[] { uri } );
+ Constructor newFile = File.class.getConstructor( new Class[]{ uri.getClass() } );
+ File urlFile = (File) newFile.newInstance( new Object[]{ uri } );
- assertEquals( f, urlFile );
+ assertEquals( f, urlFile );
}
- catch (NoSuchMethodException e )
+ catch ( NoSuchMethodException e )
{
// URL.toURI() method in JDK 1.5+, not available currently
// we won't be able to check for file equality...
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java Fri Jan 27 20:50:34 2012
@@ -19,5 +19,6 @@
package org.apache.maven.surefire.util.testdata;
-public class DataZT1A {
+public class DataZT1A
+{
}