Author: carlos
Date: Thu Feb 2 11:55:27 2006
New Revision: 374480
URL: http://svn.apache.org/viewcvs?rev=374480&view=rev
Log:
Validate forkMode
PR: MSUREFIRE-55
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java?rev=374480&r1=374479&r2=374480&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
Thu Feb 2 11:55:27 2006
@@ -16,18 +16,9 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.CommandLineException;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.StreamConsumer;
-import org.codehaus.plexus.util.cli.WriterStreamConsumer;
-
-import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.lang.reflect.Method;
@@ -40,6 +31,13 @@
import java.util.Map;
import java.util.Properties;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.codehaus.plexus.util.cli.WriterStreamConsumer;
+
/**
* @author Jason van Zyl
* @author Emmanuel Venisse
@@ -159,7 +157,14 @@
public void setForkMode( String forkMode )
{
- this.forkMode = forkMode;
+ if ( forkMode.equals( FORK_NONE ) || forkMode.equals( FORK_ONCE ) ||
forkMode.equals( FORK_PERTEST ) )
+ {
+ this.forkMode = forkMode;
+ }
+ else
+ {
+ throw new IllegalArgumentException( "Fork mode " + forkMode + " is
not a legal value" );
+ }
}
public void setJvm( String jvm )
