Convert assertThat(x instanceof X).isTrue() to assertThat(x).isInstanceOf()

Search:  assertThat\((.+?) instanceof (.+?)\)(.*?)\.isTrue\(\)

Replace: assertThat($1)$3.isInstanceOf($2.class)

See gh-36504
This commit is contained in:
Sam Brannen
2026-03-20 10:54:23 +01:00
parent 4357bbd31b
commit a40ec44cb7
70 changed files with 176 additions and 175 deletions
@@ -67,7 +67,7 @@ class HeadersMethodArgumentResolverTests {
MethodParameter param = this.resolvable.annotPresent(Headers.class).arg(Map.class, String.class, Object.class);
Object resolved = this.resolver.resolveArgument(param, this.message);
assertThat(resolved instanceof Map).isTrue();
assertThat(resolved).isInstanceOf(Map.class);
@SuppressWarnings("unchecked")
Map<String, Object> headers = (Map<String, Object>) resolved;
assertThat(headers.get("foo")).isEqualTo("bar");
@@ -83,7 +83,7 @@ class HeadersMethodArgumentResolverTests {
void resolveArgumentMessageHeaders() throws Exception {
Object resolved = this.resolver.resolveArgument(this.resolvable.arg(MessageHeaders.class), this.message);
assertThat(resolved instanceof MessageHeaders).isTrue();
assertThat(resolved).isInstanceOf(MessageHeaders.class);
MessageHeaders headers = (MessageHeaders) resolved;
assertThat(headers.get("foo")).isEqualTo("bar");
}
@@ -93,7 +93,7 @@ class HeadersMethodArgumentResolverTests {
MethodParameter param = this.resolvable.arg(MessageHeaderAccessor.class);
Object resolved = this.resolver.resolveArgument(param, this.message);
assertThat(resolved instanceof MessageHeaderAccessor).isTrue();
assertThat(resolved).isInstanceOf(MessageHeaderAccessor.class);
MessageHeaderAccessor headers = (MessageHeaderAccessor) resolved;
assertThat(headers.getHeader("foo")).isEqualTo("bar");
}
@@ -103,7 +103,7 @@ class HeadersMethodArgumentResolverTests {
MethodParameter param = this.resolvable.arg(TestMessageHeaderAccessor.class);
Object resolved = this.resolver.resolveArgument(param, this.message);
assertThat(resolved instanceof TestMessageHeaderAccessor).isTrue();
assertThat(resolved).isInstanceOf(TestMessageHeaderAccessor.class);
TestMessageHeaderAccessor headers = (TestMessageHeaderAccessor) resolved;
assertThat(headers.getHeader("foo")).isEqualTo("bar");
}
@@ -226,9 +226,9 @@ class MessageMethodArgumentResolverTests {
this.resolver = new MessageMethodArgumentResolver(new MappingJackson2MessageConverter());
Object actual = this.resolver.resolveArgument(parameter, inMessage);
assertThat(actual instanceof Message).isTrue();
assertThat(actual).isInstanceOf(Message.class);
Message<?> outMessage = (Message<?>) actual;
assertThat(outMessage.getPayload() instanceof Foo).isTrue();
assertThat(outMessage.getPayload()).isInstanceOf(Foo.class);
assertThat(((Foo) outMessage.getPayload()).getFoo()).isEqualTo("bar");
}