Fix mockito#2915 Forbid spy on mock

bmaggi · Apr 28, 2023 · 6695284 · 6695284
1 parent f9fbf50
commit 6695284
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/main/java/org/mockito/Mockito.java b/src/main/java/org/mockito/Mockito.java
@@ -10,6 +10,7 @@
 import org.mockito.internal.creation.MockSettingsImpl;
 import org.mockito.internal.framework.DefaultMockitoFramework;
 import org.mockito.internal.session.DefaultMockitoSessionBuilder;
+import org.mockito.internal.util.MockUtil;
 import org.mockito.internal.verification.VerificationModeFactory;
 import org.mockito.invocation.Invocation;
 import org.mockito.invocation.InvocationFactory;
@@ -2167,6 +2168,10 @@ public static <T> T mock(Class<T> classToMock, MockSettings mockSettings) {
      * @return a spy of the real object
      */
     public static <T> T spy(T object) {
+        if (MockUtil.isMock(object)) {
+            throw new IllegalArgumentException(
+                "Please don't pass mock here. Spy is not allowed on mock.");
+        }
         return MOCKITO_CORE.mock(
                 (Class<T>) object.getClass(),
                 withSettings().spiedInstance(object).defaultAnswer(CALLS_REAL_METHODS));

diff --git a/src/test/java/org/mockitousage/constructor/CreatingMocksWithConstructorTest.java b/src/test/java/org/mockitousage/constructor/CreatingMocksWithConstructorTest.java
@@ -409,6 +409,19 @@ public void handles_bridge_methods_correctly() {
         assertEquals("value", testBug.getValue(0));
     }
 
+
+    @Test
+    public void forbid_spy_on_mock() {
+        try {
+            spy(mock(List.class));
+            fail();
+        } catch (IllegalArgumentException e) {
+            assertThat(e)
+                .hasMessageContaining(
+                    "Please don't pass mock here. Spy is not allowed on mock.");
+        }
+    }
+
     public abstract class SomeAbstractClass<T> {
 
         protected abstract String getRealValue(T value);