adopted suggestion from @tgodzik

fail test in case of Throwable not only of NonFatal otherwise the "throwing an exception fails the test" would have just aborted the execution of the tests without indicating an error
scalameta · Apr 16, 2024 · 438a7eb · 438a7eb
1 parent 30e97c3
commit 438a7eb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/munit/shared/src/main/scala/munit/Assertions.scala b/munit/shared/src/main/scala/munit/Assertions.scala
@@ -196,8 +196,10 @@ trait Assertions extends MacroCompat.CompileErrorMacro {
       fail(expectedExceptionMsg)
     } catch {
       case e: FailExceptionLike[_]
-          if !T.runtimeClass.isAssignableFrom(e.getClass()) ||
-            e.getMessage.contains(expectedExceptionMsg) =>
+          if !T.runtimeClass.isAssignableFrom(e.getClass()) =>
+        throw e
+      case e: FailExceptionLike[_]
+          if e.getMessage.contains(expectedExceptionMsg) =>
         throw e
       case NonFatal(e) =>
         if (T.runtimeClass.isAssignableFrom(e.getClass())) {

diff --git a/munit/shared/src/main/scala/munit/FunSuite.scala b/munit/shared/src/main/scala/munit/FunSuite.scala
@@ -2,7 +2,6 @@ package munit
 
 import scala.collection.mutable
 import scala.concurrent.Future
-import scala.util.control.NonFatal
 import munit.internal.PlatformCompat
 import scala.concurrent.duration.Duration
 import scala.concurrent.duration.FiniteDuration
@@ -36,7 +35,7 @@ trait BaseFunSuite
           try {
             waitForCompletion(() => munitValueTransform(body))
           } catch {
-            case NonFatal(e) =>
+            case e: Throwable =>
               Future.failed(e)
           }
         },

diff --git a/tests/shared/src/test/scala/munit/FailExceptionSuite.scala b/tests/shared/src/test/scala/munit/FailExceptionSuite.scala
@@ -1,14 +1,19 @@
 package munit
 
 class FailExceptionSuite extends BaseSuite {
+  test("throwing an exception fails the test".fail) {
+    throw new RuntimeException("asdf")
+    println("should not reach here")
+  }
+
   test("assertion-error") {
     val e = intercept[AssertionError] {
       fail("hello world!")
     }
     assert(clue(e).isInstanceOf[Serializable])
   }
 
-test("assertion-error-no-exception") {
+  test("assertion-error-no-exception") {
     try {
       intercept[AssertionError] {
         println("throwing no exception!")