Merge branch '2.7.x'

Closes gh-29407
This commit is contained in:
Phillip Webb
2022-01-14 16:33:20 -08:00
2 changed files with 1 additions and 22 deletions

View File

@@ -140,7 +140,7 @@ class SpringBootContextLoaderTests {
List<String> names = environment.getPropertySources().stream().map(PropertySource::getName)
.collect(Collectors.toList());
String last = names.remove(names.size() - 1);
assertThat(names).containsExactly("configurationProperties", "commandLineArgs", "Inlined Test Properties",
assertThat(names).containsExactly("configurationProperties", "Inlined Test Properties", "commandLineArgs",
"servletConfigInitParams", "servletContextInitParams", "systemProperties", "systemEnvironment",
"random");
assertThat(last).startsWith("Config resource");