Skip to content

S
spring-boot
Commit 5d949cc7 authored by Madhura Bhave's avatar Madhura Bhave
Browse files
Options

Merge branch '2.0.x'

parents a8707c52 35af1667
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerYamlProfileNegationTests.java
View file @ 5d949cc7
...@@ -94,7 +94,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests { ...@@ -94,7 +94,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests {
application.setWebApplicationType(WebApplicationType.NONE); application.setWebApplicationType(WebApplicationType.NONE);
String configName = "--spring.config.name=cascadingprofiles"; String configName = "--spring.config.name=cascadingprofiles";
this.context = application.run(configName); this.context = application.run(configName);
assertVersionProperty(this.context, "E", "D", "C", "E", "A", "B"); assertVersionProperty(this.context, "E", "A", "B", "C", "E", "D");
assertThat(this.context.getEnvironment().getProperty("not-a")).isNull(); assertThat(this.context.getEnvironment().getProperty("not-a")).isNull();
assertThat(this.context.getEnvironment().getProperty("not-b")).isNull(); assertThat(this.context.getEnvironment().getProperty("not-b")).isNull();
assertThat(this.context.getEnvironment().getProperty("not-c")).isNull(); assertThat(this.context.getEnvironment().getProperty("not-c")).isNull();
...@@ -108,7 +108,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests { ...@@ -108,7 +108,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests {
application.setWebApplicationType(WebApplicationType.NONE); application.setWebApplicationType(WebApplicationType.NONE);
String configName = "--spring.config.name=cascadingprofiles"; String configName = "--spring.config.name=cascadingprofiles";
this.context = application.run(configName, "--spring.profiles.active=A"); this.context = application.run(configName, "--spring.profiles.active=A");
assertVersionProperty(this.context, "E", "C", "E", "A"); assertVersionProperty(this.context, "E", "A", "C", "E");
assertThat(this.context.getEnvironment().getProperty("not-a")).isNull(); assertThat(this.context.getEnvironment().getProperty("not-a")).isNull();
assertThat(this.context.getEnvironment().getProperty("not-b")).isEqualTo("true"); assertThat(this.context.getEnvironment().getProperty("not-b")).isEqualTo("true");
assertThat(this.context.getEnvironment().getProperty("not-c")).isNull(); assertThat(this.context.getEnvironment().getProperty("not-c")).isNull();
...@@ -122,7 +122,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests { ...@@ -122,7 +122,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests {
application.setWebApplicationType(WebApplicationType.NONE); application.setWebApplicationType(WebApplicationType.NONE);
String configName = "--spring.config.name=cascadingprofiles"; String configName = "--spring.config.name=cascadingprofiles";
this.context = application.run(configName, "--spring.profiles.active=B"); this.context = application.run(configName, "--spring.profiles.active=B");
assertVersionProperty(this.context, "E", "D", "E", "B"); assertVersionProperty(this.context, "E", "B", "D", "E");
assertThat(this.context.getEnvironment().getProperty("not-a")).isEqualTo("true"); assertThat(this.context.getEnvironment().getProperty("not-a")).isEqualTo("true");
assertThat(this.context.getEnvironment().getProperty("not-b")).isNull(); assertThat(this.context.getEnvironment().getProperty("not-b")).isNull();
assertThat(this.context.getEnvironment().getProperty("not-c")).isEqualTo("true"); assertThat(this.context.getEnvironment().getProperty("not-c")).isEqualTo("true");
......
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