From ea5abb146cb8f6db3bfaefdb36d46aa2beb46cd6 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Fri, 25 Apr 2025 08:20:59 +0900 Subject: [PATCH] Replace AssertionsForClassTypes with Assertions Signed-off-by: Johnny Lim --- .../CglibSubclassingInstantiationStrategyTests.java | 2 +- .../cache/annotation/ReactiveCachingTests.java | 2 +- .../core/serializer/SerializerTests.java | 2 +- .../support/BootstrapTestUtilsMergedConfigTests.java | 10 +++------- .../annotation/EnableTransactionManagementTests.java | 2 +- .../support/IntegerToEnumConverterFactoryTests.java | 2 +- .../web/accept/DefaultApiVersionStrategiesTests.java | 4 ++-- .../web/accept/PathApiVersionResolverTests.java | 2 +- .../web/accept/SemanticApiVersionParserTests.java | 2 +- .../accept/DefaultApiVersionStrategiesTests.java | 4 ++-- .../reactive/accept/PathApiVersionResolverTests.java | 2 +- .../result/condition/VersionRequestConditionTests.java | 4 ++-- .../view/FragmentViewResolutionResultHandlerTests.java | 2 +- .../ReactorNettyRequestUpgradeStrategyTests.java | 2 +- .../mvc/condition/VersionRequestConditionTests.java | 4 ++-- .../RequestMappingVersionHandlerMethodTests.java | 2 +- 16 files changed, 22 insertions(+), 26 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategyTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategyTests.java index d5b6ad2dffa5..d826a54eba29 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategyTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategyTests.java @@ -25,8 +25,8 @@ import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; /** * Tests for {@link CglibSubclassingInstantiationStrategy}. diff --git a/spring-context/src/test/java/org/springframework/cache/annotation/ReactiveCachingTests.java b/spring-context/src/test/java/org/springframework/cache/annotation/ReactiveCachingTests.java index 555f7c2ea8e5..02620a8572a1 100644 --- a/spring-context/src/test/java/org/springframework/cache/annotation/ReactiveCachingTests.java +++ b/spring-context/src/test/java/org/springframework/cache/annotation/ReactiveCachingTests.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.AssertionsForClassTypes.catchThrowable; +import static org.assertj.core.api.Assertions.catchThrowable; /** * Tests for annotation-based caching methods that use reactive operators. diff --git a/spring-core/src/test/java/org/springframework/core/serializer/SerializerTests.java b/spring-core/src/test/java/org/springframework/core/serializer/SerializerTests.java index f26f9b5b7b86..c39a85e371b0 100644 --- a/spring-core/src/test/java/org/springframework/core/serializer/SerializerTests.java +++ b/spring-core/src/test/java/org/springframework/core/serializer/SerializerTests.java @@ -25,7 +25,7 @@ import org.springframework.core.serializer.support.SerializationDelegate; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link Serializer}, {@link Deserializer}, and {@link SerializationDelegate}. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java index 6345184bbbe9..1ff80f1f3207 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java @@ -21,7 +21,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.assertj.core.api.AssertionsForClassTypes; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Configuration; @@ -271,10 +270,7 @@ public void buildMergedConfigForContextHierarchy() { MergedContextConfiguration parent = mergedConfig.getParent(); assertThat(parent).as("parent config").isNotNull(); - // The following does not work -- at least not in Eclipse. - // assertThat(parent.getClasses())... - // So we use AssertionsForClassTypes directly. - AssertionsForClassTypes.assertThat(parent.getClasses()).containsExactly(FooConfig.class); + assertThat(parent.getClasses()).containsExactly(FooConfig.class); assertMergedConfig(mergedConfig, testClass, EMPTY_STRING_ARRAY, expectedClasses, AnnotationConfigContextLoader.class); @@ -294,7 +290,7 @@ public void buildMergedConfigForNestedTestClassWithInheritedConfigForContextHier MergedContextConfiguration parent = mergedConfig.getParent(); assertThat(parent).as("parent config").isNotNull(); - AssertionsForClassTypes.assertThat(parent.getClasses()).containsExactly(FooConfig.class); + assertThat(parent.getClasses()).containsExactly(FooConfig.class); assertMergedConfig(mergedConfig, enclosingTestClass, EMPTY_STRING_ARRAY, expectedClasses, AnnotationConfigContextLoader.class); @@ -313,7 +309,7 @@ public void buildMergedConfigForNestedTestClassWithMergedInheritedConfigForConte MergedContextConfiguration parent = mergedConfig.getParent(); assertThat(parent).as("parent config").isNotNull(); - AssertionsForClassTypes.assertThat(parent.getClasses()).containsExactly(FooConfig.class); + assertThat(parent.getClasses()).containsExactly(FooConfig.class); assertMergedConfig(mergedConfig, testClass, EMPTY_STRING_ARRAY, expectedClasses, AnnotationConfigContextLoader.class); diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java index b3849246c070..64349056159f 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java @@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatException; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.springframework.transaction.annotation.RollbackOn.ALL_EXCEPTIONS; /** diff --git a/spring-web/src/test/java/org/springframework/core/convert/support/IntegerToEnumConverterFactoryTests.java b/spring-web/src/test/java/org/springframework/core/convert/support/IntegerToEnumConverterFactoryTests.java index 187e96881d40..89f42943a233 100644 --- a/spring-web/src/test/java/org/springframework/core/convert/support/IntegerToEnumConverterFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/core/convert/support/IntegerToEnumConverterFactoryTests.java @@ -23,7 +23,7 @@ import org.springframework.core.convert.converter.Converter; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * Tests for {@link IntegerToEnumConverterFactory}. diff --git a/spring-web/src/test/java/org/springframework/web/accept/DefaultApiVersionStrategiesTests.java b/spring-web/src/test/java/org/springframework/web/accept/DefaultApiVersionStrategiesTests.java index 900fdbe06c0b..a1d478bce039 100644 --- a/spring-web/src/test/java/org/springframework/web/accept/DefaultApiVersionStrategiesTests.java +++ b/spring-web/src/test/java/org/springframework/web/accept/DefaultApiVersionStrategiesTests.java @@ -23,8 +23,8 @@ import org.springframework.web.testfixture.servlet.MockHttpServletRequest; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * Unit tests for {@link DefaultApiVersionStrategy}. diff --git a/spring-web/src/test/java/org/springframework/web/accept/PathApiVersionResolverTests.java b/spring-web/src/test/java/org/springframework/web/accept/PathApiVersionResolverTests.java index 34631ffa7dc3..7b2934addda2 100644 --- a/spring-web/src/test/java/org/springframework/web/accept/PathApiVersionResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/accept/PathApiVersionResolverTests.java @@ -21,7 +21,7 @@ import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import org.springframework.web.util.ServletRequestPathUtils; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link PathApiVersionResolver}. diff --git a/spring-web/src/test/java/org/springframework/web/accept/SemanticApiVersionParserTests.java b/spring-web/src/test/java/org/springframework/web/accept/SemanticApiVersionParserTests.java index 11b1f2ee8095..11e1431e1a77 100644 --- a/spring-web/src/test/java/org/springframework/web/accept/SemanticApiVersionParserTests.java +++ b/spring-web/src/test/java/org/springframework/web/accept/SemanticApiVersionParserTests.java @@ -20,8 +20,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; /** * Unit tests for {@link SemanticApiVersionParser}. diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategiesTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategiesTests.java index 128020c1304e..c2a5e3c52558 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategiesTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategiesTests.java @@ -27,8 +27,8 @@ import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest; import org.springframework.web.testfixture.server.MockServerWebExchange; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * Unit tests for {@link org.springframework.web.accept.DefaultApiVersionStrategy}. diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/PathApiVersionResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/PathApiVersionResolverTests.java index b6665e4cf322..062a49069181 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/PathApiVersionResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/PathApiVersionResolverTests.java @@ -22,7 +22,7 @@ import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest; import org.springframework.web.testfixture.server.MockServerWebExchange; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link org.springframework.web.accept.PathApiVersionResolver}. diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/VersionRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/VersionRequestConditionTests.java index 7e674d7ba9ba..0fcc6472bb0f 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/VersionRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/VersionRequestConditionTests.java @@ -30,8 +30,8 @@ import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest; import org.springframework.web.testfixture.server.MockServerWebExchange; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * Unit tests for {@link VersionRequestCondition}. diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/FragmentViewResolutionResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/FragmentViewResolutionResultHandlerTests.java index 8086168b84fa..102e51010988 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/FragmentViewResolutionResultHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/FragmentViewResolutionResultHandlerTests.java @@ -47,7 +47,7 @@ import org.springframework.web.testfixture.http.server.reactive.MockServerHttpResponse; import org.springframework.web.testfixture.server.MockServerWebExchange; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.web.testfixture.method.ResolvableMethod.on; /** diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategyTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategyTests.java index 9ae91280e386..f6dfb90ba975 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategyTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategyTests.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; import reactor.netty.http.server.WebsocketServerSpec; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link ReactorNettyRequestUpgradeStrategy}. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/VersionRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/VersionRequestConditionTests.java index 4ed634038ef6..b701bf1e514d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/VersionRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/VersionRequestConditionTests.java @@ -28,8 +28,8 @@ import org.springframework.web.accept.SemanticApiVersionParser; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * Unit tests for {@link VersionRequestCondition}. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingVersionHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingVersionHandlerMethodTests.java index 15dea79a6050..dc1b01407156 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingVersionHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingVersionHandlerMethodTests.java @@ -33,7 +33,7 @@ import org.springframework.web.testfixture.servlet.MockHttpServletResponse; import org.springframework.web.testfixture.servlet.MockServletConfig; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Integration tests for API versioning.