From 94fbacd75598dbe7d693a6617614a77ef163f186 Mon Sep 17 00:00:00 2001 From: seregamorph Date: Tue, 12 May 2026 11:33:07 +0200 Subject: [PATCH] Reset mocks only when testContext.hasApplicationContext 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 dfebc3e50991..d4896ea81cb7 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 @@ -100,7 +100,7 @@ public void beforeTestMethod(TestContext testContext) { @Override public void afterTestMethod(TestContext testContext) { - if (isEnabled()) { + if (isEnabled() && testContext.hasApplicationContext()) { resetMocks(testContext.getApplicationContext(), MockReset.AFTER); } }