root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Align tests with changes to SpringApplicationHooks

Browse Source
pull/30984/head
Andy Wilkinson 3 years ago
parent 2744649892
commit 9a239c10b5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
Unescape Escape View File

@ -53,7 +53,6 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.beans.factory.support.BeanNameGenerator;
import org.springframework.beans.factory.support.DefaultBeanNameGenerator; import org.springframework.beans.factory.support.DefaultBeanNameGenerator;
import org.springframework.boot.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.BootstrapRegistry.InstanceSupplier;
import org.springframework.boot.SpringApplicationHooks.Action;
import org.springframework.boot.SpringApplicationHooks.Hook; import org.springframework.boot.SpringApplicationHooks.Hook;
import org.springframework.boot.availability.AvailabilityChangeEvent; import org.springframework.boot.availability.AvailabilityChangeEvent;
import org.springframework.boot.availability.AvailabilityState; import org.springframework.boot.availability.AvailabilityState;
@ -115,6 +114,7 @@ import org.springframework.test.context.support.TestPropertySourceUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.util.function.ThrowingSupplier;
import org.springframework.web.context.ConfigurableWebEnvironment; import org.springframework.web.context.ConfigurableWebEnvironment;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.StandardServletEnvironment; import org.springframework.web.context.support.StandardServletEnvironment;
@ -1270,7 +1270,8 @@ class SpringApplicationTests {
SpringApplication application = new SpringApplication(ExampleConfig.class); SpringApplication application = new SpringApplication(ExampleConfig.class);
application.setWebApplicationType(WebApplicationType.NONE); application.setWebApplicationType(WebApplicationType.NONE);
given(hook.preRefresh(eq(application), any(ConfigurableApplicationContext.class))).willReturn(true); given(hook.preRefresh(eq(application), any(ConfigurableApplicationContext.class))).willReturn(true);
this.context = SpringApplicationHooks.withHook(hook, (Action<ConfigurableApplicationContext>) application::run); this.context = SpringApplicationHooks.withHook(hook,
(ThrowingSupplier<ConfigurableApplicationContext>) application::run);
then(hook).should().preRun(application); then(hook).should().preRun(application);
then(hook).should().preRefresh(application, this.context); then(hook).should().preRefresh(application, this.context);
then(hook).should().postRun(application, this.context); then(hook).should().postRun(application, this.context);
@ -1282,7 +1283,8 @@ class SpringApplicationTests {
Hook hook = mock(Hook.class); Hook hook = mock(Hook.class);
SpringApplication application = new SpringApplication(ExampleConfig.class); SpringApplication application = new SpringApplication(ExampleConfig.class);
application.setWebApplicationType(WebApplicationType.NONE); application.setWebApplicationType(WebApplicationType.NONE);
this.context = SpringApplicationHooks.withHook(hook, (Action<ConfigurableApplicationContext>) application::run); this.context = SpringApplicationHooks.withHook(hook,
(ThrowingSupplier<ConfigurableApplicationContext>) application::run);
then(hook).should().preRun(application); then(hook).should().preRun(application);
then(hook).should().preRefresh(application, this.context); then(hook).should().preRefresh(application, this.context);
then(hook).should().postRun(application, this.context); then(hook).should().postRun(application, this.context);

Write Preview
Loading…
Cancel
Save