Merge branch 'cheeseng-spanScaleFactor'

Author: bvenners

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

@@ -227,6 +227,12 @@ abstract class AbstractScalaTestMojo extends AbstractMojo {
      */
     boolean logForkedProcessCommand;
 
+    /**
+     * Span scale factor.
+     *
+     * @parameter expression="${spanScaleFactor}"
+     */
+    double spanScaleFactor = 1.0;
 
     // runScalaTest is called by the concrete mojo subclasses  TODO: make it protected and others too
     // Returns true if all tests pass
@@ -407,6 +413,7 @@ List<String> sharedConfiguration() {
             addAll(memoryFiles());
             addAll(testsFiles());
             addAll(junitClasses());
+            addAll(spanScaleFactor());
         }};
     }
 
@@ -532,6 +539,15 @@ private List<String> tests() {
         return list;
     }
 
+    private List<String> spanScaleFactor() {
+        List<String> list = new ArrayList<String>();
+        if (spanScaleFactor != 1.0) {
+            list.add("-F");
+            list.add(spanScaleFactor + "");
+        }
+        return list;
+    }
+
     private List<String> suffixes() {
        return compoundArg("-q", suffixes);
     }

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

@@ -183,6 +183,10 @@ final class PluginTest
     configure(_.testsFiles = comma("nonesuch", "pom.xml", "src")) should containSuiteArgs("-A", "pom.xml", "src")
   }
 
+  def testScaledTimeSpans {
+    configure(_.spanScaleFactor = 2.5) should containSlice("-F", "2.5")
+  }
+
   def testMojoConcat {
     MojoUtils.concat(jlist("a", "b", "c"), jlist("1", "2", "3")) should be(Array("a", "b", "c", "1", "2", "3"))
   }