Don't need to @Inject the @MockBean

Signed-off-by: Jorge Bescos Gascon <[email protected]>

Author: jbescos

microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/HelidonJunitExtension.java

@@ -42,6 +42,7 @@
 import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
 import jakarta.enterprise.inject.se.SeContainer;
 import jakarta.enterprise.inject.se.SeContainerInitializer;
 import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
@@ -545,6 +546,8 @@ void processMockBean(@Observes @WithAnnotations(MockBean.class) ProcessAnnotated
                 MockBean mockBean = field.getAnnotated().getAnnotation(MockBean.class);
                 if (mockBean != null) {
                     Field f = field.getAnnotated().getJavaMember();
+                    // Adds @Inject if not found, so it is more user friendly
+                    field.add(MockBean.Literal.INSTANCE);
                     Class<?> fieldType = f.getType();
                     mocks.add(fieldType);
                 }
@@ -575,7 +578,8 @@ void registerOtherBeans(@Observes AfterBeanDiscovery event) {
                 event.addBean()
                     .addType(type)
                     .scope(ApplicationScoped.class)
-                    .createWith(inst -> Mockito.mock(type));
+                    .createWith(inst -> Mockito.mock(type))
+                    .priority(0);
             });
         }
 

microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/MockBean.java

@@ -21,11 +21,25 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Inject;
+
 /**
  * A field annotated with @MockBean will be mocked by Mockito
  * and injected in every place it is referenced.
  */
-@Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.PARAMETER})
 public @interface MockBean {
+
+    /**
+     * Supports inline instantiation of the {@link Inject} annotation.
+     */
+    final static class Literal extends AnnotationLiteral<Inject> implements Inject {
+
+        public static final Literal INSTANCE = new Literal();
+
+        private static final long serialVersionUID = 1L;
+
+    }
 }

microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestMockBean.java

@@ -34,11 +34,16 @@
 @HelidonTest
 @AddBean(TestMockBean.Resource.class)
 //@AddBean(TestMockBean.Service.class)
+//@AddBean(TestMockBean.OtherService.class)
 public class TestMockBean {
 
-    @Inject
+    // Without @Inject
     @MockBean
     private Service service;
+    // With @Inject
+    @Inject
+    @MockBean
+    private OtherService otherService;
     @Inject
     private WebTarget target;
 
@@ -47,6 +52,8 @@ public void injectionTest() {
         Mockito.when(service.test()).thenReturn("Mocked");
         String response = target.path("/test").request().get(String.class);
         assertThat(response, is("Mocked"));
+        Mockito.when(otherService.test()).thenReturn("Mocked");
+        assertThat(otherService.test(), is("Mocked"));
     }
 
     @Path("/test")
@@ -68,4 +75,12 @@ public String test() {
         }
 
     }
+
+    public static class OtherService {
+
+        public String test() {
+            return "OtherService";
+        }
+
+    }
 }