From 64d5e904e8056f51a52c546c81edf058eaa8b333 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Mon, 27 Nov 2023 16:26:59 +0800 Subject: [PATCH 1/2] Use AssertJ isInstanceOf where feasible See gh-31694 --- .../support/ConversionServiceFactoryBeanTests.java | 8 ++++---- .../socket/config/HandlersBeanDefinitionParserTests.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java index 697e4fc834..46e2ea2881 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java @@ -117,14 +117,14 @@ class ConversionServiceFactoryBeanTests { private void doTestConversionServiceInApplicationContext(String fileName, Class resourceClass) { ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext(fileName, getClass()); ResourceTestBean tb = ctx.getBean("resourceTestBean", ResourceTestBean.class); - assertThat(resourceClass.isInstance(tb.getResource())).isTrue(); + assertThat(tb.getResource()).isInstanceOf(resourceClass); assertThat(tb.getResourceArray()).hasSize(1); - assertThat(resourceClass.isInstance(tb.getResourceArray()[0])).isTrue(); + assertThat(tb.getResourceArray()[0]).isInstanceOf(resourceClass); assertThat(tb.getResourceMap()).hasSize(1); - assertThat(resourceClass.isInstance(tb.getResourceMap().get("key1"))).isTrue(); + assertThat(tb.getResourceMap().get("key1")).isInstanceOf(resourceClass); assertThat(tb.getResourceArrayMap()).hasSize(1); assertThat(tb.getResourceArrayMap().get("key1")).isNotEmpty(); - assertThat(resourceClass.isInstance(tb.getResourceArrayMap().get("key1")[0])).isTrue(); + assertThat(tb.getResourceArrayMap().get("key1")[0]).isInstanceOf(resourceClass); ctx.close(); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java index d146858d97..5dd4402aa0 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java @@ -243,7 +243,7 @@ public class HandlersBeanDefinitionParserTests { if (handler instanceof WebSocketHandlerDecorator) { handler = ((WebSocketHandlerDecorator) handler).getLastHandler(); } - assertThat(handlerClass.isInstance(handler)).isTrue(); + assertThat(handler).isInstanceOf(handlerClass); } } From f8a40555af8338e27e2f3d4c4fc4c55a472f9dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 28 Nov 2023 12:53:54 +0100 Subject: [PATCH 2/2] Upgrade copyright year of changed file See gh-31694 --- .../web/socket/config/HandlersBeanDefinitionParserTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java index 5dd4402aa0..18c31b5d4e 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.