Skip to content

Commit

Permalink
Support the use of @⁠Resource in test classes in AOT mode
Browse files Browse the repository at this point in the history
Closes gh-31733
  • Loading branch information
sbrannen committed Jan 5, 2024
1 parent f6b36a6 commit 79b0d71
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -23,6 +23,7 @@
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;
Expand Down Expand Up @@ -153,10 +154,14 @@ private void injectDependenciesInAotMode(TestContext testContext) throws Excepti

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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -57,11 +58,15 @@
})
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);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -45,4 +45,9 @@ MessageService spanishMessageService() {
return new SpanishMessageService();
}

@Bean
Number magicNumber() {
return 42;
}

}

0 comments on commit 79b0d71

Please sign in to comment.