Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore setExtractBareNamePropertyMethods() for AssertJ

Browse Source 
Closes gh-16325
This commit is contained in:
Johnny Lim
2019-03-26 21:53:28 +09:00
committed by Stephane Nicoll
parent a2d37dc0b9
commit 038e213343
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,23 +413,25 @@ public class WebFluxAutoConfigurationTests {
@Test
public void cachePeriod() {
Assertions.setExtractBareNamePropertyMethods(false);
this.contextRunner.withPropertyValues("spring.resources.cache.period:5")
.run((context) -> {
Map<PathPattern, Object> handlerMap = getHandlerMap(context);
assertThat(handlerMap).hasSize(2);
for (Object handler : handlerMap.values()) {
if (handler instanceof ResourceWebHandler) {
Assertions.setExtractBareNamePropertyMethods(false);
assertThat(((ResourceWebHandler) handler).getCacheControl())
.isEqualToComparingFieldByField(
CacheControl.maxAge(5, TimeUnit.SECONDS));
}
}
});
Assertions.setExtractBareNamePropertyMethods(true);
}
@Test
public void cacheControl() {
Assertions.setExtractBareNamePropertyMethods(false);
this.contextRunner
.withPropertyValues("spring.resources.cache.cachecontrol.max-age:5",
"spring.resources.cache.cachecontrol.proxy-revalidate:true")
@@ -438,7 +440,6 @@ public class WebFluxAutoConfigurationTests {
assertThat(handlerMap).hasSize(2);
for (Object handler : handlerMap.values()) {
if (handler instanceof ResourceWebHandler) {
Assertions.setExtractBareNamePropertyMethods(false);
assertThat(((ResourceWebHandler) handler).getCacheControl())
.isEqualToComparingFieldByField(
CacheControl.maxAge(5, TimeUnit.SECONDS)
@@ -446,6 +447,7 @@ public class WebFluxAutoConfigurationTests {
}
}
});
Assertions.setExtractBareNamePropertyMethods(true);
}
private Map<PathPattern, Object> getHandlerMap(ApplicationContext context) {