Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #2281: Make MockedConstruction stubs close on demand #2442

Merged
merged 5 commits into from Oct 6, 2021
Merged

Fixes #2281: Make MockedConstruction stubs close on demand #2442

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8cbfbd7
Fixes #2281: Make MockedConstruction stubs close on demand
Astalaseven Oct 5, 2021
6d9e73f
Fixes #2281: Make MockedConstruction stubs close on demand
Astalaseven Oct 5, 2021
5e6f219
Merge remote-tracking branch 'origin/main'
Astalaseven Oct 6, 2021
e8e7bcb
chore: Add missing license header
Astalaseven Oct 6, 2021
9bb1e75
refactor: Move test file to right subproject
Astalaseven Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
Expand All @@ -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;
Expand Down