Add support for @TestPropertySource locations

Update SpringApplicationContextLoader to support @TestPropertySource
location attributes.

Fixes gh-2198

Author: philwebb

spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java

@@ -33,6 +33,7 @@
 import org.springframework.boot.context.web.ServletContextApplicationContextInitializer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.SpringVersion;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -44,6 +45,7 @@
 import org.springframework.test.context.MergedContextConfiguration;
 import org.springframework.test.context.support.AbstractContextLoader;
 import org.springframework.test.context.support.AnnotationConfigContextLoaderUtils;
+import org.springframework.test.context.support.TestPropertySourceUtils;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.context.web.WebMergedContextConfiguration;
 import org.springframework.util.Assert;
@@ -95,7 +97,10 @@ public ApplicationContext loadContext(MergedContextConfiguration config)
 			application.setWebEnvironment(false);
 		}
 		application.setInitializers(initializers);
-		return application.run();
+		ConfigurableApplicationContext applicationContext = application.run();
+		TestPropertySourceUtils.addPropertiesFilesToEnvironment(applicationContext,
+				config.getPropertySourceLocations());
+		return applicationContext;
 	}
 
 	private void assertValidAnnotations(Class<?> testClass) {

spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestPropertyLocationTests.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2012-2015 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.test;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationIntegrationTestTests.Config;
+import org.springframework.core.env.Environment;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Tests for {@link IntegrationTest} with {@link TestPropertySource} locations.
+ *
+ * @author Phillip Webb
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = Config.class)
+@WebAppConfiguration
+@IntegrationTest({ "server.port=0", "value1=123" })
+@TestPropertySource(properties = "value2=456", locations = "classpath:/test-property-source-annotation.properties")
+public class SpringApplicationIntegrationTestPropertyLocationTests {
+
+	@Autowired
+	private Environment environment;
+
+	@Test
+	public void loadedProperties() throws Exception {
+		assertThat(this.environment.getProperty("value1"), equalTo("123"));
+		assertThat(this.environment.getProperty("value2"), equalTo("456"));
+		assertThat(this.environment.getProperty("annotation-referenced"),
+				equalTo("fromfile"));
+	}
+
+}

spring-boot/src/test/resources/test-property-source-annotation.properties

@@ -0,0 +1 @@
+annotation-referenced=fromfile