Browse Source

Make assertable context interfaces configurable

Update `Assertable*ApplicationContext` interfaces so that they also
extend the appropriate `Configurable*ApplicationContext` interface.

Closes gh-14650
pull/14652/merge
Phillip Webb 7 years ago
parent
commit
94b366bc16
  1. 5
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/AssertableApplicationContext.java
  2. 4
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/AssertableReactiveWebApplicationContext.java
  3. 4
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/AssertableWebApplicationContext.java

5
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/AssertableApplicationContext.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 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.
@ -35,7 +35,8 @@ import org.springframework.context.ConfigurableApplicationContext; @@ -35,7 +35,8 @@ import org.springframework.context.ConfigurableApplicationContext;
* @see ApplicationContext
*/
public interface AssertableApplicationContext
extends ApplicationContextAssertProvider<ConfigurableApplicationContext> {
extends ApplicationContextAssertProvider<ConfigurableApplicationContext>,
ConfigurableApplicationContext {
/**
* Factory method to create a new {@link AssertableApplicationContext} instance.

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/AssertableReactiveWebApplicationContext.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 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.
@ -35,7 +35,7 @@ import org.springframework.boot.web.reactive.context.ReactiveWebApplicationConte @@ -35,7 +35,7 @@ import org.springframework.boot.web.reactive.context.ReactiveWebApplicationConte
*/
public interface AssertableReactiveWebApplicationContext extends
ApplicationContextAssertProvider<ConfigurableReactiveWebApplicationContext>,
ReactiveWebApplicationContext {
ConfigurableReactiveWebApplicationContext {
/**
* Factory method to create a new {@link AssertableReactiveWebApplicationContext}

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/AssertableWebApplicationContext.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 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.
@ -36,7 +36,7 @@ import org.springframework.web.context.WebApplicationContext; @@ -36,7 +36,7 @@ import org.springframework.web.context.WebApplicationContext;
*/
public interface AssertableWebApplicationContext
extends ApplicationContextAssertProvider<ConfigurableWebApplicationContext>,
WebApplicationContext {
ConfigurableWebApplicationContext {
/**
* Factory method to create a new {@link AssertableWebApplicationContext} instance.

Loading…
Cancel
Save