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

Adapt SpringBootContextLoader to upstream Spring Framework changes

Browse Source
This commit is contained in:
Phillip Webb
2022-08-03 12:27:30 +01:00
parent 040ab4da5b
commit 2dae04b2f4
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
View File

@@ -84,7 +84,13 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
public class SpringBootContextLoader extends AbstractContextLoader { public class SpringBootContextLoader extends AbstractContextLoader {
@Override @Override
@Deprecated
public ApplicationContext loadContext(MergedContextConfiguration config) throws Exception { public ApplicationContext loadContext(MergedContextConfiguration config) throws Exception {
return loadContext(config, true);
}
@Override
public ApplicationContext loadContext(MergedContextConfiguration config, boolean refresh) throws Exception {
Class<?>[] configClasses = config.getClasses(); Class<?>[] configClasses = config.getClasses();
String[] configLocations = config.getLocations(); String[] configLocations = config.getLocations();
Assert.state(!ObjectUtils.isEmpty(configClasses) || !ObjectUtils.isEmpty(configLocations), Assert.state(!ObjectUtils.isEmpty(configClasses) || !ObjectUtils.isEmpty(configLocations),
@@ -129,6 +135,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
application.addListeners(new PrepareEnvironmentListener(config)); application.addListeners(new PrepareEnvironmentListener(config));
} }
String[] args = SpringBootTestArgs.get(config.getContextCustomizers()); String[] args = SpringBootTestArgs.get(config.getContextCustomizers());
Assert.isTrue(refresh, "SpringBootContextLoader and only return refreshed contexts");
return application.run(args); return application.run(args);
} }