Merge pull request #30623 from geoand/#30608

Introduce convertScopes to `@InjectSpy`
quarkusio · Jan 26, 2023 · aad2385 · aad2385
2 parents 87769af + d309d9c
commit aad2385
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerService.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerService.java
@@ -1,8 +1,8 @@
 package io.quarkus.it.mockbean;
 
-import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class CapitalizerService {
 
     public String capitalize(String input) {

diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/WithSpiesTest.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/WithSpiesTest.java
@@ -15,7 +15,7 @@
 @QuarkusTest
 class WithSpiesTest {
 
-    @InjectSpy
+    @InjectSpy(convertScopes = true)
     CapitalizerService capitalizerService;
 
     @InjectSpy

diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/InjectMock.java b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/InjectMock.java
@@ -15,7 +15,7 @@
 
     /**
      * If true, then Quarkus will change the scope of the target {@code Singleton} bean to {@code ApplicationScoped}
-     * to make the mockable.
+     * to make it mockable.
      * This is an advanced setting and should only be used if you don't rely on the differences between {@code Singleton}
      * and {@code ApplicationScoped} beans (for example it is invalid to read fields of {@code ApplicationScoped} beans
      * as a proxy stands in place of the actual implementation)

diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/InjectSpy.java b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/InjectSpy.java
@@ -23,4 +23,12 @@
      * @see org.mockito.AdditionalAnswers#delegatesTo(Object)
      */
     boolean delegate() default false;
+
+    /**
+     * If true, then Quarkus will change the scope of the target {@code Singleton} bean to {@code ApplicationScoped}.
+     * This is an advanced setting and should only be used if you don't rely on the differences between {@code Singleton}
+     * and {@code ApplicationScoped} beans (for example it is invalid to read fields of {@code ApplicationScoped} beans
+     * as a proxy stands in place of the actual implementation)
+     */
+    boolean convertScopes() default false;
 }
diff --git a/.../junit/mockito/internal/SingletonToApplicationScopedTestBuildChainCustomizerProducer.java b/.../junit/mockito/internal/SingletonToApplicationScopedTestBuildChainCustomizerProducer.java
@@ -1,5 +1,6 @@
 package io.quarkus.test.junit.mockito.internal;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -25,22 +26,26 @@
 import io.quarkus.builder.BuildStep;
 import io.quarkus.test.junit.buildchain.TestBuildChainCustomizerProducer;
 import io.quarkus.test.junit.mockito.InjectMock;
+import io.quarkus.test.junit.mockito.InjectSpy;
 
 public class SingletonToApplicationScopedTestBuildChainCustomizerProducer implements TestBuildChainCustomizerProducer {
 
     private static final DotName INJECT_MOCK = DotName.createSimple(InjectMock.class.getName());
+    private static final DotName INJECT_SPY = DotName.createSimple(InjectSpy.class.getName());
 
     @Override
     public Consumer<BuildChainBuilder> produce(Index testClassesIndex) {
-        return new Consumer<BuildChainBuilder>() {
+        return new Consumer<>() {
 
             @Override
             public void accept(BuildChainBuilder buildChainBuilder) {
                 buildChainBuilder.addBuildStep(new BuildStep() {
                     @Override
                     public void execute(BuildContext context) {
                         Set<DotName> mockTypes = new HashSet<>();
-                        List<AnnotationInstance> instances = testClassesIndex.getAnnotations(INJECT_MOCK);
+                        List<AnnotationInstance> instances = new ArrayList<>();
+                        instances.addAll(testClassesIndex.getAnnotations(INJECT_MOCK));
+                        instances.addAll(testClassesIndex.getAnnotations(INJECT_SPY));
                         for (AnnotationInstance instance : instances) {
                             if (instance.target().kind() != AnnotationTarget.Kind.FIELD) {
                                 continue;