From 824aa137f8ec1218049f3017fa23072db503467d Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Thu, 26 Feb 2026 18:01:01 +0100 Subject: [PATCH] Align implementation of injectDependencies() with injectDependenciesInAotMode() --- .../support/DependencyInjectionTestExecutionListener.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java index c11d98424c0..ae9f6e23e78 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java @@ -151,10 +151,11 @@ public class DependencyInjectionTestExecutionListener extends AbstractTestExecut */ protected void injectDependencies(TestContext testContext) throws Exception { Object bean = testContext.getTestInstance(); - Class clazz = testContext.getTestClass(); + String beanName = testContext.getTestClass().getName() + AutowireCapableBeanFactory.ORIGINAL_INSTANCE_SUFFIX; + AutowireCapableBeanFactory beanFactory = testContext.getApplicationContext().getAutowireCapableBeanFactory(); beanFactory.autowireBeanProperties(bean, AutowireCapableBeanFactory.AUTOWIRE_NO, false); - beanFactory.initializeBean(bean, clazz.getName() + AutowireCapableBeanFactory.ORIGINAL_INSTANCE_SUFFIX); + beanFactory.initializeBean(bean, beanName); testContext.removeAttribute(REINJECT_DEPENDENCIES_ATTRIBUTE); }