Testing - fix MockitoConfig(convertScopes = true)

- fixes #35080 (cherry picked from commit 806c3f8)
quarkusio · Aug 1, 2023 · cf7630a · cf7630a
1 parent e8cb64a
commit cf7630a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...-tests/injectmock/src/test/java/io/quarkus/it/mockbean/GreetingSingletonResourceTest.java b/...-tests/injectmock/src/test/java/io/quarkus/it/mockbean/GreetingSingletonResourceTest.java
@@ -12,14 +12,16 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.mockito.InjectMock;
+import io.quarkus.test.junit.mockito.MockitoConfig;
 
 @QuarkusTest
 class GreetingSingletonResourceTest {
 
     @InjectMock(convertScopes = true)
     MessageServiceSingleton messageService;
 
-    @InjectMock(convertScopes = true)
+    @io.quarkus.test.InjectMock
+    @MockitoConfig(convertScopes = true)
     SuffixServiceSingleton suffixService;
 
     @InjectMock(convertScopes = true)

diff --git a/.../junit/mockito/internal/SingletonToApplicationScopedTestBuildChainCustomizerProducer.java b/.../junit/mockito/internal/SingletonToApplicationScopedTestBuildChainCustomizerProducer.java
@@ -55,7 +55,7 @@ public void execute(BuildContext context) {
                                 continue;
                             }
                             if (instance.name().equals(MOCKITO_CONFIG)
-                                    && instance.target().asField().hasAnnotation(INJECT_MOCK)) {
+                                    && !instance.target().asField().hasAnnotation(INJECT_MOCK)) {
                                 continue;
                             }
                             AnnotationValue allowScopeConversionValue = instance.value("convertScopes");