From 1d91982f8363e4a6c1f2ed77de889ef7bb46968d Mon Sep 17 00:00:00 2001 From: seregamorph Date: Tue, 12 May 2026 11:33:07 +0200 Subject: [PATCH] Reset mocks after test only when the test has an ApplicationContext See gh-36782 Signed-off-by: seregamorph --- .../override/mockito/MockitoResetTestExecutionListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java index d3b0558eef5..02147a3992e 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java @@ -99,7 +99,7 @@ public class MockitoResetTestExecutionListener extends AbstractTestExecutionList @Override public void afterTestMethod(TestContext testContext) { - if (isEnabled()) { + if (isEnabled() && testContext.hasApplicationContext()) { resetMocks(testContext.getApplicationContext(), MockReset.AFTER); } }