Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small assertions improvements

Browse Source 
See gh-34796
This commit is contained in:
Stefano Cordio 2023-03-28 13:11:52 +02:00 committed by Moritz Halbritter
parent cb2773da21
commit d802ca017b
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java
View File

@ -90,10 +90,7 @@ class AopAutoConfigurationTests {
void whenGlobalMethodSecurityIsEnabledAndAspectJIsNotAvailableThenClassProxyingIsStillUsedByDefault() {
this.contextRunner.withClassLoader(new FilteredClassLoader(Advice.class))
.withUserConfiguration(ExampleController.class, EnableGlobalMethodSecurityConfiguration.class)
.run((context) -> {
ExampleController exampleController = context.getBean(ExampleController.class);
assertThat(AopUtils.isCglibProxy(exampleController)).isTrue();
});
.run((context) -> assertThat(context).getBean(ExampleController.class).matches(AopUtils::isCglibProxy));
}
private ContextConsumer<AssertableApplicationContext> proxyTargetClassEnabled() {

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java
View File

@ -655,10 +655,8 @@ class WebFluxAutoConfigurationTests {
this.contextRunner.withConfiguration(AutoConfigurations.of(AopAutoConfiguration.class))
.withBean(ExceptionHandlerInterceptor.class)
.withPropertyValues("spring.webflux.problemdetails.enabled:true")
.run((context) -> {
assertThat(context).hasSingleBean(ProblemDetailsExceptionHandler.class);
assertThat(AopUtils.isCglibProxy(context.getBean(ProblemDetailsExceptionHandler.class))).isTrue();
});
.run((context) -> assertThat(context).getBean(ProblemDetailsExceptionHandler.class)
.matches(AopUtils::isCglibProxy));
}
@Test

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
View File

@ -998,10 +998,8 @@ class WebMvcAutoConfigurationTests {
this.contextRunner.withConfiguration(AutoConfigurations.of(AopAutoConfiguration.class))
.withBean(ExceptionHandlerInterceptor.class)
.withPropertyValues("spring.mvc.problemdetails.enabled:true")
.run((context) -> {
assertThat(context).hasSingleBean(ProblemDetailsExceptionHandler.class);
assertThat(AopUtils.isCglibProxy(context.getBean(ProblemDetailsExceptionHandler.class))).isTrue();
});
.run((context) -> assertThat(context).getBean(ProblemDetailsExceptionHandler.class)
.matches(AopUtils::isCglibProxy));
}
@Test

12
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java
View File

@ -223,13 +223,11 @@ class RestartClassLoaderTests {
new URL[] { this.sampleJarFile.toURI().toURL() }, this.updatedFiles)) {
new ApplicationContextRunner().withClassLoader(restartClassLoader)
.withUserConfiguration(ProxyConfiguration.class)
.run((context) -> {
assertThat(context).hasNotFailed();
ExampleTransactional transactional = context.getBean(ExampleTransactional.class);
assertThat(AopUtils.isCglibProxy(transactional)).isTrue();
assertThat(transactional.getClass().getClassLoader())
.isEqualTo(ExampleTransactional.class.getClassLoader());
});
.run((context) -> assertThat(context).getBean(ExampleTransactional.class)
.matches(AopUtils::isCglibProxy)
.extracting(Object::getClass)
.extracting(Class::getClassLoader)
.isEqualTo(ExampleTransactional.class.getClassLoader()));
}
}