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

Add test case for profile ordering

Browse Source 
The command line profile (or equivalently System property) is
not winning right now. Arguably that should be fixed. (Thinking...)

Relevant to gh-342
This commit is contained in:
Dave Syer
2014-02-17 11:05:15 +00:00
parent 05fd50d190
commit d5de29b76c
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

@@ -59,6 +59,7 @@ import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.sameInstance;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -277,6 +278,29 @@ public class SpringApplicationTests {
assertEquals("bucket", environment.getProperty("foo"));
}
@Test
public void addProfiles() throws Exception {
SpringApplication application = new SpringApplication(ExampleConfig.class);
application.setWebEnvironment(false);
application.setAdditionalProfiles("foo");
ConfigurableEnvironment environment = new StandardEnvironment();
application.setEnvironment(environment);
application.run();
assertTrue(environment.acceptsProfiles("foo"));
}
@Test
public void addProfilesOrder() throws Exception {
SpringApplication application = new SpringApplication(ExampleConfig.class);
application.setWebEnvironment(false);
application.setAdditionalProfiles("foo");
ConfigurableEnvironment environment = new StandardEnvironment();
application.setEnvironment(environment);
application.run("--spring.profiles.active=bar");
// Command line arguably should always come last (not the case currently)
assertArrayEquals(new String[] { "bar", "foo" }, environment.getActiveProfiles());
}
@Test
public void emptyCommandLinePropertySourceNotAdded() throws Exception {
SpringApplication application = new SpringApplication(ExampleConfig.class);
@@ -284,8 +308,7 @@ public class SpringApplicationTests {
ConfigurableEnvironment environment = new StandardEnvironment();
application.setEnvironment(environment);
application.run();
assertFalse(hasPropertySource(environment, PropertySource.class,
"commandLineArgs"));
assertEquals("bucket", environment.getProperty("foo"));
}
@Test