Browse Source

Avoid warnings with AssertJ APIs

pull/35567/head
Sam Brannen 3 months ago
parent
commit
8dd64602e8
  1. 5
      spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ApiVersionMethodArgumentResolverTests.java
  2. 5
      spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ApiVersionMethodArgumentResolverTests.java

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

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

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

Loading…
Cancel
Save