Fixes Issue #251

Author: ultrasecreth

common/src/main/scala/org/mockito/MockitoAPI.scala

@@ -18,6 +18,7 @@ import org.mockito.internal.creation.MockSettingsImpl
 import org.mockito.internal.exceptions.Reporter.notAMockPassedToVerifyNoMoreInteractions
 import org.mockito.internal.handler.ScalaMockHandler
 import org.mockito.internal.progress.ThreadSafeMockingProgress.mockingProgress
+import org.mockito.internal.stubbing.answers.ScalaThrowsException
 import org.mockito.internal.util.MockUtil
 import org.mockito.internal.util.reflection.LenientCopyTool
 import org.mockito.internal.{ ValueClassExtractor, ValueClassWrapper }
@@ -75,13 +76,17 @@ private[mockito] trait DoSomething {
    * Delegates to <code>Mockito.doThrow</code>, it's only here so we expose all the Mockito API
    * on a single place
    */
-  def doThrow(toBeThrown: Throwable*): Stubber = Mockito.doThrow(toBeThrown: _*)
+  def doThrow(toBeThrown: Throwable*): Stubber = {
+    val stubber = Mockito.MOCKITO_CORE.stubber
+    toBeThrown.foreach(t => stubber.doAnswer(ScalaThrowsException(t)))
+    stubber
+  }
 
   /**
    * Delegates to <code>Mockito.doThrow(type: Class[T])</code>
    * It provides a nicer API as you can, for instance, do doThrow[Throwable] instead of doThrow(classOf[Throwable])
    */
-  def doThrow[T <: Throwable: ClassTag]: Stubber = Mockito.doThrow(clazz)
+  def doThrow[T <: Throwable: ClassTag]: Stubber = Mockito.doAnswer(ScalaThrowsException[T])
 
   /**
    * Delegates to <code>Mockito.doNothing()</code>, it removes the parenthesis to have a cleaner API

common/src/main/scala/org/mockito/internal/stubbing/answers/ScalaThrowsException.scala

@@ -1,7 +1,19 @@
-package org.mockito.internal.stubbing.answers
+package org.mockito
+package internal.stubbing.answers
+
+import org.mockito.internal.configuration.plugins.Plugins
 import org.mockito.internal.exceptions.Reporter.cannotStubWithNullThrowable
 import org.mockito.invocation.InvocationOnMock
 
+import scala.reflect.ClassTag
+
 class ScalaThrowsException(t: Throwable) extends ThrowsException(t) {
   override def validateFor(invocation: InvocationOnMock): Unit = if (t == null) throw cannotStubWithNullThrowable
 }
+
+object ScalaThrowsException {
+  def apply(t: Throwable): ScalaThrowsException = new ScalaThrowsException(t)
+
+  def apply[T <: Throwable: ClassTag]: ScalaThrowsException =
+    new ScalaThrowsException(Plugins.getInstantiatorProvider.getInstantiator(null).newInstance(clazz))
+}

scalatest/src/test/scala/user/org/mockito/Issue251.scala

@@ -0,0 +1,32 @@
+package user.org.mockito
+
+import org.mockito.{ ArgumentMatchersSugar, IdiomaticMockito, MockitoSugar }
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+
+class Issue251 extends AnyFlatSpec with IdiomaticMockito with Matchers with ArgumentMatchersSugar {
+
+  case class Car(id: Int)
+  class VehicleService {
+    private var cars = Map.empty[Int, Car]
+    cars += (0 -> Car(0))
+
+    def getCar(id: Int): Option[Car] = cars.get(id)
+    def saveCar(car: Car) = {
+      cars += car.id -> car;
+      car
+    }
+  }
+
+  it should "allow to stub checked exceptions" in {
+    val vehicleService = mock[VehicleService]
+    val error          = new Exception("A wild exception appears")
+    error willBe thrown by vehicleService.getCar(any[Int])
+  }
+
+  it should "allow to stub checked exceptions class" in {
+    val vehicleService = mock[VehicleService]
+    MockitoSugar.doThrow[Exception].when(vehicleService).getCar(any[Int])
+  }
+
+}