Test for property placeholder with defaults

Test property placeholder with multiple locations and default values.

Issue: SPR-10619

Author: philwebb

spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java

@@ -265,4 +265,23 @@ public void getAppliedPropertySourcesTooEarly() throws Exception {
 		thrown.expect(IllegalStateException.class);
 		ppc.getAppliedPropertySources();
 	}
+
+	@Test
+	public void multipleLocationsWithDefaultResolvedValue() throws Exception {
+		// SPR-10619
+		PropertySourcesPlaceholderConfigurer ppc = new PropertySourcesPlaceholderConfigurer();
+		ClassPathResource doesNotHave = new ClassPathResource("test.properties", getClass());
+		ClassPathResource setToTrue = new ClassPathResource("placeholder.properties", getClass());
+		ppc.setLocations(new Resource[] { doesNotHave, setToTrue });
+		ppc.setIgnoreResourceNotFound(true);
+		ppc.setIgnoreUnresolvablePlaceholders(true);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerBeanDefinition("testBean",
+				genericBeanDefinition(TestBean.class)
+					.addPropertyValue("jedi", "${jedi:false}")
+					.getBeanDefinition());
+		ppc.postProcessBeanFactory(bf);
+		assertThat(bf.getBean(TestBean.class).isJedi(), equalTo(true));
+	}
+
 }

spring-context/src/test/java/org/springframework/context/support/placeholder.properties

@@ -1,3 +1,4 @@
 targetName=wrappedAssemblerOne
 logicName=logicTwo
 realLogicName=realLogic
+jedi=true