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

Merge branch '3.3.x'

Browse Source 
Closes gh-43270
This commit is contained in:
Andy Wilkinson
2024-11-22 15:40:51 +00:00
parent 3bff418df9 bb3651b7d1
commit 32433e84f3
28 changed files with 184 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/AssertableApplicationContextTests.java
View File

@@ -33,6 +33,7 @@ import static org.mockito.Mockito.withSettings;
class AssertableApplicationContextTests {
@Test
@SuppressWarnings("resource")
void getShouldReturnProxy() {
AssertableApplicationContext context = AssertableApplicationContext
.get(() -> mock(ConfigurableApplicationContext.class));
@@ -41,12 +42,13 @@ class AssertableApplicationContextTests {
@Test
void getWhenHasAdditionalInterfaceShouldReturnProxy() {
AssertableApplicationContext context = AssertableApplicationContext.get(
try (AssertableApplicationContext context = AssertableApplicationContext.get(
() -> mock(ConfigurableApplicationContext.class,
withSettings().extraInterfaces(AdditionalContextInterface.class)),
AdditionalContextInterface.class);
assertThat(context).isInstanceOf(ConfigurableApplicationContext.class)
.isInstanceOf(AdditionalContextInterface.class);
AdditionalContextInterface.class)) {
assertThat(context).isInstanceOf(ConfigurableApplicationContext.class)
.isInstanceOf(AdditionalContextInterface.class);
}
}
}

10
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/AssertableReactiveWebApplicationContextTests.java
View File

@@ -33,6 +33,7 @@ import static org.mockito.Mockito.withSettings;
class AssertableReactiveWebApplicationContextTests {
@Test
@SuppressWarnings("resource")
void getShouldReturnProxy() {
AssertableReactiveWebApplicationContext context = AssertableReactiveWebApplicationContext
.get(() -> mock(ConfigurableReactiveWebApplicationContext.class));
@@ -41,12 +42,13 @@ class AssertableReactiveWebApplicationContextTests {
@Test
void getWhenHasAdditionalInterfaceShouldReturnProxy() {
AssertableReactiveWebApplicationContext context = AssertableReactiveWebApplicationContext.get(
try (AssertableReactiveWebApplicationContext context = AssertableReactiveWebApplicationContext.get(
() -> mock(ConfigurableReactiveWebApplicationContext.class,
withSettings().extraInterfaces(AdditionalContextInterface.class)),
AdditionalContextInterface.class);
assertThat(context).isInstanceOf(ConfigurableReactiveWebApplicationContext.class)
.isInstanceOf(AdditionalContextInterface.class);
AdditionalContextInterface.class)) {
assertThat(context).isInstanceOf(ConfigurableReactiveWebApplicationContext.class)
.isInstanceOf(AdditionalContextInterface.class);
}
}
}

10
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/AssertableWebApplicationContextTests.java
View File

@@ -33,6 +33,7 @@ import static org.mockito.Mockito.withSettings;
class AssertableWebApplicationContextTests {
@Test
@SuppressWarnings("resource")
void getShouldReturnProxy() {
AssertableWebApplicationContext context = AssertableWebApplicationContext
.get(() -> mock(ConfigurableWebApplicationContext.class));
@@ -41,12 +42,13 @@ class AssertableWebApplicationContextTests {
@Test
void getWhenHasAdditionalInterfaceShouldReturnProxy() {
ConfigurableWebApplicationContext context = AssertableWebApplicationContext.get(
try (ConfigurableWebApplicationContext context = AssertableWebApplicationContext.get(
() -> mock(ConfigurableWebApplicationContext.class,
withSettings().extraInterfaces(AdditionalContextInterface.class)),
AdditionalContextInterface.class);
assertThat(context).isInstanceOf(ConfigurableWebApplicationContext.class)
.isInstanceOf(AdditionalContextInterface.class);
AdditionalContextInterface.class)) {
assertThat(context).isInstanceOf(ConfigurableWebApplicationContext.class)
.isInstanceOf(AdditionalContextInterface.class);
}
}
}