From 8cbfbd760ee2a8a0e385686b20eb945629733a67 Mon Sep 17 00:00:00 2001
From: gbovyn <gatien.bovyn@gmail.com>
Date: Tue, 5 Oct 2021 22:13:32 +0200
Subject: [PATCH] Fixes #2281: Make MockedConstruction stubs close on demand

MockedConstruction should behave like MockedStatic when we use @Mock on it.
---
 .../java/org/mockito/junit/jupiter/MockitoExtension.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java b/subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java
index c2cf37d5fe..220b7f4509 100644
--- a/subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java
+++ b/subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java
@@ -21,9 +21,9 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.mockito.Mock;
-import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.MockitoSession;
+import org.mockito.ScopedMock;
 import org.mockito.internal.configuration.MockAnnotationProcessor;
 import org.mockito.internal.configuration.plugins.Plugins;
 import org.mockito.internal.session.MockitoSessionLoggerAdapter;
@@ -181,7 +181,7 @@ private Optional<MockitoSettings> retrieveAnnotationFromTestClasses(final Extens
     @Override
     @SuppressWarnings("unchecked")
     public void afterEach(ExtensionContext context) {
-        context.getStore(MOCKITO).remove(MOCKS, Set.class).forEach(mock -> ((MockedStatic<?>) mock).closeOnDemand());
+        context.getStore(MOCKITO).remove(MOCKS, Set.class).forEach(mock -> ((ScopedMock) mock).closeOnDemand());
         context.getStore(MOCKITO).remove(SESSION, MockitoSession.class)
                 .finishMocking(context.getExecutionException().orElse(null));
     }
@@ -200,7 +200,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
             parameter.getType(),
             parameter::getParameterizedType,
             parameter.getName());
-        if (mock instanceof MockedStatic<?>) {
+        if (mock instanceof ScopedMock) {
             context.getStore(MOCKITO).get(MOCKS, Set.class).add(mock);
         }
         return mock;