diff --git a/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java index 25cabd6788c..c53e02da56d 100644 --- a/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java @@ -63,8 +63,7 @@ class AopNamespaceHandlerScopeIntegrationTests { @Test void singletonScoping() throws Exception { assertThat(AopUtils.isAopProxy(singletonScoped)).as("Should be AOP proxy").isTrue(); - boolean condition = singletonScoped instanceof TestBean; - assertThat(condition).as("Should be target class proxy").isTrue(); + assertThat(singletonScoped).as("Should be target class proxy").isInstanceOf(TestBean.class); String rob = "Rob Harrop"; String bram = "Bram Smeets"; assertThat(singletonScoped.getName()).isEqualTo(rob); @@ -82,12 +81,10 @@ class AopNamespaceHandlerScopeIntegrationTests { RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(oldRequest)); assertThat(AopUtils.isAopProxy(requestScoped)).as("Should be AOP proxy").isTrue(); - boolean condition = requestScoped instanceof TestBean; - assertThat(condition).as("Should be target class proxy").isTrue(); + assertThat(requestScoped).as("Should be target class proxy").isInstanceOf(TestBean.class); assertThat(AopUtils.isAopProxy(testBean)).as("Should be AOP proxy").isTrue(); - boolean condition1 = testBean instanceof TestBean; - assertThat(condition1).as("Regular bean should be JDK proxy").isFalse(); + assertThat(testBean).as("Regular bean should be JDK proxy").isNotInstanceOf(TestBean.class); String rob = "Rob Harrop"; String bram = "Bram Smeets"; @@ -112,14 +109,12 @@ class AopNamespaceHandlerScopeIntegrationTests { RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); assertThat(AopUtils.isAopProxy(sessionScoped)).as("Should be AOP proxy").isTrue(); - boolean condition1 = sessionScoped instanceof TestBean; - assertThat(condition1).as("Should not be target class proxy").isFalse(); + assertThat(sessionScoped).as("Should not be target class proxy").isNotInstanceOf(TestBean.class); assertThat(sessionScopedAlias).isSameAs(sessionScoped); assertThat(AopUtils.isAopProxy(testBean)).as("Should be AOP proxy").isTrue(); - boolean condition = testBean instanceof TestBean; - assertThat(condition).as("Regular bean should be JDK proxy").isFalse(); + assertThat(testBean).as("Regular bean should be JDK proxy").isNotInstanceOf(TestBean.class); String rob = "Rob Harrop"; String bram = "Bram Smeets"; diff --git a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java index be19d0bf463..14c109f57b9 100644 --- a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java @@ -169,8 +169,7 @@ class AdvisorAutoProxyCreatorIntegrationTests { BeanFactory bf = getBeanFactory(); Object bean = bf.getBean(TXMANAGER_BEAN_NAME); - boolean condition = bean instanceof CallCountingTransactionManager; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(CallCountingTransactionManager.class); CallCountingTransactionManager txMan = (CallCountingTransactionManager) bf.getBean(TXMANAGER_BEAN_NAME); Rollback rb = (Rollback) bf.getBean("rollback"); diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java index c61aeac4f9e..ac35c46bcc0 100644 --- a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java @@ -185,8 +185,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { // should be dynamic proxy, implementing both interfaces assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue(); - boolean condition = bean instanceof AnotherScopeTestInterface; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(AnotherScopeTestInterface.class); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -207,8 +206,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { // should be a class-based proxy assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition = bean instanceof RequestScopedTestBean; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(RequestScopedTestBean.class); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -250,8 +248,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { // should be dynamic proxy, implementing both interfaces assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue(); - boolean condition = bean instanceof AnotherScopeTestInterface; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(AnotherScopeTestInterface.class); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -278,10 +275,8 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { // should be a class-based proxy assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition1 = bean instanceof ScopedTestBean; - assertThat(condition1).isTrue(); - boolean condition = bean instanceof SessionScopedTestBean; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(ScopedTestBean.class); + assertThat(bean).isInstanceOf(SessionScopedTestBean.class); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java index 7a64cfa8ab2..7fb3c19670a 100644 --- a/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java @@ -166,8 +166,7 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests { // should be dynamic proxy, implementing both interfaces assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue(); - boolean condition = bean instanceof AnotherScopeTestInterface; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(AnotherScopeTestInterface.class); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -188,8 +187,7 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests { // should be a class-based proxy assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition = bean instanceof RequestScopedTestBean; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(RequestScopedTestBean.class); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -231,8 +229,7 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests { // should be dynamic proxy, implementing both interfaces assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue(); - boolean condition = bean instanceof AnotherScopeTestInterface; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(AnotherScopeTestInterface.class); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -259,10 +256,8 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests { // should be a class-based proxy assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition1 = bean instanceof ScopedTestBean; - assertThat(condition1).isTrue(); - boolean condition = bean instanceof SessionScopedTestBean; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(ScopedTestBean.class); + assertThat(bean).isInstanceOf(SessionScopedTestBean.class); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java index b4c9de08649..dbe3a7679ec 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java @@ -17,7 +17,6 @@ package org.springframework.aop.aspectj; import java.io.IOException; -import java.util.Arrays; import java.util.concurrent.atomic.AtomicInteger; import org.aspectj.lang.JoinPoint; @@ -106,9 +105,9 @@ class MethodInvocationProceedingJoinPointTests { assertThat(AbstractAspectJAdvice.currentJoinPoint().getSignature()).as("Return same MethodSignature repeatedly").isSameAs(msig); assertThat(AbstractAspectJAdvice.currentJoinPoint()).as("Return same JoinPoint repeatedly").isSameAs(AbstractAspectJAdvice.currentJoinPoint()); assertThat(msig.getDeclaringType()).isEqualTo(method.getDeclaringClass()); - assertThat(Arrays.equals(method.getParameterTypes(), msig.getParameterTypes())).isTrue(); + assertThat(method.getParameterTypes()).isEqualTo(msig.getParameterTypes()); assertThat(msig.getReturnType()).isEqualTo(method.getReturnType()); - assertThat(Arrays.equals(method.getExceptionTypes(), msig.getExceptionTypes())).isTrue(); + assertThat(method.getExceptionTypes()).isEqualTo(msig.getExceptionTypes()); msig.toLongString(); msig.toShortString(); }); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java index 58f8937c613..139db42deda 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java @@ -63,8 +63,7 @@ class AspectJPointcutAdvisorTests { 1, "someBean"); assertThat(ajpa.getAspectMetadata().getPerClausePointcut()).isNotSameAs(Pointcut.TRUE); - boolean condition = ajpa.getAspectMetadata().getPerClausePointcut() instanceof AspectJExpressionPointcut; - assertThat(condition).isTrue(); + assertThat(ajpa.getAspectMetadata().getPerClausePointcut()).isInstanceOf(AspectJExpressionPointcut.class); assertThat(ajpa.isPerInstance()).isTrue(); assertThat(ajpa.getAspectMetadata().getPerClausePointcut().getClassFilter().matches(TestBean.class)).isTrue(); diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java index 7e81831b6f3..564aa737d07 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java @@ -54,8 +54,7 @@ class ExposeBeanNameAdvisorsTests { pf.addAdvisor(ExposeBeanNameAdvisors.createAdvisorWithoutIntroduction(beanName)); ITestBean proxy = (ITestBean) pf.getProxy(); - boolean condition = proxy instanceof NamedBean; - assertThat(condition).as("No introduction").isFalse(); + assertThat(proxy).as("No introduction").isNotInstanceOf(NamedBean.class); // Requires binding proxy.getAge(); } @@ -69,8 +68,7 @@ class ExposeBeanNameAdvisorsTests { pf.addAdvisor(ExposeBeanNameAdvisors.createAdvisorIntroducingNamedBean(beanName)); ITestBean proxy = (ITestBean) pf.getProxy(); - boolean condition = proxy instanceof NamedBean; - assertThat(condition).as("Introduction was made").isTrue(); + assertThat(proxy).as("Introduction was made").isInstanceOf(NamedBean.class); // Requires binding proxy.getAge(); diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java index 69bc51b4a1a..31f60744387 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java @@ -95,7 +95,7 @@ class RefreshableTargetSourceTests { Object d = ts.getTarget(); assertThat(d).as("D should not be null").isNotNull(); - assertThat(a.equals(d)).as("A and D should not be equal").isFalse(); + assertThat(a).as("A and D should not be equal").isNotEqualTo(d); Object e = ts.getTarget(); assertThat(e).as("D and E should be equal").isEqualTo(d); @@ -103,7 +103,7 @@ class RefreshableTargetSourceTests { Thread.sleep(110); Object f = ts.getTarget(); - assertThat(e.equals(f)).as("E and F should be different").isFalse(); + assertThat(e).as("E and F should be different").isNotEqualTo(f); } diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java index e6229fd7753..7fe309547bd 100644 --- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java @@ -599,11 +599,11 @@ abstract class AbstractPropertyAccessorTests { AbstractPropertyAccessor accessor = createAccessor(target); accessor.setPropertyValue("bool2", "true"); - assertThat(Boolean.TRUE.equals(accessor.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue(); + assertThat(accessor.getPropertyValue("bool2")).as("Correct bool2 value").isEqualTo(Boolean.TRUE); assertThat(target.getBool2()).as("Correct bool2 value").isTrue(); accessor.setPropertyValue("bool2", "false"); - assertThat(Boolean.FALSE.equals(accessor.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue(); + assertThat(accessor.getPropertyValue("bool2")).as("Correct bool2 value").isEqualTo(Boolean.FALSE); assertThat(target.getBool2()).as("Correct bool2 value").isFalse(); } @@ -628,7 +628,7 @@ abstract class AbstractPropertyAccessorTests { assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(target.getBigInteger()); assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(accessor.getPropertyValue("float2")); assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(target.getFloat2()); - assertThat(Double.valueOf("6.1").equals(accessor.getPropertyValue("double2"))).as("Correct double2 value").isTrue(); + assertThat(Double.valueOf("6.1")).as("Correct double2 value").isEqualTo(accessor.getPropertyValue("double2")); assertThat(Double.valueOf("6.1")).as("Correct double2 value").isEqualTo(target.getDouble2()); assertThat(new BigDecimal("4.0")).as("Correct bigDecimal value").isEqualTo(accessor.getPropertyValue("bigDecimal")); assertThat(new BigDecimal("4.0")).as("Correct bigDecimal value").isEqualTo(target.getBigDecimal()); @@ -651,7 +651,7 @@ abstract class AbstractPropertyAccessorTests { assertThat(Integer.valueOf("8")).as("Correct int2 value").isEqualTo(target.getInt2()); assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(accessor.getPropertyValue("long2")); assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(target.getLong2()); - assertThat(new BigInteger("3").equals(accessor.getPropertyValue("bigInteger"))).as("Correct bigInteger value").isTrue(); + assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(accessor.getPropertyValue("bigInteger")); assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(target.getBigInteger()); assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(accessor.getPropertyValue("float2")); assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(target.getFloat2()); @@ -1495,15 +1495,15 @@ abstract class AbstractPropertyAccessorTests { accessor.setPropertyValues(pvs); assertThat(target.getArray()[0]).isEqualTo(tb5); assertThat(target.getArray()[1]).isEqualTo(tb4); - assertThat((target.getList().get(0))).isEqualTo(tb3); - assertThat((target.getList().get(1))).isEqualTo(tb2); - assertThat((target.getList().get(2))).isEqualTo(tb0); - assertThat((target.getList().get(3))).isNull(); - assertThat((target.getList().get(4))).isEqualTo(tb1); - assertThat((target.getMap().get("key1"))).isEqualTo(tb1); - assertThat((target.getMap().get("key2"))).isEqualTo(tb0); - assertThat((target.getMap().get("key5"))).isEqualTo(tb4); - assertThat((target.getMap().get("key9"))).isEqualTo(tb5); + assertThat(target.getList().get(0)).isEqualTo(tb3); + assertThat(target.getList().get(1)).isEqualTo(tb2); + assertThat(target.getList().get(2)).isEqualTo(tb0); + assertThat(target.getList().get(3)).isNull(); + assertThat(target.getList().get(4)).isEqualTo(tb1); + assertThat(target.getMap().get("key1")).isEqualTo(tb1); + assertThat(target.getMap().get("key2")).isEqualTo(tb0); + assertThat(target.getMap().get("key5")).isEqualTo(tb4); + assertThat(target.getMap().get("key9")).isEqualTo(tb5); assertThat(accessor.getPropertyValue("array[0]")).isEqualTo(tb5); assertThat(accessor.getPropertyValue("array[1]")).isEqualTo(tb4); assertThat(accessor.getPropertyValue("list[0]")).isEqualTo(tb3); diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index ad1fa210599..1cd9b19f489 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -264,7 +264,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests { accessor.setPropertyValue("object", tb); assertThat(target.value).isSameAs(tb); assertThat(target.getObject()).containsSame(tb); - assertThat(((Optional) accessor.getPropertyValue("object"))).containsSame(tb); + assertThat((Optional) accessor.getPropertyValue("object")).containsSame(tb); assertThat(target.value.getName()).isEqualTo("x"); assertThat(target.getObject().get().getName()).isEqualTo("x"); assertThat(accessor.getPropertyValue("object.name")).isEqualTo("x"); @@ -272,7 +272,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests { accessor.setPropertyValue("object.name", "y"); assertThat(target.value).isSameAs(tb); assertThat(target.getObject()).containsSame(tb); - assertThat(((Optional) accessor.getPropertyValue("object"))).containsSame(tb); + assertThat((Optional) accessor.getPropertyValue("object")).containsSame(tb); assertThat(target.value.getName()).isEqualTo("y"); assertThat(target.getObject().get().getName()).isEqualTo("y"); assertThat(accessor.getPropertyValue("object.name")).isEqualTo("y"); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java index b833f1f4be7..1cc9545efcb 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java @@ -307,19 +307,19 @@ class BeanFactoryUtilsTests { @Test void bDependencies() { String[] deps = this.dependentBeansFactory.getDependentBeans("b"); - assertThat(Arrays.equals(new String[] { "c" }, deps)).isTrue(); + assertThat(deps).containsExactly("c"); } @Test void cDependencies() { String[] deps = this.dependentBeansFactory.getDependentBeans("c"); - assertThat(Arrays.equals(new String[] { "int", "long" }, deps)).isTrue(); + assertThat(deps).containsExactly("int", "long"); } @Test void intDependencies() { String[] deps = this.dependentBeansFactory.getDependentBeans("int"); - assertThat(Arrays.equals(new String[] { "buffer" }, deps)).isTrue(); + assertThat(deps).containsExactly("buffer"); } @Test diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index a70dca808c4..4e6c274797e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -516,11 +516,11 @@ class DefaultListableBeanFactoryTests { String[] names = lbf.getBeanDefinitionNames(); assertThat(names != lbf.getBeanDefinitionNames()).isTrue(); assertThat(names.length == 1).as("Array length == 1").isTrue(); - assertThat(names[0].equals("test")).as("0th element == test").isTrue(); + assertThat(names[0]).as("0th element == test").isEqualTo("test"); TestBean tb = (TestBean) lbf.getBean("test"); assertThat(tb != null).as("Test is non null").isTrue(); - assertThat("Tony".equals(tb.getName())).as("Test bean name is Tony").isTrue(); + assertThat("Tony").as("Test bean name is Tony").isEqualTo(tb.getName()); assertThat(tb.getAge() == 48).as("Test bean age is 48").isTrue(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java index f7b6ce35e93..41fae11cc0a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java @@ -98,7 +98,7 @@ class MethodInvokingFactoryBeanTests { mcfb.setTargetObject(tc1); mcfb.setTargetMethod("method1"); mcfb.afterPropertiesSet(); - assertThat(int.class.equals(mcfb.getObjectType())).isTrue(); + assertThat(int.class).isEqualTo(mcfb.getObjectType()); mcfb = new MethodInvokingFactoryBean(); mcfb.setTargetClass(TestClass1.class); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java index dd5e4840cfb..6987eaeed82 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java @@ -71,7 +71,7 @@ class YamlMapFactoryBeanTests { new ByteArrayResource("foo:\n spam: bar".getBytes())); assertThat(this.factory.getObject()).hasSize(1); - assertThat(((Map) this.factory.getObject().get("foo"))).hasSize(2); + assertThat((Map) this.factory.getObject().get("foo")).hasSize(2); } @Test diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java index 7a8173d484e..cc985a04e18 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java @@ -16,7 +16,6 @@ package org.springframework.beans.factory.support; -import java.util.Arrays; import java.util.function.Function; import org.junit.jupiter.api.Test; @@ -48,7 +47,7 @@ class BeanDefinitionBuilderTests { RootBeanDefinition rbd = (RootBeanDefinition) bdb.getBeanDefinition(); assertThat(rbd.isSingleton()).isFalse(); assertThat(rbd.getBeanClass()).isEqualTo(TestBean.class); - assertThat(Arrays.equals(dependsOn, rbd.getDependsOn())).as("Depends on was added").isTrue(); + assertThat(rbd.getDependsOn()).as("Depends on was added").isEqualTo(dependsOn); assertThat(rbd.getPropertyValues().contains("age")).isTrue(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java index 86846a05552..75d776ecfaa 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java @@ -83,7 +83,7 @@ class CollectionsWithDefaultTypesTests { MixedCollectionBean jumble = (MixedCollectionBean) this.beanFactory.getBean("jumble"); assertThat(jumble.getJumble()).as("Expected 3 elements, not " + jumble.getJumble().size()).hasSize(3); List l = (List) jumble.getJumble(); - assertThat(l.get(0).equals("literal")).isTrue(); + assertThat(l.get(0)).isEqualTo("literal"); Integer[] array1 = (Integer[]) l.get(1); assertThat(array1[0]).isEqualTo(2); assertThat(array1[1]).isEqualTo(4); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java index bab66a1e219..4902525b5b4 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java @@ -17,7 +17,6 @@ package org.springframework.beans.factory.xml; import java.lang.reflect.Proxy; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Properties; @@ -213,7 +212,7 @@ class UtilNamespaceHandlerTests { assertThat(bean.getSomeSet()).singleElement().isEqualTo("bar"); TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedShortcutCollections"); - assertThat(Arrays.equals(bean.getStringArray(), bean2.getStringArray())).isTrue(); + assertThat(bean.getStringArray()).isEqualTo(bean2.getStringArray()); assertThat(bean.getStringArray()).isNotSameAs(bean2.getStringArray()); assertThat(bean2.getSomeList()).isEqualTo(bean.getSomeList()); assertThat(bean2.getSomeSet()).isEqualTo(bean.getSomeSet()); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java index 761592c7245..0bddf4eae1e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java @@ -162,13 +162,13 @@ class XmlBeanCollectionTests { MixedCollectionBean jumble = (MixedCollectionBean) this.beanFactory.getBean("jumble"); assertThat(jumble.getJumble()).as("Expected 5 elements, not " + jumble.getJumble()).hasSize(5); List l = (List) jumble.getJumble(); - assertThat(l.get(0).equals(this.beanFactory.getBean("david"))).isTrue(); - assertThat(l.get(1).equals("literal")).isTrue(); - assertThat(l.get(2).equals(this.beanFactory.getBean("jenny"))).isTrue(); - assertThat(l.get(3).equals("rod")).isTrue(); + assertThat(l.get(0)).isEqualTo(this.beanFactory.getBean("david")); + assertThat(l.get(1)).isEqualTo("literal"); + assertThat(l.get(2)).isEqualTo(this.beanFactory.getBean("jenny")); + assertThat(l.get(3)).isEqualTo("rod"); Object[] array = (Object[]) l.get(4); - assertThat(array[0].equals(this.beanFactory.getBean("david"))).isTrue(); - assertThat(array[1].equals("literal2")).isTrue(); + assertThat(array[0]).isEqualTo(this.beanFactory.getBean("david")); + assertThat(array[1]).isEqualTo("literal2"); } @Test @@ -189,8 +189,8 @@ class XmlBeanCollectionTests { void mapWithLiteralsOnly() { HasMap hasMap = (HasMap) this.beanFactory.getBean("literalMap"); assertThat(hasMap.getMap()).hasSize(3); - assertThat(hasMap.getMap().get("foo").equals("bar")).isTrue(); - assertThat(hasMap.getMap().get("fi").equals("fum")).isTrue(); + assertThat(hasMap.getMap().get("foo")).isEqualTo("bar"); + assertThat(hasMap.getMap().get("fi")).isEqualTo("fum"); assertThat(hasMap.getMap().get("fa")).isNull(); } @@ -201,7 +201,7 @@ class XmlBeanCollectionTests { assertThat(hasMap.getMap().get("foo")).isEqualTo(10); TestBean jenny = (TestBean) this.beanFactory.getBean("jenny"); assertThat(hasMap.getMap().get("jenny")).isSameAs(jenny); - assertThat(hasMap.getMap().get(5).equals("david")).isTrue(); + assertThat(hasMap.getMap().get(5)).isEqualTo("david"); assertThat(hasMap.getMap().get("bar")).isInstanceOf(Long.class); assertThat(hasMap.getMap().get("bar")).isEqualTo(100L); assertThat(hasMap.getMap().get("baz")).isInstanceOf(Integer.class); @@ -213,13 +213,13 @@ class XmlBeanCollectionTests { TestBean jenny = (TestBean) this.beanFactory.getBean("pJenny"); HasMap hasMap = (HasMap) this.beanFactory.getBean("pMixedMap"); assertThat(hasMap.getMap()).hasSize(2); - assertThat(hasMap.getMap().get("foo").equals("bar")).isTrue(); + assertThat(hasMap.getMap().get("foo")).isEqualTo("bar"); assertThat(hasMap.getMap().get("jenny").toString()).isEqualTo(jenny.toString()); assertThat(hasMap.getMap().get("jenny")).as("Not same instance").isNotSameAs(jenny); HasMap hasMap2 = (HasMap) this.beanFactory.getBean("pMixedMap"); assertThat(hasMap2.getMap()).hasSize(2); - assertThat(hasMap2.getMap().get("foo").equals("bar")).isTrue(); + assertThat(hasMap2.getMap().get("foo")).isEqualTo("bar"); assertThat(hasMap2.getMap().get("jenny").toString()).isEqualTo(jenny.toString()); assertThat(hasMap2.getMap().get("jenny")).as("Not same instance").isNotSameAs(hasMap.getMap().get("jenny")); } @@ -228,7 +228,7 @@ class XmlBeanCollectionTests { void mapWithLiteralsReferencesAndList() { HasMap hasMap = (HasMap) this.beanFactory.getBean("mixedMapWithList"); assertThat(hasMap.getMap()).hasSize(4); - assertThat(hasMap.getMap().get(null).equals("bar")).isTrue(); + assertThat(hasMap.getMap().get(null)).isEqualTo("bar"); TestBean jenny = (TestBean) this.beanFactory.getBean("jenny"); assertThat(hasMap.getMap().get("jenny")).isEqualTo(jenny); @@ -236,29 +236,29 @@ class XmlBeanCollectionTests { List l = (List) hasMap.getMap().get("list"); assertThat(l).isNotNull(); assertThat(l).hasSize(4); - assertThat(l.get(0).equals("zero")).isTrue(); + assertThat(l.get(0)).isEqualTo("zero"); assertThat(l).element(3).isNull(); // Check nested map in list Map m = (Map) l.get(1); assertThat(m).isNotNull(); assertThat(m).hasSize(2); - assertThat(m.get("fo").equals("bar")).isTrue(); - assertThat(m.get("jen").equals(jenny)).as("Map element 'jenny' should be equal to jenny bean, not " + m.get("jen")).isTrue(); + assertThat(m.get("fo")).isEqualTo("bar"); + assertThat(m.get("jen")).as("Map element 'jenny' should be equal to jenny bean, not " + m.get("jen")).isEqualTo(jenny); // Check nested list in list l = (List) l.get(2); assertThat(l).isNotNull(); assertThat(l).hasSize(2); assertThat(l.get(0)).isEqualTo(jenny); - assertThat(l.get(1).equals("ba")).isTrue(); + assertThat(l.get(1)).isEqualTo("ba"); // Check nested map m = (Map) hasMap.getMap().get("map"); assertThat(m).isNotNull(); assertThat(m).hasSize(2); - assertThat(m.get("foo").equals("bar")).isTrue(); - assertThat(m.get("jenny").equals(jenny)).as("Map element 'jenny' should be equal to jenny bean, not " + m.get("jenny")).isTrue(); + assertThat(m.get("foo")).isEqualTo("bar"); + assertThat(m.get("jenny")).as("Map element 'jenny' should be equal to jenny bean, not " + m.get("jenny")).isEqualTo(jenny); } @Test @@ -311,16 +311,16 @@ class XmlBeanCollectionTests { void populatedProps() { HasMap hasMap = (HasMap) this.beanFactory.getBean("props"); assertThat(hasMap.getProps()).hasSize(2); - assertThat(hasMap.getProps().get("foo").equals("bar")).isTrue(); - assertThat(hasMap.getProps().get("2").equals("TWO")).isTrue(); + assertThat(hasMap.getProps().get("foo")).isEqualTo("bar"); + assertThat(hasMap.getProps().get("2")).isEqualTo("TWO"); } @Test void objectArray() { HasMap hasMap = (HasMap) this.beanFactory.getBean("objectArray"); assertThat(hasMap.getObjectArray().length).isEqualTo(2); - assertThat(hasMap.getObjectArray()[0].equals("one")).isTrue(); - assertThat(hasMap.getObjectArray()[1].equals(this.beanFactory.getBean("jenny"))).isTrue(); + assertThat(hasMap.getObjectArray()[0]).isEqualTo("one"); + assertThat(hasMap.getObjectArray()[1]).isEqualTo(this.beanFactory.getBean("jenny")); } @Test @@ -336,16 +336,16 @@ class XmlBeanCollectionTests { void classArray() { HasMap hasMap = (HasMap) this.beanFactory.getBean("classArray"); assertThat(hasMap.getClassArray().length).isEqualTo(2); - assertThat(hasMap.getClassArray()[0].equals(String.class)).isTrue(); - assertThat(hasMap.getClassArray()[1].equals(Exception.class)).isTrue(); + assertThat(hasMap.getClassArray()[0]).isEqualTo(String.class); + assertThat(hasMap.getClassArray()[1]).isEqualTo(Exception.class); } @Test void classList() { HasMap hasMap = (HasMap) this.beanFactory.getBean("classList"); assertThat(hasMap.getClassList()).hasSize(2); - assertThat(hasMap.getClassList().get(0).equals(String.class)).isTrue(); - assertThat(hasMap.getClassList().get(1).equals(Exception.class)).isTrue(); + assertThat(hasMap.getClassList().get(0)).isEqualTo(String.class); + assertThat(hasMap.getClassList().get(1)).isEqualTo(Exception.class); } @Test @@ -402,7 +402,7 @@ class XmlBeanCollectionTests { @Test void choiceBetweenSetAndMap() { MapAndSet sam = (MapAndSet) this.beanFactory.getBean("setAndMap"); - assertThat(sam.getObject() instanceof Map).as("Didn't choose constructor with Map argument").isTrue(); + assertThat(sam.getObject()).as("Didn't choose constructor with Map argument").isInstanceOf(Map.class); Map map = (Map) sam.getObject(); assertThat(map).containsOnly(entry("key1", "val1"), entry("key2", "val2"), entry("key3", "val3")); } diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java index 5ff3de4eafb..7214c1beaa3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java @@ -187,11 +187,11 @@ class CustomEditorTests { BeanWrapper bw = new BeanWrapperImpl(tb); bw.setPropertyValue("bool1", "true"); - assertThat(Boolean.TRUE.equals(bw.getPropertyValue("bool1"))).as("Correct bool1 value").isTrue(); + assertThat(bw.getPropertyValue("bool1")).as("Correct bool1 value").isEqualTo(Boolean.TRUE); assertThat(tb.isBool1()).as("Correct bool1 value").isTrue(); bw.setPropertyValue("bool1", "false"); - assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool1"))).as("Correct bool1 value").isTrue(); + assertThat(bw.getPropertyValue("bool1")).as("Correct bool1 value").isEqualTo(Boolean.FALSE); assertThat(tb.isBool1()).as("Correct bool1 value").isFalse(); bw.setPropertyValue("bool1", " true "); @@ -228,11 +228,11 @@ class CustomEditorTests { BeanWrapper bw = new BeanWrapperImpl(tb); bw.setPropertyValue("bool2", "true"); - assertThat(Boolean.TRUE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue(); + assertThat(bw.getPropertyValue("bool2")).as("Correct bool2 value").isEqualTo(Boolean.TRUE); assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue(); bw.setPropertyValue("bool2", "false"); - assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue(); + assertThat(bw.getPropertyValue("bool2")).as("Correct bool2 value").isEqualTo(Boolean.FALSE); assertThat(tb.getBool2()).as("Correct bool2 value").isFalse(); bw.setPropertyValue("bool2", "on"); @@ -264,11 +264,11 @@ class CustomEditorTests { bw.registerCustomEditor(Boolean.class, new CustomBooleanEditor(true)); bw.setPropertyValue("bool2", "true"); - assertThat(Boolean.TRUE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue(); + assertThat(bw.getPropertyValue("bool2")).as("Correct bool2 value").isEqualTo(Boolean.TRUE); assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue(); bw.setPropertyValue("bool2", "false"); - assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue(); + assertThat(bw.getPropertyValue("bool2")).as("Correct bool2 value").isEqualTo(Boolean.FALSE); assertThat(tb.getBool2()).as("Correct bool2 value").isFalse(); bw.setPropertyValue("bool2", "on"); @@ -429,10 +429,10 @@ class CustomEditorTests { bw.setPropertyValue("long1", "5"); bw.setPropertyValue("long2", "6"); - assertThat(Long.valueOf("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue(); + assertThat(Long.valueOf("5")).as("Correct long1 value").isEqualTo(bw.getPropertyValue("long1")); assertThat(tb.getLong1()).as("Correct long1 value").isEqualTo(5); - assertThat(Long.valueOf("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue(); - assertThat(Long.valueOf("6").equals(tb.getLong2())).as("Correct long2 value").isTrue(); + assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(bw.getPropertyValue("long2")); + assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(tb.getLong2()); bw.setPropertyValue("long2", ""); assertThat(bw.getPropertyValue("long2")).as("Correct long2 value").isNull(); diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java index 76d77e50f6a..dfb86c14096 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java @@ -42,7 +42,7 @@ class PropertiesEditorTests { pe.setAsText(s); Properties p = (Properties) pe.getValue(); assertThat(p.entrySet().size()).as("contains one entry").isEqualTo(1); - assertThat(p.get("foo").equals("bar")).as("foo=bar").isTrue(); + assertThat(p.get("foo")).as("foo=bar").isEqualTo("bar"); } @Test @@ -53,8 +53,8 @@ class PropertiesEditorTests { pe.setAsText(s); Properties p = (Properties) pe.getValue(); assertThat(p.entrySet().size()).as("contains two entries").isEqualTo(2); - assertThat(p.get("foo").equals("bar with whitespace")).as("foo=bar with whitespace").isTrue(); - assertThat(p.get("me").equals("mi")).as("me=mi").isTrue(); + assertThat(p.get("foo")).as("foo=bar with whitespace").isEqualTo("bar with whitespace"); + assertThat(p.get("me")).as("me=mi").isEqualTo("mi"); } @Test @@ -67,9 +67,9 @@ class PropertiesEditorTests { pe.setAsText(s); Properties p = (Properties) pe.getValue(); assertThat(p.entrySet().size()).as("contains two entries").isEqualTo(3); - assertThat(p.get("foo").equals("bar")).as("foo=bar").isTrue(); - assertThat(p.get("me").equals("mi")).as("me=mi").isTrue(); - assertThat(p.get("x").equals("y=z")).as("x='y=z'").isTrue(); + assertThat(p.get("foo")).as("foo=bar").isEqualTo("bar"); + assertThat(p.get("me")).as("me=mi").isEqualTo("mi"); + assertThat(p.get("x")).as("x='y=z'").isEqualTo("y=z"); } @Test @@ -79,9 +79,9 @@ class PropertiesEditorTests { pe.setAsText(s); Properties p = (Properties) pe.getValue(); assertThat(p.entrySet().size()).as("contains two entries").isEqualTo(3); - assertThat(p.get("foo").equals("bar")).as("foo=bar").isTrue(); - assertThat(p.get("me").equals("mi")).as("me=mi").isTrue(); - assertThat(p.get("x").equals("")).as("x='y=z'").isTrue(); + assertThat(p.get("foo")).as("foo=bar").isEqualTo("bar"); + assertThat(p.get("me")).as("me=mi").isEqualTo("mi"); + assertThat(p.get("x")).as("x='y=z'").isEqualTo(""); } @Test @@ -91,8 +91,8 @@ class PropertiesEditorTests { pe.setAsText(s); Properties p = (Properties) pe.getValue(); assertThat(p.entrySet().size()).as("contains three entries").isEqualTo(3); - assertThat(p.get("foo").equals("")).as("foo is empty").isTrue(); - assertThat(p.get("me").equals("mi")).as("me=mi").isTrue(); + assertThat(p.get("foo")).as("foo is empty").isEqualTo(""); + assertThat(p.get("me")).as("me=mi").isEqualTo("mi"); } /** @@ -112,8 +112,8 @@ class PropertiesEditorTests { pe.setAsText(s); Properties p = (Properties) pe.getValue(); assertThat(p.entrySet().size()).as("contains three entries").isEqualTo(3); - assertThat(p.get("foo").equals("bar")).as("foo is bar").isTrue(); - assertThat(p.get("me").equals("mi")).as("me=mi").isTrue(); + assertThat(p.get("foo")).as("foo is bar").isEqualTo("bar"); + assertThat(p.get("me")).as("me=mi").isEqualTo("mi"); } /** diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java index 1cd7268abd3..312366bee30 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java @@ -42,7 +42,7 @@ class ResourceBundleEditorTests { editor.setAsText(BASE_NAME); Object value = editor.getValue(); assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull(); - assertThat(value instanceof ResourceBundle).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue(); + assertThat(value).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isInstanceOf(ResourceBundle.class); ResourceBundle bundle = (ResourceBundle) value; String string = bundle.getString(MESSAGE_KEY); assertThat(string).isEqualTo(MESSAGE_KEY); @@ -54,7 +54,7 @@ class ResourceBundleEditorTests { editor.setAsText(BASE_NAME + "_"); Object value = editor.getValue(); assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull(); - assertThat(value instanceof ResourceBundle).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue(); + assertThat(value).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isInstanceOf(ResourceBundle.class); ResourceBundle bundle = (ResourceBundle) value; String string = bundle.getString(MESSAGE_KEY); assertThat(string).isEqualTo(MESSAGE_KEY); @@ -66,7 +66,7 @@ class ResourceBundleEditorTests { editor.setAsText(BASE_NAME + "Lang" + "_en"); Object value = editor.getValue(); assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull(); - assertThat(value instanceof ResourceBundle).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue(); + assertThat(value).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isInstanceOf(ResourceBundle.class); ResourceBundle bundle = (ResourceBundle) value; String string = bundle.getString(MESSAGE_KEY); assertThat(string).isEqualTo("yob"); @@ -78,7 +78,7 @@ class ResourceBundleEditorTests { editor.setAsText(BASE_NAME + "LangCountry" + "_en_GB"); Object value = editor.getValue(); assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull(); - assertThat(value instanceof ResourceBundle).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue(); + assertThat(value).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isInstanceOf(ResourceBundle.class); ResourceBundle bundle = (ResourceBundle) value; String string = bundle.getString(MESSAGE_KEY); assertThat(string).isEqualTo("chav"); @@ -90,7 +90,7 @@ class ResourceBundleEditorTests { editor.setAsText(BASE_NAME + "LangCountryDialect" + "_en_GB_GLASGOW"); Object value = editor.getValue(); assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull(); - assertThat(value instanceof ResourceBundle).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue(); + assertThat(value).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isInstanceOf(ResourceBundle.class); ResourceBundle bundle = (ResourceBundle) value; String string = bundle.getString(MESSAGE_KEY); assertThat(string).isEqualTo("ned"); diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java index fb1a20c9f92..156686bb6ce 100644 --- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java +++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java @@ -56,9 +56,9 @@ public abstract class AbstractBeanFactoryTests { TestBean rod = (TestBean) getBeanFactory().getBean("rod"); TestBean roderick = (TestBean) getBeanFactory().getBean("roderick"); assertThat(rod).as("not == ").isNotSameAs(roderick); - assertThat(rod.getName().equals("Rod")).as("rod.name is Rod").isTrue(); + assertThat(rod.getName()).as("rod.name is Rod").isEqualTo("Rod"); assertThat(rod.getAge()).as("rod.age is 31").isEqualTo(31); - assertThat(roderick.getName().equals("Roderick")).as("roderick.name is Roderick").isTrue(); + assertThat(roderick.getName()).as("roderick.name is Roderick").isEqualTo("Roderick"); assertThat(roderick.getAge()).as("roderick.age was inherited").isEqualTo(rod.getAge()); } @@ -90,15 +90,14 @@ public abstract class AbstractBeanFactoryTests { // The dummy business method will throw an exception if the // necessary callbacks weren't invoked in the right order. lb.businessMethod(); - boolean condition = !lb.isDestroyed(); - assertThat(condition).as("Not destroyed").isTrue(); + assertThat(lb.isDestroyed()).as("Not destroyed").isFalse(); } @Test protected void findsValidInstance() { Object o = getBeanFactory().getBean("rod"); assertThat(o).isInstanceOfSatisfying(TestBean.class, rod -> { - assertThat(rod.getName().equals("Rod")).as("rod.name is Rod").isTrue(); + assertThat(rod.getName()).as("rod.name is Rod").isEqualTo("Rod"); assertThat(rod.getAge()).as("rod.age is 31").isEqualTo(31); }); } @@ -156,13 +155,12 @@ public abstract class AbstractBeanFactoryTests { TestBean tb1 = (TestBean) getBeanFactory().getBean("kathy"); TestBean tb2 = (TestBean) getBeanFactory().getBean("kathy"); assertThat(tb1).as("ref equal DOES NOT apply").isNotSameAs(tb2); - assertThat(tb1.equals(tb2)).as("object equal true").isTrue(); + assertThat(tb1).as("object equal true").isEqualTo(tb2); tb1.setAge(1); tb2.setAge(2); assertThat(tb1.getAge()).as("1 age independent = 1").isEqualTo(1); assertThat(tb2.getAge()).as("2 age independent = 2").isEqualTo(2); - boolean condition = !tb1.equals(tb2); - assertThat(condition).as("object equal now false").isTrue(); + assertThat(tb1).as("object equal now false").isNotEqualTo(tb2); } @Test @@ -192,7 +190,7 @@ public abstract class AbstractBeanFactoryTests { @Test protected void grandparentDefinitionFoundInBeanFactory() { TestBean dad = (TestBean) getBeanFactory().getBean("father"); - assertThat(dad.getName().equals("Albert")).as("Dad has correct name").isTrue(); + assertThat(dad.getName()).as("Dad has correct name").isEqualTo("Albert"); } @Test @@ -200,7 +198,7 @@ public abstract class AbstractBeanFactoryTests { assertThat(getBeanFactory().isSingleton("&singletonFactory")).isTrue(); assertThat(getBeanFactory().isSingleton("singletonFactory")).isTrue(); TestBean tb = (TestBean) getBeanFactory().getBean("singletonFactory"); - assertThat(tb.getName().equals(DummyFactory.SINGLETON_NAME)).as("Singleton from factory has correct name, not " + tb.getName()).isTrue(); + assertThat(tb.getName()).as("Singleton from factory has correct name, not " + tb.getName()).isEqualTo(DummyFactory.SINGLETON_NAME); DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory"); TestBean tb2 = (TestBean) getBeanFactory().getBean("singletonFactory"); assertThat(tb).as("Singleton references ==").isSameAs(tb2); diff --git a/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java b/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java index 320d001faa4..976f8abfbb4 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java @@ -133,12 +133,10 @@ class SimpleMailMessageTests { // Null object is not equal message1 = new SimpleMailMessage(); message2 = null; - boolean condition1 = !(message1.equals(message2)); - assertThat(condition1).isTrue(); + assertThat(message1).isNotEqualTo(message2); // Different class is not equal - boolean condition = !(message1.equals(new Object())); - assertThat(condition).isTrue(); + assertThat(message1).isNotEqualTo(new Object()); // Equal values are equal message1 = new SimpleMailMessage(); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java index b405c2be679..ab9f6ce2550 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java @@ -66,8 +66,7 @@ class BeanNamePointcutAtAspectTests { @Test void matchingBeanName() { - boolean condition = testBean1 instanceof Advised; - assertThat(condition).as("Expected a proxy").isTrue(); + assertThat(testBean1).as("Expected a proxy").isInstanceOf(Advised.class); // Call two methods to test for SPR-3953-like condition testBean1.setAge(20); @@ -77,8 +76,7 @@ class BeanNamePointcutAtAspectTests { @Test void nonMatchingBeanName() { - boolean condition = testBean3 instanceof Advised; - assertThat(condition).as("Didn't expect a proxy").isFalse(); + assertThat(testBean3).as("Didn't expect a proxy").isNotInstanceOf(Advised.class); testBean3.setAge(20); assertThat(counterAspect.count).isEqualTo(0); @@ -96,8 +94,7 @@ class BeanNamePointcutAtAspectTests { ITestBean proxyTestBean = factory.getProxy(); - boolean condition = proxyTestBean instanceof Advised; - assertThat(condition).as("Expected a proxy").isTrue(); + assertThat(proxyTestBean).as("Expected a proxy").isInstanceOf(Advised.class); proxyTestBean.setAge(20); assertThat(myCounterAspect.count).as("Programmatically created proxy shouldn't match bean()").isEqualTo(0); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java index 43b6205da52..ce98f2945ec 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java @@ -75,8 +75,7 @@ class BeanNamePointcutTests { @Test void matchingBeanName() { - boolean condition = this.testBean1 instanceof Advised; - assertThat(condition).as("Matching bean must be advised (proxied)").isTrue(); + assertThat(this.testBean1).as("Matching bean must be advised (proxied)").isInstanceOf(Advised.class); // Call two methods to test for SPR-3953-like condition this.testBean1.setAge(20); this.testBean1.setName(""); @@ -85,37 +84,31 @@ class BeanNamePointcutTests { @Test void nonMatchingBeanName() { - boolean condition = this.testBean2 instanceof Advised; - assertThat(condition).as("Non-matching bean must *not* be advised (proxied)").isFalse(); + assertThat(this.testBean2).as("Non-matching bean must *not* be advised (proxied)").isNotInstanceOf(Advised.class); this.testBean2.setAge(20); assertThat(this.counterAspect.getCount()).as("Advice must *not* have been executed").isEqualTo(0); } @Test void nonMatchingNestedBeanName() { - boolean condition = this.testBeanContainingNestedBean.getDoctor() instanceof Advised; - assertThat(condition).as("Non-matching bean must *not* be advised (proxied)").isFalse(); + assertThat(this.testBeanContainingNestedBean.getDoctor()).as("Non-matching bean must *not* be advised (proxied)").isNotInstanceOf(Advised.class); } @Test void matchingFactoryBeanObject() { - boolean condition1 = this.testFactoryBean1 instanceof Advised; - assertThat(condition1).as("Matching bean must be advised (proxied)").isTrue(); + assertThat(this.testFactoryBean1).as("Matching bean must be advised (proxied)").isInstanceOf(Advised.class); assertThat(this.testFactoryBean1.get("myKey")).isEqualTo("myValue"); assertThat(this.testFactoryBean1.get("myKey")).isEqualTo("myValue"); assertThat(this.counterAspect.getCount()).as("Advice not executed: must have been").isEqualTo(2); FactoryBean fb = (FactoryBean) ctx.getBean("&testFactoryBean1"); - boolean condition = !(fb instanceof Advised); - assertThat(condition).as("FactoryBean itself must *not* be advised").isTrue(); + assertThat(fb).as("FactoryBean itself must *not* be advised").isNotInstanceOf(Advised.class); } @Test void matchingFactoryBeanItself() { - boolean condition1 = !(this.testFactoryBean2 instanceof Advised); - assertThat(condition1).as("Matching bean must *not* be advised (proxied)").isTrue(); + assertThat(this.testFactoryBean2).as("Matching bean must *not* be advised (proxied)").isNotInstanceOf(Advised.class); FactoryBean fb = (FactoryBean) ctx.getBean("&testFactoryBean2"); - boolean condition = fb instanceof Advised; - assertThat(condition).as("FactoryBean itself must be advised").isTrue(); + assertThat(fb).as("FactoryBean itself must be advised").isInstanceOf(Advised.class); assertThat(Map.class.isAssignableFrom(fb.getObjectType())).isTrue(); assertThat(Map.class.isAssignableFrom(fb.getObjectType())).isTrue(); assertThat(this.counterAspect.getCount()).as("Advice not executed: must have been").isEqualTo(2); @@ -123,10 +116,8 @@ class BeanNamePointcutTests { @Test void pointcutAdvisorCombination() { - boolean condition = this.interceptThis instanceof Advised; - assertThat(condition).as("Matching bean must be advised (proxied)").isTrue(); - boolean condition1 = this.dontInterceptThis instanceof Advised; - assertThat(condition1).as("Non-matching bean must *not* be advised (proxied)").isFalse(); + assertThat(this.interceptThis).as("Matching bean must be advised (proxied)").isInstanceOf(Advised.class); + assertThat(this.dontInterceptThis).as("Non-matching bean must *not* be advised (proxied)").isNotInstanceOf(Advised.class); interceptThis.setAge(20); assertThat(testInterceptor.interceptionCount).isEqualTo(1); dontInterceptThis.setAge(20); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java index 19722814897..053628b1c13 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java @@ -61,8 +61,7 @@ class PropertyDependentAspectTests { private void checkXmlAspect(String appContextFile) { ApplicationContext context = new ClassPathXmlApplicationContext(appContextFile, getClass()); ICounter counter = (ICounter) context.getBean("counter"); - boolean condition = counter instanceof Advised; - assertThat(condition).as("Proxy didn't get created").isTrue(); + assertThat(counter).as("Proxy didn't get created").isInstanceOf(Advised.class); counter.increment(); JoinPointMonitorAspect callCountingAspect = (JoinPointMonitorAspect)context.getBean("monitoringAspect"); @@ -73,8 +72,7 @@ class PropertyDependentAspectTests { private void checkAtAspectJAspect(String appContextFile) { ApplicationContext context = new ClassPathXmlApplicationContext(appContextFile, getClass()); ICounter counter = (ICounter) context.getBean("counter"); - boolean condition = counter instanceof Advised; - assertThat(condition).as("Proxy didn't get created").isTrue(); + assertThat(counter).as("Proxy didn't get created").isInstanceOf(Advised.class); counter.increment(); JoinPointMonitorAtAspectJAspect callCountingAspect = (JoinPointMonitorAtAspectJAspect)context.getBean("monitoringAspect"); diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java index 1d00aa02680..5963b630274 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java @@ -97,8 +97,7 @@ class MethodLocatingFactoryBeanTests { factory.setBeanFactory(beanFactory); Object result = factory.getObject(); assertThat(result).isNotNull(); - boolean condition = result instanceof Method; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(Method.class); Method method = (Method) result; assertThat(method.invoke("Bingo")).isEqualTo("Bingo"); } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index fce41fe93a7..ac9172174d4 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java @@ -855,8 +855,7 @@ abstract class AbstractAopProxyTests { assertThat(proxied.getAge()).isEqualTo(10); assertThat(mba.getCalls()).isEqualTo(1); - boolean condition = proxied instanceof Advised; - assertThat(condition).as("Cannot be cast to Advised").isFalse(); + assertThat(proxied).as("Cannot be cast to Advised").isNotInstanceOf(Advised.class); } @Test diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java index e0efad450d1..b6e59fce8ae 100644 --- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java @@ -121,13 +121,11 @@ class CommonsPool2TargetSourceTests { void proxySerializableWithoutConfigMixin() throws Exception { Person pooled = (Person) beanFactory.getBean("pooledPerson"); - boolean condition1 = ((Advised) pooled).getTargetSource() instanceof CommonsPool2TargetSource; - assertThat(condition1).isTrue(); + assertThat(((Advised) pooled).getTargetSource()).isInstanceOf(CommonsPool2TargetSource.class); //((Advised) pooled).setTargetSource(new SingletonTargetSource(new SerializablePerson())); Person serialized = SerializationTestUtils.serializeAndDeserialize(pooled); - boolean condition = ((Advised) serialized).getTargetSource() instanceof SingletonTargetSource; - assertThat(condition).isTrue(); + assertThat(((Advised) serialized).getTargetSource()).isInstanceOf(SingletonTargetSource.class); serialized.setAge(25); assertThat(serialized.getAge()).isEqualTo(25); } @@ -206,10 +204,8 @@ class CommonsPool2TargetSourceTests { Object first = targetSource.getTarget(); Object second = targetSource.getTarget(); - boolean condition1 = first instanceof SerializablePerson; - assertThat(condition1).isTrue(); - boolean condition = second instanceof SerializablePerson; - assertThat(condition).isTrue(); + assertThat(first).isInstanceOf(SerializablePerson.class); + assertThat(second).isInstanceOf(SerializablePerson.class); assertThat(second).isEqualTo(first); targetSource.releaseTarget(first); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java index 3efb7f590ca..78f47ad86b2 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java @@ -152,8 +152,8 @@ class XmlBeanFactoryTests { assertThat(emmasJenks.getName()).as("Emmas jenks has right name").isEqualTo("Andrew"); assertThat(emmasJenks).as("Emmas doesn't equal new ref").isNotSameAs(xbf.getBean("jenks")); assertThat(georgiasJenks.getName()).as("Georgias jenks has right name").isEqualTo("Andrew"); - assertThat(emmasJenks.equals(georgiasJenks)).as("They are object equal").isTrue(); - assertThat(emmasJenks.equals(xbf.getBean("jenks"))).as("They object equal direct ref").isTrue(); + assertThat(emmasJenks).as("They are object equal").isEqualTo(georgiasJenks); + assertThat(emmasJenks).as("They object equal direct ref").isEqualTo(xbf.getBean("jenks")); } @Test @@ -1526,7 +1526,7 @@ class XmlBeanFactoryTests { new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArray"); assertThat(bean.array).isInstanceOf(int[].class); - assertThat(((int[]) bean.array)).hasSize(1); + assertThat((int[]) bean.array).hasSize(1); assertThat(((int[]) bean.array)[0]).isEqualTo(1); } @@ -1536,7 +1536,7 @@ class XmlBeanFactoryTests { new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("indexedConstructorArray"); assertThat(bean.array).isInstanceOf(int[].class); - assertThat(((int[]) bean.array)).hasSize(1); + assertThat((int[]) bean.array).hasSize(1); assertThat(((int[]) bean.array)[0]).isEqualTo(1); } @@ -1546,7 +1546,7 @@ class XmlBeanFactoryTests { new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType"); assertThat(bean.array).isInstanceOf(String[].class); - assertThat(((String[]) bean.array)).isEmpty(); + assertThat((String[]) bean.array).isEmpty(); } @Test @@ -1557,7 +1557,7 @@ class XmlBeanFactoryTests { bd.setLenientConstructorResolution(false); ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType"); assertThat(bean.array).isInstanceOf(String[].class); - assertThat(((String[]) bean.array)).isEmpty(); + assertThat((String[]) bean.array).isEmpty(); } @Test diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java index ece89d99be4..bb5870b9271 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java @@ -472,7 +472,7 @@ class ClassPathBeanDefinitionScannerTests { int initialBeanCount = context.getBeanDefinitionCount(); int scannedBeanCount = scanner.scan(BASE_PACKAGE); assertThat(scannedBeanCount).isGreaterThanOrEqualTo(12); - assertThat((context.getBeanDefinitionCount() - initialBeanCount)).isEqualTo(scannedBeanCount); + assertThat(context.getBeanDefinitionCount() - initialBeanCount).isEqualTo(scannedBeanCount); int addedBeanCount = scanner.scan("org.springframework.aop.aspectj.annotation"); assertThat(context.getBeanDefinitionCount()).isEqualTo((initialBeanCount + scannedBeanCount + addedBeanCount)); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java index 67f98a29d57..ac91c96f7d2 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java @@ -79,8 +79,7 @@ class ClassPathFactoryBeanDefinitionScannerTests { Object bean = context.getBean("requestScopedInstance"); //5 assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition = bean instanceof ScopedObject; - assertThat(condition).isTrue(); + assertThat(bean).isInstanceOf(ScopedObject.class); QualifiedClientBean clientBean = context.getBean("clientBean", QualifiedClientBean.class); assertThat(clientBean.testBean).isSameAs(context.getBean("publicInstance")); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java index 40c331af853..42f218534df 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java @@ -431,8 +431,7 @@ class CommonAnnotationBeanPostProcessorTests { bf.getBean("annotatedBean2"); } catch (BeanCreationException ex) { - boolean condition = ex.getRootCause() instanceof NoSuchBeanDefinitionException; - assertThat(condition).isTrue(); + assertThat(ex.getRootCause()).isInstanceOf(NoSuchBeanDefinitionException.class); NoSuchBeanDefinitionException innerEx = (NoSuchBeanDefinitionException) ex.getRootCause(); assertThat(innerEx.getBeanName()).isEqualTo("testBean9"); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java index daf234ad8d4..54e5514e211 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java @@ -444,8 +444,7 @@ class ConfigurationClassPostProcessorTests { pp.postProcessBeanFactory(beanFactory); Foo foo = beanFactory.getBean(Foo.class); - boolean condition = foo instanceof ExtendedFoo; - assertThat(condition).isTrue(); + assertThat(foo).isInstanceOf(ExtendedFoo.class); Bar bar = beanFactory.getBean(Bar.class); assertThat(bar.foo).isSameAs(foo); } @@ -460,8 +459,7 @@ class ConfigurationClassPostProcessorTests { pp.postProcessBeanFactory(beanFactory); Foo foo = beanFactory.getBean(Foo.class); - boolean condition = foo instanceof ExtendedAgainFoo; - assertThat(condition).isTrue(); + assertThat(foo).isInstanceOf(ExtendedAgainFoo.class); Bar bar = beanFactory.getBean(Bar.class); assertThat(bar.foo).isSameAs(foo); } @@ -491,8 +489,7 @@ class ConfigurationClassPostProcessorTests { pp.postProcessBeanFactory(beanFactory); Foo foo = beanFactory.getBean(Foo.class); - boolean condition = foo instanceof ExtendedFoo; - assertThat(condition).isTrue(); + assertThat(foo).isInstanceOf(ExtendedFoo.class); Bar bar = beanFactory.getBean(Bar.class); assertThat(bar.foo).isSameAs(foo); } @@ -506,8 +503,7 @@ class ConfigurationClassPostProcessorTests { beanFactory.addBeanPostProcessor(new AutowiredAnnotationBeanPostProcessor()); Foo foo = beanFactory.getBean(Foo.class); - boolean condition = foo instanceof ExtendedFoo; - assertThat(condition).isTrue(); + assertThat(foo).isInstanceOf(ExtendedFoo.class); Bar bar = beanFactory.getBean(Bar.class); assertThat(bar.foo).isSameAs(foo); } @@ -523,8 +519,7 @@ class ConfigurationClassPostProcessorTests { pp.postProcessBeanFactory(beanFactory); ITestBean injected = beanFactory.getBean("consumer", ScopedProxyConsumer.class).testBean; - boolean condition = injected instanceof ScopedObject; - assertThat(condition).isTrue(); + assertThat(injected).isInstanceOf(ScopedObject.class); assertThat(injected).isSameAs(beanFactory.getBean("scopedClass")); assertThat(injected).isSameAs(beanFactory.getBean(ITestBean.class)); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java index 2a7c3034e47..365233fdb72 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java @@ -91,7 +91,7 @@ class LazyAutowiredAnnotationBeanPostProcessorTests { tb.setName("tb"); assertThat(bean.getTestBean().getName()).isSameAs("tb"); - assertThat(bean.getTestBeans() instanceof Advised).isTrue(); + assertThat(bean.getTestBeans()).isInstanceOf(Advised.class); TargetSource targetSource = ((Advised) bean.getTestBeans()).getTargetSource(); assertThat(targetSource.getTarget()).isSameAs(targetSource.getTarget()); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java index 01be9631453..a905ba04fbc 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java @@ -44,8 +44,7 @@ class SimpleConfigTests { assertThat(value).isEqualTo("bar"); Future future = fooService.asyncFoo(1); - boolean condition = future instanceof FutureTask; - assertThat(condition).isTrue(); + assertThat(future).isInstanceOf(FutureTask.class); assertThat(future.get()).isEqualTo("bar"); assertThat(serviceInvocationCounter.getCount()).isEqualTo(2); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java index 8fd6c722113..909da5bb8ed 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java @@ -153,16 +153,14 @@ class ScopingTests { // get hidden bean Object bean = ctx.getBean("scopedTarget." + beanName); - boolean condition = bean instanceof ScopedObject; - assertThat(condition).isFalse(); + assertThat(bean).isNotInstanceOf(ScopedObject.class); } @Test void scopedProxyConfiguration() { TestBean singleton = (TestBean) ctx.getBean("singletonWithScopedInterfaceDep"); ITestBean spouse = singleton.getSpouse(); - boolean condition = spouse instanceof ScopedObject; - assertThat(condition).as("scoped bean is not wrapped by the scoped-proxy").isTrue(); + assertThat(spouse).as("scoped bean is not wrapped by the scoped-proxy").isInstanceOf(ScopedObject.class); String beanName = "scopedProxyInterface"; @@ -194,8 +192,7 @@ class ScopingTests { void scopedProxyConfigurationWithClasses() { TestBean singleton = (TestBean) ctx.getBean("singletonWithScopedClassDep"); ITestBean spouse = singleton.getSpouse(); - boolean condition = spouse instanceof ScopedObject; - assertThat(condition).as("scoped bean is not wrapped by the scoped-proxy").isTrue(); + assertThat(spouse).as("scoped bean is not wrapped by the scoped-proxy").isInstanceOf(ScopedObject.class); String beanName = "scopedProxyClass"; diff --git a/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java b/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java index ca33007666c..370f5b68ede 100644 --- a/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java +++ b/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java @@ -67,15 +67,13 @@ class LocaleContextHolderTests { LocaleContextHolder.setLocale(Locale.GERMAN); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMAN); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); - boolean condition1 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition1).isFalse(); + assertThat(LocaleContextHolder.getLocaleContext()).isNotInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMAN); LocaleContextHolder.setLocale(Locale.GERMANY); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMANY); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); - boolean condition = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition).isFalse(); + assertThat(LocaleContextHolder.getLocaleContext()).isNotInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMANY); LocaleContextHolder.setLocale(null); @@ -94,16 +92,14 @@ class LocaleContextHolderTests { LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("GMT+1")); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.getDefault()); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); - boolean condition1 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition1).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext()).isInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isNull(); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("GMT+2")); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.getDefault()); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); - boolean condition = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext()).isInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isNull(); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); @@ -123,46 +119,40 @@ class LocaleContextHolderTests { LocaleContextHolder.setLocale(Locale.GERMANY); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMANY); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); - boolean condition5 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition5).isFalse(); + assertThat(LocaleContextHolder.getLocaleContext()).isNotInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMANY); LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("GMT+1")); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMANY); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); - boolean condition3 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition3).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext()).isInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMANY); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); LocaleContextHolder.setLocale(Locale.GERMAN); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMAN); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); - boolean condition2 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition2).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext()).isInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMAN); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); LocaleContextHolder.setTimeZone(null); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMAN); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); - boolean condition4 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition4).isFalse(); + assertThat(LocaleContextHolder.getLocaleContext()).isNotInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMAN); LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("GMT+2")); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMAN); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); - boolean condition1 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition1).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext()).isInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMAN); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); LocaleContextHolder.setLocale(null); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.getDefault()); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); - boolean condition = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext()).isInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isNull(); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); diff --git a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java index 3a046926cd1..faca9dd7e9e 100644 --- a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java @@ -53,22 +53,19 @@ class JeeNamespaceHandlerEventTests { @Test void jndiLookupComponentEventReceived() { ComponentDefinition component = this.eventListener.getComponentDefinition("simple"); - boolean condition = component instanceof BeanComponentDefinition; - assertThat(condition).isTrue(); + assertThat(component).isInstanceOf(BeanComponentDefinition.class); } @Test void localSlsbComponentEventReceived() { ComponentDefinition component = this.eventListener.getComponentDefinition("simpleLocalEjb"); - boolean condition = component instanceof BeanComponentDefinition; - assertThat(condition).isTrue(); + assertThat(component).isInstanceOf(BeanComponentDefinition.class); } @Test void remoteSlsbComponentEventReceived() { ComponentDefinition component = this.eventListener.getComponentDefinition("simpleRemoteEjb"); - boolean condition = component instanceof BeanComponentDefinition; - assertThat(condition).isTrue(); + assertThat(component).isInstanceOf(BeanComponentDefinition.class); } } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java index 3b4cc37530f..34799f6d4a6 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java @@ -86,8 +86,7 @@ class ModelMBeanNotificationPublisherTests { publisher.sendNotification(notification); assertThat(mbean.getActualNotification()).isNotNull(); - boolean condition = mbean.getActualNotification() instanceof AttributeChangeNotification; - assertThat(condition).isTrue(); + assertThat(mbean.getActualNotification()).isInstanceOf(AttributeChangeNotification.class); assertThat(mbean.getActualNotification()).as("The exact same Notification is not being passed through from the publisher to the mbean.").isSameAs(notification); assertThat(mbean.getActualNotification().getSource()).as("The 'source' property of the Notification is not being set to the ObjectName of the associated MBean.").isSameAs(objectName); } @@ -102,8 +101,7 @@ class ModelMBeanNotificationPublisherTests { publisher.sendNotification(notification); assertThat(mbean.getActualNotification()).isNotNull(); - boolean condition = mbean.getActualNotification() instanceof AttributeChangeNotification; - assertThat(condition).isTrue(); + assertThat(mbean.getActualNotification()).isInstanceOf(AttributeChangeNotification.class); assertThat(mbean.getActualNotification()).as("The exact same Notification is not being passed through from the publisher to the mbean.").isSameAs(notification); assertThat(mbean.getActualNotification().getSource()).as("The 'source' property of the Notification is *wrongly* being set to the ObjectName of the associated MBean.").isSameAs(this); } diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java index d9e580a819f..098da562687 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java @@ -210,8 +210,7 @@ class JndiObjectFactoryBeanTests { jof.setJndiName("foo"); jof.setProxyInterface(ITestBean.class); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject()).isInstanceOf(ITestBean.class); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getAge()).isEqualTo(0); proxy.setAge(99); @@ -247,8 +246,7 @@ class JndiObjectFactoryBeanTests { jof.setProxyInterface(ITestBean.class); jof.setLookupOnStartup(false); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject()).isInstanceOf(ITestBean.class); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getName()).isNull(); assertThat(tb.getAge()).isEqualTo(0); @@ -276,8 +274,7 @@ class JndiObjectFactoryBeanTests { jof.setProxyInterface(ITestBean.class); jof.setCache(false); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject()).isInstanceOf(ITestBean.class); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getName()).isEqualTo("tb"); assertThat(tb.getAge()).isEqualTo(1); @@ -307,8 +304,7 @@ class JndiObjectFactoryBeanTests { jof.setLookupOnStartup(false); jof.setCache(false); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject()).isInstanceOf(ITestBean.class); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getName()).isNull(); assertThat(tb.getAge()).isEqualTo(0); @@ -347,8 +343,7 @@ class JndiObjectFactoryBeanTests { jof.setExpectedType(TestBean.class); jof.setProxyInterface(ITestBean.class); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject()).isInstanceOf(ITestBean.class); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getAge()).isEqualTo(0); proxy.setAge(99); @@ -384,8 +379,7 @@ class JndiObjectFactoryBeanTests { jof.setProxyInterface(ITestBean.class); jof.setExposeAccessContext(true); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject()).isInstanceOf(ITestBean.class); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getAge()).isEqualTo(0); proxy.setAge(99); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java index b81bf25bd06..7dd8be82bf1 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java @@ -335,8 +335,7 @@ class ScheduledAnnotationBeanPostProcessorTests { assertThat(task.getExpression()).isEqualTo("0 0 0-4,6-23 * * ?"); Trigger trigger = task.getTrigger(); assertThat(trigger).isNotNull(); - boolean condition = trigger instanceof CronTrigger; - assertThat(condition).isTrue(); + assertThat(trigger).isInstanceOf(CronTrigger.class); CronTrigger cronTrigger = (CronTrigger) trigger; ZonedDateTime dateTime = ZonedDateTime.of(2013, 4, 15, 4, 0, 0, 0, ZoneId.of("GMT+10")); Instant lastScheduledExecution = dateTime.toInstant(); diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java index bb28e0f3ec1..d410d44de6e 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java @@ -106,9 +106,9 @@ class BitsCronFieldTests { @Test void names() { - assertThat(((BitsCronField)CronField.parseMonth("JAN,FEB,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC"))) + assertThat((BitsCronField)CronField.parseMonth("JAN,FEB,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC")) .has(clear(0)).has(setRange(1, 12)); - assertThat(((BitsCronField)CronField.parseDaysOfWeek("SUN,MON,TUE,WED,THU,FRI,SAT"))) + assertThat((BitsCronField)CronField.parseDaysOfWeek("SUN,MON,TUE,WED,THU,FRI,SAT")) .has(clear(0)).has(setRange(1, 7)); } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index f26e656763f..7fbce4f1acb 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -78,8 +78,8 @@ class GroovyScriptFactoryTests { assertThat(AopUtils.isAopProxy(calc)).as("Shouldn't get proxy when refresh is disabled").isFalse(); assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse(); - assertThat(calc instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); - assertThat(messenger instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); + assertThat(calc).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); + assertThat(messenger).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); assertThat(calc).isEqualTo(calc); assertThat(messenger).isEqualTo(messenger); @@ -107,8 +107,8 @@ class GroovyScriptFactoryTests { assertThat(AopUtils.isAopProxy(calc)).as("Shouldn't get proxy when refresh is disabled").isFalse(); assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse(); - assertThat(calc instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); - assertThat(messenger instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); + assertThat(calc).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); + assertThat(messenger).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); assertThat(calc).isEqualTo(calc); assertThat(messenger).isEqualTo(messenger); @@ -130,7 +130,7 @@ class GroovyScriptFactoryTests { ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse(); - assertThat(messenger instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); + assertThat(messenger).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); assertThat(messenger2).isNotSameAs(messenger); assertThat(messenger2.getClass()).isSameAs(messenger.getClass()); @@ -149,7 +149,7 @@ class GroovyScriptFactoryTests { ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse(); - assertThat(messenger instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); + assertThat(messenger).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); assertThat(messenger2).isNotSameAs(messenger); assertThat(messenger2.getClass()).isSameAs(messenger.getClass()); @@ -168,7 +168,7 @@ class GroovyScriptFactoryTests { Messenger messenger = (Messenger) ctx.getBean("messengerInstance"); assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse(); - assertThat(messenger instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); + assertThat(messenger).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); String desiredMessage = "Hello World!"; assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); @@ -182,7 +182,7 @@ class GroovyScriptFactoryTests { Messenger messenger = (Messenger) ctx.getBean("messengerInstance"); assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse(); - assertThat(messenger instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); + assertThat(messenger).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); String desiredMessage = "Hello World!"; assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); @@ -196,7 +196,7 @@ class GroovyScriptFactoryTests { Messenger messenger = (Messenger) ctx.getBean("messengerInstanceInline"); assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse(); - assertThat(messenger instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); + assertThat(messenger).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); String desiredMessage = "Hello World!"; assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); @@ -210,7 +210,7 @@ class GroovyScriptFactoryTests { Messenger messenger = (Messenger) ctx.getBean("messengerInstanceInline"); assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse(); - assertThat(messenger instanceof Refreshable).as("Scripted object should not be instance of Refreshable").isFalse(); + assertThat(messenger).as("Scripted object should not be instance of Refreshable").isNotInstanceOf(Refreshable.class); String desiredMessage = "Hello World!"; assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); @@ -223,7 +223,7 @@ class GroovyScriptFactoryTests { Messenger messenger = (Messenger) ctx.getBean("messenger"); assertThat(AopUtils.isAopProxy(messenger)).as("Should be a proxy for refreshable scripts").isTrue(); - assertThat(messenger instanceof Refreshable).as("Should be an instance of Refreshable").isTrue(); + assertThat(messenger).as("Should be an instance of Refreshable").isInstanceOf(Refreshable.class); String desiredMessage = "Hello World!"; assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); @@ -242,7 +242,7 @@ class GroovyScriptFactoryTests { ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); assertThat(AopUtils.isAopProxy(messenger)).as("Should be a proxy for refreshable scripts").isTrue(); - assertThat(messenger instanceof Refreshable).as("Should be an instance of Refreshable").isTrue(); + assertThat(messenger).as("Should be an instance of Refreshable").isInstanceOf(Refreshable.class); assertThat(messenger.getMessage()).isEqualTo("Hello World!"); assertThat(messenger2.getMessage()).isEqualTo("Hello World!"); @@ -355,7 +355,7 @@ class GroovyScriptFactoryTests { CallCounter countingAspect = (CallCounter) ctx.getBean("getMessageAspect"); assertThat(AopUtils.isAopProxy(messenger)).isTrue(); - assertThat(messenger instanceof Refreshable).isFalse(); + assertThat(messenger).isNotInstanceOf(Refreshable.class); assertThat(countingAspect.getCalls()).isEqualTo(0); assertThat(messenger.getMessage()).isEqualTo("Hello World!"); assertThat(countingAspect.getCalls()).isEqualTo(1); @@ -387,7 +387,7 @@ class GroovyScriptFactoryTests { assertThat(ObjectUtils.containsElement(bd.getDependsOn(), "messenger")).isTrue(); Calculator calculator = (Calculator) ctx.getBean("calculator"); assertThat(calculator).isNotNull(); - assertThat(calculator instanceof Refreshable).isFalse(); + assertThat(calculator).isNotInstanceOf(Refreshable.class); } @Test @@ -399,7 +399,7 @@ class GroovyScriptFactoryTests { CallCounter countingAspect = (CallCounter) ctx.getBean("getMessageAspect"); assertThat(AopUtils.isAopProxy(messenger)).isTrue(); - assertThat(messenger instanceof Refreshable).isTrue(); + assertThat(messenger).isInstanceOf(Refreshable.class); assertThat(countingAspect.getCalls()).isEqualTo(0); assertThat(messenger.getMessage()).isEqualTo("Hello World!"); assertThat(countingAspect.getCalls()).isEqualTo(1); @@ -416,7 +416,7 @@ class GroovyScriptFactoryTests { Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger"); assertThat(AopUtils.isAopProxy(messenger)).isTrue(); - assertThat(messenger instanceof Refreshable).isTrue(); + assertThat(messenger).isInstanceOf(Refreshable.class); assertThat(messenger.getMessage()).isEqualTo("Hello World!"); assertThat(ctx.getBeansOfType(ConcreteMessenger.class)).containsValue((ConcreteMessenger) messenger); @@ -467,7 +467,7 @@ class GroovyScriptFactoryTests { assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger"); Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger"); assertThat(AopUtils.isAopProxy(messenger)).isTrue(); - assertThat(messenger instanceof Refreshable).isTrue(); + assertThat(messenger).isInstanceOf(Refreshable.class); assertThat(messenger.getMessage()).isEqualTo("Hello World!"); } @@ -530,7 +530,7 @@ class GroovyScriptFactoryTests { void factoryBean() { ApplicationContext context = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); Object factory = context.getBean("&factory"); - assertThat(factory instanceof FactoryBean).isTrue(); + assertThat(factory).isInstanceOf(FactoryBean.class); Object result = context.getBean("factory"); assertThat(result).isEqualTo("test"); } @@ -539,7 +539,7 @@ class GroovyScriptFactoryTests { void refreshableFactoryBean() { ApplicationContext context = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); Object factory = context.getBean("&refreshableFactory"); - assertThat(factory instanceof FactoryBean).isTrue(); + assertThat(factory).isInstanceOf(FactoryBean.class); Object result = context.getBean("refreshableFactory"); assertThat(result).isEqualTo("test"); } diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java index 17b27039406..cc1e22ad51c 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java @@ -58,7 +58,7 @@ class DataBinderFieldAccessTests { Map m = binder.getBindingResult().getModel(); assertThat(m).as("There is one element in map").hasSize(2); FieldAccessBean tb = (FieldAccessBean) m.get("person"); - assertThat(tb.equals(rod)).as("Same object").isTrue(); + assertThat(tb).as("Same object").isEqualTo(rod); } @Test diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index dedf6180621..23b3f38a48a 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -113,7 +113,7 @@ class DataBinderTests { Map map = binder.getBindingResult().getModel(); assertThat(map).as("There is one element in map").hasSize(2); TestBean tb = (TestBean) map.get("person"); - assertThat(tb.equals(rod)).as("Same object").isTrue(); + assertThat(tb).as("Same object").isEqualTo(rod); BindingResult other = new DataBinder(rod, "person").getBindingResult(); assertThat(binder.getBindingResult()).isEqualTo(other); @@ -793,7 +793,7 @@ class DataBinderTests { Map m = binder.getBindingResult().getModel(); assertThat(m).as("There is one element in map").hasSize(2); TestBean tb = (TestBean) m.get("person"); - assertThat(tb.equals(rod)).as("Same object").isTrue(); + assertThat(tb).as("Same object").isEqualTo(rod); } @Test diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java index 45a1a8186b4..4b32b4b40e3 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java @@ -93,8 +93,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe assertThat(aca.getApplicationContext()).as("has had context set").isSameAs(applicationContext); Object aca2 = applicationContext.getBean("aca-prototype"); assertThat(aca).as("NOT Same instance").isNotSameAs(aca2); - boolean condition = !applicationContext.isSingleton("aca-prototype"); - assertThat(condition).as("Says is prototype").isTrue(); + assertThat(applicationContext.isSingleton("aca-prototype")).as("Says is prototype").isFalse(); } @Test @@ -110,26 +109,25 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe @Test protected void overrideWorked() { TestBean rod = (TestBean) applicationContext.getParent().getBean("rod"); - assertThat(rod.getName().equals("Roderick")).as("Parent's name differs").isTrue(); + assertThat(rod.getName()).as("Parent's name differs").isEqualTo("Roderick"); } @Test protected void grandparentDefinitionFound() { TestBean dad = (TestBean) applicationContext.getBean("father"); - assertThat(dad.getName().equals("Albert")).as("Dad has correct name").isTrue(); + assertThat(dad.getName()).as("Dad has correct name").isEqualTo("Albert"); } @Test protected void grandparentTypedDefinitionFound() { TestBean dad = applicationContext.getBean("father", TestBean.class); - assertThat(dad.getName().equals("Albert")).as("Dad has correct name").isTrue(); + assertThat(dad.getName()).as("Dad has correct name").isEqualTo("Albert"); } @Test protected void closeTriggersDestroy() { LifecycleBean lb = (LifecycleBean) applicationContext.getBean("lifecycle"); - boolean condition = !lb.isDestroyed(); - assertThat(condition).as("Not destroyed").isTrue(); + assertThat(lb.isDestroyed()).as("Not destroyed").isFalse(); applicationContext.close(); if (applicationContext.getParent() != null) { ((ConfigurableApplicationContext) applicationContext.getParent()).close(); diff --git a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java index 08b6f489d00..e8900a22f9d 100644 --- a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java +++ b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java @@ -18,7 +18,6 @@ package org.springframework.core; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.Arrays; import org.junit.jupiter.api.Test; @@ -71,22 +70,22 @@ class PrioritizedParameterNameDiscovererTests { void orderedParameterDiscoverers1() { PrioritizedParameterNameDiscoverer pnd = new PrioritizedParameterNameDiscoverer(); pnd.addDiscoverer(returnsFooBar); - assertThat(Arrays.equals(FOO_BAR, pnd.getParameterNames(anyMethod))).isTrue(); - assertThat(Arrays.equals(FOO_BAR, pnd.getParameterNames((Constructor) null))).isTrue(); + assertThat(pnd.getParameterNames(anyMethod)).containsExactly(FOO_BAR); + assertThat(pnd.getParameterNames((Constructor) null)).containsExactly(FOO_BAR); pnd.addDiscoverer(returnsSomethingElse); - assertThat(Arrays.equals(FOO_BAR, pnd.getParameterNames(anyMethod))).isTrue(); - assertThat(Arrays.equals(FOO_BAR, pnd.getParameterNames((Constructor) null))).isTrue(); + assertThat(pnd.getParameterNames(anyMethod)).containsExactly(FOO_BAR); + assertThat(pnd.getParameterNames((Constructor) null)).containsExactly(FOO_BAR); } @Test void orderedParameterDiscoverers2() { PrioritizedParameterNameDiscoverer pnd = new PrioritizedParameterNameDiscoverer(); pnd.addDiscoverer(returnsSomethingElse); - assertThat(Arrays.equals(SOMETHING_ELSE, pnd.getParameterNames(anyMethod))).isTrue(); - assertThat(Arrays.equals(SOMETHING_ELSE, pnd.getParameterNames((Constructor) null))).isTrue(); + assertThat(pnd.getParameterNames(anyMethod)).containsExactly(SOMETHING_ELSE); + assertThat(pnd.getParameterNames((Constructor) null)).containsExactly(SOMETHING_ELSE); pnd.addDiscoverer(returnsFooBar); - assertThat(Arrays.equals(SOMETHING_ELSE, pnd.getParameterNames(anyMethod))).isTrue(); - assertThat(Arrays.equals(SOMETHING_ELSE, pnd.getParameterNames((Constructor) null))).isTrue(); + assertThat(pnd.getParameterNames(anyMethod)).containsExactly(SOMETHING_ELSE); + assertThat(pnd.getParameterNames((Constructor) null)).containsExactly(SOMETHING_ELSE); } } diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java index c01ade2347b..8b67d70d783 100644 --- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java +++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java @@ -1256,9 +1256,9 @@ class ResolvableTypeTests { ResolvableType arg1 = ResolvableType.forMethodParameter(method, 1, ClassArguments.class); ResolvableType arg2 = ResolvableType.forMethodParameter(method, 2, ClassArguments.class); - assertThat(returnType.getType().equals(arg0.as(Class.class).getGeneric(0).getType())).isTrue(); - assertThat(returnType.getType().equals(arg1.as(Class.class).getGeneric(0).getType())).isFalse(); - assertThat(returnType.getType().equals(arg2.as(Class.class).getGeneric(0).getType())).isFalse(); + assertThat(returnType.getType()).isEqualTo(arg0.as(Class.class).getGeneric(0).getType()); + assertThat(returnType.getType()).isNotEqualTo(arg1.as(Class.class).getGeneric(0).getType()); + assertThat(returnType.getType()).isNotEqualTo(arg2.as(Class.class).getGeneric(0).getType()); } @Test diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java index ef5739f73ae..b3fd598da0d 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java @@ -663,8 +663,7 @@ class AnnotatedElementUtilsTests { } } assertThat(bridgeMethod != null && bridgeMethod.isBridge()).isTrue(); - boolean condition = bridgedMethod != null && !bridgedMethod.isBridge(); - assertThat(condition).isTrue(); + assertThat(bridgedMethod != null && !bridgedMethod.isBridge()).isTrue(); AnnotationAttributes attributes = findMergedAnnotationAttributes(bridgeMethod, Order.class); assertThat(attributes).as("Should find @Order on StringGenericParameter.getFor() bridge method").isNotNull(); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java index 454653896dd..3019dfe8e0b 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java @@ -63,7 +63,7 @@ class AnnotationAttributesTests { assertThat(attributes.getBoolean("bool1")).isTrue(); assertThat(attributes.getBoolean("bool2")).isFalse(); assertThat(attributes.getEnum("color")).isEqualTo(Color.RED); - assertThat(attributes.getClass("class").equals(Integer.class)).isTrue(); + assertThat(attributes.getClass("class")).isEqualTo(Integer.class); assertThat(attributes.getClassArray("classes")).isEqualTo(new Class[] {Number.class, Short.class, Integer.class}); assertThat(attributes.getNumber("number")).isEqualTo(42); assertThat(attributes.getAnnotation("anno").getNumber("value")).isEqualTo(10); diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index 70f92da662a..65ffe4784f5 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -40,6 +40,7 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.InstanceOfAssertFactories.LIST; /** * @author Keith Donald @@ -181,12 +182,11 @@ class CollectionToCollectionConverterTests { } @SuppressWarnings("rawtypes") - private void testCollectionConversionToArrayList(Collection aSource) { - Object myConverted = (new CollectionToCollectionConverter(new GenericConversionService())).convert( - aSource, TypeDescriptor.forObject(aSource), TypeDescriptor.forObject(new ArrayList())); - boolean condition = myConverted instanceof ArrayList; - assertThat(condition).isTrue(); - assertThat(((ArrayList) myConverted)).hasSameSizeAs(aSource); + private void testCollectionConversionToArrayList(Collection source) { + CollectionToCollectionConverter converter = new CollectionToCollectionConverter(new GenericConversionService()); + Object convertedValue = converter.convert( + source, TypeDescriptor.forObject(source), TypeDescriptor.forObject(new ArrayList())); + assertThat(convertedValue).asInstanceOf(LIST).hasSameSizeAs(source); } @Test diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index 78e27ddece7..ebf8f7ae176 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -335,7 +335,7 @@ class GenericConversionServiceTests { TypeDescriptor sourceType = TypeDescriptor.forObject(list); TypeDescriptor targetType = TypeDescriptor.valueOf(String[].class); assertThat(conversionService.canConvert(sourceType, targetType)).isTrue(); - assertThat(((String[]) conversionService.convert(list, sourceType, targetType))).isEmpty(); + assertThat((String[]) conversionService.convert(list, sourceType, targetType)).isEmpty(); } @Test diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java index 1d0f63882c4..49d25ad76f1 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java @@ -433,33 +433,33 @@ class AnnotationMetadataTests { AnnotationAttributes specialAttrs = (AnnotationAttributes) metadata.getAnnotationAttributes(SpecialAttr.class.getName()); assertThat(specialAttrs).hasSize(6); assertThat(String.class.isAssignableFrom(specialAttrs.getClass("clazz"))).isTrue(); - assertThat(specialAttrs.getEnum("state").equals(Thread.State.NEW)).isTrue(); + assertThat((Enum) specialAttrs.getEnum("state")).isEqualTo(Thread.State.NEW); AnnotationAttributes nestedAnno = specialAttrs.getAnnotation("nestedAnno"); assertThat(nestedAnno.getString("value")).isEqualTo("na"); - assertThat(nestedAnno.getEnum("anEnum").equals(SomeEnum.LABEL1)).isTrue(); + assertThat((Enum) nestedAnno.getEnum("anEnum")).isEqualTo(SomeEnum.LABEL1); assertThat((Class[]) nestedAnno.get("classArray")).isEqualTo(new Class[] {String.class}); AnnotationAttributes[] nestedAnnoArray = specialAttrs.getAnnotationArray("nestedAnnoArray"); assertThat(nestedAnnoArray).hasSize(2); assertThat(nestedAnnoArray[0].getString("value")).isEqualTo("default"); - assertThat(nestedAnnoArray[0].getEnum("anEnum").equals(SomeEnum.DEFAULT)).isTrue(); + assertThat((Enum) nestedAnnoArray[0].getEnum("anEnum")).isEqualTo(SomeEnum.DEFAULT); assertThat((Class[]) nestedAnnoArray[0].get("classArray")).isEqualTo(new Class[] {Void.class}); assertThat(nestedAnnoArray[1].getString("value")).isEqualTo("na1"); - assertThat(nestedAnnoArray[1].getEnum("anEnum").equals(SomeEnum.LABEL2)).isTrue(); + assertThat((Enum) nestedAnnoArray[1].getEnum("anEnum")).isEqualTo(SomeEnum.LABEL2); assertThat((Class[]) nestedAnnoArray[1].get("classArray")).isEqualTo(new Class[] {Number.class}); assertThat(nestedAnnoArray[1].getClassArray("classArray")).isEqualTo(new Class[] {Number.class}); AnnotationAttributes optional = specialAttrs.getAnnotation("optional"); assertThat(optional.getString("value")).isEqualTo("optional"); - assertThat(optional.getEnum("anEnum").equals(SomeEnum.DEFAULT)).isTrue(); + assertThat((Enum) optional.getEnum("anEnum")).isEqualTo(SomeEnum.DEFAULT); assertThat((Class[]) optional.get("classArray")).isEqualTo(new Class[] {Void.class}); assertThat(optional.getClassArray("classArray")).isEqualTo(new Class[] {Void.class}); AnnotationAttributes[] optionalArray = specialAttrs.getAnnotationArray("optionalArray"); assertThat(optionalArray).hasSize(1); assertThat(optionalArray[0].getString("value")).isEqualTo("optional"); - assertThat(optionalArray[0].getEnum("anEnum").equals(SomeEnum.DEFAULT)).isTrue(); + assertThat((Enum) optionalArray[0].getEnum("anEnum")).isEqualTo(SomeEnum.DEFAULT); assertThat((Class[]) optionalArray[0].get("classArray")).isEqualTo(new Class[] {Void.class}); assertThat(optionalArray[0].getClassArray("classArray")).isEqualTo(new Class[] {Void.class}); diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java index 41eee5a7d91..019038bec1d 100644 --- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java +++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java @@ -57,8 +57,7 @@ class AutoPopulatingListTests { for (int x = 0; x < 10; x++) { Object element = list.get(x); assertThat(list.get(x)).as("Element is null").isNotNull(); - boolean condition = element instanceof TestObject; - assertThat(condition).as("Element is incorrect type").isTrue(); + assertThat(element).as("Element is incorrect type").isInstanceOf(TestObject.class); assertThat(element).isNotSameAs(lastElement); lastElement = element; } @@ -68,14 +67,10 @@ class AutoPopulatingListTests { list.add(11, helloWorld); assertThat(list).element(11, InstanceOfAssertFactories.STRING).isEqualTo(helloWorld); - boolean condition3 = list.get(10) instanceof TestObject; - assertThat(condition3).isTrue(); - boolean condition2 = list.get(12) instanceof TestObject; - assertThat(condition2).isTrue(); - boolean condition1 = list.get(13) instanceof TestObject; - assertThat(condition1).isTrue(); - boolean condition = list.get(20) instanceof TestObject; - assertThat(condition).isTrue(); + assertThat(list.get(10)).isInstanceOf(TestObject.class); + assertThat(list.get(12)).isInstanceOf(TestObject.class); + assertThat(list.get(13)).isInstanceOf(TestObject.class); + assertThat(list.get(20)).isInstanceOf(TestObject.class); } private void doTestWithElementFactory(AutoPopulatingList list) { diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java index 88c288898ca..1baeb027d6c 100644 --- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java @@ -944,11 +944,11 @@ class ClassUtilsTests { } private static void assertNotPublic(Member member) { - assertThat(!isPublic(member)).as("%s must be not be public", member).isTrue(); + assertThat(isPublic(member)).as("%s must be not be public", member).isFalse(); } private static void assertNotPublic(Class clazz) { - assertThat(!isPublic(clazz)).as("%s must be not be public", clazz).isTrue(); + assertThat(isPublic(clazz)).as("%s must be not be public", clazz).isFalse(); } private static boolean isPublic(Class clazz) { diff --git a/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java b/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java index a144b63bbce..dfd4124834d 100644 --- a/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java +++ b/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java @@ -38,10 +38,10 @@ class CompositeSetTests { Set all = new HashSet<>(first); all.addAll(second); - assertThat(composite.equals(all)).isTrue(); - assertThat(composite.equals(first)).isFalse(); - assertThat(composite.equals(second)).isFalse(); - assertThat(composite.equals(Collections.emptySet())).isFalse(); + assertThat(composite).isEqualTo(all); + assertThat(composite).isNotEqualTo(first); + assertThat(composite).isNotEqualTo(second); + assertThat(composite).isNotEqualTo(Collections.emptySet()); } } diff --git a/spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java index 4f24a6df213..988ca8423d0 100644 --- a/spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java @@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; -import java.util.Arrays; import org.junit.jupiter.api.Test; @@ -42,7 +41,7 @@ class FileCopyUtilsTests { ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); int count = FileCopyUtils.copy(in, out); assertThat(count).isEqualTo(content.length); - assertThat(Arrays.equals(content, out.toByteArray())).isTrue(); + assertThat(out.toByteArray()).isEqualTo(content); } @Test @@ -50,7 +49,7 @@ class FileCopyUtilsTests { byte[] content = "content".getBytes(); ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); FileCopyUtils.copy(content, out); - assertThat(Arrays.equals(content, out.toByteArray())).isTrue(); + assertThat(out.toByteArray()).isEqualTo(content); } @Test @@ -58,7 +57,7 @@ class FileCopyUtilsTests { byte[] content = "content".getBytes(); ByteArrayInputStream in = new ByteArrayInputStream(content); byte[] result = FileCopyUtils.copyToByteArray(in); - assertThat(Arrays.equals(content, result)).isTrue(); + assertThat(result).isEqualTo(content); } @Test diff --git a/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java b/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java index 52a0cf98f10..8490420c5a8 100644 --- a/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java +++ b/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java @@ -35,8 +35,8 @@ class FilteredSetTests { Set expected = Set.of("foo", "baz"); - assertThat(filtered.equals(expected)).isTrue(); - assertThat(filtered.equals(set)).isFalse(); - assertThat(filtered.equals(Collections.emptySet())).isFalse(); + assertThat(filtered).isEqualTo(expected); + assertThat(filtered).isNotEqualTo(set); + assertThat(filtered).isNotEqualTo(Collections.emptySet()); } } diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java index c1485e82d6c..f670edcb5cd 100644 --- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java @@ -16,7 +16,6 @@ package org.springframework.util; -import java.util.Arrays; import java.util.Collections; import java.util.Locale; import java.util.Properties; @@ -515,120 +514,106 @@ class StringUtilsTests { @Test void tokenizeToStringArray() { - String[] sa = StringUtils.tokenizeToStringArray("a,b , ,c", ","); - assertThat(sa).hasSize(3); - assertThat(sa[0].equals("a") && sa[1].equals("b") && sa[2].equals("c")).as("components are correct").isTrue(); + String[] array = StringUtils.tokenizeToStringArray("a,b , ,c", ","); + assertThat(array).containsExactly("a", "b", "c"); } @Test void tokenizeToStringArrayWithNotIgnoreEmptyTokens() { - String[] sa = StringUtils.tokenizeToStringArray("a,b , ,c", ",", true, false); - assertThat(sa).hasSize(4); - assertThat(sa[0].equals("a") && sa[1].equals("b") && sa[2].isEmpty() && sa[3].equals("c")).as("components are correct").isTrue(); + String[] array = StringUtils.tokenizeToStringArray("a,b , ,c", ",", true, false); + assertThat(array).containsExactly("a", "b", "", "c"); } @Test void tokenizeToStringArrayWithNotTrimTokens() { - String[] sa = StringUtils.tokenizeToStringArray("a,b ,c", ",", false, true); - assertThat(sa).hasSize(3); - assertThat(sa[0].equals("a") && sa[1].equals("b ") && sa[2].equals("c")).as("components are correct").isTrue(); + String[] array = StringUtils.tokenizeToStringArray("a,b ,c", ",", false, true); + assertThat(array).containsExactly("a", "b ", "c"); } @Test void commaDelimitedListToStringArrayWithNullProducesEmptyArray() { - String[] sa = StringUtils.commaDelimitedListToStringArray(null); - assertThat(sa).as("String array isn't null with null input").isNotNull(); - assertThat(sa.length).as("String array length == 0 with null input").isEqualTo(0); + String[] array = StringUtils.commaDelimitedListToStringArray(null); + assertThat(array).isEmpty(); } @Test void commaDelimitedListToStringArrayWithEmptyStringProducesEmptyArray() { - String[] sa = StringUtils.commaDelimitedListToStringArray(""); - assertThat(sa).as("String array isn't null with null input").isNotNull(); - assertThat(sa.length).as("String array length == 0 with null input").isEqualTo(0); + String[] array = StringUtils.commaDelimitedListToStringArray(""); + assertThat(array).isEmpty(); } @Test void delimitedListToStringArrayWithComma() { - String[] sa = StringUtils.delimitedListToStringArray("a,b", ","); - assertThat(sa).hasSize(2); - assertThat(sa[0]).isEqualTo("a"); - assertThat(sa[1]).isEqualTo("b"); + String[] array = StringUtils.delimitedListToStringArray("a,b", ","); + assertThat(array).containsExactly("a", "b"); } @Test void delimitedListToStringArrayWithSemicolon() { - String[] sa = StringUtils.delimitedListToStringArray("a;b", ";"); - assertThat(sa).hasSize(2); - assertThat(sa[0]).isEqualTo("a"); - assertThat(sa[1]).isEqualTo("b"); + String[] array = StringUtils.delimitedListToStringArray("a;b", ";"); + assertThat(array).containsExactly("a", "b"); } @Test void delimitedListToStringArrayWithEmptyDelimiter() { - String[] sa = StringUtils.delimitedListToStringArray("a,b", ""); - assertThat(sa).hasSize(3); - assertThat(sa[0]).isEqualTo("a"); - assertThat(sa[1]).isEqualTo(","); - assertThat(sa[2]).isEqualTo("b"); + String[] array = StringUtils.delimitedListToStringArray("a,b", ""); + assertThat(array).containsExactly("a", ",", "b"); } @Test void delimitedListToStringArrayWithNullDelimiter() { - String[] sa = StringUtils.delimitedListToStringArray("a,b", null); - assertThat(sa).hasSize(1); - assertThat(sa[0]).isEqualTo("a,b"); + String[] array = StringUtils.delimitedListToStringArray("a,b", null); + assertThat(array).containsExactly("a,b"); } @Test void delimitedListToStringArrayWithCharacterToDelete() { - String[] sa = StringUtils.delimitedListToStringArray("a,b,c", ",", "a"); - assertThat(sa).containsExactly("", "b", "c"); + String[] array = StringUtils.delimitedListToStringArray("a,b,c", ",", "a"); + assertThat(array).containsExactly("", "b", "c"); } @Test void delimitedListToStringArrayWithCharacterToDeleteEqualsToDelimiter() { - String[] sa = StringUtils.delimitedListToStringArray("a,b,c", ",", ","); - assertThat(sa).containsExactly("a", "b", "c"); + String[] array = StringUtils.delimitedListToStringArray("a,b,c", ",", ","); + assertThat(array).containsExactly("a", "b", "c"); } @Test void commaDelimitedListToStringArrayMatchWords() { // Could read these from files - String[] sa = new String[] {"foo", "bar", "big"}; - doTestCommaDelimitedListToStringArrayLegalMatch(sa); - doTestStringArrayReverseTransformationMatches(sa); + String[] array = new String[] {"foo", "bar", "big"}; + doTestCommaDelimitedListToStringArrayLegalMatch(array); + doTestStringArrayReverseTransformationMatches(array); - sa = new String[] {"a", "b", "c"}; - doTestCommaDelimitedListToStringArrayLegalMatch(sa); - doTestStringArrayReverseTransformationMatches(sa); + array = new String[] {"a", "b", "c"}; + doTestCommaDelimitedListToStringArrayLegalMatch(array); + doTestStringArrayReverseTransformationMatches(array); // Test same words - sa = new String[] {"AA", "AA", "AA", "AA", "AA"}; - doTestCommaDelimitedListToStringArrayLegalMatch(sa); - doTestStringArrayReverseTransformationMatches(sa); + array = new String[] {"AA", "AA", "AA", "AA", "AA"}; + doTestCommaDelimitedListToStringArrayLegalMatch(array); + doTestStringArrayReverseTransformationMatches(array); } - private void doTestStringArrayReverseTransformationMatches(String[] sa) { + private void doTestStringArrayReverseTransformationMatches(String[] array) { String[] reverse = - StringUtils.commaDelimitedListToStringArray(StringUtils.arrayToCommaDelimitedString(sa)); - assertThat(Arrays.asList(reverse)).as("Reverse transformation is equal").isEqualTo(Arrays.asList(sa)); + StringUtils.commaDelimitedListToStringArray(StringUtils.arrayToCommaDelimitedString(array)); + assertThat(reverse).as("Reverse transformation is equal").isEqualTo(array); } @Test void commaDelimitedListToStringArraySingleString() { // Could read these from files String s = "woeirqupoiewuropqiewuorpqiwueopriquwopeiurqopwieur"; - String[] sa = StringUtils.commaDelimitedListToStringArray(s); - assertThat(sa.length).as("Found one String with no delimiters").isEqualTo(1); - assertThat(sa[0]).as("Single array entry matches input String with no delimiters").isEqualTo(s); + String[] array = StringUtils.commaDelimitedListToStringArray(s); + assertThat(array).as("Single array entry matches input String with no delimiters").containsExactly(s); } @Test void commaDelimitedListToStringArrayWithOtherPunctuation() { // Could read these from files - String[] sa = new String[] {"xcvwert4456346&*.", "///", ".!", ".", ";"}; - doTestCommaDelimitedListToStringArrayLegalMatch(sa); + String[] array = new String[] {"xcvwert4456346&*.", "///", ".!", ".", ";"}; + doTestCommaDelimitedListToStringArrayLegalMatch(array); } /** @@ -637,20 +622,17 @@ class StringUtilsTests { @Test void commaDelimitedListToStringArrayEmptyStrings() { // Could read these from files - String[] sa = StringUtils.commaDelimitedListToStringArray("a,,b"); - assertThat(sa.length).as("a,,b produces array length 3").isEqualTo(3); - assertThat(sa[0].equals("a") && sa[1].isEmpty() && sa[2].equals("b")).as("components are correct").isTrue(); + String[] array = StringUtils.commaDelimitedListToStringArray("a,,b"); + assertThat(array).containsExactly("a", "", "b"); - sa = new String[] {"", "", "a", ""}; - doTestCommaDelimitedListToStringArrayLegalMatch(sa); + array = new String[] {"", "", "a", ""}; + doTestCommaDelimitedListToStringArrayLegalMatch(array); } private void doTestCommaDelimitedListToStringArrayLegalMatch(String[] components) { String sb = String.join(String.valueOf(','), components); - String[] sa = StringUtils.commaDelimitedListToStringArray(sb); - assertThat(sa).as("String array isn't null with legal match").isNotNull(); - assertThat(sa.length).as("String array length is correct with legal match").isEqualTo(components.length); - assertThat(Arrays.equals(sa, components)).as("Output equals input").isTrue(); + String[] array = StringUtils.commaDelimitedListToStringArray(sb); + assertThat(array).as("Output equals input").isEqualTo(components); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index cdfd6a3f06b..920333a2ec6 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -886,10 +886,10 @@ class EvaluationTests extends AbstractExpressionTests { // BigDecimal e = parser.parseExpression("bd++"); - assertThat(new BigDecimal("2").equals(helper.bd)).isTrue(); + assertThat(new BigDecimal("2")).isEqualTo(helper.bd); BigDecimal return_bd = e.getValue(ctx, BigDecimal.class); assertThat(new BigDecimal("2")).isEqualTo(return_bd); - assertThat(new BigDecimal("3").equals(helper.bd)).isTrue(); + assertThat(new BigDecimal("3")).isEqualTo(helper.bd); // double e = parser.parseExpression("ddd++"); @@ -939,10 +939,10 @@ class EvaluationTests extends AbstractExpressionTests { // BigDecimal e = parser.parseExpression("++bd"); - assertThat(new BigDecimal("2").equals(helper.bd)).isTrue(); + assertThat(new BigDecimal("2")).isEqualTo(helper.bd); BigDecimal return_bd = e.getValue(ctx, BigDecimal.class); assertThat(new BigDecimal("3")).isEqualTo(return_bd); - assertThat(new BigDecimal("3").equals(helper.bd)).isTrue(); + assertThat(new BigDecimal("3")).isEqualTo(helper.bd); // double e = parser.parseExpression("++ddd"); @@ -1036,10 +1036,10 @@ class EvaluationTests extends AbstractExpressionTests { // BigDecimal e = parser.parseExpression("bd--"); - assertThat(new BigDecimal("2").equals(helper.bd)).isTrue(); + assertThat(new BigDecimal("2")).isEqualTo(helper.bd); BigDecimal return_bd = e.getValue(ctx,BigDecimal.class); assertThat(new BigDecimal("2")).isEqualTo(return_bd); - assertThat(new BigDecimal("1").equals(helper.bd)).isTrue(); + assertThat(new BigDecimal("1")).isEqualTo(helper.bd); // double e = parser.parseExpression("ddd--"); @@ -1089,10 +1089,10 @@ class EvaluationTests extends AbstractExpressionTests { // BigDecimal e = parser.parseExpression("--bd"); - assertThat(new BigDecimal("2").equals(helper.bd)).isTrue(); + assertThat(new BigDecimal("2")).isEqualTo(helper.bd); BigDecimal return_bd = e.getValue(ctx,BigDecimal.class); assertThat(new BigDecimal("1")).isEqualTo(return_bd); - assertThat(new BigDecimal("1").equals(helper.bd)).isTrue(); + assertThat(new BigDecimal("1")).isEqualTo(helper.bd); // double e = parser.parseExpression("--ddd"); @@ -1439,22 +1439,22 @@ class EvaluationTests extends AbstractExpressionTests { ctx.setVariable("wobble", 3); e = parser.parseExpression("#wobble++"); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(3); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(3); int r = e.getValue(ctx, int.class); assertThat(r).isEqualTo(3); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(4); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(4); e = parser.parseExpression("--#wobble"); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(4); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(4); r = e.getValue(ctx, int.class); assertThat(r).isEqualTo(3); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(3); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(3); e = parser.parseExpression("#wobble=34"); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(3); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(3); r = e.getValue(ctx, int.class); assertThat(r).isEqualTo(34); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(34); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(34); // Projection expectFailNotIncrementable(parser, ctx, "({1,2,3}.![#isEven(#this)])++"); // projection would be {false,true,false} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java index 0467f7be166..4ebcf4c3c1d 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java @@ -87,8 +87,8 @@ class JdbcTemplateQueryTests { given(this.resultSet.getObject(1)).willReturn(11, 12); List> li = this.template.queryForList(sql); assertThat(li).as("All rows returned").hasSize(2); - assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11); - assertThat(((Integer) li.get(1).get("age"))).as("Second row is Integer").isEqualTo(12); + assertThat((Integer) li.get(0).get("age")).as("First row is Integer").isEqualTo(11); + assertThat((Integer) li.get(1).get("age")).as("Second row is Integer").isEqualTo(12); verify(this.resultSet).close(); verify(this.statement).close(); verify(this.connection).close(); @@ -112,7 +112,7 @@ class JdbcTemplateQueryTests { given(this.resultSet.getObject(1)).willReturn(11); List> li = this.template.queryForList(sql); assertThat(li).as("All rows returned").hasSize(1); - assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11); + assertThat((Integer) li.get(0).get("age")).as("First row is Integer").isEqualTo(11); verify(this.resultSet).close(); verify(this.statement).close(); verify(this.connection).close(); @@ -303,8 +303,8 @@ class JdbcTemplateQueryTests { given(this.resultSet.getObject(1)).willReturn(11, 12); List> li = this.template.queryForList(sql, 3); assertThat(li).as("All rows returned").hasSize(2); - assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11); - assertThat(((Integer) li.get(1).get("age"))).as("Second row is Integer").isEqualTo(12); + assertThat((Integer) li.get(0).get("age")).as("First row is Integer").isEqualTo(11); + assertThat((Integer) li.get(1).get("age")).as("Second row is Integer").isEqualTo(12); verify(this.preparedStatement).setObject(1, 3); verify(this.resultSet).close(); verify(this.preparedStatement).close(); @@ -330,7 +330,7 @@ class JdbcTemplateQueryTests { given(this.resultSet.getObject(1)).willReturn(11); List> li = this.template.queryForList(sql, 3); assertThat(li).as("All rows returned").hasSize(1); - assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11); + assertThat((Integer) li.get(0).get("age")).as("First row is Integer").isEqualTo(11); verify(this.preparedStatement).setObject(1, 3); verify(this.resultSet).close(); verify(this.preparedStatement).close(); @@ -356,7 +356,7 @@ class JdbcTemplateQueryTests { given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getObject(1)).willReturn(11); Map map = this.template.queryForMap(sql, 3); - assertThat(((Integer) map.get("age"))).as("Row is Integer").isEqualTo(11); + assertThat((Integer) map.get("age")).as("Row is Integer").isEqualTo(11); verify(this.preparedStatement).setObject(1, 3); verify(this.resultSet).close(); verify(this.preparedStatement).close(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index 10363a983c3..10c9da2bc8d 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -114,8 +114,7 @@ class JdbcTemplateTests { assertThat(this.template.getDataSource()).as("datasource ok").isSameAs(this.dataSource); assertThat(this.template.isIgnoreWarnings()).as("ignores warnings by default").isTrue(); this.template.setIgnoreWarnings(false); - boolean condition = !this.template.isIgnoreWarnings(); - assertThat(condition).as("can set NOT to ignore warnings").isTrue(); + assertThat(this.template.isIgnoreWarnings()).as("can set NOT to ignore warnings").isFalse(); } @Test @@ -1123,8 +1122,7 @@ class JdbcTemplateTests { given(this.callableStatement.getUpdateCount()).willReturn(-1); given(this.callableStatement.getObject(1)).willReturn("X"); - boolean condition = !this.template.isResultsMapCaseInsensitive(); - assertThat(condition).as("default should have been NOT case insensitive").isTrue(); + assertThat(this.template.isResultsMapCaseInsensitive()).as("default should have been NOT case insensitive").isFalse(); this.template.setResultsMapCaseInsensitive(true); assertThat(this.template.isResultsMapCaseInsensitive()).as("now it should have been set to case insensitive").isTrue(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java index cb2cb8ae545..fcca55103b3 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java @@ -94,8 +94,7 @@ class CallMetaDataContextTests { assertThat(inParameters).as("Wrong number of matched in parameter values").hasSize(2); assertThat(inParameters.containsKey("id")).as("in parameter value missing").isTrue(); assertThat(inParameters.containsKey("name")).as("in out parameter value missing").isTrue(); - boolean condition = !inParameters.containsKey("customer_no"); - assertThat(condition).as("out parameter value matched").isTrue(); + assertThat(inParameters.containsKey("customer_no")).as("out parameter value matched").isFalse(); List names = context.getOutParameterNames(); assertThat(names).as("Wrong number of out parameters").hasSize(2); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java index 2e7660b6560..f2b06097ae7 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java @@ -104,14 +104,10 @@ class TableMetaDataContextTests { List values = context.matchInParameterValuesWithInsertColumns(map); assertThat(values.size()).as("wrong number of parameters: ").isEqualTo(4); - boolean condition3 = values.get(0) instanceof Number; - assertThat(condition3).as("id not wrapped with type info").isTrue(); - boolean condition2 = values.get(1) instanceof String; - assertThat(condition2).as("name not wrapped with type info").isTrue(); - boolean condition1 = values.get(2) instanceof SqlParameterValue; - assertThat(condition1).as("date wrapped with type info").isTrue(); - boolean condition = values.get(3) instanceof SqlParameterValue; - assertThat(condition).as("version wrapped with type info").isTrue(); + assertThat(values.get(0)).as("id not wrapped with type info").isInstanceOf(Number.class); + assertThat(values.get(1)).as("name not wrapped with type info").isInstanceOf(String.class); + assertThat(values.get(2)).as("date wrapped with type info").isInstanceOf(SqlParameterValue.class); + assertThat(values.get(3)).as("version wrapped with type info").isInstanceOf(SqlParameterValue.class); verify(metaDataResultSet, atLeastOnce()).next(); verify(columnsResultSet, atLeastOnce()).next(); verify(metaDataResultSet).close(); diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java index fd254a20efd..aaecffe606c 100644 --- a/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java @@ -107,8 +107,7 @@ class JmsListenerAnnotationBeanPostProcessorTests { assertThat(endpoint.getClass()).as("Wrong endpoint type").isEqualTo(MethodJmsListenerEndpoint.class); MethodJmsListenerEndpoint methodEndpoint = (MethodJmsListenerEndpoint) endpoint; assertThat(AopUtils.isJdkDynamicProxy(methodEndpoint.getBean())).isTrue(); - boolean condition = methodEndpoint.getBean() instanceof SimpleService; - assertThat(condition).isTrue(); + assertThat(methodEndpoint.getBean()).isInstanceOf(SimpleService.class); assertThat(methodEndpoint.getMethod()).isEqualTo(SimpleService.class.getMethod("handleIt", String.class, String.class)); assertThat(methodEndpoint.getMostSpecificMethod()).isEqualTo(InterfaceProxyTestBean.class.getMethod("handleIt", String.class, String.class)); @@ -129,8 +128,7 @@ class JmsListenerAnnotationBeanPostProcessorTests { assertThat(endpoint.getClass()).as("Wrong endpoint type").isEqualTo(MethodJmsListenerEndpoint.class); MethodJmsListenerEndpoint methodEndpoint = (MethodJmsListenerEndpoint) endpoint; assertThat(AopUtils.isCglibProxy(methodEndpoint.getBean())).isTrue(); - boolean condition = methodEndpoint.getBean() instanceof ClassProxyTestBean; - assertThat(condition).isTrue(); + assertThat(methodEndpoint.getBean()).isInstanceOf(ClassProxyTestBean.class); assertThat(methodEndpoint.getMethod()).isEqualTo(ClassProxyTestBean.class.getMethod("handleIt", String.class, String.class)); assertThat(methodEndpoint.getMostSpecificMethod()).isEqualTo(ClassProxyTestBean.class.getMethod("handleIt", String.class, String.class)); diff --git a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java index 97442fcb62e..c227c2c0737 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java @@ -474,7 +474,7 @@ class MethodJmsListenerEndpointTests { private Method getListenerMethod(String methodName, Class... parameterTypes) { Method method = ReflectionUtils.findMethod(JmsEndpointSampleBean.class, methodName, parameterTypes); - assertThat(("no method found with name " + methodName + " and parameters " + Arrays.toString(parameterTypes))).isNotNull(); + assertThat("no method found with name " + methodName + " and parameters " + Arrays.toString(parameterTypes)).isNotNull(); return method; } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java index f511021c748..f726444c1a2 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java @@ -170,8 +170,7 @@ class MessageListenerAdapterTests { @Override protected void handleListenerException(Throwable ex) { assertThat(ex).as("The Throwable passed to the handleListenerException(..) method must never be null.").isNotNull(); - boolean condition = ex instanceof ListenerExecutionFailedException; - assertThat(condition).as("The Throwable passed to the handleListenerException(..) method must be of type [ListenerExecutionFailedException].").isTrue(); + assertThat(ex).as("The Throwable passed to the handleListenerException(..) method must be of type [ListenerExecutionFailedException].").isInstanceOf(ListenerExecutionFailedException.class); ListenerExecutionFailedException lefx = (ListenerExecutionFailedException) ex; Throwable cause = lefx.getCause(); assertThat(cause).as("The cause of a ListenerExecutionFailedException must be preserved.").isNotNull(); @@ -187,8 +186,7 @@ class MessageListenerAdapterTests { void thatTheDefaultMessageConverterisIndeedTheSimpleMessageConverter() { MessageListenerAdapter adapter = new MessageListenerAdapter(); assertThat(adapter.getMessageConverter()).as("The default [MessageConverter] must never be null.").isNotNull(); - boolean condition = adapter.getMessageConverter() instanceof SimpleMessageConverter; - assertThat(condition).as("The default [MessageConverter] must be of the type [SimpleMessageConverter]").isTrue(); + assertThat(adapter.getMessageConverter()).as("The default [MessageConverter] must be of the type [SimpleMessageConverter]").isInstanceOf(SimpleMessageConverter.class); } @Test diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java index 184e5e7f07b..37a1ffb435b 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java @@ -78,7 +78,7 @@ class SimpleMessageConverterTests { SimpleMessageConverter converter = new SimpleMessageConverter(); Message msg = converter.toMessage(content, session); - assertThat(((byte[]) converter.fromMessage(msg))).hasSize(content.length); + assertThat((byte[]) converter.fromMessage(msg)).hasSize(content.length); verify(message).writeBytes(content); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java index a97597c53af..55a6678c802 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java @@ -190,7 +190,7 @@ class DefaultMessageHandlerMethodFactoryTests { private Method getListenerMethod(String methodName, Class... parameterTypes) { Method method = ReflectionUtils.findMethod(SampleBean.class, methodName, parameterTypes); - assertThat(("no method found with name " + methodName + " and parameters " + Arrays.toString(parameterTypes))).isNotNull(); + assertThat("no method found with name " + methodName + " and parameters " + Arrays.toString(parameterTypes)).isNotNull(); return method; } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java index cee197b51cf..4a7c16d23de 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java @@ -67,8 +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); - boolean condition = resolved instanceof Map; - assertThat(condition).isTrue(); + assertThat(resolved).isInstanceOf(Map.class); @SuppressWarnings("unchecked") Map headers = (Map) resolved; assertThat(headers.get("foo")).isEqualTo("bar"); @@ -84,8 +83,7 @@ class HeadersMethodArgumentResolverTests { void resolveArgumentMessageHeaders() throws Exception { Object resolved = this.resolver.resolveArgument(this.resolvable.arg(MessageHeaders.class), this.message); - boolean condition = resolved instanceof MessageHeaders; - assertThat(condition).isTrue(); + assertThat(resolved).isInstanceOf(MessageHeaders.class); MessageHeaders headers = (MessageHeaders) resolved; assertThat(headers.get("foo")).isEqualTo("bar"); } @@ -95,8 +93,7 @@ class HeadersMethodArgumentResolverTests { MethodParameter param = this.resolvable.arg(MessageHeaderAccessor.class); Object resolved = this.resolver.resolveArgument(param, this.message); - boolean condition = resolved instanceof MessageHeaderAccessor; - assertThat(condition).isTrue(); + assertThat(resolved).isInstanceOf(MessageHeaderAccessor.class); MessageHeaderAccessor headers = (MessageHeaderAccessor) resolved; assertThat(headers.getHeader("foo")).isEqualTo("bar"); } @@ -106,8 +103,7 @@ class HeadersMethodArgumentResolverTests { MethodParameter param = this.resolvable.arg(TestMessageHeaderAccessor.class); Object resolved = this.resolver.resolveArgument(param, this.message); - boolean condition = resolved instanceof TestMessageHeaderAccessor; - assertThat(condition).isTrue(); + assertThat(resolved).isInstanceOf(TestMessageHeaderAccessor.class); TestMessageHeaderAccessor headers = (TestMessageHeaderAccessor) resolved; assertThat(headers.getHeader("foo")).isEqualTo("bar"); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java index a3e3ad547fb..2b0d1987eac 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java @@ -225,11 +225,9 @@ class MessageMethodArgumentResolverTests { this.resolver = new MessageMethodArgumentResolver(new MappingJackson2MessageConverter()); Object actual = this.resolver.resolveArgument(parameter, inMessage); - boolean condition1 = actual instanceof Message; - assertThat(condition1).isTrue(); + assertThat(actual).isInstanceOf(Message.class); Message outMessage = (Message) actual; - boolean condition = outMessage.getPayload() instanceof Foo; - assertThat(condition).isTrue(); + assertThat(outMessage.getPayload()).isInstanceOf(Foo.class); assertThat(((Foo) outMessage.getPayload()).getFoo()).isEqualTo("bar"); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolverTests.java index 3c2646e1f66..62214e0ba5b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolverTests.java @@ -133,7 +133,7 @@ class PayloadMethodArgumentResolverTests { Message emptyStringMessage = MessageBuilder.withPayload(" ").build(); assertThat(this.resolver.resolveArgument(this.paramAnnotatedNotRequired, emptyStringMessage)).isNull(); - assertThat(((Optional) this.resolver.resolveArgument(this.paramOptional, emptyStringMessage))).isEmpty(); + assertThat((Optional) this.resolver.resolveArgument(this.paramOptional, emptyStringMessage)).isEmpty(); Message emptyOptionalMessage = MessageBuilder.withPayload(Optional.empty()).build(); assertThat(this.resolver.resolveArgument(this.paramAnnotatedNotRequired, emptyOptionalMessage)).isNull(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java index 2473b46aab7..49cbf1c9e39 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java @@ -56,7 +56,7 @@ public abstract class AbstractEntityManagerFactoryBeanTests { protected void checkInvariants(AbstractEntityManagerFactoryBean emfb) { assertThat(EntityManagerFactory.class.isAssignableFrom(emfb.getObjectType())).isTrue(); EntityManagerFactory emf = emfb.getObject(); - assertThat(emf instanceof EntityManagerFactoryInfo).as("Object created by factory implements EntityManagerFactoryInfo").isTrue(); + assertThat(emf).as("Object created by factory implements EntityManagerFactoryInfo").isInstanceOf(EntityManagerFactoryInfo.class); EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) emf; assertThat(emfb.getObject()).as("Successive invocations of getObject() return same object").isSameAs(emfi); assertThat(emfb.getObject()).isSameAs(emfi); diff --git a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java index bbf87165faa..cc8bb947351 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java @@ -96,8 +96,7 @@ public abstract class AbstractMarshallerTests { DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder(); DOMResult domResult = new DOMResult(); marshaller.marshal(flights, domResult); - boolean condition = domResult.getNode() instanceof Document; - assertThat(condition).as("DOMResult does not contain a Document").isTrue(); + assertThat(domResult.getNode()).as("DOMResult does not contain a Document").isInstanceOf(Document.class); Document result = (Document) domResult.getNode(); Document expected = builder.newDocument(); Element flightsElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flights"); diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java index f2e2fa7f5a2..e416e3fb44d 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java @@ -356,7 +356,7 @@ class MockHttpServletRequestTests { Locale.setDefault(newDefaultLocale); // Create the request after changing the default locale. MockHttpServletRequest request = new MockHttpServletRequest(); - assertThat(newDefaultLocale.equals(request.getLocale())).isFalse(); + assertThat(newDefaultLocale).isNotEqualTo(request.getLocale()); assertThat(request.getLocale()).isEqualTo(Locale.ENGLISH); } finally { diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideHandlerTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideHandlerTests.java index 62a947ee80d..bffb3a0ec28 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideHandlerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideHandlerTests.java @@ -21,7 +21,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.lang.reflect.Field; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.function.Consumer; @@ -180,7 +179,7 @@ class BeanOverrideHandlerTests { Field field2 = field(ConfigB.class, "qualifiedDummyBean"); // Prerequisite - assertThat(Arrays.equals(field1.getAnnotations(), field2.getAnnotations())).isFalse(); + assertThat(field1.getAnnotations()).isNotEqualTo(field2.getAnnotations()); BeanOverrideHandler handler1 = createBeanOverrideHandler(field1); BeanOverrideHandler handler2 = createBeanOverrideHandler(field2); diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java index c2e69b719af..8076cde5002 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java @@ -92,15 +92,13 @@ class JndiJtaTransactionManagerTests { assertThat(ptm.getUserTransaction()).isEqualTo(ut); } else { - boolean condition = ptm.getUserTransaction() instanceof UserTransactionAdapter; - assertThat(condition).isTrue(); + assertThat(ptm.getUserTransaction()).isInstanceOf(UserTransactionAdapter.class); UserTransactionAdapter uta = (UserTransactionAdapter) ptm.getUserTransaction(); assertThat(uta.getTransactionManager()).isEqualTo(tm); } TransactionTemplate tt = new TransactionTemplate(ptm); - boolean condition1 = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition1).isTrue(); + assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); tt.execute(new TransactionCallbackWithoutResult() { @Override @@ -110,8 +108,7 @@ class JndiJtaTransactionManagerTests { assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); } }); - boolean condition = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition).isTrue(); + assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); @@ -146,8 +143,7 @@ class JndiJtaTransactionManagerTests { assertThat(ptm.getTransactionManager()).isEqualTo(tm); TransactionTemplate tt = new TransactionTemplate(ptm); - boolean condition1 = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition1).isTrue(); + assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); tt.execute(new TransactionCallbackWithoutResult() { @Override @@ -157,8 +153,7 @@ class JndiJtaTransactionManagerTests { assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); } }); - boolean condition = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition).isTrue(); + assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); verify(ut).begin(); @@ -182,8 +177,7 @@ class JndiJtaTransactionManagerTests { TransactionTemplate tt = new TransactionTemplate(ptm); assertThat(ptm.getTransactionSynchronization()).isEqualTo(JtaTransactionManager.SYNCHRONIZATION_ALWAYS); - boolean condition1 = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition1).isTrue(); + assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); tt.execute(new TransactionCallbackWithoutResult() { @Override diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java index 3e5149989cf..2ec4ba00a5e 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java @@ -116,11 +116,11 @@ class TransactionInterceptorTests extends AbstractTransactionAspectTests { ti.setTransactionManager(ptm); ti = SerializationTestUtils.serializeAndDeserialize(ti); - assertThat(ti.getTransactionManager() instanceof SerializableTransactionManager).isTrue(); - assertThat(ti.getTransactionAttributeSource() instanceof CompositeTransactionAttributeSource).isTrue(); + assertThat(ti.getTransactionManager()).isInstanceOf(SerializableTransactionManager.class); + assertThat(ti.getTransactionAttributeSource()).isInstanceOf(CompositeTransactionAttributeSource.class); CompositeTransactionAttributeSource ctas = (CompositeTransactionAttributeSource) ti.getTransactionAttributeSource(); - assertThat(ctas.getTransactionAttributeSources()[0] instanceof NameMatchTransactionAttributeSource).isTrue(); - assertThat(ctas.getTransactionAttributeSources()[1] instanceof NameMatchTransactionAttributeSource).isTrue(); + assertThat(ctas.getTransactionAttributeSources()[0]).isInstanceOf(NameMatchTransactionAttributeSource.class); + assertThat(ctas.getTransactionAttributeSources()[1]).isInstanceOf(NameMatchTransactionAttributeSource.class); } @Test diff --git a/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java b/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java index 5cd1999b917..8558e2bba97 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java @@ -68,25 +68,25 @@ class HttpEntityTests { @Test void equals() { - MultiValueMap map1 = new LinkedMultiValueMap<>(); - map1.set("Content-Type", "text/plain"); + MultiValueMap headers1 = new LinkedMultiValueMap<>(); + headers1.set("Content-Type", "text/plain"); - MultiValueMap map2 = new LinkedMultiValueMap<>(); - map2.set("Content-Type", "application/json"); + MultiValueMap headers2 = new LinkedMultiValueMap<>(); + headers2.set("Content-Type", "application/json"); - assertThat(new HttpEntity<>().equals(new HttpEntity<>())).isTrue(); - assertThat(new HttpEntity<>(map1).equals(new HttpEntity<>())).isFalse(); - assertThat(new HttpEntity<>().equals(new HttpEntity<>(map2))).isFalse(); + assertThat(new HttpEntity<>()).isEqualTo(new HttpEntity<>()); + assertThat(new HttpEntity<>(headers1)).isNotEqualTo(new HttpEntity<>()); + assertThat(new HttpEntity<>()).isNotEqualTo(new HttpEntity<>(headers2)); - assertThat(new HttpEntity<>(map1).equals(new HttpEntity<>(map1))).isTrue(); - assertThat(new HttpEntity<>(map1).equals(new HttpEntity<>(map2))).isFalse(); + assertThat(new HttpEntity<>(headers1)).isEqualTo(new HttpEntity<>(headers1)); + assertThat(new HttpEntity<>(headers1)).isNotEqualTo(new HttpEntity<>(headers2)); - assertThat(new HttpEntity(null, null).equals(new HttpEntity<>(null, null))).isTrue(); - assertThat(new HttpEntity<>("foo", null).equals(new HttpEntity<>(null, null))).isFalse(); - assertThat(new HttpEntity(null, null).equals(new HttpEntity<>("bar", null))).isFalse(); + assertThat(new HttpEntity(null, (HttpHeaders) null).equals(new HttpEntity<>(null, (HttpHeaders) null))).isTrue(); + assertThat(new HttpEntity<>("foo", (HttpHeaders) null)).isNotEqualTo(new HttpEntity<>(null, (HttpHeaders) null)); + assertThat(new HttpEntity(null, (HttpHeaders) null)).isNotEqualTo(new HttpEntity<>("bar", (HttpHeaders) null)); - assertThat(new HttpEntity<>("foo", map1).equals(new HttpEntity<>("foo", map1))).isTrue(); - assertThat(new HttpEntity<>("foo", map1).equals(new HttpEntity<>("bar", map1))).isFalse(); + assertThat(new HttpEntity<>("foo", headers1)).isEqualTo(new HttpEntity<>("foo", headers1)); + assertThat(new HttpEntity<>("foo", headers1)).isNotEqualTo(new HttpEntity<>("bar", headers1)); } @Test diff --git a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java index 146185bfb91..abb6f6dae76 100644 --- a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java @@ -102,7 +102,7 @@ abstract class AbstractHttpRequestFactoryTests extends AbstractMockWebServerTest assertThat(response.getHeaders()).as("Header value not found") .containsEntry(headerName, Arrays.asList(headerValue1, headerValue2)); byte[] result = FileCopyUtils.copyToByteArray(response.getBody()); - assertThat(Arrays.equals(body, result)).as("Invalid body").isTrue(); + assertThat(result).as("Invalid body").isEqualTo(body); } } diff --git a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java index 6afea0d33ec..17bfe9c2356 100644 --- a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java @@ -19,7 +19,6 @@ package org.springframework.http.client; import java.io.IOException; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -203,7 +202,8 @@ class InterceptingClientHttpRequestFactoryTests { ClientHttpRequest request = requestFactory.createRequest(URI.create("https://example.com"), HttpMethod.GET); request.execute(); - assertThat(Arrays.equals(changedBody, requestMock.getBodyAsBytes())).isTrue(); + + assertThat(requestMock.getBodyAsBytes()).isEqualTo(changedBody); assertThat(requestMock.getHeaders().getContentLength()).isEqualTo(changedBody.length); } diff --git a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java index 399f1e98836..33885ac42e1 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java @@ -19,7 +19,6 @@ package org.springframework.http.converter; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; import org.junit.jupiter.api.Test; @@ -119,7 +118,7 @@ class ResourceHttpMessageConverterTests { Resource body = new ByteArrayResource(byteArray); converter.write(body, null, outputMessage); - assertThat(Arrays.equals(byteArray, outputMessage.getBodyAsBytes())).isTrue(); + assertThat(outputMessage.getBodyAsBytes()).isEqualTo(byteArray); } @Test // SPR-12999 diff --git a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java index 71a06307393..96def23148a 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java @@ -85,7 +85,7 @@ class EscapedErrorsTests { FieldError ageError = errors.getFieldError("age"); assertThat(ageError.getDefaultMessage()).as("Age error message escaped").isEqualTo("message: <tag>"); assertThat(ageError.getCode()).as("Age error code not escaped").isEqualTo("AGE_NOT_SET "); - assertThat((Integer.valueOf(0))).as("Age value not escaped").isEqualTo(errors.getFieldValue("age")); + assertThat(Integer.valueOf(0)).as("Age value not escaped").isEqualTo(errors.getFieldValue("age")); FieldError ageErrorInList = errors.getFieldErrors("age").get(0); assertThat(ageError.getDefaultMessage()).as("Same name error in list") .isEqualTo(ageErrorInList.getDefaultMessage()); diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java index 323f415676d..3bcc26bbf3f 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java @@ -204,8 +204,7 @@ class ServletRequestDataBinderTests { request.addParameter("test_age", "" + 50); ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); - boolean condition = !pvs.contains("forname"); - assertThat(condition).as("Didn't find normal when given prefix").isTrue(); + assertThat(pvs.contains("forname")).as("Didn't find normal when given prefix").isFalse(); assertThat(pvs.contains("test_forname")).as("Did treat prefix as normal when not given prefix").isTrue(); pvs = new ServletRequestParameterPropertyValues(request, "test"); @@ -227,8 +226,7 @@ class ServletRequestDataBinderTests { ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); assertThat(pvs.getPropertyValues().length).as("Found 1 parameter").isEqualTo(1); - boolean condition = pvs.getPropertyValue("forname").getValue() instanceof String[]; - assertThat(condition).as("Found array value").isTrue(); + assertThat(pvs.getPropertyValue("forname").getValue()).as("Found array value").isInstanceOf(String[].class); String[] values = (String[]) pvs.getPropertyValue("forname").getValue(); assertThat(Arrays.asList(original)).as("Correct values").isEqualTo(Arrays.asList(values)); } @@ -241,8 +239,7 @@ class ServletRequestDataBinderTests { assertThat(pvs.contains("forname")).as("Contains forname").isTrue(); assertThat(pvs.contains("surname")).as("Contains surname").isTrue(); assertThat(pvs.contains("age")).as("Contains age").isTrue(); - boolean condition1 = !pvs.contains("tory"); - assertThat(condition1).as("Doesn't contain tory").isTrue(); + assertThat(pvs.contains("tory")).as("Doesn't contain tory").isFalse(); PropertyValue[] ps = pvs.getPropertyValues(); Map m = new HashMap<>(); @@ -252,9 +249,8 @@ class ServletRequestDataBinderTests { for (PropertyValue element : ps) { Object val = m.get(element.getName()); assertThat(val).as("Can't have unexpected value").isNotNull(); - boolean condition = val instanceof String; - assertThat(condition).as("Val i string").isTrue(); - assertThat(val.equals(element.getValue())).as("val matches expected").isTrue(); + assertThat(val).as("Val i string").isInstanceOf(String.class); + assertThat(val).as("val matches expected").isEqualTo(element.getValue()); m.remove(element.getName()); } assertThat(m.size()).as("Map size is 0").isEqualTo(0); diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java index 5f77833308e..49a763496bf 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java @@ -205,7 +205,7 @@ class ServletRequestUtilsTests { request.addParameter("param5", "1"); request.addParameter("paramEmpty", ""); - assertThat(ServletRequestUtils.getBooleanParameter(request, "param1").equals(Boolean.TRUE)).isTrue(); + assertThat(ServletRequestUtils.getBooleanParameter(request, "param1")).isEqualTo(Boolean.TRUE); assertThat(ServletRequestUtils.getBooleanParameter(request, "param1", false)).isTrue(); assertThat(ServletRequestUtils.getRequiredBooleanParameter(request, "param1")).isTrue(); diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java index a3194bad383..13eab71b896 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java @@ -307,8 +307,7 @@ class WebRequestDataBinderTests { request.addParameter("test_age", "" + 50); ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); - boolean condition = !pvs.contains("forname"); - assertThat(condition).as("Didn't find normal when given prefix").isTrue(); + assertThat(pvs.contains("forname")).as("Didn't find normal when given prefix").isFalse(); assertThat(pvs.contains("test_forname")).as("Did treat prefix as normal when not given prefix").isTrue(); pvs = new ServletRequestParameterPropertyValues(request, "test"); @@ -323,8 +322,7 @@ class WebRequestDataBinderTests { assertThat(pvs.contains("forname")).as("Contains forname").isTrue(); assertThat(pvs.contains("surname")).as("Contains surname").isTrue(); assertThat(pvs.contains("age")).as("Contains age").isTrue(); - boolean condition1 = !pvs.contains("tory"); - assertThat(condition1).as("Doesn't contain tory").isTrue(); + assertThat(pvs.contains("tory")).as("Doesn't contain tory").isFalse(); PropertyValue[] pvArray = pvs.getPropertyValues(); Map m = new HashMap<>(); @@ -334,9 +332,8 @@ class WebRequestDataBinderTests { for (PropertyValue pv : pvArray) { Object val = m.get(pv.getName()); assertThat(val).as("Can't have unexpected value").isNotNull(); - boolean condition = val instanceof String; - assertThat(condition).as("Val i string").isTrue(); - assertThat(val.equals(pv.getValue())).as("val matches expected").isTrue(); + assertThat(val).as("Val i string").isInstanceOf(String.class); + assertThat(val).as("val matches expected").isEqualTo(pv.getValue()); m.remove(pv.getName()); } assertThat(m.size()).as("Map size is 0").isEqualTo(0); @@ -357,8 +354,7 @@ class WebRequestDataBinderTests { ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); assertThat(pvs.getPropertyValues().length).as("Found 1 parameter").isEqualTo(1); - boolean condition = pvs.getPropertyValue("forname").getValue() instanceof String[]; - assertThat(condition).as("Found array value").isTrue(); + assertThat(pvs.getPropertyValue("forname").getValue()).as("Found array value").isInstanceOf(String[].class); String[] values = (String[]) pvs.getPropertyValue("forname").getValue(); assertThat(Arrays.asList(original)).as("Correct values").isEqualTo(Arrays.asList(values)); } diff --git a/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java b/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java index 76be45f3801..4cdc4f3b50b 100644 --- a/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java @@ -55,8 +55,7 @@ class ContextLoaderInitializerTests { void register() throws ServletException { initializer.onStartup(servletContext); - boolean condition1 = eventListener instanceof ContextLoaderListener; - assertThat(condition1).isTrue(); + assertThat(eventListener).isInstanceOf(ContextLoaderListener.class); ContextLoaderListener cll = (ContextLoaderListener) eventListener; cll.contextInitialized(new ServletContextEvent(servletContext)); @@ -64,8 +63,7 @@ class ContextLoaderInitializerTests { .getRequiredWebApplicationContext(servletContext); assertThat(applicationContext.containsBean(BEAN_NAME)).isTrue(); - boolean condition = applicationContext.getBean(BEAN_NAME) instanceof MyBean; - assertThat(condition).isTrue(); + assertThat(applicationContext.getBean(BEAN_NAME)).isInstanceOf(MyBean.class); } private class MyMockServletContext extends MockServletContext { diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java index 46915025398..4224d8b45fb 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java @@ -104,8 +104,7 @@ class RequestScopeTests { String name = "requestScopedFactoryBean"; assertThat(request.getAttribute(name)).isNull(); TestBean bean = (TestBean) this.beanFactory.getBean(name); - boolean condition = request.getAttribute(name) instanceof FactoryBean; - assertThat(condition).isTrue(); + assertThat(request.getAttribute(name)).isInstanceOf(FactoryBean.class); assertThat(this.beanFactory.getBean(name)).isSameAs(bean); } diff --git a/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java b/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java index 5b5308481be..e94cc8dfdc2 100644 --- a/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java @@ -50,8 +50,7 @@ class SpringBeanAutowiringSupportTests { InjectionTarget target = new InjectionTarget(); SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(target, sc); - boolean condition = target.testBean instanceof TestBean; - assertThat(condition).isTrue(); + assertThat(target.testBean).isInstanceOf(TestBean.class); assertThat(target.name).isEqualTo("tb"); } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java index 5187589f951..dbac9623903 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java @@ -80,8 +80,7 @@ class CookieValueMethodArgumentResolverTests { void resolveCookieDefaultValue() throws Exception { Object result = resolver.resolveArgument(paramNamedDefaultValueString, null, webRequest, null); - boolean condition = result instanceof String; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(String.class); assertThat(result).as("Invalid result").isEqualTo("bar"); } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java index 05979e951be..48ebb012b7d 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java @@ -91,8 +91,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Object result = resolver.resolveArgument(paramMap, null, webRequest, null); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(Map.class); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -111,8 +110,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Object result = resolver.resolveArgument(paramMultiValueMap, null, webRequest, null); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(MultiValueMap.class); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -131,8 +129,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Object result = resolver.resolveArgument(paramHttpHeaders, null, webRequest, null); - boolean condition = result instanceof HttpHeaders; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(HttpHeaders.class); assertThat(result).as("Invalid result").isEqualTo(expected); } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java index e580e1d73f8..accf839d2f4 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java @@ -82,8 +82,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(Map.class, String.class, String.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(Map.class); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -101,8 +100,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annotPresent(RequestParam.class).arg(MultiValueMap.class, String.class, String.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(MultiValueMap.class); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -119,8 +117,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(Map.class, String.class, MultipartFile.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(Map.class); Map resultMap = (Map) result; assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfile")).isEqualTo(expected1); @@ -142,8 +139,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(MultiValueMap.class, String.class, MultipartFile.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(MultiValueMap.class); MultiValueMap resultMap = (MultiValueMap) result; assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfilelist")).containsExactly(expected1, expected2); @@ -164,8 +160,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(Map.class, String.class, Part.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(Map.class); Map resultMap = (Map) result; assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfile")).isEqualTo(expected1); @@ -188,8 +183,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(MultiValueMap.class, String.class, Part.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(MultiValueMap.class); MultiValueMap resultMap = (MultiValueMap) result; assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfilelist")).containsExactly(expected1, expected2); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java index 11d1bb646d6..86415f98aee 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java @@ -538,7 +538,7 @@ class RequestParamMethodArgumentResolverTests { request.addParameter("name", "123"); result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).contains(123); + assertThat((Optional) result).contains(123); } @Test @@ -554,7 +554,7 @@ class RequestParamMethodArgumentResolverTests { result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).isNotPresent(); + assertThat((Optional) result).isNotPresent(); } @Test @@ -587,7 +587,7 @@ class RequestParamMethodArgumentResolverTests { result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).isNotPresent(); + assertThat((Optional) result).isNotPresent(); } @Test @@ -604,7 +604,7 @@ class RequestParamMethodArgumentResolverTests { request.addParameter("name", "123", "456"); result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).contains(Arrays.asList("123", "456")); + assertThat((Optional) result).contains(Arrays.asList("123", "456")); } @Test @@ -620,7 +620,7 @@ class RequestParamMethodArgumentResolverTests { result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).isNotPresent(); + assertThat((Optional) result).isNotPresent(); } @Test diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java index 575ce8e6eb8..2f1dca0adc7 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java @@ -104,8 +104,7 @@ class SessionAttributesHandlerTests { assertThat(sessionAttributeStore.retrieveAttribute(request, "attr1")).isEqualTo("value1"); assertThat(sessionAttributeStore.retrieveAttribute(request, "attr2")).isEqualTo("value2"); - boolean condition = sessionAttributeStore.retrieveAttribute(request, "attr3") instanceof TestBean; - assertThat(condition).isTrue(); + assertThat(sessionAttributeStore.retrieveAttribute(request, "attr3")).isInstanceOf(TestBean.class); } diff --git a/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java b/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java index 7706ebbb182..5c9e5d18e2d 100644 --- a/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java @@ -66,8 +66,7 @@ class WebHttpHandlerBuilderTests { context.refresh(); HttpHandler httpHandler = WebHttpHandlerBuilder.applicationContext(context).build(); - boolean condition = httpHandler instanceof HttpWebHandlerAdapter; - assertThat(condition).isTrue(); + assertThat(httpHandler).isInstanceOf(HttpWebHandlerAdapter.class); assertThat(((HttpWebHandlerAdapter) httpHandler).getApplicationContext()).isSameAs(context); MockServerHttpRequest request = MockServerHttpRequest.get("/").build(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java index dd26a2243fc..97d0d146371 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java @@ -113,8 +113,7 @@ class DelegatingWebFluxConfigurationTests { verify(webFluxConfigurer).configureArgumentResolvers(any()); assertThat(initializer).isNotNull(); - boolean condition = initializer.getValidator() instanceof LocalValidatorFactoryBean; - assertThat(condition).isTrue(); + assertThat(initializer.getValidator()).isInstanceOf(LocalValidatorFactoryBean.class); assertThat(initializer.getConversionService()).isSameAs(formatterRegistry.getValue()); assertThat(codecsConfigurer.getValue().getReaders()).hasSize(17); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java index 5bc98628961..2861be79a47 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java @@ -79,8 +79,7 @@ class ResourceHandlerFunctionTests { Mono result = responseMono.flatMap(response -> { assertThat(response.statusCode()).isEqualTo(HttpStatus.OK); - boolean condition = response instanceof EntityResponse; - assertThat(condition).isTrue(); + assertThat(response).isInstanceOf(EntityResponse.class); @SuppressWarnings("unchecked") EntityResponse entityResponse = (EntityResponse) response; assertThat(entityResponse.entity()).isEqualTo(this.resource); @@ -116,8 +115,7 @@ class ResourceHandlerFunctionTests { Mono result = responseMono.flatMap(response -> { assertThat(response.statusCode()).isEqualTo(HttpStatus.OK); - boolean condition = response instanceof EntityResponse; - assertThat(condition).isTrue(); + assertThat(response).isInstanceOf(EntityResponse.class); @SuppressWarnings("unchecked") EntityResponse entityResponse = (EntityResponse) response; assertThat(entityResponse.entity().getFilename()).isEqualTo(this.resource.getFilename()); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java index 81837a85ef4..6b4568ca2f0 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java @@ -85,8 +85,7 @@ class EncodedResourceResolverTests { assertThat(actual.getDescription()).isEqualTo(getResource(file + ".gz").getDescription()); assertThat(actual.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition = actual instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(actual).isInstanceOf(HttpResource.class); HttpHeaders headers = ((HttpResource) actual).getResponseHeaders(); assertThat(headers.getFirst(HttpHeaders.CONTENT_ENCODING)).isEqualTo("gzip"); assertThat(headers.getFirst(HttpHeaders.VARY)).isEqualTo("Accept-Encoding"); @@ -103,8 +102,7 @@ class EncodedResourceResolverTests { assertThat(actual.getDescription()).isEqualTo(getResource("foo.css.gz").getDescription()); assertThat(actual.getFilename()).isEqualTo(getResource("foo.css").getFilename()); - boolean condition = actual instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(actual).isInstanceOf(HttpResource.class); } @Test @@ -121,8 +119,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource(file + ".gz").getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition = resolved instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(resolved).isInstanceOf(HttpResource.class); // 2. Resolve unencoded resource @@ -131,8 +128,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource(file).getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition1 = resolved instanceof HttpResource; - assertThat(condition1).isFalse(); + assertThat(resolved).isNotInstanceOf(HttpResource.class); } @Test // SPR-13149 diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java index e4a12adf389..81b6908ad62 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java @@ -16,8 +16,6 @@ package org.springframework.web.reactive.result.condition; -import java.util.Collection; - import org.junit.jupiter.api.Test; import org.springframework.web.server.ServerWebExchange; @@ -147,8 +145,7 @@ class HeadersRequestConditionTests { HeadersRequestCondition condition2 = new HeadersRequestCondition("foo=baz"); HeadersRequestCondition result = condition1.combine(condition2); - Collection conditions = result.getContent(); - assertThat(conditions).hasSize(2); + assertThat(result.getContent()).hasSize(2); } @Test diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java index 4ffc7eab4c9..034e02c3b9b 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java @@ -16,8 +16,6 @@ package org.springframework.web.reactive.result.condition; -import java.util.Collection; - import org.junit.jupiter.api.Test; import org.springframework.web.server.ServerWebExchange; @@ -138,8 +136,7 @@ class ParamsRequestConditionTests { ParamsRequestCondition condition2 = new ParamsRequestCondition("foo=baz"); ParamsRequestCondition result = condition1.combine(condition2); - Collection conditions = result.getContent(); - assertThat(conditions).hasSize(2); + assertThat(result.getContent()).hasSize(2); } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java index 56b93eb1458..c9be2d5f847 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java @@ -113,8 +113,7 @@ class CookieValueMethodArgumentResolverTests { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/")); Object result = this.resolver.resolveArgument(this.cookieStringParameter, this.bindingContext, exchange).block(); - boolean condition = result instanceof String; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(String.class); assertThat(result).isEqualTo("bar"); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java index 7d27a87398e..7dd6b794891 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java @@ -149,9 +149,8 @@ class PathVariableMethodArgumentResolverTests { StepVerifier.create(mono) .consumeNextWith(value -> { - boolean condition = value instanceof Optional; - assertThat(condition).isTrue(); - assertThat(((Optional) value)).isNotPresent(); + assertThat(value).isInstanceOf(Optional.class); + assertThat((Optional) value).isNotPresent(); }) .expectComplete() .verify(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java index ed036374144..02037dfe768 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java @@ -120,7 +120,7 @@ class RequestAttributeMethodArgumentResolverTests { assertThat(mono.block()).isNotNull(); assertThat(mono.block().getClass()).isEqualTo(Optional.class); - assertThat(((Optional) mono.block())).isNotPresent(); + assertThat((Optional) mono.block()).isNotPresent(); ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer(); initializer.setConversionService(new DefaultFormattingConversionService()); @@ -154,8 +154,7 @@ class RequestAttributeMethodArgumentResolverTests { this.exchange.getAttributes().put("fooMono", singleMono); mono = this.resolver.resolveArgument(param, new BindingContext(), this.exchange); Object value = mono.block(Duration.ZERO); - boolean condition = value instanceof Mono; - assertThat(condition).isTrue(); + assertThat(value).isInstanceOf(Mono.class); assertThat(((Mono) value).block(Duration.ZERO)).isSameAs(foo); // No attribute --> Mono.empty diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java index 23b261ed9fc..e86b4370bd3 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java @@ -90,8 +90,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Mono mono = resolver.resolveArgument(paramMap, null, exchange); Object result = mono.block(); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(Map.class); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -130,8 +129,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Mono mono = resolver.resolveArgument(paramHttpHeaders, null, exchange); Object result = mono.block(); - boolean condition = result instanceof HttpHeaders; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(HttpHeaders.class); assertThat(result).as("Invalid result").isEqualTo(expected); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java index 7b7f0a396bc..2a556795088 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java @@ -73,8 +73,7 @@ class RequestParamMapMethodArgumentResolverTests { void resolveMapArgumentWithQueryString() { MethodParameter param = this.testMethod.annot(requestParam().name("")).arg(Map.class); Object result= resolve(param, MockServerWebExchange.from(MockServerHttpRequest.get("/path?foo=bar"))); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(Map.class); assertThat(result).isEqualTo(Collections.singletonMap("foo", "bar")); } @@ -84,8 +83,7 @@ class RequestParamMapMethodArgumentResolverTests { ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/path?foo=bar&foo=baz")); Object result= resolve(param, exchange); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result).isInstanceOf(MultiValueMap.class); assertThat(result).isEqualTo(Collections.singletonMap("foo", Arrays.asList("bar", "baz"))); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java index 29a4d41595a..cefc90bd8c4 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java @@ -98,8 +98,7 @@ class SessionAttributesHandlerTests { assertThat(session.getAttributes().get("attr1")).isEqualTo("value1"); assertThat(session.getAttributes().get("attr2")).isEqualTo("value2"); - boolean condition = session.getAttributes().get("attr3") instanceof TestBean; - assertThat(condition).isTrue(); + assertThat(session.getAttributes().get("attr3")).isInstanceOf(TestBean.class); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java index e45498abd76..ea3652f62a5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java @@ -70,16 +70,14 @@ class ContextLoaderTests { listener.contextInitialized(event); String contextAttr = WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE; WebApplicationContext context = (WebApplicationContext) sc.getAttribute(contextAttr); - boolean condition1 = context instanceof XmlWebApplicationContext; - assertThat(condition1).as("Correct WebApplicationContext exposed in ServletContext").isTrue(); + assertThat(context).as("Correct WebApplicationContext exposed in ServletContext").isInstanceOf(XmlWebApplicationContext.class); assertThat(WebApplicationContextUtils.getRequiredWebApplicationContext(sc)).isInstanceOf( XmlWebApplicationContext.class); LifecycleBean lb = (LifecycleBean) context.getBean("lifecycle"); assertThat(context.containsBean("father")).as("Has father").isTrue(); assertThat(context.containsBean("rod")).as("Has rod").isTrue(); assertThat(context.containsBean("kerry")).as("Has kerry").isTrue(); - boolean condition = !lb.isDestroyed(); - assertThat(condition).as("Not destroyed").isTrue(); + assertThat(lb.isDestroyed()).as("Not destroyed").isFalse(); assertThat(context.containsBean("beans1.bean1")).isFalse(); assertThat(context.containsBean("beans1.bean2")).isFalse(); listener.contextDestroyed(event); @@ -241,8 +239,7 @@ class ContextLoaderTests { listener.contextInitialized(event); String contextAttr = WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE; WebApplicationContext wc = (WebApplicationContext) sc.getAttribute(contextAttr); - boolean condition = wc instanceof SimpleWebApplicationContext; - assertThat(condition).as("Correct WebApplicationContext exposed in ServletContext").isTrue(); + assertThat(wc).as("Correct WebApplicationContext exposed in ServletContext").isInstanceOf(SimpleWebApplicationContext.class); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java index 595abbb4d7f..32511a62e3b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java @@ -135,9 +135,9 @@ class XmlWebApplicationContextTests extends AbstractApplicationContextTests { InitAndIB iib = (InitAndIB) this.applicationContext.getBean("init-and-ib"); assertThat(InitAndIB.constructed).isTrue(); assertThat(iib.afterPropertiesSetInvoked && iib.initMethodInvoked).isTrue(); - assertThat(!iib.destroyed && !iib.customDestroyed).isTrue(); + assertThat(iib.destroyed && !iib.customDestroyed).isFalse(); this.applicationContext.close(); - assertThat(!iib.destroyed && !iib.customDestroyed).isTrue(); + assertThat(iib.destroyed && !iib.customDestroyed).isFalse(); ConfigurableApplicationContext parent = (ConfigurableApplicationContext) this.applicationContext.getParent(); parent.close(); assertThat(iib.destroyed && iib.customDestroyed).isTrue(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java index 3ffd20ccda3..79c105bb3f3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java @@ -121,15 +121,15 @@ class DispatcherServletTests { @Test void configuredDispatcherServlets() { - assertThat((simpleDispatcherServlet.getNamespace())).as("Correct namespace") + assertThat(simpleDispatcherServlet.getNamespace()).as("Correct namespace") .isEqualTo("simple" + FrameworkServlet.DEFAULT_NAMESPACE_SUFFIX); - assertThat((FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple")).as("Correct attribute") + assertThat(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple").as("Correct attribute") .isEqualTo(simpleDispatcherServlet.getServletContextAttributeName()); assertThat(simpleDispatcherServlet.getWebApplicationContext()).as("Context published") .isSameAs(getServletContext().getAttribute(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple")); assertThat(complexDispatcherServlet.getNamespace()).as("Correct namespace").isEqualTo("test"); - assertThat((FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex")).as("Correct attribute") + assertThat(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex").as("Correct attribute") .isEqualTo(complexDispatcherServlet.getServletContextAttributeName()); assertThat(getServletContext().getAttribute(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex")).as("Context not published") .isNull(); @@ -205,7 +205,7 @@ class DispatcherServletTests { MockHttpServletResponse response = new MockHttpServletResponse(); complexDispatcherServlet.service(request, response); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed0.jsp"); - assertThat(request.getAttribute("exception").getClass().equals(ServletException.class)).as("Exception exposed").isTrue(); + assertThat(request.getAttribute("exception").getClass()).as("Exception exposed").isEqualTo(ServletException.class); } @Test @@ -368,7 +368,7 @@ class DispatcherServletTests { complexDispatcherServlet.service(request, response); assertThat(response.getStatus()).isEqualTo(200); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed0.jsp"); - assertThat(request.getAttribute("exception").getClass().equals(RuntimeException.class)).as("Exception exposed").isTrue(); + assertThat(request.getAttribute("exception").getClass()).as("Exception exposed").isEqualTo(RuntimeException.class); } @Test @@ -381,7 +381,7 @@ class DispatcherServletTests { complexDispatcherServlet.service(request, response); assertThat(response.getStatus()).isEqualTo(200); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed0.jsp"); - assertThat(request.getAttribute("exception").getClass().equals(ServletException.class)).as("Exception exposed").isTrue(); + assertThat(request.getAttribute("exception").getClass()).as("Exception exposed").isEqualTo(ServletException.class); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java index c2af541c7c1..37fb8a26757 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java @@ -111,8 +111,7 @@ class DelegatingWebMvcConfigurationTests { assertThat(initializer).isNotNull(); assertThat(initializer.getConversionService()).isSameAs(conversionService.getValue()); - boolean condition = initializer.getValidator() instanceof LocalValidatorFactoryBean; - assertThat(condition).isTrue(); + assertThat(initializer.getValidator()).isInstanceOf(LocalValidatorFactoryBean.class); assertThat(resolvers.getValue()).isEmpty(); assertThat(handlers.getValue()).isEmpty(); assertThat(adapter.getMessageConverters()).isEqualTo(converters.getValue()); @@ -176,12 +175,9 @@ class DelegatingWebMvcConfigurationTests { verify(webMvcConfigurer).configureHandlerExceptionResolvers(exceptionResolvers.capture()); assertThat(exceptionResolvers.getValue()).hasSize(3); - boolean condition2 = exceptionResolvers.getValue().get(0) instanceof ExceptionHandlerExceptionResolver; - assertThat(condition2).isTrue(); - boolean condition1 = exceptionResolvers.getValue().get(1) instanceof ResponseStatusExceptionResolver; - assertThat(condition1).isTrue(); - boolean condition = exceptionResolvers.getValue().get(2) instanceof DefaultHandlerExceptionResolver; - assertThat(condition).isTrue(); + assertThat(exceptionResolvers.getValue().get(0)).isInstanceOf(ExceptionHandlerExceptionResolver.class); + assertThat(exceptionResolvers.getValue().get(1)).isInstanceOf(ResponseStatusExceptionResolver.class); + assertThat(exceptionResolvers.getValue().get(2)).isInstanceOf(DefaultHandlerExceptionResolver.class); assertThat(converters.getValue()).isNotEmpty(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java index 081a6cab60a..6a4c88175e1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java @@ -200,8 +200,7 @@ class InterceptorRegistryTests { private void verifyWebInterceptor(HandlerInterceptor interceptor, TestWebRequestInterceptor webInterceptor) throws Exception { - boolean condition = interceptor instanceof WebRequestHandlerInterceptorAdapter; - assertThat(condition).isTrue(); + assertThat(interceptor).isInstanceOf(WebRequestHandlerInterceptorAdapter.class); interceptor.preHandle(this.request, this.response, null); assertThat(webInterceptor.preHandleInvoked).isTrue(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java index 3fc1237dcef..1786ae8760c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java @@ -192,13 +192,11 @@ class WebMvcConfigurationSupportTests { ConversionService conversionService = initializer.getConversionService(); assertThat(conversionService).isNotNull(); - boolean condition1 = conversionService instanceof FormattingConversionService; - assertThat(condition1).isTrue(); + assertThat(conversionService).isInstanceOf(FormattingConversionService.class); Validator validator = initializer.getValidator(); assertThat(validator).isNotNull(); - boolean condition = validator instanceof LocalValidatorFactoryBean; - assertThat(condition).isTrue(); + assertThat(validator).isInstanceOf(LocalValidatorFactoryBean.class); DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(adapter); @SuppressWarnings("unchecked") diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java index 750b00cbdb2..95e14da1090 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java @@ -93,8 +93,7 @@ class LocaleResolverTests { else { assertThat(localeContext.getLocale()).isEqualTo(Locale.UK); } - boolean condition2 = localeContext instanceof TimeZoneAwareLocaleContext; - assertThat(condition2).isTrue(); + assertThat(localeContext).isInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(((TimeZoneAwareLocaleContext) localeContext).getTimeZone()).isNull(); if (localeContextResolver instanceof AbstractLocaleContextResolver) { @@ -122,16 +121,14 @@ class LocaleResolverTests { new SimpleTimeZoneAwareLocaleContext(Locale.GERMANY, TimeZone.getTimeZone("GMT+2"))); localeContext = localeContextResolver.resolveLocaleContext(request); assertThat(localeContext.getLocale()).isEqualTo(Locale.GERMANY); - boolean condition1 = localeContext instanceof TimeZoneAwareLocaleContext; - assertThat(condition1).isTrue(); + assertThat(localeContext).isInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(TimeZone.getTimeZone("GMT+2")).isEqualTo(((TimeZoneAwareLocaleContext) localeContext).getTimeZone()); localeContextResolver.setLocaleContext(request, response, new SimpleTimeZoneAwareLocaleContext(null, TimeZone.getTimeZone("GMT+3"))); localeContext = localeContextResolver.resolveLocaleContext(request); assertThat(localeContext.getLocale()).isEqualTo(Locale.UK); - boolean condition = localeContext instanceof TimeZoneAwareLocaleContext; - assertThat(condition).isTrue(); + assertThat(localeContext).isInstanceOf(TimeZoneAwareLocaleContext.class); assertThat(TimeZone.getTimeZone("GMT+3")).isEqualTo(((TimeZoneAwareLocaleContext) localeContext).getTimeZone()); if (localeContextResolver instanceof AbstractLocaleContextResolver) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java index b8f9a873480..5bf15d57bdf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java @@ -16,11 +16,8 @@ package org.springframework.web.servlet.mvc.condition; -import java.util.Collection; - import org.junit.jupiter.api.Test; -import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition.HeaderExpression; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -160,8 +157,7 @@ class HeadersRequestConditionTests { HeadersRequestCondition condition2 = new HeadersRequestCondition("foo=baz"); HeadersRequestCondition result = condition1.combine(condition2); - Collection conditions = result.getContent(); - assertThat(conditions).hasSize(2); + assertThat(result.getContent()).hasSize(2); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java index ec2f2699ced..9fad66b032d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java @@ -16,11 +16,8 @@ package org.springframework.web.servlet.mvc.condition; -import java.util.Collection; - import org.junit.jupiter.api.Test; -import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition.ParamExpression; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -149,8 +146,7 @@ class ParamsRequestConditionTests { ParamsRequestCondition condition2 = new ParamsRequestCondition("foo=baz"); ParamsRequestCondition result = condition1.combine(condition2); - Collection conditions = result.getContent(); - assertThat(conditions).hasSize(2); + assertThat(result.getContent()).hasSize(2); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java index 4440ed88d48..807937b2541 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java @@ -128,7 +128,7 @@ public abstract class AbstractRequestAttributesArgumentResolverTests { Object actual = testResolveArgument(param, factory); assertThat(actual).isNotNull(); assertThat(actual.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) actual)).isNotPresent(); + assertThat((Optional) actual).isNotPresent(); Foo foo = new Foo(); this.webRequest.setAttribute("foo", foo, getScope()); @@ -136,7 +136,7 @@ public abstract class AbstractRequestAttributesArgumentResolverTests { actual = testResolveArgument(param, factory); assertThat(actual).isNotNull(); assertThat(actual.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) actual)).isPresent(); + assertThat((Optional) actual).isPresent(); assertThat(((Optional) actual).get()).isSameAs(foo); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java index acb070a9b78..a251dc153f9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java @@ -826,7 +826,7 @@ class HttpEntityMethodProcessorMockTests { } if (lastModified != -1) { assertThat(servletResponse.getHeaderValues(HttpHeaders.LAST_MODIFIED)).hasSize(1); - assertThat((servletResponse.getDateHeader(HttpHeaders.LAST_MODIFIED) / 1000)).isEqualTo((lastModified / 1000)); + assertThat(servletResponse.getDateHeader(HttpHeaders.LAST_MODIFIED) / 1000).isEqualTo((lastModified / 1000)); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java index 15d0890ea27..498b0afd222 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java @@ -396,8 +396,7 @@ class RequestPartMethodArgumentResolverTests { webRequest = new ServletWebRequest(request); Object actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null); - boolean condition1 = actualValue instanceof Optional; - assertThat(condition1).isTrue(); + assertThat(actualValue).isInstanceOf(Optional.class); assertThat(((Optional) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected)); actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null); @@ -439,8 +438,7 @@ class RequestPartMethodArgumentResolverTests { webRequest = new ServletWebRequest(request); Object actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null); - boolean condition1 = actualValue instanceof Optional; - assertThat(condition1).isTrue(); + assertThat(actualValue).isInstanceOf(Optional.class); assertThat(((Optional) actualValue).get()).as("Invalid result").isEqualTo(expected); actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null); @@ -484,8 +482,7 @@ class RequestPartMethodArgumentResolverTests { webRequest = new ServletWebRequest(request); Object actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null); - boolean condition1 = actualValue instanceof Optional; - assertThat(condition1).isTrue(); + assertThat(actualValue).isInstanceOf(Optional.class); assertThat(((Optional) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected)); actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java index 23bebffcb4d..a605f45b80d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java @@ -399,10 +399,8 @@ class ResponseEntityExceptionHandlerTests { servlet.service(this.servletRequest, this.servletResponse); } catch (ServletException ex) { - boolean condition1 = ex.getCause() instanceof IllegalStateException; - assertThat(condition1).isTrue(); - boolean condition = ex.getCause().getCause() instanceof ServletRequestBindingException; - assertThat(condition).isTrue(); + assertThat(ex.getCause()).isInstanceOf(IllegalStateException.class); + assertThat(ex.getCause().getCause()).isInstanceOf(ServletRequestBindingException.class); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index d68a3504a8e..a6454b8747a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -401,8 +401,8 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(session).isNotNull(); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); request = new MockHttpServletRequest("POST", "/myPage"); request.setSession(session); @@ -411,8 +411,8 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(request.getAttribute("viewName")).isEqualTo("page2"); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -434,8 +434,8 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(session).isNotNull(); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); request = new MockHttpServletRequest("POST", "/myPage"); request.setSession(session); @@ -444,8 +444,8 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(request.getAttribute("viewName")).isEqualTo("page2"); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -464,9 +464,9 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(session).isNotNull(); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); - assertThat(((Map) session.getAttribute("model"))).containsKey("testBeanList"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("testBeanList"); request = new MockHttpServletRequest("POST", "/myPage"); request.setSession(session); @@ -475,9 +475,9 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(request.getAttribute("viewName")).isEqualTo("page2"); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); - assertThat(((Map) session.getAttribute("model"))).containsKey("testBeanList"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("testBeanList"); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -496,9 +496,9 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(session).isNotNull(); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); - assertThat(((Map) session.getAttribute("model"))).containsKey("testBeanList"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("testBeanList"); request = new MockHttpServletRequest("POST", "/myPage"); request.setSession(session); @@ -507,9 +507,9 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(request.getAttribute("viewName")).isEqualTo("page2"); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); - assertThat(((Map) session.getAttribute("model"))).containsKey("testBeanList"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("testBeanList"); } @PathPatternsParameterizedTest @@ -2799,8 +2799,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl public String myOtherHandle(TB tb, BindingResult errors, ExtendedModelMap model, MySpecialArg arg) { TestBean tbReal = (TestBean) tb; tbReal.setName("myName"); - boolean condition = model.get("ITestBean") instanceof DerivedTestBean; - assertThat(condition).isTrue(); + assertThat(model.get("ITestBean")).isInstanceOf(DerivedTestBean.class); assertThat(arg).isNotNull(); return super.myHandle(tbReal, errors, model); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java index 580bdd213c9..4dabb47993a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java @@ -78,8 +78,7 @@ class EncodedResourceResolverTests { assertThat(actual.getDescription()).isEqualTo(getResource(file + ".gz").getDescription()); assertThat(actual.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition = actual instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(actual).isInstanceOf(HttpResource.class); HttpHeaders headers = ((HttpResource) actual).getResponseHeaders(); assertThat(headers.getFirst(HttpHeaders.CONTENT_ENCODING)).isEqualTo("gzip"); assertThat(headers.getFirst(HttpHeaders.VARY)).isEqualTo("Accept-Encoding"); @@ -95,8 +94,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource("foo.css.gz").getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource("foo.css").getFilename()); - boolean condition = resolved instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(resolved).isInstanceOf(HttpResource.class); } @Test @@ -110,8 +108,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource(file + ".gz").getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition = resolved instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(resolved).isInstanceOf(HttpResource.class); // 2. Resolve unencoded resource request = new MockHttpServletRequest("GET", "/js/foo.js"); @@ -119,8 +116,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource(file).getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition1 = resolved instanceof HttpResource; - assertThat(condition1).isFalse(); + assertThat(resolved).isNotInstanceOf(HttpResource.class); } @Test // SPR-13149 diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java index c9315345e40..9b60b74e5f6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java @@ -92,8 +92,7 @@ class AnnotationConfigDispatcherServletInitializerTests { ((AnnotationConfigWebApplicationContext) wac).refresh(); assertThat(wac.containsBean("bean")).isTrue(); - boolean condition = wac.getBean("bean") instanceof MyBean; - assertThat(condition).isTrue(); + assertThat(wac.getBean("bean")).isInstanceOf(MyBean.class); assertThat(servletRegistrations).hasSize(1); assertThat(servletRegistrations.get(SERVLET_NAME)).isNotNull(); @@ -161,8 +160,7 @@ class AnnotationConfigDispatcherServletInitializerTests { ((AnnotationConfigWebApplicationContext) wac).refresh(); assertThat(wac.containsBean("bean")).isTrue(); - boolean condition = wac.getBean("bean") instanceof MyBean; - assertThat(condition).isTrue(); + assertThat(wac.getBean("bean")).isInstanceOf(MyBean.class); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java index 46862aac8fb..9e90bd50a37 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java @@ -67,8 +67,7 @@ class DispatcherServletInitializerTests { WebApplicationContext servletContext = servlet.getWebApplicationContext(); assertThat(servletContext.containsBean("bean")).isTrue(); - boolean condition = servletContext.getBean("bean") instanceof MyBean; - assertThat(condition).isTrue(); + assertThat(servletContext.getBean("bean")).isInstanceOf(MyBean.class); assertThat(registrations).hasSize(1); assertThat(registrations.get(SERVLET_NAME)).isNotNull(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java index 13d1012ee0f..640e4ae9696 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java @@ -65,8 +65,7 @@ class BindTagTests extends AbstractTagTests { assertThat(status.getExpression()).as("Correct expression").isNull(); assertThat(status.getValue()).as("Correct value").isNull(); assertThat(status.getDisplayValue()).as("Correct displayValue").isEmpty(); - boolean condition = !status.isError(); - assertThat(condition).as("Correct isError").isTrue(); + assertThat(status.isError()).as("Correct isError").isFalse(); assertThat(status.getErrorCodes()).as("Correct errorCodes").isEmpty(); assertThat(status.getErrorMessages()).as("Correct errorMessages").isEmpty(); assertThat(status.getErrorCode()).as("Correct errorCode").isEmpty(); @@ -480,8 +479,7 @@ class BindTagTests extends AbstractTagTests { BindStatus status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE); assertThat(status).as("Has status variable").isNotNull(); assertThat(status.getExpression()).as("Correct expression").isEqualTo("array[0]"); - boolean condition = status.getValue() instanceof TestBean; - assertThat(condition).as("Value is TestBean").isTrue(); + assertThat(status.getValue()).as("Value is TestBean").isInstanceOf(TestBean.class); assertThat(((TestBean) status.getValue()).getName()).as("Correct value").isEqualTo("name0"); assertThat(status.isError()).as("Correct isError").isTrue(); assertThat(status.getErrorCodes()).as("Correct errorCodes").hasSize(2); @@ -508,8 +506,7 @@ class BindTagTests extends AbstractTagTests { BindStatus status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE); assertThat(status).as("Has status variable").isNotNull(); assertThat(status.getExpression()).as("Correct expression").isEqualTo("map[key1]"); - boolean condition = status.getValue() instanceof TestBean; - assertThat(condition).as("Value is TestBean").isTrue(); + assertThat(status.getValue()).as("Value is TestBean").isInstanceOf(TestBean.class); assertThat(((TestBean) status.getValue()).getName()).as("Correct value").isEqualTo("name4"); assertThat(status.isError()).as("Correct isError").isTrue(); assertThat(status.getErrorCodes()).as("Correct errorCodes").hasSize(2); @@ -544,8 +541,7 @@ class BindTagTests extends AbstractTagTests { assertThat(status).as("Has status variable").isNotNull(); assertThat(status.getExpression()).as("Correct expression").isEqualTo("array[0]"); // because of the custom editor getValue() should return a String - boolean condition = status.getValue() instanceof String; - assertThat(condition).as("Value is TestBean").isTrue(); + assertThat(status.getValue()).as("Value is TestBean").isInstanceOf(String.class); assertThat(status.getValue()).as("Correct value").isEqualTo("something"); } @@ -563,8 +559,7 @@ class BindTagTests extends AbstractTagTests { tag.doStartTag(); BindStatus status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE); assertThat(status.getExpression()).isEqualTo("doctor"); - boolean condition = status.getValue() instanceof NestedTestBean; - assertThat(condition).isTrue(); + assertThat(status.getValue()).isInstanceOf(NestedTestBean.class); assertThat(status.getDisplayValue()).contains("juergen&eva"); } @@ -579,8 +574,7 @@ class BindTagTests extends AbstractTagTests { tag.doStartTag(); BindStatus status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE); assertThat(status.getExpression()).isEqualTo("someSet"); - boolean condition = status.getValue() instanceof Set; - assertThat(condition).isTrue(); + assertThat(status.getValue()).isInstanceOf(Set.class); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java index 243bec1f9d0..b98a83e4989 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java @@ -48,20 +48,16 @@ class HtmlEscapeTagTests extends AbstractTagTests { testTag.setPageContext(pc); testTag.doStartTag(); - boolean condition7 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition7).as("Correct default").isTrue(); - boolean condition6 = !testTag.isHtmlEscape(); - assertThat(condition6).as("Correctly applied").isTrue(); + assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isFalse(); + assertThat(testTag.isHtmlEscape()).as("Correctly applied").isFalse(); tag.setDefaultHtmlEscape(true); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue(); assertThat(testTag.isHtmlEscape()).as("Correctly applied").isTrue(); tag.setDefaultHtmlEscape(false); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); - boolean condition5 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition5).as("Correctly disabled").isTrue(); - boolean condition4 = !testTag.isHtmlEscape(); - assertThat(condition4).as("Correctly applied").isTrue(); + assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse(); + assertThat(testTag.isHtmlEscape()).as("Correctly applied").isFalse(); tag.setDefaultHtmlEscape(true); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); @@ -70,19 +66,15 @@ class HtmlEscapeTagTests extends AbstractTagTests { assertThat(testTag.isHtmlEscape()).as("Correctly applied").isTrue(); testTag.setHtmlEscape(false); assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue(); - boolean condition3 = !testTag.isHtmlEscape(); - assertThat(condition3).as("Correctly applied").isTrue(); + assertThat(testTag.isHtmlEscape()).as("Correctly applied").isFalse(); tag.setDefaultHtmlEscape(false); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); testTag.setHtmlEscape(true); - boolean condition2 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition2).as("Correctly disabled").isTrue(); + assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse(); assertThat(testTag.isHtmlEscape()).as("Correctly applied").isTrue(); testTag.setHtmlEscape(false); - boolean condition1 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition1).as("Correctly disabled").isTrue(); - boolean condition = !testTag.isHtmlEscape(); - assertThat(condition).as("Correctly applied").isTrue(); + assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse(); + assertThat(testTag.isHtmlEscape()).as("Correctly applied").isFalse(); } @Test @@ -95,15 +87,13 @@ class HtmlEscapeTagTests extends AbstractTagTests { tag.setPageContext(pc); tag.doStartTag(); - boolean condition1 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition1).as("Correct default").isTrue(); + assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isFalse(); tag.setDefaultHtmlEscape(true); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue(); tag.setDefaultHtmlEscape(false); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); - boolean condition = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition).as("Correctly disabled").isTrue(); + assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse(); } @Test @@ -115,15 +105,13 @@ class HtmlEscapeTagTests extends AbstractTagTests { tag.doStartTag(); sc.addInitParameter(WebUtils.HTML_ESCAPE_CONTEXT_PARAM, "false"); - boolean condition1 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition1).as("Correct default").isTrue(); + assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isFalse(); tag.setDefaultHtmlEscape(true); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue(); tag.setDefaultHtmlEscape(false); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); - boolean condition = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition).as("Correctly disabled").isTrue(); + assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse(); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java index 65763704c6f..0b930e7b29d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java @@ -237,7 +237,7 @@ class MessageTagTests extends AbstractTagTests { tag.setText("testtext"); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); assertThat(tag.doEndTag()).as("Correct doEndTag return value").isEqualTo(Tag.EVAL_PAGE); - assertThat((message.toString())).as("Correct message").isEqualTo("test message"); + assertThat(message.toString()).as("Correct message").isEqualTo("test message"); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java index 72a6ff88a9a..7ffa079cae2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java @@ -345,8 +345,7 @@ class ErrorsTagTests extends AbstractFormTagTests { int result = this.tag.doStartTag(); assertThat(result).isEqualTo(BodyTag.EVAL_BODY_BUFFERED); assertThat(getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE)).isNotNull(); - boolean condition = getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE) instanceof List; - assertThat(condition).isTrue(); + assertThat(getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE)).isInstanceOf(List.class); String bodyContent = "Foo"; this.tag.setBodyContent(new MockBodyContent(bodyContent, getWriter())); this.tag.doEndTag(); @@ -366,8 +365,7 @@ class ErrorsTagTests extends AbstractFormTagTests { int result = this.tag.doStartTag(); assertThat(result).isEqualTo(BodyTag.EVAL_BODY_BUFFERED); assertThat(getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE)).isNotNull(); - boolean condition = getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE) instanceof List; - assertThat(condition).isTrue(); + assertThat(getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE)).isInstanceOf(List.class); String bodyContent = "Foo"; this.tag.setBodyContent(new MockBodyContent(bodyContent, getWriter())); this.tag.doEndTag(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java index 5b41dc18265..c79c9ce45a0 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java @@ -1125,7 +1125,7 @@ class SelectTagTests extends AbstractFormTagTests { Element e = (Element) rootElement.selectSingleNode("option[@value = 'UK']"); Attribute selectedAttr = e.attribute("selected"); if (selected) { - assertThat(selectedAttr != null && "selected".equals(selectedAttr.getValue())).isTrue(); + assertThat(selectedAttr.getValue()).isEqualTo("selected"); } else { assertThat(selectedAttr).isNull(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java index 7768fd1a496..8d273ead3c2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java @@ -217,8 +217,8 @@ class BaseViewTests { AbstractView v = new ConcreteView(); v.setAttributesCSV("foo=[bar],king=[kong]"); assertThat(v.getStaticAttributes()).hasSize(2); - assertThat(v.getStaticAttributes().get("foo").equals("bar")).isTrue(); - assertThat(v.getStaticAttributes().get("king").equals("kong")).isTrue(); + assertThat(v.getStaticAttributes().get("foo")).isEqualTo("bar"); + assertThat(v.getStaticAttributes().get("king")).isEqualTo("kong"); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java index f76bf5c9985..3904f010281 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java @@ -364,7 +364,7 @@ class RedirectViewTests { */ @Override protected Map queryProperties(Map model) { - assertThat(this.expectedModel.equals(model)).as("Map and model must be equal.").isTrue(); + assertThat(this.expectedModel).as("Map and model must be equal.").isEqualTo(model); this.queryPropertiesCalled = true; return super.queryProperties(model); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java index 7d06b1f4b41..732c21ce133 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java @@ -182,9 +182,8 @@ class ViewResolverTests { TestBean tb = new TestBean(); model.put("tb", tb); view.render(model, this.request, this.response); - assertThat(tb.equals(this.request.getAttribute("tb"))).as("Correct tb attribute").isTrue(); - boolean condition = this.request.getAttribute("rc") instanceof RequestContext; - assertThat(condition).as("Correct rc attribute").isTrue(); + assertThat(tb).as("Correct tb attribute").isEqualTo(this.request.getAttribute("tb")); + assertThat(this.request.getAttribute("rc")).as("Correct rc attribute").isInstanceOf(RequestContext.class); view = vr.resolveViewName("redirect:myUrl", Locale.getDefault()); assertThat(view.getClass()).as("Correct view class").isEqualTo(RedirectView.class); @@ -252,7 +251,7 @@ class ViewResolverTests { model.put("tb", tb); view.render(model, this.request, this.response); - assertThat(tb.equals(this.request.getAttribute("tb"))).as("Correct tb attribute").isTrue(); + assertThat(tb).as("Correct tb attribute").isEqualTo(this.request.getAttribute("tb")); assertThat(this.request.getAttribute("rc")).as("Correct rc attribute").isNull(); assertThat(this.request.getAttribute("key1")).isEqualTo("value1"); assertThat(this.request.getAttribute("key2")).isEqualTo(2); @@ -355,7 +354,7 @@ class ViewResolverTests { model.put("tb", tb); view.render(model, this.request, this.response); - assertThat(tb.equals(this.request.getAttribute("tb"))).as("Correct tb attribute").isTrue(); + assertThat(tb).as("Correct tb attribute").isEqualTo(this.request.getAttribute("tb")); assertThat(this.request.getAttribute("rc")).as("Correct rc attribute").isNull(); assertThat(Config.get(this.request, Config.FMT_LOCALE)).isEqualTo(locale); @@ -389,7 +388,7 @@ class ViewResolverTests { model.put("tb", tb); view.render(model, this.request, this.response); - assertThat(tb.equals(this.request.getAttribute("tb"))).as("Correct tb attribute").isTrue(); + assertThat(tb).as("Correct tb attribute").isEqualTo(this.request.getAttribute("tb")); assertThat(this.request.getAttribute("rc")).as("Correct rc attribute").isNull(); assertThat(Config.get(this.request, Config.FMT_LOCALE)).isEqualTo(locale); 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 9476cd68d77..eac2f0f6be4 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 @@ -83,8 +83,7 @@ class HandlersBeanDefinitionParserTests { assertThat(handlersMap).hasSize(2); for (HandlerMapping hm : handlersMap.values()) { - boolean condition2 = hm instanceof SimpleUrlHandlerMapping; - assertThat(condition2).isTrue(); + assertThat(hm).isInstanceOf(SimpleUrlHandlerMapping.class); SimpleUrlHandlerMapping shm = (SimpleUrlHandlerMapping) hm; if (shm.getUrlMap().containsKey("/foo")) { @@ -94,11 +93,9 @@ class HandlersBeanDefinitionParserTests { unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), FooWebSocketHandler.class); HandshakeHandler handshakeHandler = handler.getHandshakeHandler(); assertThat(handshakeHandler).isNotNull(); - boolean condition1 = handshakeHandler instanceof DefaultHandshakeHandler; - assertThat(condition1).isTrue(); + assertThat(handshakeHandler).isInstanceOf(DefaultHandshakeHandler.class); assertThat(handler.getHandshakeInterceptors()).isNotEmpty(); - boolean condition = handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor; - assertThat(condition).isTrue(); + assertThat(handler.getHandshakeInterceptors().get(0)).isInstanceOf(OriginHandshakeInterceptor.class); } else { assertThat(shm.getUrlMap()).containsOnlyKeys("/test"); @@ -107,11 +104,9 @@ class HandlersBeanDefinitionParserTests { unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), TestWebSocketHandler.class); HandshakeHandler handshakeHandler = handler.getHandshakeHandler(); assertThat(handshakeHandler).isNotNull(); - boolean condition1 = handshakeHandler instanceof DefaultHandshakeHandler; - assertThat(condition1).isTrue(); + assertThat(handshakeHandler).isInstanceOf(DefaultHandshakeHandler.class); assertThat(handler.getHandshakeInterceptors()).isNotEmpty(); - boolean condition = handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor; - assertThat(condition).isTrue(); + assertThat(handler.getHandshakeInterceptors().get(0)).isInstanceOf(OriginHandshakeInterceptor.class); } } } @@ -122,8 +117,7 @@ class HandlersBeanDefinitionParserTests { HandlerMapping handlerMapping = this.appContext.getBean(HandlerMapping.class); assertThat(handlerMapping).isNotNull(); - boolean condition2 = handlerMapping instanceof SimpleUrlHandlerMapping; - assertThat(condition2).isTrue(); + assertThat(handlerMapping).isInstanceOf(SimpleUrlHandlerMapping.class); SimpleUrlHandlerMapping urlHandlerMapping = (SimpleUrlHandlerMapping) handlerMapping; assertThat(urlHandlerMapping.getOrder()).isEqualTo(2); @@ -133,8 +127,7 @@ class HandlersBeanDefinitionParserTests { unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), FooWebSocketHandler.class); HandshakeHandler handshakeHandler = handler.getHandshakeHandler(); assertThat(handshakeHandler).isNotNull(); - boolean condition1 = handshakeHandler instanceof TestHandshakeHandler; - assertThat(condition1).isTrue(); + assertThat(handshakeHandler).isInstanceOf(TestHandshakeHandler.class); List interceptors = handler.getHandshakeInterceptors(); assertThat(interceptors).extracting("class") .containsExactlyInAnyOrder(FooTestInterceptor.class, BarTestInterceptor.class, OriginHandshakeInterceptor.class); @@ -144,8 +137,7 @@ class HandlersBeanDefinitionParserTests { unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), TestWebSocketHandler.class); handshakeHandler = handler.getHandshakeHandler(); assertThat(handshakeHandler).isNotNull(); - boolean condition = handshakeHandler instanceof TestHandshakeHandler; - assertThat(condition).isTrue(); + assertThat(handshakeHandler).isInstanceOf(TestHandshakeHandler.class); interceptors = handler.getHandshakeInterceptors(); assertThat(interceptors).extracting("class") .containsExactlyInAnyOrder(FooTestInterceptor.class, BarTestInterceptor.class, OriginHandshakeInterceptor.class); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java index e3b2af9ab0e..0bff8ce3a32 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java @@ -267,8 +267,8 @@ class StompSubProtocolHandlerTests { assertThat(this.session.getSentMessages()).hasSize(1); WebSocketMessage textMessage = this.session.getSentMessages().get(0); - assertThat(((String) textMessage.getPayload())).contains("destination:/user/queue/foo\n"); - assertThat(((String) textMessage.getPayload())).doesNotContain(SimpMessageHeaderAccessor.ORIGINAL_DESTINATION); + assertThat((String) textMessage.getPayload()).contains("destination:/user/queue/foo\n"); + assertThat((String) textMessage.getPayload()).doesNotContain(SimpMessageHeaderAccessor.ORIGINAL_DESTINATION); } // SPR-12475