root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix @IntegrationTest context caching 

Add an additional "IntegrationTest" property to @IntegrationTests
to ensure that they get a different MergedContextConfiguration which
is used as a context cache key.

Fixes gh-1909
This commit is contained in:
Phillip Webb 2014-11-13 14:28:20 -08:00
parent 0a6c635f5e
commit 37d0b1a64d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot/src/main/java/org/springframework/boot/test/IntegrationTestPropertiesListener.java
View File

@ -62,16 +62,24 @@ class IntegrationTestPropertiesListener extends AbstractTestExecutionListener {
private void addPropertySourcePropertiesUsingReflection(TestContext testContext, private void addPropertySourcePropertiesUsingReflection(TestContext testContext,
String[] properties) throws Exception { String[] properties) throws Exception {
if (properties.length == 0) {
return;
}
MergedContextConfiguration configuration = (MergedContextConfiguration) ReflectionTestUtils MergedContextConfiguration configuration = (MergedContextConfiguration) ReflectionTestUtils
.getField(testContext, "mergedContextConfiguration"); .getField(testContext, "mergedContextConfiguration");
Set<String> merged = new LinkedHashSet<String>((Arrays.asList(configuration Set<String> merged = new LinkedHashSet<String>((Arrays.asList(configuration
.getPropertySourceProperties()))); .getPropertySourceProperties())));
merged.addAll(Arrays.asList(properties)); merged.addAll(Arrays.asList(properties));
addIntegrationTestProperty(merged);
ReflectionTestUtils.setField(configuration, "propertySourceProperties", ReflectionTestUtils.setField(configuration, "propertySourceProperties",
merged.toArray(new String[merged.size()])); merged.toArray(new String[merged.size()]));
} }
/**
* Add an "IntegrationTest" property to ensure that there is something to
* differentiate regular tests and {@code @IntegrationTest} tests. Without this
* property a cached context could be returned that hadn't started the embedded
* servlet container.
* @param propertySourceProperties the property source properties
*/
private void addIntegrationTestProperty(Set<String> propertySourceProperties) {
propertySourceProperties.add(IntegrationTest.class.getName() + "=true");
}
} }