Added support for suite sorting and thread count.

cheeseng · cheeseng · commit b5087b76a7ca · 2022-09-07T20:59:31.000+08:00
diff --git a/src/main/java/org/scalatest/tools/maven/AbstractScalaTestMojo.java b/src/main/java/org/scalatest/tools/maven/AbstractScalaTestMojo.java
@@ -108,6 +108,18 @@ abstract class AbstractScalaTestMojo extends AbstractMojo {
      */
     boolean parallel;
 
+    /**
+     * Set to true to enable suite sorting, this only takes effect if parallel is set to true. 
+     * @parameter property="suiteSorting"
+     */
+    boolean suiteSorting;
+
+    /**
+     * Set the thread count for parallel tests execution, this only takes effect if parallel is set to true. 
+     * @parameter property="threadCount"
+     */
+    int threadCount;
+
     /**
      * Comma separated list of packages containing suites to execute
      * @parameter property="membersOnlySuites"
@@ -507,7 +519,13 @@ private List<String> tagsToExclude() {
     }
 
     private List<String> parallel() {
-        return parallel ? unmodifiableList(singletonList("-P")) : Collections.<String>emptyList();
+        if (parallel) {
+            String useSuiteSorting = suiteSorting ? "S" : "";
+            String useThreadCount = threadCount == 0 ? "" : ("" + threadCount);
+            return unmodifiableList(singletonList("-P" + useSuiteSorting + useThreadCount));
+        }
+        else
+            return Collections.<String>emptyList();
     }
 
     //
diff --git a/src/test/scala/org/scalatest/tools/maven/PluginTest.scala b/src/test/scala/org/scalatest/tools/maven/PluginTest.scala
@@ -123,6 +123,50 @@ final class PluginTest
     configure(_.parallel = false) should not contain ("-P")
   }
 
+  def testConcurrentSuiteSorting {
+    configure { m => 
+      m.parallel = true
+      m.suiteSorting = true
+    } should containSlice("-PS")
+  }
+
+  def testConcurrentThreadCount {
+    configure { m => 
+      m.parallel = true
+      m.threadCount = 4
+    } should containSlice("-P4")
+  }
+
+  def testConcurrentSuiteSortingThreadCount {
+    configure { m => 
+      m.parallel = true
+      m.suiteSorting = true
+      m.threadCount = 4
+    } should containSlice("-PS4")
+  }
+
+  def testSuiteSorting {
+    // Suite sorting count should have no effect if parallel is not set to true.
+    configure { m =>
+      m.suiteSorting = true
+    } shouldNot containSlice ("-PS")
+  }
+
+  def testSuiteSortingThreadCount {
+    // Suite sorting and thread count should have no effect if parallel is not set to true.
+    configure { m =>
+      m.suiteSorting = true
+      m.threadCount = 4
+    } shouldNot containSlice ("-PS4")
+  }
+
+  def testThreadCount {
+    // Thread count should have no effect if parallel is not set to true.
+    configure { m =>
+      m.threadCount = 4
+    } shouldNot containSlice ("-P4")
+  }
+
   def testSuites {
     val suites: String = comma(" a ",
                                "b",
