Merge branch 'cheeseng-3.1-scala-js-test-count-fix' into 3.1.x

scalatest · Jun 2, 2018 · 57151f8 · 57151f8
2 parents 2401a97 + 93acc27
commit 57151f8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/scalatest.js/src/main/scala/org/scalatest/tools/MasterRunner.scala b/scalatest.js/src/main/scala/org/scalatest/tools/MasterRunner.scala
@@ -159,14 +159,19 @@ class MasterRunner(theArgs: Array[String], theRemoteArgs: Array[String], testCla
 
     def createTask(t: TaskDef): Task =
       new TaskRunner(t, testClassLoader, tracker, tagsToInclude, tagsToExclude, t.selectors ++ autoSelectors, false, presentAllDurations, presentInColor, presentShortStackTraces, presentFullStackTraces, presentUnformatted, presentReminder,
-        presentReminderWithShortStackTraces, presentReminderWithFullStackTraces, presentReminderWithoutCanceledTests, presentFilePathname, presentJson, None)
+        presentReminderWithShortStackTraces, presentReminderWithFullStackTraces, presentReminderWithoutCanceledTests, presentFilePathname, presentJson, Some(send))
 
     for {
       taskDef <- if (wildcard.isEmpty && membersOnly.isEmpty) taskDefs else (filterWildcard(wildcard, taskDefs) ++ filterMembersOnly(membersOnly, taskDefs)).distinct
       val task = createTask(taskDef)
     } yield task
   }
 
+  private def send(msg: String): Unit = {
+    receiveMessage(msg)
+    ()
+  }
+
   def receiveMessage(msg: String): Option[String] = {
     msg match {
       case "org.scalatest.events.TestPending" =>
@@ -196,7 +201,7 @@ class MasterRunner(theArgs: Array[String], theRemoteArgs: Array[String], testCla
   def deserializeTask(task: String, deserializer: (String) => TaskDef): Task = {
     val taskDef = deserializer(task)
     new TaskRunner(taskDef, testClassLoader, tracker, tagsToInclude, tagsToExclude, taskDef.selectors ++ autoSelectors, false, presentAllDurations, presentInColor, presentShortStackTraces, presentFullStackTraces, presentUnformatted, presentReminder,
-      presentReminderWithShortStackTraces, presentReminderWithFullStackTraces, presentReminderWithoutCanceledTests, presentFilePathname, presentJson, None)
+      presentReminderWithShortStackTraces, presentReminderWithFullStackTraces, presentReminderWithoutCanceledTests, presentFilePathname, presentJson, Some(send))
   }
 
-}
+}
diff --git a/scalatest.native/src/main/scala/org/scalatest/tools/MasterRunner.scala b/scalatest.native/src/main/scala/org/scalatest/tools/MasterRunner.scala
@@ -159,14 +159,19 @@ class MasterRunner(theArgs: Array[String], theRemoteArgs: Array[String], testCla
 
     def createTask(t: TaskDef): Task =
       new TaskRunner(t, testClassLoader, tracker, tagsToInclude, tagsToExclude, t.selectors ++ autoSelectors, false, presentAllDurations, presentInColor, presentShortStackTraces, presentFullStackTraces, presentUnformatted, presentReminder,
-        presentReminderWithShortStackTraces, presentReminderWithFullStackTraces, presentReminderWithoutCanceledTests, presentFilePathname, presentJson, None)
+        presentReminderWithShortStackTraces, presentReminderWithFullStackTraces, presentReminderWithoutCanceledTests, presentFilePathname, presentJson, Some(send))
 
     for {
       taskDef <- if (wildcard.isEmpty && membersOnly.isEmpty) taskDefs else (filterWildcard(wildcard, taskDefs) ++ filterMembersOnly(membersOnly, taskDefs)).distinct
       val task = createTask(taskDef)
     } yield task
   }
 
+  private def send(msg: String): Unit = {
+    receiveMessage(msg)
+    ()
+  }
+
   def receiveMessage(msg: String): Option[String] = {
     msg match {
       case "org.scalatest.events.TestPending" =>
@@ -196,7 +201,7 @@ class MasterRunner(theArgs: Array[String], theRemoteArgs: Array[String], testCla
   def deserializeTask(task: String, deserializer: (String) => TaskDef): Task = {
     val taskDef = deserializer(task)
     new TaskRunner(taskDef, testClassLoader, tracker, tagsToInclude, tagsToExclude, taskDef.selectors ++ autoSelectors, false, presentAllDurations, presentInColor, presentShortStackTraces, presentFullStackTraces, presentUnformatted, presentReminder,
-      presentReminderWithShortStackTraces, presentReminderWithFullStackTraces, presentReminderWithoutCanceledTests, presentFilePathname, presentJson, None)
+      presentReminderWithShortStackTraces, presentReminderWithFullStackTraces, presentReminderWithoutCanceledTests, presentFilePathname, presentJson, Some(send))
   }
 
-}
+}