Add suspension when Mockito exception is thrown.

mockito · Aug 24, 2020 · eaa12bf · eaa12bf
1 parent 065dd12
commit eaa12bf
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java
@@ -265,12 +265,18 @@ public InlineByteBuddyMockMaker() {
                         } else if (type.isInstance(spy)) {
                             return spy;
                         } else {
-                            // Unexpected construction of non-spied object
-                            throw new MockitoException(
-                                    "Unexpected spy for "
-                                            + type.getName()
-                                            + " on instance of "
-                                            + object.getClass().getName());
+                            isSuspended.set(true);
+                            try {
+                                // Unexpected construction of non-spied object
+                                throw new MockitoException(
+                                        "Unexpected spy for "
+                                                + type.getName()
+                                                + " on instance of "
+                                                + object.getClass().getName(),
+                                        object instanceof Throwable ? (Throwable) object : null);
+                            } finally {
+                                isSuspended.set(false);
+                            }
                         }
                     } else if (currentConstruction.get() != type) {
                         return null;