From 00ae4c1575534e9edb03450e51f135d816150bda Mon Sep 17 00:00:00 2001
From: Youssef Awichawi <youssef3wi@icloud.com>
Date: Thu, 1 Feb 2024 12:55:51 +0100
Subject: [PATCH] Fixes #3229: Resolve test generic arguments

---
 .../util/reflection/GenericMaster.java        |  2 +-
 .../CaptorAnnotationWithPrimitiveTest.java    | 52 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 subprojects/junit-jupiter/src/test/java/org/mockitousage/annotation/CaptorAnnotationWithPrimitiveTest.java

diff --git a/src/main/java/org/mockito/internal/util/reflection/GenericMaster.java b/src/main/java/org/mockito/internal/util/reflection/GenericMaster.java
index 8166500bed..c5c3581f6d 100644
--- a/src/main/java/org/mockito/internal/util/reflection/GenericMaster.java
+++ b/src/main/java/org/mockito/internal/util/reflection/GenericMaster.java
@@ -27,7 +27,7 @@ public Class<?> getGenericType(Field field) {
      * @param parameter the parameter to inspect
      */
     public Class<?> getGenericType(Parameter parameter) {
-        return getaClass(parameter.getType());
+        return getaClass(parameter.getParameterizedType());
     }
 
     private Class<?> getaClass(Type generic) {
diff --git a/subprojects/junit-jupiter/src/test/java/org/mockitousage/annotation/CaptorAnnotationWithPrimitiveTest.java b/subprojects/junit-jupiter/src/test/java/org/mockitousage/annotation/CaptorAnnotationWithPrimitiveTest.java
new file mode 100644
index 0000000000..2af1dc504e
--- /dev/null
+++ b/subprojects/junit-jupiter/src/test/java/org/mockitousage/annotation/CaptorAnnotationWithPrimitiveTest.java
@@ -0,0 +1,52 @@
+package org.mockitousage.annotation;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.doNothing;
+
+@ExtendWith(MockitoExtension.class)
+public class CaptorAnnotationWithPrimitiveTest {
+    @Mock
+    private Foo foo;
+
+    private AutoCloseable closeable;
+
+    static class Foo {
+        void doSomething(int value) {
+        }
+    }
+
+    @BeforeEach
+    void setUp() {
+        closeable = MockitoAnnotations.openMocks(this);
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        if (closeable != null) {
+            closeable.close();
+        }
+    }
+
+    @Test
+    public void shouldCaptorPrimitive(@Captor ArgumentCaptor<Integer> captor) {
+        // Given
+        int value = 1;
+
+        // When
+        doNothing().when(foo).doSomething(captor.capture());
+
+        // Then
+        foo.doSomething(value);
+        assertEquals(1, captor.getValue());
+    }
+}