Merge pull request #779 from alexarchambault/cleaner-output

Don't print test suite name if no test is being run
scalameta · May 23, 2024 · 472dfe8 · 472dfe8
2 parents 53a74d3 + 5968a44
commit 472dfe8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/munit/shared/src/main/scala/munit/MUnitRunner.scala b/munit/shared/src/main/scala/munit/MUnitRunner.scala
@@ -122,15 +122,20 @@ class MUnitRunner(val cls: Class[_ <: Suite], newInstance: () => Suite)
   }
   def runAsync(notifier: RunNotifier): Future[Unit] = {
     val description = getDescription()
-    notifier.fireTestSuiteStarted(description)
-    runAll(notifier)
-      .transformCompat[Unit](result => {
-        result.failed.foreach(ex =>
-          fireFailedHiddenTest(notifier, "unexpected error running tests", ex)
-        )
-        notifier.fireTestSuiteFinished(description)
-        util.Success(())
-      })
+    if (PlatformCompat.isIgnoreSuite(cls) || munitTests.isEmpty) {
+      notifier.fireTestIgnored(description)
+      Future.successful(())
+    } else {
+      notifier.fireTestSuiteStarted(description)
+      runAll(notifier)
+        .transformCompat[Unit](result => {
+          result.failed.foreach(ex =>
+            fireFailedHiddenTest(notifier, "unexpected error running tests", ex)
+          )
+          notifier.fireTestSuiteFinished(description)
+          util.Success(())
+        })
+    }
   }
 
   private def runTests(
@@ -176,11 +181,6 @@ class MUnitRunner(val cls: Class[_ <: Suite], newInstance: () => Suite)
   }
 
   private def runAll(notifier: RunNotifier): Future[Unit] = {
-    if (PlatformCompat.isIgnoreSuite(cls) || munitTests.isEmpty) {
-      val description = getDescription()
-      notifier.fireTestIgnored(description)
-      return Future.successful(())
-    }
     for {
       beforeAll <- runBeforeAll(notifier)
       _ <- {

diff --git a/tests/shared/src/main/scala/munit/Issue497FrameworkSuite.scala b/tests/shared/src/main/scala/munit/Issue497FrameworkSuite.scala
@@ -34,8 +34,7 @@ class Issue497FrameworkSuite extends FunSuite {
 object Issue497FrameworkSuite
     extends FrameworkTest(
       classOf[Issue497FrameworkSuite],
-      """|munit.Issue497FrameworkSuite:
-         |""".stripMargin,
+      "",
       arguments = Array("--exclude-categories=munit.Slow"),
       tags = Set(
         OnlyJVM