From 6874a2fb9a01ff1f70b562138f1c8325f4e70d83 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 11 Oct 2023 14:03:12 +0200 Subject: [PATCH] Polish "Remove @ConditionalOnMissingBean from RestTemplateBuilderConfigurer" See gh-37746 --- .../client/RestTemplateAutoConfigurationTests.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java index 5365bd047d..8e576929f2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java @@ -43,7 +43,6 @@ import org.springframework.mock.http.client.MockClientHttpResponse; import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; @@ -68,12 +67,11 @@ class RestTemplateAutoConfigurationTests { } @Test - void assertExceptionWhenCustomRestTemplateConfigurerIsDefined() { - this.contextRunner - .withUserConfiguration(RestTemplateCustomConfigurerConfig.class) - .run((context) -> assertThrows( BeanDefinitionOverrideException.class, () ->{ - context.getBeanFactory().getBeanDefinition("restTemplateBuilderConfigurer"); - })); + void shouldFailOnCustomRestTemplateBuilderConfigurer() { + this.contextRunner.withUserConfiguration(RestTemplateCustomConfigurerConfig.class) + .run((context) -> assertThat(context).getFailure() + .isInstanceOf(BeanDefinitionOverrideException.class) + .hasMessageContaining("with name 'restTemplateBuilderConfigurer'")); } @Test