Browse Source

Revert SpringBootContextLoader and ErrorPageFilterIntegrationTests changes"

Spring Framework has change the signature so we no longer need the updates.
pull/31997/head
Phillip Webb 3 years ago
parent
commit
dd87cf47a4
  1. 7
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
  2. 8
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java

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

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

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

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

Loading…
Cancel
Save