Merge pull request #47 from jupco/feature/InterceptReturnsThrowable

Changes the signature of `intercept` to return the Throwable.
monix · Feb 21, 2020 · aef7a63 · aef7a63
2 parents 213aab9 + f79c03e
commit aef7a63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/shared/src/main/scala/minitest/api/Asserts.scala b/shared/src/main/scala/minitest/api/Asserts.scala
@@ -78,7 +78,7 @@ trait Asserts {
     macro Asserts.DoesNotCompileMacros.applyImpl
 
   def intercept[E <: Throwable : ClassTag](callback: => Unit)
-    (implicit pos: SourceLocation): Unit = {
+    (implicit pos: SourceLocation): Throwable = {
 
     val E = implicitly[ClassTag[E]]
     try {
@@ -89,7 +89,7 @@ trait Asserts {
       case ex: InterceptException =>
         throw new AssertionException(ex.getMessage, pos)
       case ex: Throwable if E.runtimeClass.isInstance(ex) =>
-        () // Do nothing!
+        ex
     }
   }
 

diff --git a/shared/src/test/scala/minitest/tests/SimpleTest.scala b/shared/src/test/scala/minitest/tests/SimpleTest.scala
@@ -74,15 +74,17 @@ object SimpleTest extends SimpleTestSuite {
     intercept[AssertionException] {
       assertEquals("dummy", s)
     }
+    ()
   }
 
   test("intercept") {
-    class DummyException extends RuntimeException
+    class DummyException(message: String) extends RuntimeException(message)
     def test = 1
 
-    intercept[DummyException] {
-      if (test != 2) throw new DummyException
+    val ex = intercept[DummyException] {
+      if (test != 2) throw new DummyException("value was not equal to 2")
     }
+    assertEquals(ex.getMessage, "value was not equal to 2")
   }
 
   testAsync("asynchronous test") {
@@ -102,11 +104,13 @@ object SimpleTest extends SimpleTestSuite {
         if (hello(1) != 2) throw new DummyException
       }
     }
+    ()
   }
 
   test("fail()") {
     def x = 1
     intercept[AssertionException] { if (x == 1) fail() }
+    ()
   }
 
   test("fail(reason)") {