Fixes #2201 : Fixed checking of declared exceptions.

src/main/java/org/mockito/internal/stubbing/answers/InvocationInfo.java

@@ -6,6 +6,7 @@
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.Arrays;
 
 import org.mockito.internal.invocation.AbstractAwareMethod;
 import org.mockito.internal.util.MockUtil;
@@ -25,14 +26,33 @@ public InvocationInfo(InvocationOnMock theInvocation) {
     }
 
     public boolean isValidException(Throwable throwable) {
+        if (isValidException(method, throwable)) {
+            return true;
+        }
+
+        return Arrays.stream(method.getDeclaringClass().getInterfaces())
+                .anyMatch(parent -> isValidExceptionForParent(parent, throwable));
+    }
+
+    private boolean isValidExceptionForParent(Class<?> parent, Throwable throwable) {
+        try {
+            Method parentMethod =
+                    parent.getMethod(this.method.getName(), this.method.getParameterTypes());
+            return isValidException(parentMethod, throwable);
+        } catch (NoSuchMethodException e) {
+            // ignore interfaces that doesn't have such a method
+            return false;
+        }
+    }
+
+    private boolean isValidException(Method method, Throwable throwable) {
         Class<?>[] exceptions = method.getExceptionTypes();
         Class<?> throwableClass = throwable.getClass();
         for (Class<?> exception : exceptions) {
             if (exception.isAssignableFrom(throwableClass)) {
                 return true;
             }
         }
-
         return false;
     }
 

src/test/java/org/mockito/internal/invocation/InvocationBuilder.java

@@ -30,6 +30,7 @@ public class InvocationBuilder {
     private int sequenceNumber = 0;
     private Object[] args = new Object[] {};
     private Object mock = Mockito.mock(IMethods.class);
+    private Class<?> mockClass = IMethods.class;
     private Method method;
     private boolean verified;
     private List<Class<?>> argTypes;
@@ -57,7 +58,7 @@ public Invocation toInvocation() {
 
             try {
                 method =
-                        IMethods.class.getMethod(
+                        mockClass.getMethod(
                                 methodName, argTypes.toArray(new Class[argTypes.size()]));
             } catch (Exception e) {
                 throw new RuntimeException(
@@ -115,6 +116,12 @@ public InvocationBuilder mock(Object mock) {
         return this;
     }
 
+    public InvocationBuilder mockClass(Class<?> mockClass) {
+        this.mockClass = mockClass;
+        this.mock = mock(mockClass);
+        return this;
+    }
+
     public InvocationBuilder method(Method method) {
         this.method = method;
         return this;

src/test/java/org/mockito/internal/stubbing/answers/InvocationInfoTest.java

@@ -15,6 +15,7 @@
 import org.mockito.internal.invocation.InvocationBuilder;
 import org.mockito.invocation.Invocation;
 import org.mockitousage.IMethods;
+import org.mockitousage.MethodsImpl;
 
 public class InvocationInfoTest {
 
@@ -29,6 +30,20 @@ public void should_know_valid_throwables() throws Exception {
         assertThat(info.isValidException(new CharacterCodingException())).isTrue();
     }
 
+    @Test
+    public void should_mark_interface_overridden_exceptions_as_valid() {
+        // when
+        Invocation invocation =
+                new InvocationBuilder()
+                        .method("throwsRemovedInSubclass")
+                        .mockClass(MethodsImpl.class)
+                        .toInvocation();
+        InvocationInfo info = new InvocationInfo(invocation);
+
+        // then
+        assertThat(info.isValidException(new CharacterCodingException())).isTrue();
+    }
+
     @Test
     public void should_know_valid_return_types() throws Exception {
         assertThat(

src/test/java/org/mockitousage/IMethods.java

@@ -159,6 +159,8 @@ String simpleMethod(
 
     String canThrowException() throws CharacterCodingException;
 
+    String throwsRemovedInSubclass() throws CharacterCodingException;
+
     String oneArray(String[] array);
 
     void varargsString(int i, String... string);

src/test/java/org/mockitousage/MethodsImpl.java

@@ -303,6 +303,11 @@ public String canThrowException() throws CharacterCodingException {
         return null;
     }
 
+    @Override
+    public String throwsRemovedInSubclass() {
+        return null;
+    }
+
     public String oneArray(String[] array) {
         return null;
     }