Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support the use of @⁠Resource in test classes in AOT mode

Browse Source 
Closes gh-31733
This commit is contained in:
Sam Brannen
2024-01-05 16:30:54 +01:00
parent f6b36a689a
commit 79b0d71514
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostP
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.Conventions;
import org.springframework.test.context.TestContext;
@@ -153,10 +154,14 @@ public class DependencyInjectionTestExecutionListener extends AbstractTestExecut
Object bean = testContext.getTestInstance();
Class<?> clazz = testContext.getTestClass();
ConfigurableListableBeanFactory beanFactory = gac.getBeanFactory();
AutowiredAnnotationBeanPostProcessor beanPostProcessor = new AutowiredAnnotationBeanPostProcessor();
beanPostProcessor.setBeanFactory(beanFactory);
beanPostProcessor.processInjection(bean);
AutowiredAnnotationBeanPostProcessor autowiredAnnotationBpp = new AutowiredAnnotationBeanPostProcessor();
autowiredAnnotationBpp.setBeanFactory(beanFactory);
autowiredAnnotationBpp.processInjection(bean);
CommonAnnotationBeanPostProcessor commonAnnotationBpp = new CommonAnnotationBeanPostProcessor();
commonAnnotationBpp.setBeanFactory(beanFactory);
commonAnnotationBpp.processInjection(bean);
beanFactory.initializeBean(bean, clazz.getName() + AutowireCapableBeanFactory.ORIGINAL_INSTANCE_SUFFIX);
testContext.removeAttribute(REINJECT_DEPENDENCIES_ATTRIBUTE);
}

5
spring-test/src/test/java/org/springframework/test/context/aot/samples/basic/BasicSpringJupiterTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.test.context.aot.samples.basic;
import jakarta.annotation.Resource;
import org.junit.jupiter.api.Nested;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,11 +58,15 @@ import static org.springframework.test.context.TestExecutionListeners.MergeMode.
})
public class BasicSpringJupiterTests {
@Resource
Integer magicNumber;
@org.junit.jupiter.api.Test
void test(@Autowired ApplicationContext context, @Autowired MessageService messageService,
@Value("${test.engine}") String testEngine) {
assertThat(messageService.generateMessage()).isEqualTo("Hello, AOT!");
assertThat(testEngine).isEqualTo("jupiter");
assertThat(magicNumber).isEqualTo(42);
assertEnvProperties(context);
}

7
spring-test/src/test/java/org/springframework/test/context/aot/samples/basic/BasicTestConfiguration.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -45,4 +45,9 @@ class BasicTestConfiguration {
return new SpanishMessageService();
}
@Bean
Number magicNumber() {
return 42;
}
}