Clear inline mocks after all tests are executed

Also remove mocks from MockitoMocksTracker after the whole test is
executed.

Author: gsmet

integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/NestedSpyTest.java

@@ -0,0 +1,62 @@
+package io.quarkus.it.mockbean;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.mockito.InjectSpy;
+
+@QuarkusTest
+public class NestedSpyTest {
+
+    @InjectSpy
+    MessageService messageService;
+
+    @Nested
+    public class ActualTest {
+
+        @InjectSpy
+        SuffixService suffixService;
+
+        @Test
+        @Order(1)
+        public void testGreet() {
+            Mockito.when(messageService.getMessage()).thenReturn("hi");
+            Mockito.when(suffixService.getSuffix()).thenReturn("!");
+
+            given()
+                    .when().get("/greeting")
+                    .then()
+                    .statusCode(200)
+                    .body(is("HI!"));
+        }
+
+        @Test
+        @Order(2)
+        public void testGreetAgain() {
+            Mockito.when(messageService.getMessage()).thenReturn("yolo");
+            Mockito.when(suffixService.getSuffix()).thenReturn("!!!");
+
+            given()
+                    .when().get("/greeting")
+                    .then()
+                    .statusCode(200)
+                    .body(is("YOLO!!!"));
+        }
+
+        @Test
+        @Order(3)
+        public void testNoSpy() {
+            given()
+                    .when().get("/greeting")
+                    .then()
+                    .statusCode(200)
+                    .body(is("HELLO"));
+        }
+    }
+}

test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MockitoMocksTracker.java

@@ -7,6 +7,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.mockito.Mockito;
 import org.mockito.internal.util.MockUtil;
 
 final class MockitoMocksTracker {
@@ -30,6 +31,13 @@ static void reset(Object testInstance) {
         }
     }
 
+    static void clear(Object testInstance) {
+        for (Mocked m : getMocks(testInstance)) {
+            Mockito.framework().clearInlineMock(m.mock);
+        }
+        TEST_TO_USED_MOCKS.remove(testInstance);
+    }
+
     static Optional<Object> currentMock(Object testInstance, Object beanInstance) {
         Set<Mocked> mocks = getMocks(testInstance);
         for (Mocked mocked : mocks) {

test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetOuterMockitoMocksCallback.java renamed to test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterAllCallback.java

@@ -3,14 +3,18 @@
 import io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback;
 import io.quarkus.test.junit.callback.QuarkusTestContext;
 
-public class ResetOuterMockitoMocksCallback implements QuarkusTestAfterAllCallback {
+public class ResetMockitoMocksAfterAllCallback implements QuarkusTestAfterAllCallback {
 
     @Override
     public void afterAll(QuarkusTestContext context) {
+        MockitoMocksTracker.clear(context.getTestInstance());
+
         if (context.getOuterInstances() != null) {
             for (Object outerInstance : context.getOuterInstances()) {
                 MockitoMocksTracker.reset(outerInstance);
+                MockitoMocksTracker.clear(outerInstance);
             }
         }
+
     }
 }

test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksCallback.java renamed to test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterEachCallback.java

@@ -3,7 +3,7 @@
 import io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback;
 import io.quarkus.test.junit.callback.QuarkusTestMethodContext;
 
-public class ResetMockitoMocksCallback implements QuarkusTestAfterEachCallback {
+public class ResetMockitoMocksAfterEachCallback implements QuarkusTestAfterEachCallback {
 
     @Override
     public void afterEach(QuarkusTestMethodContext context) {

test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback

@@ -1,2 +1,2 @@
-io.quarkus.test.junit.mockito.internal.ResetOuterMockitoMocksCallback
+io.quarkus.test.junit.mockito.internal.ResetMockitoMocksAfterAllCallback
 io.quarkus.test.junit.mockito.internal.CreateMockitoSpiesCallback

test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback

@@ -1 +1 @@
-io.quarkus.test.junit.mockito.internal.ResetMockitoMocksCallback
+io.quarkus.test.junit.mockito.internal.ResetMockitoMocksAfterEachCallback