Merge pull request #2736 from mockito/static-varargs-call

raphw · web-flow · commit 9b93df72c9aa · 2022-08-22T23:13:01.000+02:00
Drop varargs collector before invoking a user method.
diff --git a/src/main/java/org/mockito/internal/util/reflection/InstrumentationMemberAccessor.java b/src/main/java/org/mockito/internal/util/reflection/InstrumentationMemberAccessor.java
@@ -235,6 +235,9 @@ public Object invoke(Method method, Object target, Object... arguments)
             if (!Modifier.isStatic(method.getModifiers())) {
                 handle = handle.bindTo(target);
             }
+            if (handle.isVarargsCollector()) {
+                handle = handle.asFixedArity();
+            }
             try {
                 return DISPATCHER.invokeWithArguments(handle, arguments);
             } catch (Throwable t) {
diff --git a/subprojects/inline/src/test/java/org/mockitoinline/StaticMockTest.java b/subprojects/inline/src/test/java/org/mockitoinline/StaticMockTest.java
@@ -212,6 +212,15 @@ public void testStaticMockMustUseValidMatchers() {
         }
     }
 
+    @Test
+    public void testStaticMockVarargs() {
+        assertEquals("foobar", Dummy.fooVarargs("foo", "bar"));
+        try (MockedStatic<Dummy> ignored = Mockito.mockStatic(Dummy.class)) {
+            assertNull(Dummy.fooVarargs("foo", "bar"));
+        }
+        assertEquals("foobar", Dummy.fooVarargs("foo", "bar"));
+    }
+
     static class Dummy {
 
         static String var1 = null;
@@ -227,5 +236,13 @@ static void fooVoid(String var2) {
         static void fooVoid(String var2, String var3) {
             var1 = var2;
         }
+
+        static String fooVarargs(String... args) {
+            StringBuilder sb = new StringBuilder();
+            for (String arg : args) {
+                sb.append(arg);
+            }
+            return sb.toString();
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,15 @@ public void testStaticMockMustUseValidMatchers() {`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
	`215`	`+ @Test`
	`216`	`+ public void testStaticMockVarargs() {`
	`217`	`+ assertEquals("foobar", Dummy.fooVarargs("foo", "bar"));`
	`218`	`+ try (MockedStatic<Dummy> ignored = Mockito.mockStatic(Dummy.class)) {`
	`219`	`+ assertNull(Dummy.fooVarargs("foo", "bar"));`
	`220`	`+ }`
	`221`	`+ assertEquals("foobar", Dummy.fooVarargs("foo", "bar"));`
	`222`	`+ }`
	`223`	`+`
`215`	`224`	`static class Dummy {`
`216`	`225`
`217`	`226`	`static String var1 = null;`
`@@ -227,5 +236,13 @@ static void fooVoid(String var2) {`
`227`	`236`	`static void fooVoid(String var2, String var3) {`
`228`	`237`	`var1 = var2;`
`229`	`238`	`}`
	`239`	`+`
	`240`	`+ static String fooVarargs(String... args) {`
	`241`	`+ StringBuilder sb = new StringBuilder();`
	`242`	`+ for (String arg : args) {`
	`243`	`+ sb.append(arg);`
	`244`	`+ }`
	`245`	`+ return sb.toString();`
	`246`	`+ }`
`230`	`247`	`}`
`231`	`248`	`}`