root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Avoid warnings with AssertJ APIs

This commit is contained in:
Sam Brannen 2025-09-29 17:11:42 +02:00
parent 60673a0e32
commit 8dd64602e8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ApiVersionMethodArgumentResolverTests.java
View File

@ -32,6 +32,7 @@ import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRe
import org.springframework.web.testfixture.server.MockServerWebExchange;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.InstanceOfAssertFactories.OPTIONAL;
/**
* Tests for {@link ApiVersionMethodArgumentResolver}.
@ -94,13 +95,13 @@ class ApiVersionMethodArgumentResolverTests {
this.exchange.getAttributes().put(HandlerMapping.API_VERSION_ATTRIBUTE, version);
Object actual = this.resolver.resolveArgumentValue(this.optionalParam, new BindingContext(), exchange);
assertThat(((Optional) actual)).hasValue(version);
assertThat(actual).asInstanceOf(OPTIONAL).hasValue(version);
}
@Test
void resolveOptionalArgumentWhenEmpty() {
Object actual = this.resolver.resolveArgumentValue(this.optionalParam, new BindingContext(), exchange);
assertThat(((Optional) actual)).isEmpty();
assertThat(actual).asInstanceOf(OPTIONAL).isEmpty();
}

5
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ApiVersionMethodArgumentResolverTests.java
View File

@ -32,6 +32,7 @@ import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.InstanceOfAssertFactories.OPTIONAL;
/**
* Test fixture with {@link ApiVersionMethodArgumentResolver}.
@ -102,13 +103,13 @@ class ApiVersionMethodArgumentResolverTests {
this.servletRequest.setAttribute(HandlerMapping.API_VERSION_ATTRIBUTE, version);
Object actual = this.resolver.resolveArgument(this.optionalParam, this.mav, this.webRequest, null);
assertThat(((Optional) actual)).hasValue(version);
assertThat(actual).asInstanceOf(OPTIONAL).hasValue(version);
}
@Test
void resolveOptionalArgumentWhenEmpty() throws Exception {
Object actual = this.resolver.resolveArgument(this.optionalParam, this.mav, this.webRequest, null);
assertThat(((Optional) actual)).isEmpty();
assertThat(actual).asInstanceOf(OPTIONAL).isEmpty();
}