From c65345bb6d22b7fa0f121901f368ce3bab5b4f5d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 3 Feb 2020 08:54:52 +0100 Subject: [PATCH] Adapt tests to bean overriding rules --- .../config/VaultBootstrapPropertySourceConfigurationTests.java | 3 +++ .../vault/config/VaultReactiveBootstrapConfigurationTests.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java index a8be6c44..73bfd83e 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java @@ -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 diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java index 8c9201e8..48c8bfcd 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java @@ -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() {