Merge pull request #1536 from li-wjohnson/release/2.x

Allow delegating to non-public methods for AdditionalAnswers#delegatesTo

[ci maven-central-release]

src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java

@@ -40,6 +40,11 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
             }
 
             Object[] rawArguments = ((Invocation) invocation).getRawArguments();
+            try {
+                delegateMethod.setAccessible(true);
+            } catch (SecurityException ignore) {
+                // try to invoke anyway
+            }
             return delegateMethod.invoke(delegatedObject, rawArguments);
         } catch (NoSuchMethodException e) {
             throw delegatedMethodDoesNotExistOnDelegate(mockMethod, invocation.getMock(), delegatedObject);

src/test/java/org/mockitousage/stubbing/StubbingWithDelegateTest.java

@@ -5,6 +5,7 @@
 package org.mockitousage.stubbing;
 
 import org.junit.Test;
+import org.mockito.AdditionalAnswers;
 import org.mockito.Mockito;
 import org.mockito.exceptions.base.MockitoException;
 import org.mockitousage.IMethods;
@@ -14,12 +15,13 @@
 import java.util.Collection;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.mockito.AdditionalAnswers.delegatesTo;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @SuppressWarnings("unchecked")
 public class StubbingWithDelegateTest {
@@ -175,4 +177,25 @@ public String simpleMethod() {
             assertThat(e).isEqualTo(failure);
         }
     }
+
+    interface Foo {
+        int bar();
+    }
+
+    @Test
+    public void should_call_anonymous_class_method() throws Throwable {
+        Foo foo = new Foo() {
+            public int bar() {
+                return 0;
+            }
+        };
+
+        Foo mock = mock(Foo.class);
+        when(mock.bar()).thenAnswer(AdditionalAnswers.delegatesTo(foo));
+
+        //when
+        mock.bar();
+
+        //then no exception is thrown
+    }
 }