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

Merge branch '2.2.x' into 2.3.x

Browse Source 
Closes gh-23477
This commit is contained in:
Andy Wilkinson
2020-09-24 14:45:55 +01:00
parent 184bd5b13d bf9d23e55a
commit e626f7f47e
3 changed files with 91 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperTests.java
View File

@@ -71,6 +71,24 @@ class SpringBootTestContextBootstrapperTests {
assertThat(contextConfiguration).isEqualTo(otherContextConfiguration);
}
@Test
void mergedContextConfigurationWhenWebEnvironmentsDifferentShouldNotBeConsideredEqual() {
TestContext context = buildTestContext(SpringBootTestMockWebEnvironmentConfiguration.class);
Object contextConfiguration = ReflectionTestUtils.getField(context, "mergedContextConfiguration");
TestContext otherContext = buildTestContext(SpringBootTestDefinedPortWebEnvironmentConfiguration.class);
Object otherContextConfiguration = ReflectionTestUtils.getField(otherContext, "mergedContextConfiguration");
assertThat(contextConfiguration).isNotEqualTo(otherContextConfiguration);
}
@Test
void mergedContextConfigurationWhenWebEnvironmentsSameShouldtBeConsideredEqual() {
TestContext context = buildTestContext(SpringBootTestMockWebEnvironmentConfiguration.class);
Object contextConfiguration = ReflectionTestUtils.getField(context, "mergedContextConfiguration");
TestContext otherContext = buildTestContext(SpringBootTestAnotherMockWebEnvironmentConfiguration.class);
Object otherContextConfiguration = ReflectionTestUtils.getField(otherContext, "mergedContextConfiguration");
assertThat(contextConfiguration).isEqualTo(otherContextConfiguration);
}
@SuppressWarnings("rawtypes")
private TestContext buildTestContext(Class<?> testClass) {
SpringBootTestContextBootstrapper bootstrapper = new SpringBootTestContextBootstrapper();
@@ -99,6 +117,21 @@ class SpringBootTestContextBootstrapperTests {
}
@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
static class SpringBootTestMockWebEnvironmentConfiguration {
}
@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
static class SpringBootTestAnotherMockWebEnvironmentConfiguration {
}
@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)
static class SpringBootTestDefinedPortWebEnvironmentConfiguration {
}
@SpringBootTest(args = "--app.test=same")
static class SpringBootTestSameArgsConfiguration {