svn commit: r381871 - /maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java

[brett]

Author: brett
Date: Tue Feb 28 18:02:57 2006
New Revision: 381871

URL: http://svn.apache.org/viewcvs?rev=381871&view=rev
Log:
merge r381060:381866 from trunk

Modified:
    
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java

Modified: 
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=381871&r1=381870&r2=381871&view=diff
==============================================================================
--- 
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
 (original)
+++ 
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
 Tue Feb 28 18:02:57 2006
@@ -117,8 +117,8 @@
     private File testSourceDirectory;
 
     /**
-     * Specify this parameter if you want to use the test regex notation to 
select tests to run.
-     * The regular expression will be used to create an include pattern 
formatted like <code>**&#47;${test}.java</code>
+     * Specify this parameter if you want to use the test pattern matching 
notation, Ant pattern matching, to select tests to run.
+     * The Ant pattern will be used to create an include pattern formatted 
like <code>**&#47;${test}.java</code>
      * When used, the <code>includes</code> and <code>excludes</code> patterns 
parameters are ignored
      *
      * @parameter expression="${test}"
@@ -466,7 +466,7 @@
 
         if ( !success )
         {
-            String msg = "There are some test failures.";
+            String msg = "There are test failures.";
 
             if ( testFailureIgnore )
             {
@@ -496,9 +496,9 @@
 
                 String value = (String) systemProperties.get( key );
 
-                System.setProperty( key, value );
-
                 getLog().debug( "Setting system property [" + key + "]=[" + 
value + "]" );
+
+                System.setProperty( key, value );
             }
         }
     }
@@ -575,11 +575,25 @@
         {
             if ( printSummary )
             {
-                surefireBooter.addReport( 
"org.apache.maven.surefire.report.ConsoleReporter" );
+                if ( forking() )
+                {
+                    surefireBooter.addReport( 
"org.apache.maven.surefire.report.ForkingConsoleReporter" );
+                }
+                else
+                {
+                    surefireBooter.addReport( 
"org.apache.maven.surefire.report.ConsoleReporter" );
+                }
             }
             else
             {
-                surefireBooter.addReport( 
"org.apache.maven.surefire.report.SummaryConsoleReporter" );
+                if ( forking() )
+                {
+                    surefireBooter.addReport( 
"org.apache.maven.surefire.report.ForkingSummaryConsoleReporter" );
+                }
+                else
+                {
+                    surefireBooter.addReport( 
"org.apache.maven.surefire.report.SummaryConsoleReporter" );
+                }
             }
 
             if ( reportFormat.equals( "brief" ) )
@@ -602,6 +616,12 @@
                 surefireBooter.addReport( 
"org.apache.maven.surefire.report.DetailedConsoleReporter" );
             }
         }
+
         surefireBooter.addReport( 
"org.apache.maven.surefire.report.XMLReporter" );
+    }
+
+    private boolean forking()
+    {
+        return !forkMode.equals( "none" );
     }
 }