SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt tests to bean overriding rules

Browse Source
This commit is contained in:
Mark Paluch
2020-02-03 08:54:52 +01:00
parent b6e8b256f2
commit c65345bb6d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java
View File

@@ -24,6 +24,7 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.vault.core.VaultOperations;
import org.springframework.vault.core.lease.LeaseEndpoints;
@@ -48,6 +49,7 @@ public class VaultBootstrapPropertySourceConfigurationTests {
public void shouldConfigureExpiryTimeouts() {
this.contextRunner.withUserConfiguration(MockConfiguration.class)
.withAllowBeanDefinitionOverriding(true)
.withPropertyValues("spring.cloud.vault.generic.enabled=false",
"spring.cloud.vault.config.lifecycle.expiry-threshold=5m",
"spring.cloud.vault.config.lifecycle.min-renewal=6m",
@@ -63,6 +65,7 @@ public class VaultBootstrapPropertySourceConfigurationTests {
}
@EnableConfigurationProperties(VaultProperties.class)
@Configuration(proxyBeanMethods = false)
private static class MockConfiguration {
@Bean

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
View File

@@ -48,7 +48,8 @@ public class VaultReactiveBootstrapConfigurationTests {
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(
AutoConfigurations.of(VaultReactiveBootstrapConfiguration.class));
AutoConfigurations.of(VaultReactiveBootstrapConfiguration.class))
.withAllowBeanDefinitionOverriding(true);
@Test
public void shouldConfigureTemplate() {