You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2005/12/04 00:13:12 UTC
svn commit: r352045 -
/maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Author: jvanzyl
Date: Sat Dec 3 15:13:08 2005
New Revision: 352045
URL: http://svn.apache.org/viewcvs?rev=352045&view=rev
Log:
o adding the options for forking
Modified:
maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Modified: maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=352045&r1=352044&r2=352045&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java (original)
+++ maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Sat Dec 3 15:13:08 2005
@@ -172,6 +172,14 @@
*/
private boolean useFile;
+ /**
+ * Option to generate a file test report or just output the test report to the console.
+ *
+ * @parameter expression="${forkMode}"
+ * default-value="none"
+ */
+ private String forkMode;
+
public void execute()
throws MojoExecutionException
{
@@ -195,6 +203,18 @@
SurefireBooter surefireBooter = new SurefireBooter();
+ // ----------------------------------------------------------------------
+ // Forking
+ // ----------------------------------------------------------------------
+
+ getLog().info( "forkMode: " + forkMode );
+
+ surefireBooter.setForkMode( forkMode );
+
+ // ----------------------------------------------------------------------
+ // Reporting
+ // ----------------------------------------------------------------------
+
getLog().info( "Setting reports dir: " + reportsDirectory );
surefireBooter.setReportsDirectory( reportsDirectory );
@@ -219,8 +239,7 @@
includes.add( "**/" + testRegexes[i] + ".java" );
}
- surefireBooter.addBattery( "org.codehaus.surefire.battery.DirectoryBattery",
- new Object[]{testClassesDirectory, includes, excludes} );
+ surefireBooter.addBattery( "org.codehaus.surefire.battery.DirectoryBattery", new Object[]{testClassesDirectory, includes, excludes} );
}
else
{
@@ -228,17 +247,14 @@
// Have to wrap in an ArrayList as surefire expects an ArrayList instead of a List for some reason
if ( includes == null || includes.size() == 0 )
{
- includes = new ArrayList(
- Arrays.asList( new String[]{"**/Test*.java", "**/*Test.java", "**/*TestCase.java"} ) );
+ includes = new ArrayList( Arrays.asList( new String[]{"**/Test*.java", "**/*Test.java", "**/*TestCase.java"} ) );
}
if ( excludes == null || excludes.size() == 0 )
{
- excludes = new ArrayList(
- Arrays.asList( new String[]{"**/Abstract*Test.java", "**/Abstract*TestCase.java"} ) );
+ excludes = new ArrayList( Arrays.asList( new String[]{"**/Abstract*Test.java", "**/Abstract*TestCase.java"} ) );
}
- surefireBooter.addBattery( "org.codehaus.surefire.battery.DirectoryBattery",
- new Object[]{testClassesDirectory, includes, excludes} );
+ surefireBooter.addBattery( "org.codehaus.surefire.battery.DirectoryBattery", new Object[]{testClassesDirectory, includes, excludes} );
}
// ----------------------------------------------------------------------
@@ -397,7 +413,6 @@
*/
private void addReporters( SurefireBooter surefireBooter )
{
-
if ( useFile )
{
if ( printSummary )