Merge pull request #213 from einholen/fix-unclosed-mocking-session

Close mocking session on aborted Scalatest runs

Author: ultrasecreth

core/src/main/scala/org/mockito/MockitoScalaSession.scala

@@ -20,6 +20,12 @@ class MockitoScalaSession(name: String, strictness: Strictness, logger: MockitoS
 
   Mockito.framework().addListener(listener)
 
+  /**
+   * If the test has thrown an exception, the session will check first if the exception could be related to a misuse
+   * of mockito. If not, it will rethrow the original error so the real test failure can be reported by the testing framework
+   *
+   * @param t exception thrown by the test framework
+   */
   def finishMocking(t: Option[Throwable] = None): Unit = {
     listener.cleanLenientStubs()
     try t.fold {

scalatest/src/main/scala/org/mockito/scalatest/MockitoSessionFixture.scala

@@ -1,18 +1,24 @@
 package org.mockito.scalatest
+
 import org.mockito.{ MockitoScalaSession, Strictness }
 import org.scalatest._
 
-import scala.util.control.NonFatal
-
 private[mockito] trait MockitoSessionFixture extends TestSuite { this: Suite =>
 
   val strictness: Strictness = Strictness.StrictStubs
 
   abstract override def withFixture(test: NoArgTest): Outcome = {
     val session = MockitoScalaSession(name = s"${test.name} - session", strictness)
-    val result  = super.withFixture(test)
-    // if the test has thrown an exception, the session will check first if the exception could be related to a mis-use
-    // of mockito, if not, it will throw nothing so the real test failure can be reported by the ScalaTest
+
+    val result =
+      try {
+        super.withFixture(test)
+      } catch {
+        case t: Throwable =>
+          session.finishMocking(Some(t))
+          throw t
+      }
+
     session.finishMocking(result.toOption)
     result
   }
@@ -25,15 +31,13 @@ private[mockito] trait MockitoSessionAsyncFixture extends AsyncTestSuite { this:
   abstract override def withFixture(test: NoArgAsyncTest): FutureOutcome = {
     val session = MockitoScalaSession(name = s"${test.name} - session", strictness)
 
-    // if the test has thrown an exception, the session will check first if the exception could be related to a mis-use
-    // of mockito, if not, it will throw nothing so the real test failure can be reported by the ScalaTest
     val result =
       try {
         super.withFixture(test)
       } catch {
-        case NonFatal(ex) =>
-          session.finishMocking(Some(ex))
-          throw ex
+        case t: Throwable =>
+          session.finishMocking(Some(t))
+          throw t
       }
 
     result.onOutcomeThen(o => session.finishMocking(o.toOption))