Fix Mockito.mockConstructionWithAnswer with more than 2 invocations (m…

…ockito#2545) If you build a mockConstructionWithAnswer with more than 1 additionalAnswers, there was a logic error whereby the method would return the wrong value when making the second last invocation. It would accidentally think it's at the end an only return the last answer, never returning the second last answer when it should. Co-authored-by: John Pyeatt <john.pyeatt@singlewire.com>
priskats · Jan 18, 2022 · 5505941 · 5505941
1 parent 9e95f1a
commit 5505941
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/org/mockito/Mockito.java b/src/main/java/org/mockito/Mockito.java
@@ -2185,7 +2185,7 @@ public static <T> MockedConstruction<T> mockConstructionWithAnswer(
                 context -> {
                     if (context.getCount() == 1 || additionalAnswers.length == 0) {
                         return withSettings().defaultAnswer(defaultAnswer);
-                    } else if (context.getCount() >= additionalAnswers.length) {
+                    } else if (context.getCount() > additionalAnswers.length) {
                         return withSettings()
                                 .defaultAnswer(additionalAnswers[additionalAnswers.length - 1]);
                     } else {

diff --git a/subprojects/inline/src/test/java/org/mockitoinline/ConstructionMockTest.java b/subprojects/inline/src/test/java/org/mockitoinline/ConstructionMockTest.java
@@ -57,6 +57,19 @@ public void testConstructionMockDefaultAnswerMultiple() {
         }
     }
 
+    /**
+     * Tests issue #2544
+     */
+    @Test
+    public void testConstructionMockDefaultAnswerMultipleMoreThanTwo() {
+        try (MockedConstruction<Dummy> ignored = Mockito.mockConstructionWithAnswer(Dummy.class, invocation -> "bar", invocation -> "qux", invocation -> "baz")) {
+            assertEquals("bar", new Dummy().foo());
+            assertEquals("qux", new Dummy().foo());
+            assertEquals("baz", new Dummy().foo());
+            assertEquals("baz", new Dummy().foo());
+        }
+    }
+
     @Test
     public void testConstructionMockPrepared() {
         try (MockedConstruction<Dummy> ignored = Mockito.mockConstruction(Dummy.class, (mock, context) -> when(mock.foo()).thenReturn("bar"))) {