Skip to content

Commit 6874a2f

Browse files
committed
Polish "Remove @ConditionalOnMissingBean from RestTemplateBuilderConfigurer"
See gh-37746
1 parent 882e29d commit 6874a2f

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.springframework.web.client.RestTemplate;
4444

4545
import static org.assertj.core.api.Assertions.assertThat;
46-
import static org.junit.jupiter.api.Assertions.assertThrows;
4746
import static org.mockito.ArgumentMatchers.any;
4847
import static org.mockito.BDDMockito.given;
4948
import static org.mockito.BDDMockito.then;
@@ -68,12 +67,11 @@ void restTemplateBuilderConfigurerShouldBeLazilyDefined() {
6867
}
6968

7069
@Test
71-
void assertExceptionWhenCustomRestTemplateConfigurerIsDefined() {
72-
this.contextRunner
73-
.withUserConfiguration(RestTemplateCustomConfigurerConfig.class)
74-
.run((context) -> assertThrows( BeanDefinitionOverrideException.class, () ->{
75-
context.getBeanFactory().getBeanDefinition("restTemplateBuilderConfigurer");
76-
}));
70+
void shouldFailOnCustomRestTemplateBuilderConfigurer() {
71+
this.contextRunner.withUserConfiguration(RestTemplateCustomConfigurerConfig.class)
72+
.run((context) -> assertThat(context).getFailure()
73+
.isInstanceOf(BeanDefinitionOverrideException.class)
74+
.hasMessageContaining("with name 'restTemplateBuilderConfigurer'"));
7775
}
7876

7977
@Test

0 commit comments

Comments
 (0)