From 0e1a237139e8035860457d129bd93451291e11f5 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 8 Nov 2019 09:17:25 +0000 Subject: [PATCH] Polishing --- .../support/PrincipalMethodArgumentResolverTests.java | 7 ++----- .../annotation/PrincipalMethodArgumentResolverTests.java | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolverTests.java index 0f9664aa40..7ccbb7e79a 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolverTests.java @@ -62,15 +62,12 @@ public class PrincipalMethodArgumentResolverTests { param = this.testMethod.arg(Optional.class, Principal.class); actual = this.resolver.resolveArgument(param, message); - assertThat(Optional.class.isAssignableFrom(actual.getClass())).isTrue(); - assertThat(((Optional) actual).get()).isSameAs(user); + assertThat(actual).isInstanceOf(Optional.class).extracting(o -> ((Optional) o).get()).isSameAs(user); } @SuppressWarnings("unused") - void handle( - Principal user, - Optional optionalUser) { + void handle(Principal user, Optional optionalUser) { } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PrincipalMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PrincipalMethodArgumentResolverTests.java index e12ab79928..32078174ff 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PrincipalMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PrincipalMethodArgumentResolverTests.java @@ -55,24 +55,22 @@ public class PrincipalMethodArgumentResolverTests { @Test public void resolverArgument() { - BindingContext context = new BindingContext(); Principal user = () -> "Joe"; ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/")) .mutate().principal(Mono.just(user)).build(); + BindingContext context = new BindingContext(); MethodParameter param = this.testMethod.arg(Principal.class); Object actual = this.resolver.resolveArgument(param, context, exchange).block(); assertThat(actual).isSameAs(user); param = this.testMethod.arg(Mono.class, Principal.class); actual = this.resolver.resolveArgument(param, context, exchange).block(); - assertThat(Mono.class.isAssignableFrom(actual.getClass())).isTrue(); - assertThat(((Mono) actual).block()).isSameAs(user); + assertThat(actual).isInstanceOf(Mono.class).extracting(o -> ((Mono) o).block()).isSameAs(user); param = this.testMethod.arg(Single.class, Principal.class); actual = this.resolver.resolveArgument(param, context, exchange).block(); - assertThat(Single.class.isAssignableFrom(actual.getClass())).isTrue(); - assertThat(((Single) actual).blockingGet()).isSameAs(user); + assertThat(actual).isInstanceOf(Single.class).extracting(o -> ((Single) o).blockingGet()).isSameAs(user); }