admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid the use of assertThat(Arrays.equals(...))

Browse Source 
See gh-36504
This commit is contained in:
Sam Brannen
2026-03-19 17:50:10 +01:00
parent 29ea530525
commit 8ca0262e2f
10 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
+2 -3
View File
@@ -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();
});
spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
+3 -3
View File
@@ -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
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
+1 -2
View File
@@ -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();
}
spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
+1 -2
View File
@@ -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());
spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
+8 -9
View File
@@ -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);
}
}
spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java
+3 -4
View File
@@ -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
spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideHandlerTests.java
+1 -2
View File
@@ -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);
spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java
+1 -1
View File
@@ -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);
}
}
spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
+1 -2
View File
@@ -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);
}
spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
+1 -2
View File
@@ -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