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

Revert SpringBootContextLoader and ErrorPageFilterIntegrationTests changes"

Browse Source 
Spring Framework has change the signature so we no longer need the updates.
This commit is contained in:
Phillip Webb
2022-08-03 15:37:51 +01:00
parent 2f0dfc341c
commit dd87cf47a4
2 changed files with 1 additions and 14 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,13 +84,7 @@ 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),
@@ -135,7 +129,6 @@ 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);
} }

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java
View File

@@ -179,13 +179,7 @@ class ErrorPageFilterIntegrationTests {
private static final String[] EMPTY_RESOURCE_SUFFIXES = {}; private static final String[] EMPTY_RESOURCE_SUFFIXES = {};
@Override @Override
@Deprecated public ApplicationContext loadContext(MergedContextConfiguration config) {
public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
return loadContext(mergedConfig, true);
}
@Override
public ApplicationContext loadContext(MergedContextConfiguration config, boolean refresh) {
AnnotationConfigServletWebServerApplicationContext context = new AnnotationConfigServletWebServerApplicationContext( AnnotationConfigServletWebServerApplicationContext context = new AnnotationConfigServletWebServerApplicationContext(
config.getClasses()); config.getClasses());
context.registerShutdownHook(); context.registerShutdownHook();