From e2f2099197b27d5135129807b3c1b8ad6e8f5463 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 28 Oct 2014 16:12:14 +0000 Subject: [PATCH] Add test for gh-1776 --- .../boot/builder/SpringApplicationBuilderTests.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java index e0b0db9507..6afb05bf32 100644 --- a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java @@ -178,6 +178,17 @@ public class SpringApplicationBuilderTests { assertThat(this.context.getEnvironment().getProperty("bar"), is(equalTo("spam"))); } + @Test + public void parentFirstWithDifferentProfile() throws Exception { + SpringApplicationBuilder application = new SpringApplicationBuilder( + ExampleConfig.class).profiles("node").properties("transport=redis") + .child(ChildConfig.class).profiles("admin").web(false); + this.context = application.run(); + assertThat(this.context.getEnvironment().acceptsProfiles("node"), is(true)); + assertThat(this.context.getParent().getEnvironment().acceptsProfiles("admin"), + is(false)); + } + @Test public void parentContextIdentical() throws Exception { SpringApplicationBuilder application = new SpringApplicationBuilder(