Fix @Mock(serializable = true) for parameterized types (#3007)

Fixes #2979
mockito · May 8, 2023 · 7d53c57 · 7d53c57
1 parent 6e0c228
commit 7d53c57
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/org/mockito/internal/creation/settings/CreationSettings.java b/src/main/java/org/mockito/internal/creation/settings/CreationSettings.java
@@ -26,7 +26,7 @@ public class CreationSettings<T> implements MockCreationSettings<T>, Serializabl
     private static final long serialVersionUID = -6789800638070123629L;
 
     protected Class<T> typeToMock;
-    protected Type genericTypeToMock;
+    protected transient Type genericTypeToMock;
     protected Set<Class<?>> extraInterfaces = new LinkedHashSet<>();
     protected String name;
     protected Object spiedInstance;

diff --git a/src/test/java/org/mockitousage/basicapi/MocksSerializationForAnnotationTest.java b/src/test/java/org/mockitousage/basicapi/MocksSerializationForAnnotationTest.java
@@ -13,6 +13,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Observable;
+import java.util.function.Supplier;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
@@ -53,6 +54,9 @@ public class MocksSerializationForAnnotationTest extends TestBase implements Ser
             serializable = true)
     IMethods imethodsWithExtraInterfacesMock;
 
+    @Mock(serializable = true)
+    Supplier<Object> parameterizedSupplier;
+
     @Test
     public void should_allow_throws_exception_to_be_serializable() throws Exception {
         // given
@@ -68,6 +72,11 @@ public void should_allow_mock_to_be_serializable() throws Exception {
         serializeAndBack(imethodsMock);
     }
 
+    @Test
+    public void should_allow_mock_of_parameterized_type_to_be_serializable() throws Exception {
+        serializeAndBack(parameterizedSupplier);
+    }
+
     @Test
     public void should_allow_mock_and_boolean_value_to_serializable() throws Exception {
         // given