Fixes #2497: Throw exception on invalid matchers for mockStatic (#2506)

temp-droid · web-flow · commit 44ba00f38c44 · 2021-12-14T09:42:29.000Z
diff --git a/src/main/java/org/mockito/internal/MockedStaticImpl.java b/src/main/java/org/mockito/internal/MockedStaticImpl.java
@@ -47,6 +47,8 @@ public <S> OngoingStubbing<S> when(Verification verification) {
 
         try {
             verification.apply();
+        } catch (MockitoException exception) {
+            throw exception;
         } catch (Throwable ignored) {
         }
 
diff --git a/subprojects/inline/inline.gradle b/subprojects/inline/inline.gradle
@@ -5,6 +5,7 @@ apply from: "$rootDir/gradle/java-library.gradle"
 dependencies {
     api project.rootProject
     testImplementation libraries.junit4
+    testImplementation libraries.assertj
 }
 
 tasks.javadoc.enabled = false
diff --git a/subprojects/inline/src/test/java/org/mockitoinline/StaticMockTest.java b/subprojects/inline/src/test/java/org/mockitoinline/StaticMockTest.java
@@ -7,10 +7,13 @@
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.assertj.core.api.ThrowableAssert;
 import org.junit.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
@@ -46,15 +49,15 @@ public void testStaticMockWithVerificationFailed() {
     }
 
     @Test
-    public void testStaticMockWithMoInteractions() {
+    public void testStaticMockWithNoInteractions() {
         try (MockedStatic<Dummy> dummy = Mockito.mockStatic(Dummy.class)) {
             dummy.when(Dummy::foo).thenReturn("bar");
             dummy.verifyNoInteractions();
         }
     }
 
     @Test(expected = NoInteractionsWanted.class)
-    public void testStaticMockWithMoInteractionsFailed() {
+    public void testStaticMockWithNoInteractionsFailed() {
         try (MockedStatic<Dummy> dummy = Mockito.mockStatic(Dummy.class)) {
             dummy.when(Dummy::foo).thenReturn("bar");
             assertEquals("bar", Dummy.foo());
@@ -63,7 +66,7 @@ public void testStaticMockWithMoInteractionsFailed() {
     }
 
     @Test
-    public void testStaticMockWithMoMoreInteractions() {
+    public void testStaticMockWithNoMoreInteractions() {
         try (MockedStatic<Dummy> dummy = Mockito.mockStatic(Dummy.class)) {
             dummy.when(Dummy::foo).thenReturn("bar");
             assertEquals("bar", Dummy.foo());
@@ -73,7 +76,7 @@ public void testStaticMockWithMoMoreInteractions() {
     }
 
     @Test(expected = NoInteractionsWanted.class)
-    public void testStaticMockWithMoMoreInteractionsFailed() {
+    public void testStaticMockWithNoMoreInteractionsFailed() {
         try (MockedStatic<Dummy> dummy = Mockito.mockStatic(Dummy.class)) {
             dummy.when(Dummy::foo).thenReturn("bar");
             assertEquals("bar", Dummy.foo());
@@ -171,12 +174,27 @@ public void testStaticMockVoid() {
         try (MockedStatic<Dummy> dummy = Mockito.mockStatic(Dummy.class)) {
             Dummy.fooVoid("bar");
             assertNull(Dummy.var1);
-            dummy.verify(()->Dummy.fooVoid("bar"));
+            dummy.verify(() -> Dummy.fooVoid("bar"));
         }
         Dummy.fooVoid("bar");
         assertEquals("bar", Dummy.var1);
     }
 
+    @Test
+    public void testStaticMockMustUseValidMatchers() {
+        try (MockedStatic<Dummy> mockedClass = Mockito.mockStatic(Dummy.class)) {
+            assertThatThrownBy(
+                new ThrowableAssert.ThrowingCallable() {
+                    public void call() {
+                        mockedClass.when(() -> Dummy.fooVoid("foo", any())).thenReturn(null);
+                    }
+                })
+                .hasMessageContaining("Invalid use of argument matchers!");
+
+            Dummy.fooVoid("foo", "bar");
+        }
+    }
+
     static class Dummy {
 
         static String var1 = null;
@@ -188,5 +206,9 @@ static String foo() {
         static void fooVoid(String var2) {
             var1 = var2;
         }
+
+        static void fooVoid(String var2, String var3) {
+            var1 = var2;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ public <S> OngoingStubbing<S> when(Verification verification) {`
`47`	`47`
`48`	`48`	`try {`
`49`	`49`	`verification.apply();`
	`50`	`+ } catch (MockitoException exception) {`
	`51`	`+ throw exception;`
`50`	`52`	`} catch (Throwable ignored) {`
`51`	`53`	`}`
`52`	`54`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ apply from: "$rootDir/gradle/java-library.gradle"`
`5`	`5`	`dependencies {`
`6`	`6`	`api project.rootProject`
`7`	`7`	`testImplementation libraries.junit4`
	`8`	`+ testImplementation libraries.assertj`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`tasks.javadoc.enabled = false`