Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Madhura Bhave
2019-04-22 22:33:22 -07:00
parent 9fb65e57c0
commit 5c2a7e61d0
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanRegistrarTests.java
View File

@@ -17,6 +17,7 @@ package org.springframework.boot.context.properties;
import java.io.IOException; import java.io.IOException;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
@@ -27,6 +28,7 @@ import org.springframework.boot.context.properties.scan.invalid.d.OtherInvalidCo
import org.springframework.boot.context.properties.scan.valid.ConfigurationPropertiesScanConfiguration; import org.springframework.boot.context.properties.scan.valid.ConfigurationPropertiesScanConfiguration;
import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.classreading.SimpleMetadataReaderFactory; import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
import org.springframework.mock.env.MockEnvironment;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -42,6 +44,11 @@ public class ConfigurationPropertiesScanRegistrarTests {
private final DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); private final DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
@Before
public void setup() {
this.registrar.setEnvironment(new MockEnvironment());
}
@Test @Test
public void registerBeanDefintionsShouldScanForConfigurationProperties() public void registerBeanDefintionsShouldScanForConfigurationProperties()
throws IOException { throws IOException {

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

@@ -53,7 +53,7 @@ public class ConfigurationPropertiesScanTests {
@Test @Test
public void scanImportBeanRegistrarShouldBeEnvironmentAware() { public void scanImportBeanRegistrarShouldBeEnvironmentAware() {
// this.context.getEnvironment().addActiveProfile("test"); this.context.getEnvironment().addActiveProfile("test");
load(TestConfiguration.class); load(TestConfiguration.class);
assertThat(this.context.containsBean( assertThat(this.context.containsBean(
"profile-org.springframework.boot.context.properties.scan.valid.a.AScanConfiguration$MyProfileProperties")) "profile-org.springframework.boot.context.properties.scan.valid.a.AScanConfiguration$MyProfileProperties"))

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/a/AScanConfiguration.java
View File

@@ -20,7 +20,6 @@ import org.springframework.context.annotation.Condition;
import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.ConditionContext;
import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.core.type.AnnotatedTypeMetadata;
/** /**
@@ -49,9 +48,7 @@ public class AScanConfiguration {
@Override @Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
ByteArrayResource resource = (ByteArrayResource) context.getResourceLoader() return context.getResourceLoader().getResource("test").exists();
.getResource("test");
return (new String(resource.getByteArray())).equals("test");
} }
} }