Strip new lines in argLine and debugArgLine parameters

Author: veysiertekin

src/main/java/org/scalatest/tools/maven/AbstractScalaTestMojo.java

@@ -6,21 +6,7 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.cli.*;
 
-import static java.util.Collections.unmodifiableList;
-import static org.scalatest.tools.maven.MojoUtils.*;
-
-import java.io.*;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-
-import static java.util.Collections.singletonList;
-
-import java.net.MalformedURLException;
-import java.net.URLClassLoader;
-import java.net.URL;
+import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
@@ -29,7 +15,7 @@
 import java.util.*;
 
 import static java.util.Collections.singletonList;
-import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static java.util.Collections.unmodifiableList;
 import static org.scalatest.tools.maven.MojoUtils.*;
 
 /**
@@ -294,12 +280,12 @@ private boolean runForkingOnce(String[] args) throws MojoFailureException {
 
         // Set user specified JVM arguments
         if (argLine != null) {
-            cli.createArg().setLine(argLine);
+            cli.createArg().setLine(stripNewLines(argLine));
         }
 
         // Set debugging JVM arguments if debugging is enabled
         if (debugForkedProcess) {
-            cli.createArg().setLine(forkedProcessDebuggingArguments());
+            cli.createArg().setLine(stripNewLines(forkedProcessDebuggingArguments()));
         }
 
         // Set ScalaTest arguments

src/main/java/org/scalatest/tools/maven/MojoUtils.java

@@ -147,4 +147,8 @@ static String getJvm() {
         }
         return result;
     }
+
+    static String stripNewLines(String argLine) {
+        return argLine.replaceAll("[\r\n]{1,2}", " ");
+    }
 }

src/test/scala/org/scalatest/tools/maven/PluginTest.scala

@@ -208,4 +208,14 @@ final class PluginTest
     MojoUtils.compoundArg("-a", comma("a", "b", "c")) should be(jlist("-a", "a b c"))
     MojoUtils.compoundArg("-a", null.asInstanceOf[String]) should be(jlist())
   }
+
+  def testMojoStripNewLines {
+    MojoUtils.stripNewLines("-XmsXg -XmxYg -XX:MaxPermSize=Zm") should be("-XmsXg -XmxYg -XX:MaxPermSize=Zm")
+    MojoUtils.stripNewLines("-XmsXg\n-XmxYg -XX:MaxPermSize=Zm") should be("-XmsXg -XmxYg -XX:MaxPermSize=Zm")
+    MojoUtils.stripNewLines("-XmsXg\n-XmxYg") should be("-XmsXg -XmxYg")
+    MojoUtils.stripNewLines("-XmsXg\r-XmxYg -XX:MaxPermSize=Zm") should be("-XmsXg -XmxYg -XX:MaxPermSize=Zm")
+    MojoUtils.stripNewLines("-XmsXg\r-XmxYg") should be("-XmsXg -XmxYg")
+    MojoUtils.stripNewLines("-XmsXg\r\n-XmxYg -XX:MaxPermSize=Zm") should be("-XmsXg -XmxYg -XX:MaxPermSize=Zm")
+    MojoUtils.stripNewLines("-XmsXg\r\n-XmxYg") should be("-XmsXg -XmxYg")
+  }
 }