Skip to content

Commit 94b366b

Browse files
committed
Make assertable context interfaces configurable
Update `Assertable*ApplicationContext` interfaces so that they also extend the appropriate `Configurable*ApplicationContext` interface. Closes gh-14650
1 parent 1e6c7cc commit 94b366b

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,7 +35,8 @@
3535
* @see ApplicationContext
3636
*/
3737
public interface AssertableApplicationContext
38-
extends ApplicationContextAssertProvider<ConfigurableApplicationContext> {
38+
extends ApplicationContextAssertProvider<ConfigurableApplicationContext>,
39+
ConfigurableApplicationContext {
3940

4041
/**
4142
* Factory method to create a new {@link AssertableApplicationContext} instance.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
3535
*/
3636
public interface AssertableReactiveWebApplicationContext extends
3737
ApplicationContextAssertProvider<ConfigurableReactiveWebApplicationContext>,
38-
ReactiveWebApplicationContext {
38+
ConfigurableReactiveWebApplicationContext {
3939

4040
/**
4141
* Factory method to create a new {@link AssertableReactiveWebApplicationContext}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
3636
*/
3737
public interface AssertableWebApplicationContext
3838
extends ApplicationContextAssertProvider<ConfigurableWebApplicationContext>,
39-
WebApplicationContext {
39+
ConfigurableWebApplicationContext {
4040

4141
/**
4242
* Factory method to create a new {@link AssertableWebApplicationContext} instance.

0 commit comments

Comments
 (0)