Test for placeholder-specified default value within @Value

Issue: SPR-14025

spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassWithPlaceholderConfigurerBeanTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ import static org.junit.Assert.*;
  * and @Value fields in the same configuration class are mutually exclusive.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  */
 public class ConfigurationClassWithPlaceholderConfigurerBeanTests {
 
@@ -49,7 +50,7 @@ public class ConfigurationClassWithPlaceholderConfigurerBeanTests {
 	 * cannot be declared in the same configuration class that has a @Value
 	 * field in need of placeholder replacement. It's an obvious chicken-and-egg issue.
 	 * The solution is to do as {@link #valueFieldsAreProcessedWhenPlaceholderConfigurerIsSegregated()}
-	 * does and segragate the two bean definitions across configuration classes.
+	 * does and segregate the two bean definitions across configuration classes.
 	 */
 	@Ignore @Test
 	public void valueFieldsAreNotProcessedWhenPlaceholderConfigurerIsIntegrated() {
@@ -75,32 +76,44 @@ public class ConfigurationClassWithPlaceholderConfigurerBeanTests {
 		TestBean testBean = ctx.getBean(TestBean.class);
 		assertThat(testBean.getName(), equalTo("foo"));
 	}
-}
 
-@Configuration
+	@Test
-class ConfigWithValueField {
+	public void valueFieldsResolveToPlaceholderSpecifiedDefaultValue() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(ConfigWithValueField.class);
+		ctx.register(ConfigWithPlaceholderConfigurer.class);
+		ctx.refresh();
 
-	@Value("${test.name}")
+		TestBean testBean = ctx.getBean(TestBean.class);
+		assertThat(testBean.getName(), equalTo("bar"));
+	}
+
+
+	@Configuration
+	static class ConfigWithValueField {
+
+		@Value("${test.name:bar}")
 		private String name;
 
 		@Bean
 		public ITestBean testBean() {
 			return new TestBean(this.name);
 		}
-}
+	}
 
-@Configuration
+
-class ConfigWithPlaceholderConfigurer {
+	@Configuration
+	static class ConfigWithPlaceholderConfigurer {
 
 		@Bean
 		public PropertySourcesPlaceholderConfigurer ppc() {
 			return new PropertySourcesPlaceholderConfigurer();
 		}
+	}
 
-}
 
-@Configuration
+	@Configuration
-class ConfigWithValueFieldAndPlaceholderConfigurer {
+	static class ConfigWithValueFieldAndPlaceholderConfigurer {
 
 		@Value("${test.name}")
 		private String name;
@@ -114,5 +127,6 @@ class ConfigWithValueFieldAndPlaceholderConfigurer {
 		public PropertySourcesPlaceholderConfigurer ppc() {
 			return new PropertySourcesPlaceholderConfigurer();
 		}
+	}
 
 }