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/12/06 20:16:45 UTC
[5/6] o Reformatted entire code base to code style
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-junit.twoTestCaseSuite.WrapperTestSuite.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-junit.twoTestCaseSuite.WrapperTestSuite.xml b/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-junit.twoTestCaseSuite.WrapperTestSuite.xml
index 2e67834..cd94387 100644
--- a/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-junit.twoTestCaseSuite.WrapperTestSuite.xml
+++ b/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-junit.twoTestCaseSuite.WrapperTestSuite.xml
@@ -13,10 +13,12 @@
<property value="SUN_STANDARD" name="sun.java.launcher"/>
<property value="Service Pack 2" name="sun.os.patch.level"/>
<property value="Java Virtual Machine Specification" name="java.vm.specification.name"/>
- <property value="C:\svn\maven\trunks\surefire\surefire-integration-tests\src\test\resources\junit-twoTestCaseSuite" name="user.dir"/>
+ <property value="C:\svn\maven\trunks\surefire\surefire-integration-tests\src\test\resources\junit-twoTestCaseSuite"
+ name="user.dir"/>
<property value="1.5.0_12-b04" name="java.runtime.version"/>
<property value="sun.awt.Win32GraphicsEnvironment" name="java.awt.graphicsenv"/>
- <property value="C:\svn\maven\trunks\surefire\surefire-integration-tests\src\test\resources\junit-twoTestCaseSuite" name="basedir"/>
+ <property value="C:\svn\maven\trunks\surefire\surefire-integration-tests\src\test\resources\junit-twoTestCaseSuite"
+ name="basedir"/>
<property value="C:\devtools\jdk1.5.0_12\jre\lib\endorsed" name="java.endorsed.dirs"/>
<property value="x86" name="os.arch"/>
<property value="C:\DOCUME~1\DAN~1.FAB\LOCALS~1\Temp\" name="java.io.tmpdir"/>
@@ -27,8 +29,12 @@
<property value="Windows XP" name="os.name"/>
<property value="C:\devtools\maven-2.0.8\bin\m2.conf" name="classworlds.conf"/>
<property value="Cp1252" name="sun.jnu.encoding"/>
- <property value="C:\devtools\jdk1.5.0_12\bin;.;C:\WINDOWS\system32;C:\WINDOWS;c:\devtools\apache-ant-1.7.0\bin;C:\Python25;C:\Perl\bin;C:\devtools\php-5.2.3\;c:\devtools\ruby-1.8.6-25\bin;C:\devtools\jdk1.5.0_12\bin;C:\devtools\maven-2.0.8\bin;c:\dan\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\IDM Computer Solutions\UltraEdit-32;C:\Program Files\Subversion\bin;C:\Program Files\cvsnt;C:\Program Files\GNU\GnuPG\pub;c:\cygwin\bin;C:\Program Files\MySQL\MySQL Server 5.0\bin;C:\Program Files\PostgreSQL\8.2\bin;C:\Program Files\Perforce;" name="java.library.path"/>
- <property value="C:\svn\maven\trunks\surefire\surefire-integration-tests\src\test\resources\junit-twoTestCaseSuite\target\test-classes;C:\svn\maven\trunks\surefire\surefire-integration-tests\src\test\resources\junit-twoTestCaseSuite\target\classes;c:\weirdlocalrepo\junit\junit\3.8.1\junit-3.8.1.jar;" name="surefire.test.class.path"/>
+ <property
+ value="C:\devtools\jdk1.5.0_12\bin;.;C:\WINDOWS\system32;C:\WINDOWS;c:\devtools\apache-ant-1.7.0\bin;C:\Python25;C:\Perl\bin;C:\devtools\php-5.2.3\;c:\devtools\ruby-1.8.6-25\bin;C:\devtools\jdk1.5.0_12\bin;C:\devtools\maven-2.0.8\bin;c:\dan\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\IDM Computer Solutions\UltraEdit-32;C:\Program Files\Subversion\bin;C:\Program Files\cvsnt;C:\Program Files\GNU\GnuPG\pub;c:\cygwin\bin;C:\Program Files\MySQL\MySQL Server 5.0\bin;C:\Program Files\PostgreSQL\8.2\bin;C:\Program Files\Perforce;"
+ name="java.library.path"/>
+ <property
+ value="C:\svn\maven\trunks\surefire\surefire-integration-tests\src\test\resources\junit-twoTestCaseSuite\target\test-classes;C:\svn\maven\trunks\surefire\surefire-integration-tests\src\test\resources\junit-twoTestCaseSuite\target\classes;c:\weirdlocalrepo\junit\junit\3.8.1\junit-3.8.1.jar;"
+ name="surefire.test.class.path"/>
<property value="Java Platform API Specification" name="java.specification.name"/>
<property value="49.0" name="java.class.version"/>
<property value="HotSpot Client Compiler" name="sun.management.compiler"/>
@@ -49,7 +55,9 @@
<property value="mixed mode" name="java.vm.info"/>
<property value="1.5.0_12" name="java.version"/>
<property value="C:\devtools\jdk1.5.0_12\jre\lib\ext" name="java.ext.dirs"/>
- <property value="C:\devtools\jdk1.5.0_12\jre\lib\rt.jar;C:\devtools\jdk1.5.0_12\jre\lib\i18n.jar;C:\devtools\jdk1.5.0_12\jre\lib\sunrsasign.jar;C:\devtools\jdk1.5.0_12\jre\lib\jsse.jar;C:\devtools\jdk1.5.0_12\jre\lib\jce.jar;C:\devtools\jdk1.5.0_12\jre\lib\charsets.jar;C:\devtools\jdk1.5.0_12\jre\classes" name="sun.boot.class.path"/>
+ <property
+ value="C:\devtools\jdk1.5.0_12\jre\lib\rt.jar;C:\devtools\jdk1.5.0_12\jre\lib\i18n.jar;C:\devtools\jdk1.5.0_12\jre\lib\sunrsasign.jar;C:\devtools\jdk1.5.0_12\jre\lib\jsse.jar;C:\devtools\jdk1.5.0_12\jre\lib\jce.jar;C:\devtools\jdk1.5.0_12\jre\lib\charsets.jar;C:\devtools\jdk1.5.0_12\jre\classes"
+ name="sun.boot.class.path"/>
<property value="Sun Microsystems Inc." name="java.vendor"/>
<property value="C:\devtools\maven-2.0.8" name="maven.home"/>
<property value="c:\weirdlocalrepo" name="localRepository"/>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 42c9f99..56141bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,7 +329,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.6</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java
index 2295652..93784fa 100644
--- a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java
+++ b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java
@@ -39,6 +39,7 @@ public class Priority
/**
* Returns a priority that applies to a new testclass (that has never been run/recorded)
+ *
* @param className The class name
* @return A priority
*/
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java b/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
index 659c7e4..31b1340 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
@@ -21,8 +21,8 @@ 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.apache.maven.shared.utils.io.SelectorUtils;
+import org.apache.maven.surefire.util.ScannerFilter;
public class SpecificTestClassFilter
implements ScannerFilter
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java
index 152d0e2..de4bbdd 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java
@@ -19,12 +19,11 @@ package org.apache.maven.surefire.booter;
* under the License.
*/
+import java.io.PrintStream;
import org.apache.maven.surefire.report.ReporterFactory;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.suite.RunResult;
-import java.io.PrintStream;
-
/**
* Creates ForkingReporters, which are typically one instance per TestSet or thread.
* This factory is only used inside forks.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
index e5c8ac3..c468ccb 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.booter;
import java.io.PrintStream;
import java.util.Enumeration;
import java.util.Properties;
-
import org.apache.maven.surefire.report.ConsoleLogger;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ReportEntry;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java
index fd6ecb5..7b8a11f 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterFactory.java
@@ -23,6 +23,7 @@ import org.apache.maven.surefire.suite.RunResult;
/**
* Used by the providers to request (per-thread) run listeners.
+ *
* @author Kristian Rosenvold
*/
public interface ReporterFactory
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java b/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
index f710225..8749cfa 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
@@ -19,6 +19,15 @@ package org.apache.maven.surefire.suite;
* under the License.
*/
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.io.IOUtil;
import org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter;
@@ -26,11 +35,9 @@ import org.apache.maven.shared.utils.xml.Xpp3Dom;
import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
import org.apache.maven.shared.utils.xml.Xpp3DomWriter;
-import java.io.*;
-
/**
* Represents a test-run-result; this may be from a single test run or an aggregated result.
- *
+ * <p/>
* In the case of timeout==true, the run-counts reflect the state of the test-run at the time
* of the timeout.
*
@@ -56,17 +63,20 @@ public class RunResult
private static final int NO_TESTS = 254;
- public static RunResult timeout(RunResult accumulatedAtTimeout){
- return errorCode( accumulatedAtTimeout, accumulatedAtTimeout.getFailure(), true);
+ public static RunResult timeout( RunResult accumulatedAtTimeout )
+ {
+ return errorCode( accumulatedAtTimeout, accumulatedAtTimeout.getFailure(), true );
}
- public static RunResult failure(RunResult accumulatedAtTimeout, Exception cause){
- return errorCode( accumulatedAtTimeout, getStackTrace(cause), accumulatedAtTimeout.isTimeout());
+ public static RunResult failure( RunResult accumulatedAtTimeout, Exception cause )
+ {
+ return errorCode( accumulatedAtTimeout, getStackTrace( cause ), accumulatedAtTimeout.isTimeout() );
}
- private static RunResult errorCode( RunResult other, String failure, boolean timeout){
- return new RunResult(other.getCompletedCount(), other.getErrors(),
- other.getFailures(), other.getSkipped(), failure, timeout);
+ private static RunResult errorCode( RunResult other, String failure, boolean timeout )
+ {
+ return new RunResult( other.getCompletedCount(), other.getErrors(), other.getFailures(), other.getSkipped(),
+ failure, timeout );
}
@@ -85,12 +95,16 @@ public class RunResult
this.timeout = timeout;
}
- private static String getStackTrace(Exception e){
- if (e== null) return null;
+ private static String getStackTrace( Exception e )
+ {
+ if ( e == null )
+ {
+ return null;
+ }
ByteArrayOutputStream out = new ByteArrayOutputStream();
- PrintWriter pw = new PrintWriter(out);
- e.printStackTrace(pw);
- return new String(out.toByteArray());
+ PrintWriter pw = new PrintWriter( out );
+ e.printStackTrace( pw );
+ return new String( out.toByteArray() );
}
public int getCompletedCount()
@@ -115,8 +129,14 @@ public class RunResult
public Integer getFailsafeCode() // Only used for compatibility reasons.
{
- if (completedCount == 0) return Integer.valueOf(NO_TESTS);
- if (!isErrorFree()) return Integer.valueOf( FAILURE );
+ if ( completedCount == 0 )
+ {
+ return Integer.valueOf( NO_TESTS );
+ }
+ if ( !isErrorFree() )
+ {
+ return Integer.valueOf( FAILURE );
+ }
return null;
}
@@ -137,7 +157,8 @@ public class RunResult
return failure != null;
}
- public String getFailure() {
+ public String getFailure()
+ {
return failure;
}
@@ -163,43 +184,52 @@ public class RunResult
return new RunResult( 0, 0, 0, 0 );
}
- private Xpp3Dom create(String node, String value){
- Xpp3Dom dom = new Xpp3Dom(node);
- dom.setValue( value);
+ private Xpp3Dom create( String node, String value )
+ {
+ Xpp3Dom dom = new Xpp3Dom( node );
+ dom.setValue( value );
return dom;
}
- private Xpp3Dom create(String node, int value){
- return create(node, Integer.toString(value));
+
+ private Xpp3Dom create( String node, int value )
+ {
+ return create( node, Integer.toString( value ) );
}
- Xpp3Dom asXpp3Dom(){
- Xpp3Dom dom = new Xpp3Dom("failsafe-summary");
+ Xpp3Dom asXpp3Dom()
+ {
+ Xpp3Dom dom = new Xpp3Dom( "failsafe-summary" );
Integer failsafeCode = getFailsafeCode();
- if ( failsafeCode != null ){
- dom.setAttribute( "result", Integer.toString( failsafeCode.intValue()) );
+ if ( failsafeCode != null )
+ {
+ dom.setAttribute( "result", Integer.toString( failsafeCode.intValue() ) );
}
- dom.setAttribute("timeout", Boolean.toString(this.timeout));
- dom.addChild(create("completed", this.completedCount));
- dom.addChild(create("errors", this.errors));
- dom.addChild(create("failures", this.failures));
- dom.addChild(create("skipped", this.skipped));
- dom.addChild(create("failureMessage", this.failure));
+ dom.setAttribute( "timeout", Boolean.toString( this.timeout ) );
+ dom.addChild( create( "completed", this.completedCount ) );
+ dom.addChild( create( "errors", this.errors ) );
+ dom.addChild( create( "failures", this.failures ) );
+ dom.addChild( create( "skipped", this.skipped ) );
+ dom.addChild( create( "failureMessage", this.failure ) );
return dom;
}
- public static RunResult fromInputStream(InputStream inputStream, String encoding) throws FileNotFoundException {
- Xpp3Dom dom = Xpp3DomBuilder.build(inputStream, encoding);
- boolean timeout = Boolean.parseBoolean(dom.getAttribute("timeout"));
- int completed = Integer.parseInt(dom.getChild("completed").getValue());
- int errors = Integer.parseInt(dom.getChild("errors").getValue());
- int failures = Integer.parseInt(dom.getChild("failures").getValue());
- int skipped = Integer.parseInt( dom.getChild("skipped").getValue());
- String failureMessage1 = dom.getChild("failureMessage").getValue();
- String failureMessage = StringUtils.isEmpty(failureMessage1) ? null : failureMessage1;
- return new RunResult(completed, errors, failures, skipped, failureMessage, timeout);
+ public static RunResult fromInputStream( InputStream inputStream, String encoding )
+ throws FileNotFoundException
+ {
+ Xpp3Dom dom = Xpp3DomBuilder.build( inputStream, encoding );
+ boolean timeout = Boolean.parseBoolean( dom.getAttribute( "timeout" ) );
+ int completed = Integer.parseInt( dom.getChild( "completed" ).getValue() );
+ int errors = Integer.parseInt( dom.getChild( "errors" ).getValue() );
+ int failures = Integer.parseInt( dom.getChild( "failures" ).getValue() );
+ int skipped = Integer.parseInt( dom.getChild( "skipped" ).getValue() );
+ String failureMessage1 = dom.getChild( "failureMessage" ).getValue();
+ String failureMessage = StringUtils.isEmpty( failureMessage1 ) ? null : failureMessage1;
+ return new RunResult( completed, errors, failures, skipped, failureMessage, timeout );
}
- public void writeSummary( File summaryFile, boolean inProgress, String encoding) throws IOException {
+ public void writeSummary( File summaryFile, boolean inProgress, String encoding )
+ throws IOException
+ {
if ( !summaryFile.getParentFile().isDirectory() )
{
//noinspection ResultOfMethodCallIgnored
@@ -215,45 +245,71 @@ public class RunResult
{
fin = new FileInputStream( summaryFile );
- RunResult runResult = RunResult.fromInputStream(new BufferedInputStream(fin), encoding);
- mergedSummary = mergedSummary.aggregate( runResult);
+ RunResult runResult = RunResult.fromInputStream( new BufferedInputStream( fin ), encoding );
+ mergedSummary = mergedSummary.aggregate( runResult );
}
- writer = new FileWriter(summaryFile);
- writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
- PrettyPrintXMLWriter prettyPrintXMLWriter = new PrettyPrintXMLWriter(writer);
- Xpp3DomWriter.write(prettyPrintXMLWriter, mergedSummary.asXpp3Dom());
+ writer = new FileWriter( summaryFile );
+ writer.write( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" );
+ PrettyPrintXMLWriter prettyPrintXMLWriter = new PrettyPrintXMLWriter( writer );
+ Xpp3DomWriter.write( prettyPrintXMLWriter, mergedSummary.asXpp3Dom() );
}
finally
{
- IOUtil.close(fin);
- IOUtil.close(writer);
+ IOUtil.close( fin );
+ IOUtil.close( writer );
}
}
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ public boolean equals( Object o )
+ {
+ if ( this == o )
+ {
+ return true;
+ }
+ if ( o == null || getClass() != o.getClass() )
+ {
+ return false;
+ }
RunResult runResult = (RunResult) o;
- if (completedCount != runResult.completedCount) return false;
- if (errors != runResult.errors) return false;
- if (failures != runResult.failures) return false;
- if (skipped != runResult.skipped) return false;
- if (timeout != runResult.timeout) return false;
- if (failure != null ? !failure.equals(runResult.failure) : runResult.failure != null) return false;
+ if ( completedCount != runResult.completedCount )
+ {
+ return false;
+ }
+ if ( errors != runResult.errors )
+ {
+ return false;
+ }
+ if ( failures != runResult.failures )
+ {
+ return false;
+ }
+ if ( skipped != runResult.skipped )
+ {
+ return false;
+ }
+ if ( timeout != runResult.timeout )
+ {
+ return false;
+ }
+ if ( failure != null ? !failure.equals( runResult.failure ) : runResult.failure != null )
+ {
+ return false;
+ }
return true;
}
- public int hashCode() {
+ public int hashCode()
+ {
int result = completedCount;
result = 31 * result + errors;
result = 31 * result + failures;
result = 31 * result + skipped;
- result = 31 * result + (failure != null ? failure.hashCode() : 0);
- result = 31 * result + (timeout ? 1 : 0);
+ result = 31 * result + ( failure != null ? failure.hashCode() : 0 );
+ result = 31 * result + ( timeout ? 1 : 0 );
return result;
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
index 1dee53b..e5f8174 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
@@ -113,7 +113,8 @@ public class DefaultDirectoryScanner
String[] tests = EMPTY_STRING_ARRAY;
if ( basedir.exists() )
{
- org.apache.maven.shared.utils.io.DirectoryScanner scanner = new org.apache.maven.shared.utils.io.DirectoryScanner();
+ org.apache.maven.shared.utils.io.DirectoryScanner scanner =
+ new org.apache.maven.shared.utils.io.DirectoryScanner();
scanner.setBasedir( basedir );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
index 24fe675..874c971 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
@@ -28,7 +28,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-
import org.apache.maven.surefire.booter.ForkingRunListener;
/**
@@ -40,125 +39,157 @@ import org.apache.maven.surefire.booter.ForkingRunListener;
* <p/>
* The methods {@link #getLocatedClasses()} and {@link #size()} will throw an
* {@link UnsupportedOperationException}.
- *
+ *
* @author Andreas Gudian
- *
*/
-public class LazyTestsToRun extends TestsToRun {
- private List workQueue = new ArrayList();
- private BufferedReader inputReader;
- private boolean streamClosed = false;
- private ClassLoader testClassLoader;
- private PrintStream originalOutStream;
-
- /**
- * C'tor
- *
- * @param testSource source to read the tests from
- * @param testClassLoader class loader to load the test classes
- * @param originalOutStream the output stream to use when requesting new new tests
- */
- public LazyTestsToRun(InputStream testSource, ClassLoader testClassLoader, PrintStream originalOutStream) {
- super(Collections.emptyList());
-
- this.testClassLoader = testClassLoader;
- this.originalOutStream = originalOutStream;
-
- inputReader = new BufferedReader(new InputStreamReader(testSource));
- }
-
- protected void addWorkItem(String className) {
- synchronized (workQueue) {
- workQueue.add(ReflectionUtils.loadClass(testClassLoader, className));
- }
- }
-
- protected void requestNextTest() {
- StringBuffer sb = new StringBuffer();
- sb.append((char) ForkingRunListener.BOOTERCODE_NEXT_TEST).append(",0,want more!\n");
- originalOutStream.print(sb.toString());
- }
-
- private class BlockingIterator implements Iterator {
- private int lastPos = -1;
-
- public boolean hasNext() {
- int nextPos = lastPos + 1;
- synchronized (workQueue) {
- if (workQueue.size() > nextPos) {
- return true;
- } else {
- if (needsToWaitForInput(nextPos)) {
- requestNextTest();
-
- String nextClassName;
- try {
- nextClassName = inputReader.readLine();
- } catch (IOException e) {
- streamClosed = true;
- return false;
- }
-
- if (null == nextClassName) {
- streamClosed = true;
- } else {
- addWorkItem(nextClassName);
- }
- }
-
- return (workQueue.size() > nextPos);
- }
- }
- }
-
- private boolean needsToWaitForInput(int nextPos) {
- return workQueue.size() == nextPos && !streamClosed;
- }
-
- public Object next() {
- synchronized (workQueue) {
- return workQueue.get(++lastPos);
- }
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.apache.maven.surefire.util.TestsToRun#iterator()
- */
- public Iterator iterator() {
- return new BlockingIterator();
- }
-
- /**
- * Unsupported. Use {@link #iterator()} instead.
- */
- public int size() {
- throw new UnsupportedOperationException("use method iterator()");
- }
-
- /**
- * Unsupported. Use {@link #iterator()} instead.
- */
- public Class[] getLocatedClasses() {
- throw new UnsupportedOperationException("use method iterator()");
- }
-
- /* (non-Javadoc)
- * @see org.apache.maven.surefire.util.TestsToRun#toString()
- */
- public String toString() {
- StringBuffer sb = new StringBuffer("LazyTestsToRun ");
- synchronized (workQueue) {
- sb.append("(more items expected: ").append(!streamClosed).append("): ");
- sb.append(workQueue);
- }
-
- return sb.toString();
- }
+public class LazyTestsToRun
+ extends TestsToRun
+{
+ private List workQueue = new ArrayList();
+
+ private BufferedReader inputReader;
+
+ private boolean streamClosed = false;
+
+ private ClassLoader testClassLoader;
+
+ private PrintStream originalOutStream;
+
+ /**
+ * C'tor
+ *
+ * @param testSource source to read the tests from
+ * @param testClassLoader class loader to load the test classes
+ * @param originalOutStream the output stream to use when requesting new new tests
+ */
+ public LazyTestsToRun( InputStream testSource, ClassLoader testClassLoader, PrintStream originalOutStream )
+ {
+ super( Collections.emptyList() );
+
+ this.testClassLoader = testClassLoader;
+ this.originalOutStream = originalOutStream;
+
+ inputReader = new BufferedReader( new InputStreamReader( testSource ) );
+ }
+
+ protected void addWorkItem( String className )
+ {
+ synchronized ( workQueue )
+ {
+ workQueue.add( ReflectionUtils.loadClass( testClassLoader, className ) );
+ }
+ }
+
+ protected void requestNextTest()
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append( (char) ForkingRunListener.BOOTERCODE_NEXT_TEST ).append( ",0,want more!\n" );
+ originalOutStream.print( sb.toString() );
+ }
+
+ private class BlockingIterator
+ implements Iterator
+ {
+ private int lastPos = -1;
+
+ public boolean hasNext()
+ {
+ int nextPos = lastPos + 1;
+ synchronized ( workQueue )
+ {
+ if ( workQueue.size() > nextPos )
+ {
+ return true;
+ }
+ else
+ {
+ if ( needsToWaitForInput( nextPos ) )
+ {
+ requestNextTest();
+
+ String nextClassName;
+ try
+ {
+ nextClassName = inputReader.readLine();
+ }
+ catch ( IOException e )
+ {
+ streamClosed = true;
+ return false;
+ }
+
+ if ( null == nextClassName )
+ {
+ streamClosed = true;
+ }
+ else
+ {
+ addWorkItem( nextClassName );
+ }
+ }
+
+ return ( workQueue.size() > nextPos );
+ }
+ }
+ }
+
+ private boolean needsToWaitForInput( int nextPos )
+ {
+ return workQueue.size() == nextPos && !streamClosed;
+ }
+
+ public Object next()
+ {
+ synchronized ( workQueue )
+ {
+ return workQueue.get( ++lastPos );
+ }
+ }
+
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.surefire.util.TestsToRun#iterator()
+ */
+ public Iterator iterator()
+ {
+ return new BlockingIterator();
+ }
+
+ /**
+ * Unsupported. Use {@link #iterator()} instead.
+ */
+ public int size()
+ {
+ throw new UnsupportedOperationException( "use method iterator()" );
+ }
+
+ /**
+ * Unsupported. Use {@link #iterator()} instead.
+ */
+ public Class[] getLocatedClasses()
+ {
+ throw new UnsupportedOperationException( "use method iterator()" );
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.surefire.util.TestsToRun#toString()
+ */
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer( "LazyTestsToRun " );
+ synchronized ( workQueue )
+ {
+ sb.append( "(more items expected: " ).append( !streamClosed ).append( "): " );
+ sb.append( workQueue );
+ }
+
+ return sb.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/site/site.xml
----------------------------------------------------------------------
diff --git a/surefire-api/src/site/site.xml b/surefire-api/src/site/site.xml
index 0442da7..8ccc3eb 100644
--- a/surefire-api/src/site/site.xml
+++ b/surefire-api/src/site/site.xml
@@ -19,7 +19,8 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java
index 67d57e9..8f285a3 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java
@@ -19,12 +19,17 @@ package org.apache.maven.surefire.suite;
* under the License.
*/
-import junit.framework.TestCase;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.StringWriter;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter;
import org.apache.maven.shared.utils.xml.Xpp3DomWriter;
-import java.io.*;
+import junit.framework.TestCase;
/**
* @author Kristian Rosenvold
@@ -57,60 +62,74 @@ public class RunResultTest
}
- public void testSerialization() throws FileNotFoundException {
- writeReadCheck(getSimpleAggregate());
+ public void testSerialization()
+ throws FileNotFoundException
+ {
+ writeReadCheck( getSimpleAggregate() );
}
- public void testFailures() throws FileNotFoundException {
- writeReadCheck(new RunResult(0,1,2,3,"stacktraceHere",false));
+ public void testFailures()
+ throws FileNotFoundException
+ {
+ writeReadCheck( new RunResult( 0, 1, 2, 3, "stacktraceHere", false ) );
}
- public void testSkipped() throws FileNotFoundException {
- writeReadCheck(new RunResult(3,2,1,0,null,true));
+ public void testSkipped()
+ throws FileNotFoundException
+ {
+ writeReadCheck( new RunResult( 3, 2, 1, 0, null, true ) );
}
- public void testAppendSerialization() throws IOException {
+ public void testAppendSerialization()
+ throws IOException
+ {
RunResult simpleAggregate = getSimpleAggregate();
- RunResult additional = new RunResult(2,1,2,2, null, true);
- File summary = File.createTempFile("failsafe", "test");
- simpleAggregate.writeSummary(summary, false, "utf-8");
- additional.writeSummary(summary, true, "utf-8");
-
- RunResult actual = RunResult.fromInputStream(new FileInputStream(summary), "utf-8");
- RunResult expected = simpleAggregate.aggregate(additional);
- assertEquals(expected, actual);
+ RunResult additional = new RunResult( 2, 1, 2, 2, null, true );
+ File summary = File.createTempFile( "failsafe", "test" );
+ simpleAggregate.writeSummary( summary, false, "utf-8" );
+ additional.writeSummary( summary, true, "utf-8" );
+
+ RunResult actual = RunResult.fromInputStream( new FileInputStream( summary ), "utf-8" );
+ RunResult expected = simpleAggregate.aggregate( additional );
+ assertEquals( expected, actual );
//noinspection ResultOfMethodCallIgnored
summary.delete();
}
- public void testStringValue() throws FileNotFoundException {
- RunResult simpleAggregate = new RunResult(3, 2, 1, 0, null, true);
- StringWriter stringWriter = getStringWriter(simpleAggregate);
+ public void testStringValue()
+ throws FileNotFoundException
+ {
+ RunResult simpleAggregate = new RunResult( 3, 2, 1, 0, null, true );
+ StringWriter stringWriter = getStringWriter( simpleAggregate );
String actual = stringWriter.toString();
- String expected = StringUtils.unifyLineSeparators("<failsafe-summary result=\"255\" timeout=\"true\">\n" +
- " <completed>3</completed>\n" +
- " <errors>2</errors>\n" +
- " <failures>1</failures>\n" +
- " <skipped>0</skipped>\n" +
- " <failureMessage/>\n" +
- "</failsafe-summary>");
- assertEquals( expected, actual);
+ String expected = StringUtils.unifyLineSeparators( "<failsafe-summary result=\"255\" timeout=\"true\">\n" +
+ " <completed>3</completed>\n" +
+ " <errors>2</errors>\n" +
+ " <failures>1</failures>\n" +
+ " <skipped>0</skipped>\n" +
+ " <failureMessage/>\n" +
+ "</failsafe-summary>" );
+ assertEquals( expected, actual );
}
- private void writeReadCheck(RunResult simpleAggregate) throws FileNotFoundException {
- StringWriter writer = getStringWriter(simpleAggregate);
+ private void writeReadCheck( RunResult simpleAggregate )
+ throws FileNotFoundException
+ {
+ StringWriter writer = getStringWriter( simpleAggregate );
- RunResult actual = RunResult.fromInputStream(new ByteArrayInputStream(writer.getBuffer().toString().getBytes()), "UTF-8");
- assertEquals(simpleAggregate, actual);
+ RunResult actual =
+ RunResult.fromInputStream( new ByteArrayInputStream( writer.getBuffer().toString().getBytes() ), "UTF-8" );
+ assertEquals( simpleAggregate, actual );
}
- private StringWriter getStringWriter(RunResult simpleAggregate) {
+ private StringWriter getStringWriter( RunResult simpleAggregate )
+ {
StringWriter writer = new StringWriter();
- PrettyPrintXMLWriter wr = new PrettyPrintXMLWriter(writer);
- Xpp3DomWriter.write(wr, simpleAggregate.asXpp3Dom());
+ PrettyPrintXMLWriter wr = new PrettyPrintXMLWriter( writer );
+ Xpp3DomWriter.write( wr, simpleAggregate.asXpp3Dom() );
return writer;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-booter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index 8262c64..b2c81e9 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -17,7 +17,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
index 430ea9c..d53bfda 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
@@ -46,5 +46,5 @@ public interface BooterConstants
String TEST_SUITE_XML_FILES = "testSuiteXmlFiles";
String PROVIDER_CONFIGURATION = "providerConfiguration";
String FORKTESTSET = "forkTestSet";
- String FORKTESTSET_PREFER_TESTS_FROM_IN_STREAM = "preferTestsFromInStream";
+ String FORKTESTSET_PREFER_TESTS_FROM_IN_STREAM = "preferTestsFromInStream";
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
index 85e4c93..a9028e0 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
@@ -41,7 +41,6 @@ import org.apache.maven.surefire.testset.TestRequest;
* @author Jason van Zyl
* @author Emmanuel Venisse
* @author Kristian Rosenvold
- *
*/
public class BooterDeserializer
implements BooterConstants
@@ -61,10 +60,11 @@ public class BooterDeserializer
final File reportsDirectory = new File( properties.getProperty( REPORTSDIRECTORY ) );
final String testNgVersion = properties.getProperty( TESTARTIFACT_VERSION );
final String testArtifactClassifier = properties.getProperty( TESTARTIFACT_CLASSIFIER );
-
+
final TypeEncodedValue typeEncodedTestForFork = properties.getTypeEncodedValue( FORKTESTSET );
- final boolean preferTestsFromInStream = properties.getBooleanProperty( FORKTESTSET_PREFER_TESTS_FROM_IN_STREAM );
-
+ final boolean preferTestsFromInStream =
+ properties.getBooleanProperty( FORKTESTSET_PREFER_TESTS_FROM_IN_STREAM );
+
final String requestedTest = properties.getProperty( REQUESTEDTEST );
final String requestedTestMethod = properties.getProperty( REQUESTEDTESTMETHOD );
final File sourceDirectory = properties.getFileProperty( SOURCE_DIRECTORY );
@@ -93,7 +93,8 @@ public class BooterDeserializer
return new ProviderConfiguration( dirScannerParams, runOrderParameters,
properties.getBooleanProperty( FAILIFNOTESTS ), reporterConfiguration, testNg,
- testSuiteDefinition, properties.getProperties(), typeEncodedTestForFork, preferTestsFromInStream );
+ testSuiteDefinition, properties.getProperties(), typeEncodedTestForFork,
+ preferTestsFromInStream );
}
public StartupConfiguration getProviderConfiguration()
@@ -107,6 +108,7 @@ public class BooterDeserializer
ClasspathConfiguration classpathConfiguration = new ClasspathConfiguration( properties );
- return StartupConfiguration.inForkedVm( providerConfiguration, classpathConfiguration, classLoaderConfiguration );
+ return StartupConfiguration.inForkedVm( providerConfiguration, classpathConfiguration,
+ classLoaderConfiguration );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
index 006654b..e3b8243 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
@@ -26,7 +26,6 @@ package org.apache.maven.surefire.booter;
* @author Jason van Zyl
* @author Emmanuel Venisse
* @author Kristian Rosenvold
- *
*/
public class ClasspathConfiguration
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
index 2e8f812..f96ec87 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.PrintStream;
-
import org.apache.maven.surefire.suite.RunResult;
import org.apache.maven.surefire.util.LazyTestsToRun;
@@ -36,7 +35,6 @@ import org.apache.maven.surefire.util.LazyTestsToRun;
* @author Jason van Zyl
* @author Emmanuel Venisse
* @author Kristian Rosenvold
- *
*/
public class ForkedBooter
{
@@ -75,13 +73,16 @@ public class ForkedBooter
startupConfiguration.writeSurefireTestClasspathProperty();
Object testSet;
- if (forkedTestSet != null) {
- testSet = forkedTestSet.getDecodedValue( testClassLoader );
- }
- else if (readTestsFromInputStream) {
- testSet = new LazyTestsToRun(System.in, testClassLoader, originalOut);
+ if ( forkedTestSet != null )
+ {
+ testSet = forkedTestSet.getDecodedValue( testClassLoader );
}
- else {
+ else if ( readTestsFromInputStream )
+ {
+ testSet = new LazyTestsToRun( System.in, testClassLoader, originalOut );
+ }
+ else
+ {
testSet = null;
}
@@ -112,9 +113,9 @@ public class ForkedBooter
private static RunResult runSuitesInProcess( Object testSet, ClassLoader testsClassLoader,
- StartupConfiguration startupConfiguration,
- ProviderConfiguration providerConfiguration,
- PrintStream originalSystemOut )
+ StartupConfiguration startupConfiguration,
+ ProviderConfiguration providerConfiguration,
+ PrintStream originalSystemOut )
throws SurefireExecutionException
{
final ClasspathConfiguration classpathConfiguration = startupConfiguration.getClasspathConfiguration();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
index 23535ad..cd29916 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
@@ -36,7 +36,6 @@ import org.apache.maven.surefire.testset.TestRequest;
* @author Jason van Zyl
* @author Emmanuel Venisse
* @author Kristian Rosenvold
- *
*/
public class ProviderConfiguration
{
@@ -64,14 +63,14 @@ public class ProviderConfiguration
private final boolean failIfNoTests;
private final TypeEncodedValue forkTestSet;
-
+
private final boolean readTestsFromInStream;
public ProviderConfiguration( DirectoryScannerParameters directoryScannerParameters,
RunOrderParameters runOrderParameters, boolean failIfNoTests,
ReporterConfiguration reporterConfiguration, TestArtifactInfo testArtifact,
TestRequest testSuiteDefinition, Properties providerProperties,
- TypeEncodedValue typeEncodedTestSet, boolean readTestsFromInStream)
+ TypeEncodedValue typeEncodedTestSet, boolean readTestsFromInStream )
{
this.runOrderParameters = runOrderParameters;
this.providerProperties = providerProperties;
@@ -136,14 +135,15 @@ public class ProviderConfiguration
{
return forkTestSet;
}
-
+
public RunOrderParameters getRunOrderParameters()
{
return runOrderParameters;
}
- public boolean isReadTestsFromInStream() {
- return readTestsFromInStream;
- }
+ public boolean isReadTestsFromInStream()
+ {
+ return readTestsFromInStream;
+ }
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
index d6cb072..32d3f79 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
@@ -40,7 +40,8 @@ public class StartupConfiguration
public StartupConfiguration( String providerClassName, ClasspathConfiguration classpathConfiguration,
- ClassLoaderConfiguration classLoaderConfiguration, boolean isForkRequested, boolean inForkedVm )
+ ClassLoaderConfiguration classLoaderConfiguration, boolean isForkRequested,
+ boolean inForkedVm )
{
this.providerClassName = providerClassName;
this.classpathConfiguration = classpathConfiguration;
@@ -53,7 +54,8 @@ public class StartupConfiguration
ClasspathConfiguration classpathConfiguration,
ClassLoaderConfiguration classLoaderConfiguration )
{
- return new StartupConfiguration( providerClassName, classpathConfiguration, classLoaderConfiguration, true, true );
+ return new StartupConfiguration( providerClassName, classpathConfiguration, classLoaderConfiguration, true,
+ true );
}
public ClasspathConfiguration getClasspathConfiguration()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
index 7a997f1..6ad7647 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
@@ -23,8 +23,6 @@ import org.apache.maven.surefire.util.NestedCheckedException;
/**
* Encapsulates exceptions thrown during Surefire forking.
- *
- *
*/
public class SurefireBooterForkException
extends NestedCheckedException
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
index 1c0302b..4a624ea 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
@@ -70,7 +70,8 @@ public class SystemPropertyManager
p.setAsSystemProperties();
}
- public static File writePropertiesFile( Properties properties, File tempDirectory, String name, boolean keepForkFiles )
+ public static File writePropertiesFile( Properties properties, File tempDirectory, String name,
+ boolean keepForkFiles )
throws IOException
{
File file = File.createTempFile( name, "tmp", tempDirectory );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-grouper/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml
index da2f1f8..5b42486 100644
--- a/surefire-grouper/pom.xml
+++ b/surefire-grouper/pom.xml
@@ -18,7 +18,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index 9914a28..e47a303 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -103,7 +103,8 @@
<surefire.version>${project.version}</surefire.version>
<testng.version>${testng.version}</testng.version>
<maven.home>${mavenHomeUsed}</maven.home>
- <maven.settings.file>${project.basedir}/../surefire-setup-integration-tests/target/private/it-settings.xml</maven.settings.file>
+ <maven.settings.file>${project.basedir}/../surefire-setup-integration-tests/target/private/it-settings.xml
+ </maven.settings.file>
<maven.repo.local>${project.basedir}/../surefire-setup-integration-tests/target/it-repo</maven.repo.local>
<maven.test.tmpdir>${project.build.directory}</maven.test.tmpdir>
<user.localRepository>${settings.localRepository}</user.localRepository>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
index cbde1ac..7001cfd 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.its;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
@@ -59,25 +58,26 @@ public class ForkModeIT
String[] pids = doTest( unpack( getProject() ).debugLogging().forkMode( "none" ) );
assertSamePids( pids );
}
-
+
public void testForkModeOncePerThreadSingleThread()
{
- String[] pids = doTest( unpack( getProject() ).debugLogging().forkOncePerThread().threadCount(1) );
+ String[] pids = doTest( unpack( getProject() ).debugLogging().forkOncePerThread().threadCount( 1 ) );
assertSamePids( pids );
}
public void testForkModeOncePerThreadTwoThreads()
{
- String[] pids = doTest( unpack( getProject() ).debugLogging().forkOncePerThread().threadCount(2) );
+ String[] pids = doTest( unpack( getProject() ).debugLogging().forkOncePerThread().threadCount( 2 ) );
assertDifferentPids( pids, 2 );
}
-
- private void assertDifferentPids(String[] pids, int numOfDifferentPids) {
- Set<String> pidSet = new HashSet<String>(Arrays.asList(pids));
- assertEquals( "number of different pids is not as expected", numOfDifferentPids, pidSet.size() );
- }
- public void testForkModeOnce()
+ private void assertDifferentPids( String[] pids, int numOfDifferentPids )
+ {
+ Set<String> pidSet = new HashSet<String>( Arrays.asList( pids ) );
+ assertEquals( "number of different pids is not as expected", numOfDifferentPids, pidSet.size() );
+ }
+
+ public void testForkModeOnce()
{
String[] pids = doTest( unpack( getProject() ).forkOnce() );
// DGF It would be nice to assert that "once" was different
@@ -113,7 +113,7 @@ public class ForkModeIT
private String[] doTest( SurefireLauncher forkMode )
{
- forkMode.addD( "testProperty", "testValue_${surefire.threadNumber}" );
+ forkMode.addD( "testProperty", "testValue_${surefire.threadNumber}" );
final OutputValidator outputValidator = forkMode.executeTest();
outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
String[] pids = new String[3];
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
index d7619ca..d8da28f 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
@@ -27,7 +27,6 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* Test include/exclude patterns.
*
* @author Benjamin Bentmann
- *
*/
public class IncludesExcludesIT
extends SurefireIntegrationTestCase
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
index c3ad471..d60aa8c 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
@@ -56,7 +56,7 @@ public class JUnit48TestCategoriesIT
public void testCategoriesAC()
throws Exception
{
- runAC( unpacked());
+ runAC( unpacked() );
}
public void testCategoriesACForkAlways()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
index 8d52683..8868699 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
@@ -46,10 +46,10 @@ public class UnicodeTestNamesIT
File dest = new File( unpacked.getUnpackLocation(),
"src/test/java/junit/twoTestCases/\u800C\u7D22\u5176\u60C5Test.java" );
- Assume.assumeTrue( xxyz.renameTo( dest ));
+ Assume.assumeTrue( xxyz.renameTo( dest ) );
Assume.assumeTrue( dest.exists() );
- Assume.assumeTrue( !new File( unpacked.getUnpackLocation(),
- "src/test/java/junit/twoTestCases/????Test.java" ).exists());
+ Assume.assumeTrue(
+ !new File( unpacked.getUnpackLocation(), "src/test/java/junit/twoTestCases/????Test.java" ).exists() );
OutputValidator outputValidator = unpacked.executeTest().assertTestSuiteResults( 2, 0, 0, 0 );
TestFile surefireReportsFile = outputValidator.getSurefireReportsFile( "junit.twoTestCases.而索其情Test.txt" );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
index 26848bd..cba2069 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
@@ -115,7 +115,8 @@ public class WorkingDirectoryIT
// test if not a symlink
if ( childTestDir.getBaseDir().getCanonicalFile().equals( childTestDir.getBaseDir().getAbsoluteFile() ) )
{
- assertTrue( "wrong user.dir ! symlink ", childTestDir.getBaseDir().getAbsolutePath().equalsIgnoreCase(userDir.getAbsolutePath()));
+ assertTrue( "wrong user.dir ! symlink ",
+ childTestDir.getBaseDir().getAbsolutePath().equalsIgnoreCase( userDir.getAbsolutePath() ) );
}
else
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
index ebb3669..26bfbf2 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
@@ -22,7 +22,8 @@ package org.apache.maven.surefire.its.fixture;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
-public class FailsafeOutputValidator extends OutputValidator
+public class FailsafeOutputValidator
+ extends OutputValidator
{
public FailsafeOutputValidator( Verifier verifier )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 330b87e..0e4cedb 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.commons.lang.text.StrSubstitutor;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
index 6580012..6d3429b 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
@@ -1,20 +1,23 @@
package org.apache.maven.surefire.its.fixture;
+import java.io.IOException;
import org.apache.maven.it.VerificationException;
-import org.junit.Test;
-import java.io.IOException;
+import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
* @author Kristian Rosenvold
*/
-public class SurefireLauncherTest {
+public class SurefireLauncherTest
+{
@Test
- public void launcherGetsProperMethodName() throws IOException, VerificationException {
- String method = new SurefireLauncher(SurefireLauncherTest.class, "foo", "").getTestMethodName();
- assertEquals( "launcherGetsProperMethodName", method);
+ public void launcherGetsProperMethodName()
+ throws IOException, VerificationException
+ {
+ String method = new SurefireLauncher( SurefireLauncherTest.class, "foo", "" ).getTestMethodName();
+ assertEquals( "launcherGetsProperMethodName", method );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java
index 9b3e7dd..82c19b7 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java
@@ -57,7 +57,7 @@ public class SurefireReportParser
continue;
}
String[] xmlReportFiles = getIncludedFiles( reportsDirectory, "*.xml",
- "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml, failsafe-summary.xml");
+ "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml, failsafe-summary.xml" );
for ( String xmlReportFile : xmlReportFiles )
{
File xmlReport = new File( reportsDirectory, xmlReportFile );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParserTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParserTest.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParserTest.java
index 64ec7f5..55419de 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParserTest.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParserTest.java
@@ -1,12 +1,13 @@
package org.apache.maven.surefire.its.fixture;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
import java.util.Collection;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.junit.Test;
+import org.xml.sax.SAXException;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -21,10 +22,10 @@ public class TestSuiteXmlParserTest
{
TestSuiteXmlParser parser = new TestSuiteXmlParser();
- Collection<ReportTestSuite> oldResult =
- parser.parse( "src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.FailingTest.xml" );
+ Collection<ReportTestSuite> oldResult = parser.parse(
+ "src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.FailingTest.xml" );
- assertNotNull( oldResult);
+ assertNotNull( oldResult );
assertEquals( 1, oldResult.size() );
ReportTestSuite next = oldResult.iterator().next();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
index 6b0c946..af3f9f7 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
@@ -19,7 +19,6 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
-import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
@@ -34,7 +33,7 @@ public class Surefire141PluggableProvidersIT
public void testParallelBuildResultCount()
throws Exception
{
- OutputValidator outputValidator = unpack( "surefire-141-pluggableproviders-provider" , "prov").executeInstall();
+ OutputValidator outputValidator = unpack( "surefire-141-pluggableproviders-provider", "prov" ).executeInstall();
unpack( "surefire-141-pluggableproviders" ).setEOption().executeTest().verifyTextInLog(
"Using configured provider org.apache.maven.surefire.testprovider.TestProvider" ).verifyTextInLog(
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
index 58c1479..a0d8b07 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
/**
* @author Kristian Rosenvold
*/
-@Category( Not2xCompatible.class)
+@Category( Not2xCompatible.class )
public class Surefire735ForkFailWithRedirectConsoleOutputIT
extends SurefireJUnit4IntegrationTestCase
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
index 3a12cd8..d6a96c0 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
@@ -24,7 +24,7 @@ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-@Category( Not2xCompatible.class)
+@Category( Not2xCompatible.class )
public class Surefire806SpecifiedTestControlsIT
extends SurefireJUnit4IntegrationTestCase
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
index 6d0e51c..679b266 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
@@ -19,7 +19,6 @@ package org.apache.maven.surefire.its.jiras;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
@@ -46,7 +45,8 @@ public class Surefire809GroupExpressionsIT
@Test
public void incorrectJUnitVersions()
{
- unpackJUnit().setJUnitVersion( "4.5" ).groups( "junit4.CategoryA AND junit4.CategoryB" ).executeTestWithFailure();
+ unpackJUnit().setJUnitVersion( "4.5" ).groups(
+ "junit4.CategoryA AND junit4.CategoryB" ).executeTestWithFailure();
}
@Test
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
index df20588..14e278e 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
@@ -19,7 +19,6 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
index 577b8a5..1fd9ea8 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
@@ -17,6 +17,7 @@ package org.apache.maven.surefire.its.jiras;
* specific language governing permissions and limitations
* under the License.
*/
+
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
@@ -28,7 +29,7 @@ public class Surefire907PerThreadWithoutThreadCountIT
@Test
public void categoryAB()
{
- OutputValidator validator = unpack("fork-mode").forkPerThread().executeTestWithFailure();
+ OutputValidator validator = unpack( "fork-mode" ).forkPerThread().executeTestWithFailure();
validator.verifyTextInLog( "Fork modes perthread and onceperthread require a thread count" );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
index 90d0a1d..7b3371d 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
@@ -19,9 +19,7 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.TestFile;
/**
* @author Kristian Rosenvold
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/common-junit3/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit3/pom.xml b/surefire-providers/common-junit3/pom.xml
index a8cea8f..bd4dcde 100644
--- a/surefire-providers/common-junit3/pom.xml
+++ b/surefire-providers/common-junit3/pom.xml
@@ -17,7 +17,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector40Test.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector40Test.java b/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector40Test.java
index 968ef1d..2444065 100644
--- a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector40Test.java
+++ b/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector40Test.java
@@ -17,6 +17,7 @@ package org.apache.maven.surefire.common.junit4;
* specific language governing permissions and limitations
* under the License.
*/
+
import junit.framework.TestCase;
import org.junit.Assert;
import org.junit.Ignore;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/common-junit48/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit48/pom.xml b/surefire-providers/common-junit48/pom.xml
index a9de567..0ad0f77 100644
--- a/surefire-providers/common-junit48/pom.xml
+++ b/surefire-providers/common-junit48/pom.xml
@@ -17,7 +17,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -47,10 +48,10 @@
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-grouper</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-utils</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml
index a7e0dd2..151b2e5 100644
--- a/surefire-providers/pom.xml
+++ b/surefire-providers/pom.xml
@@ -18,7 +18,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/src/site/site.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/src/site/site.xml b/surefire-providers/src/site/site.xml
index c929710..13a485b 100644
--- a/surefire-providers/src/site/site.xml
+++ b/surefire-providers/src/site/site.xml
@@ -20,7 +20,7 @@ under the License.
-->
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
<menu ref="parent"/>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/surefire-junit3/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/pom.xml b/surefire-providers/surefire-junit3/pom.xml
index e1c4272..26de120 100644
--- a/surefire-providers/surefire-junit3/pom.xml
+++ b/surefire-providers/surefire-junit3/pom.xml
@@ -17,7 +17,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -52,28 +53,28 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>org.apache.maven.surefire:common-junit3</include>
- </includes>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.maven.surefire:common-junit3</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
index bbff4da..448ba5a 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
@@ -76,14 +76,15 @@ public class JUnit3Provider
{
if ( testsToRun == null )
{
- if (forkTestSet instanceof TestsToRun)
+ if ( forkTestSet instanceof TestsToRun )
{
testsToRun = (TestsToRun) forkTestSet;
}
- else if (forkTestSet instanceof Class)
+ else if ( forkTestSet instanceof Class )
{
testsToRun = TestsToRun.fromClass( (Class<?>) forkTestSet );
- } else
+ }
+ else
{
testsToRun = scanClassPath();
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/surefire-junit4/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit4/pom.xml b/surefire-providers/surefire-junit4/pom.xml
index e97bbcc..077bdd3 100644
--- a/surefire-providers/surefire-junit4/pom.xml
+++ b/surefire-providers/surefire-junit4/pom.xml
@@ -17,7 +17,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>