Align precedence of @SpringBootTest properties with @TestPropertySource
This commit updates the precedence of properties configured using @SpringBootTest to align with @TestPropertySource. Properties configured using properties on @SpringBootTest are now added to the same property source as those configured using properties on @TestPropertySource so the precedence described in the javadoc of @TestPropertySource now applies in full. Additionally, if both @TestPropertySource properties and @SpringBootTest properties configure the same property, the value from @TestPropertySource will win. Closes gh-4828
This commit is contained in:
Andy Wilkinson
@@ -1,85 +0,0 @@
|
||||
/*
|
||||
* Copyright 2012-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.
|
||||
* 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.context;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.test.annotation.DirtiesContext;
|
||||
import org.springframework.test.context.TestPropertySource;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for {@link SpringBootTest} with {@link TestPropertySource} locations.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@DirtiesContext
|
||||
@SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = "value1=123")
|
||||
@TestPropertySource(properties = "value2=456", locations = "classpath:/test-property-source-annotation.properties")
|
||||
public class SpringBootTestPropertyLocationTests {
|
||||
|
||||
@Autowired
|
||||
private Environment environment;
|
||||
|
||||
@Test
|
||||
public void loadedProperties() throws Exception {
|
||||
assertThat(this.environment.getProperty("value1")).isEqualTo("123");
|
||||
assertThat(this.environment.getProperty("value2")).isEqualTo("456");
|
||||
assertThat(this.environment.getProperty("annotation-referenced"))
|
||||
.isEqualTo("fromfile");
|
||||
}
|
||||
|
||||
@Configuration
|
||||
static class Config {
|
||||
|
||||
@Value("${value1}")
|
||||
private String value1;
|
||||
|
||||
@Value("${value2}")
|
||||
private String value2;
|
||||
|
||||
@Value("${annotation-referenced}")
|
||||
private String annotationReferenced;
|
||||
|
||||
@PostConstruct
|
||||
void checkValues() {
|
||||
assertThat(this.value1).isEqualTo("123");
|
||||
assertThat(this.value2).isEqualTo("456");
|
||||
assertThat(this.annotationReferenced).isEqualTo("fromfile");
|
||||
}
|
||||
|
||||
@Bean
|
||||
public static PropertySourcesPlaceholderConfigurer propertyPlaceholder() {
|
||||
return new PropertySourcesPlaceholderConfigurer();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
/*
|
||||
* Copyright 2012-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.
|
||||
* 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.context;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
|
||||
import org.springframework.test.annotation.DirtiesContext;
|
||||
import org.springframework.test.context.TestPropertySource;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for using {@link SpringBootTest} with {@link TestPropertySource}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@DirtiesContext
|
||||
@SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = {
|
||||
"boot-test-inlined=foo", "b=boot-test-inlined", "c=boot-test-inlined" })
|
||||
@TestPropertySource(properties = { "property-source-inlined=bar",
|
||||
"a=property-source-inlined",
|
||||
"c=property-source-inlined" }, locations = "classpath:/test-property-source-annotation.properties")
|
||||
public class SpringBootTestWithTestPropertySourceTests {
|
||||
|
||||
@Autowired
|
||||
private Config config;
|
||||
|
||||
@Test
|
||||
public void propertyFromSpringBootTestProperties() {
|
||||
assertThat(this.config.bootTestInlined).isEqualTo("foo");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void propertyFromTestPropertySourceProperties() {
|
||||
assertThat(this.config.propertySourceInlined).isEqualTo("bar");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void propertyFromTestPropertySourceLocations() {
|
||||
assertThat(this.config.propertySourceLocation).isEqualTo("baz");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void propertyFromPropertySourcePropertiesOverridesPropertyFromPropertySourceLocations() {
|
||||
assertThat(this.config.propertySourceInlinedOverridesPropertySourceLocation)
|
||||
.isEqualTo("property-source-inlined");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void propertyFromBootTestPropertiesOverridesPropertyFromPropertySourceLocations() {
|
||||
assertThat(this.config.bootTestInlinedOverridesPropertySourceLocation)
|
||||
.isEqualTo("boot-test-inlined");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void propertyFromPropertySourcePropertiesOverridesPropertyFromBootTestProperties() {
|
||||
assertThat(this.config.propertySourceInlinedOverridesBootTestInlined)
|
||||
.isEqualTo("property-source-inlined");
|
||||
}
|
||||
|
||||
@Configuration
|
||||
static class Config {
|
||||
|
||||
@Value("${boot-test-inlined}")
|
||||
private String bootTestInlined;
|
||||
|
||||
@Value("${property-source-inlined}")
|
||||
private String propertySourceInlined;
|
||||
|
||||
@Value("${property-source-location}")
|
||||
private String propertySourceLocation;
|
||||
|
||||
@Value("${a}")
|
||||
private String propertySourceInlinedOverridesPropertySourceLocation;
|
||||
|
||||
@Value("${b}")
|
||||
private String bootTestInlinedOverridesPropertySourceLocation;
|
||||
|
||||
@Value("${c}")
|
||||
private String propertySourceInlinedOverridesBootTestInlined;
|
||||
|
||||
@Bean
|
||||
public static PropertySourcesPlaceholderConfigurer propertyPlaceholder() {
|
||||
return new PropertySourcesPlaceholderConfigurer();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1 +1,3 @@
|
||||
annotation-referenced=fromfile
|
||||
property-source-location=baz
|
||||
a=property-source-location
|
||||
b=property-source-location
|
||||
|
||||
Reference in New Issue
Block a user