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

Merge pull request #16758 from izeye 

* pr/16758:
  Polish "Add negative tests to ConfigurationPropertiesScanTests"
  Add negative tests to ConfigurationPropertiesScanTests
This commit is contained in:
Stephane Nicoll 2019-05-10 10:24:36 +02:00
parent 75eb0ef91d c85c653e57
commit 555dd3bcaa
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java
View File

@ -34,6 +34,7 @@ import static org.mockito.BDDMockito.willCallRealMethod;
* Integration tests for {@link ConfigurationPropertiesScan}.
*
* @author Madhura Bhave
* @author Johnny Lim
*/
public class ConfigurationPropertiesScanTests {
@ -52,7 +53,7 @@ public class ConfigurationPropertiesScanTests {
}
@Test
public void scanImportBeanRegistrarShouldBeEnvironmentAware() {
public void scanImportBeanRegistrarShouldBeEnvironmentAwareWithRequiredProfile() {
this.context.getEnvironment().addActiveProfile("test");
load(TestConfiguration.class);
assertThat(this.context.containsBean(
@ -61,7 +62,15 @@ public class ConfigurationPropertiesScanTests {
}
@Test
public void scanImportBeanRegistrarShouldBeResourceLoaderAware() {
public void scanImportBeanRegistrarShouldBeEnvironmentAwareWithoutRequiredProfile() {
load(TestConfiguration.class);
assertThat(this.context.containsBean(
"profile-org.springframework.boot.context.properties.scan.valid.a.AScanConfiguration$MyProfileProperties"))
.isFalse();
}
@Test
public void scanImportBeanRegistrarShouldBeResourceLoaderAwareWithRequiredResource() {
DefaultResourceLoader resourceLoader = Mockito.mock(DefaultResourceLoader.class);
this.context.setResourceLoader(resourceLoader);
willCallRealMethod().given(resourceLoader).getClassLoader();
@ -73,6 +82,14 @@ public class ConfigurationPropertiesScanTests {
.isTrue();
}
@Test
public void scanImportBeanRegistrarShouldBeResourceLoaderAwareWithoutRequiredResource() {
load(TestConfiguration.class);
assertThat(this.context.containsBean(
"resource-org.springframework.boot.context.properties.scan.valid.a.AScanConfiguration$MyResourceProperties"))
.isFalse();
}
private void load(Class<?>... classes) {
this.context.register(classes);
this.context.refresh();