mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-17 16:39:29 +00:00
Avoid warnings with AssertJ APIs
This commit is contained in:
+3
-2
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
|
||||
+3
-2
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user