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-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java index 295002d4ab2..e64ce637133 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 @@ -311,19 +311,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/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/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-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/util/FileCopyUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java index 65e5662f22e..87d1b114057 100644 --- a/spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java @@ -23,7 +23,6 @@ import java.io.StringReader; import java.io.StringWriter; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Arrays; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -45,7 +44,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 @@ -53,7 +52,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 @@ -61,7 +60,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-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 30811d17678..12656bbe149 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-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java index ff20a732fe9..66ae82e8b53 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 @@ -104,7 +104,7 @@ abstract class AbstractHttpRequestFactoryTests extends AbstractMockWebServerTest .as("Header value not found") .isTrue(); 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 3a891e0603a..b205e5ed1d8 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; @@ -192,7 +191,7 @@ 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 1158e7fb8db..3383c7878d6 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; @@ -144,7 +143,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