svn commit: r353868 - /maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java

[jvanzyl]

Author: jvanzyl
Date: Sun Dec  4 08:27:25 2005
New Revision: 353868

URL: http://svn.apache.org/viewcvs?rev=353868&view=rev
Log:
o removing duplication in creating the forking args

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=353868&r1=353867&r2=353868&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
 Sun Dec  4 08:27:25 2005
@@ -39,6 +39,10 @@
  */
 public class SurefireBooter
 {
+    protected static final String EOL = System.getProperty( "line.separator" );
+
+    protected static final String PS = System.getProperty( "path.separator" );
+
     private static String RUNNER = 
"org.apache.maven.surefire.ForkedSurefireRunner";
 
     private static String BATTERY_EXECUTOR = 
"org.apache.maven.surefire.Surefire";
@@ -57,9 +61,9 @@
 
     private String basedir;
 
-    public SurefireBooter()
-    {
-    }
+    // ----------------------------------------------------------------------
+    // Accessors
+    // ----------------------------------------------------------------------
 
     public void setReportsDirectory( String reportsDirectory )
     {
@@ -99,11 +103,19 @@
         this.classpathUrls = classpathUrls;
     }
 
+    // ----------------------------------------------------------------------
+    // Forking options
+    // ----------------------------------------------------------------------
+
     public void setForkMode( String forkMode )
     {
         this.forkMode = forkMode;
     }
 
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+
     public boolean run()
         throws Exception
     {
@@ -169,10 +181,6 @@
         return result.booleanValue();
     }
 
-    protected static final String EOL = System.getProperty( "line.separator" );
-
-    protected static final String PS = System.getProperty( "path.separator" );
-
     private boolean runTestsForkOnce()
         throws Exception
     {
@@ -291,51 +299,23 @@
     private String[] getForkOnceArgs()
         throws Exception
     {
-        // List reports
-        // List batteryHolders
-        // List classpathUrls
-        // String reportsDirectory
-        // String forkMode
-
-        String pathSeparator = System.getProperty( "path.separator" );
-
-        String classpathEntries = getListOfStringsAsString( classpathUrls, 
pathSeparator );
-
-        String reportClassNames = getListOfStringsAsString( reports, "," );
-
-        String[] batteryConfig = getStringArrayFromBatteries();
-
-        String[] argArray =
-            {
-                "-classpath",
-                classpathEntries,
-                RUNNER,
-                "reportClassNames=" + reportClassNames,
-                "reportsDirectory=" + reportsDirectory,
-                "batteryExecutorName=" + BATTERY_EXECUTOR,
-                "forkMode=" + forkMode,
-                "batteryConfig=" + batteryConfig[0]
-            };
-
-        return argArray;
+        return getForkArgs( getStringArrayFromBatteries()[0] );
     }
 
     private String[] getForkPerTestArgs( String testClass )
         throws Exception
     {
-        // List reports
-        // List batteryHolders
-        // List classpathUrls
-        // String reportsDirectory
-        // String forkMode
+        return getForkArgs( SINGLE_TEST_BATTERY + "|" + testClass );
+    }
 
+    private String[] getForkArgs( String batteryConfig )
+        throws Exception
+    {
         String pathSeparator = System.getProperty( "path.separator" );
 
         String classpathEntries = getListOfStringsAsString( classpathUrls, 
pathSeparator );
 
         String reportClassNames = getListOfStringsAsString( reports, "," );
-
-        String batteryConfig = SINGLE_TEST_BATTERY + "|" + testClass;
 
         String[] argArray =
             {