Commit 7cd31594 authored by Stephane Nicoll's avatar Stephane Nicoll

Polish contribution

Closes gh-5561
parent 4353963d
...@@ -535,32 +535,13 @@ public class ConfigFileApplicationListenerTests { ...@@ -535,32 +535,13 @@ public class ConfigFileApplicationListenerTests {
this.initializer.setSearchNames("testsetmultiprofiles"); this.initializer.setSearchNames("testsetmultiprofiles");
this.initializer.postProcessEnvironment(this.environment, this.application); this.initializer.postProcessEnvironment(this.environment, this.application);
assertThat(this.environment.getActiveProfiles()).containsExactly("dev", "healthcheck"); assertThat(this.environment.getActiveProfiles()).containsExactly("dev", "healthcheck");
String property = this.environment.getProperty("my.property"); }
String property2 = this.environment.getProperty("my.property2");
assertThat(property).isEqualTo("fromdevprofile"); @Test
assertThat(property2).isEqualTo("fromhealthcheckprofile"); public void yamlSetsMultiProfilesWithWithespace() throws Exception {
ConfigurationPropertySources propertySource = (ConfigurationPropertySources) this.environment this.initializer.setSearchNames("testsetmultiprofileswhitespace");
.getPropertySources() this.initializer.postProcessEnvironment(this.environment, this.application);
.get(ConfigFileApplicationListener.APPLICATION_CONFIGURATION_PROPERTY_SOURCE_NAME); assertThat(this.environment.getActiveProfiles()).containsExactly("dev", "healthcheck");
Collection<org.springframework.core.env.PropertySource<?>> sources = propertySource
.getSource();
assertThat(sources).hasSize(3);
List<String> names = new ArrayList<String>();
for (org.springframework.core.env.PropertySource<?> source : sources) {
if (source instanceof EnumerableCompositePropertySource) {
for (org.springframework.core.env.PropertySource<?> nested : ((EnumerableCompositePropertySource) source)
.getSource()) {
names.add(nested.getName());
}
}
else {
names.add(source.getName());
}
}
assertThat(names).contains(
"applicationConfig: [classpath:/testsetmultiprofiles.yml]#healthcheck",
"applicationConfig: [classpath:/testsetmultiprofiles.yml]#dev",
"applicationConfig: [classpath:/testsetmultiprofiles.yml]");
} }
@Test @Test
......
--- ---
spring: spring:
profiles: profiles:
active: dev, healthcheck active: dev,healthcheck
my: \ No newline at end of file
property: fromyamlfile
property2: fromyamlfile
---
spring:
profiles: dev
my:
property: fromdevprofile
---
spring:
profiles: healthcheck
my:
property2: fromhealthcheckprofile
\ No newline at end of file
---
spring:
profiles:
active: dev, healthcheck
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment