Fixes #3229: Resolve test generic arguments

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) {

src/test/java/org/mockito/internal/util/reflection/GenericMasterTest.java

@@ -7,6 +7,8 @@
 import static org.junit.Assert.assertEquals;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 import java.util.*;
 
@@ -64,7 +66,24 @@ public void should_deal_with_nested_generics() throws Exception {
         assertEquals(Set.class, m.getGenericType(field("multiNested")));
     }
 
+    @Test
+    public void should_detect_generics() throws NoSuchMethodException {
+        // Given
+        Method method = ClassWithParameter.class.getMethod("process", List.class);
+        Parameter parameter = method.getParameters()[0];
+
+        // When
+        Class<?> genericType = m.getGenericType(parameter);
+
+        // Then
+        assertEquals(Integer.class, genericType);
+    }
+
     private Field field(String fieldName) throws SecurityException, NoSuchFieldException {
         return this.getClass().getDeclaredField(fieldName);
     }
+
+    private static class ClassWithParameter {
+        public void process(List<Integer> integers) {}
+    }
 }

subprojects/junit-jupiter/src/test/java/org/mockitousage/annotation/CaptorAnnotationWithPrimitiveTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockitousage.annotation;
+
+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.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;
+
+    static class Foo {
+        void doSomething(int value) {}
+    }
+
+    @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());
+    }
+}