Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace assertThat(x.equals(y)) with assertThat(x).isEqualTo(y)

Browse Source 
Search for   : assertThat\((.+)\.equals\((\w+)\)\)\.isTrue\(\)
Replace with : assertThat($1).isEqualTo($2)

Search for   : assertThat\((.+)\.equals\((\w+)\)\)\.isFalse\(\)
Replace with : assertThat($1).isNotEqualTo($2)

Closes gh-31763
This commit is contained in:
Yanming Zhou
2023-12-06 14:44:43 +08:00
committed by Brian Clozel
parent e2852e7355
commit 7b16ef90f1
30 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/test/java/org/springframework/core/MethodParameterTests.java
View File

@@ -65,12 +65,12 @@ class MethodParameterTests {
assertThat(longParameter).isEqualTo(longParameter);
assertThat(intReturnType).isEqualTo(intReturnType);
assertThat(stringParameter.equals(longParameter)).isFalse();
assertThat(stringParameter.equals(intReturnType)).isFalse();
assertThat(longParameter.equals(stringParameter)).isFalse();
assertThat(longParameter.equals(intReturnType)).isFalse();
assertThat(intReturnType.equals(stringParameter)).isFalse();
assertThat(intReturnType.equals(longParameter)).isFalse();
assertThat(stringParameter).isNotEqualTo(longParameter);
assertThat(stringParameter).isNotEqualTo(intReturnType);
assertThat(longParameter).isNotEqualTo(stringParameter);
assertThat(longParameter).isNotEqualTo(intReturnType);
assertThat(intReturnType).isNotEqualTo(stringParameter);
assertThat(intReturnType).isNotEqualTo(longParameter);
Method method = getClass().getMethod("method", String.class, Long.TYPE);
MethodParameter methodParameter = new MethodParameter(method, 0);

12
spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java
View File

@@ -56,12 +56,12 @@ class SynthesizingMethodParameterTests {
assertThat(longParameter).isEqualTo(longParameter);
assertThat(intReturnType).isEqualTo(intReturnType);
assertThat(stringParameter.equals(longParameter)).isFalse();
assertThat(stringParameter.equals(intReturnType)).isFalse();
assertThat(longParameter.equals(stringParameter)).isFalse();
assertThat(longParameter.equals(intReturnType)).isFalse();
assertThat(intReturnType.equals(stringParameter)).isFalse();
assertThat(intReturnType.equals(longParameter)).isFalse();
assertThat(stringParameter).isNotEqualTo(longParameter);
assertThat(stringParameter).isNotEqualTo(intReturnType);
assertThat(longParameter).isNotEqualTo(stringParameter);
assertThat(longParameter).isNotEqualTo(intReturnType);
assertThat(intReturnType).isNotEqualTo(stringParameter);
assertThat(intReturnType).isNotEqualTo(longParameter);
Method method = getClass().getMethod("method", String.class, Long.TYPE);
MethodParameter methodParameter = new SynthesizingMethodParameter(method, 0);

2
spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
View File

@@ -386,7 +386,7 @@ class GenericConversionServiceTests {
void convertiblePairDifferentEqualsAndHash() {
GenericConverter.ConvertiblePair pair = new GenericConverter.ConvertiblePair(Number.class, String.class);
GenericConverter.ConvertiblePair pairOpposite = new GenericConverter.ConvertiblePair(String.class, Number.class);
assertThat(pair.equals(pairOpposite)).isFalse();
assertThat(pair).isNotEqualTo(pairOpposite);
assertThat(pair.hashCode()).isNotEqualTo(pairOpposite.hashCode());
}

8
spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
View File

@@ -72,7 +72,7 @@ class MapToMapConverterTests {
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
@SuppressWarnings("unchecked")
Map<Integer, Integer> result = (Map<Integer, Integer>) conversionService.convert(map, sourceType, targetType);
assertThat(map.equals(result)).isFalse();
assertThat(map).isNotEqualTo(result);
assertThat((int) result.get(1)).isEqualTo(9);
assertThat((int) result.get(2)).isEqualTo(37);
}
@@ -107,7 +107,7 @@ class MapToMapConverterTests {
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
@SuppressWarnings("unchecked")
Map<Integer, Integer> result = (Map<Integer, Integer>) conversionService.convert(map, sourceType, targetType);
assertThat(map.equals(result)).isFalse();
assertThat(map).isNotEqualTo(result);
assertThat((int) result.get(1)).isEqualTo(9);
assertThat((int) result.get(2)).isEqualTo(37);
}
@@ -133,7 +133,7 @@ class MapToMapConverterTests {
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
@SuppressWarnings("unchecked")
Map<Integer, List<Integer>> result = (Map<Integer, List<Integer>>) conversionService.convert(map, sourceType, targetType);
assertThat(map.equals(result)).isFalse();
assertThat(map).isNotEqualTo(result);
assertThat(result.get(1)).isEqualTo(Arrays.asList(9, 12));
assertThat(result.get(2)).isEqualTo(Arrays.asList(37, 23));
}
@@ -155,7 +155,7 @@ class MapToMapConverterTests {
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
@SuppressWarnings("unchecked")
Map<Integer, List<Integer>> result = (Map<Integer, List<Integer>>) conversionService.convert(map, sourceType, targetType);
assertThat(map.equals(result)).isFalse();
assertThat(map).isNotEqualTo(result);
assertThat(result.get(1)).isEqualTo(Arrays.asList(9, 12));
assertThat(result.get(2)).isEqualTo(Arrays.asList(37, 23));
}

2
spring-core/src/test/java/org/springframework/core/io/support/EncodedResourceTests.java
View File

@@ -43,7 +43,7 @@ class EncodedResourceTests {
@Test
void equalsWithNullOtherObject() {
assertThat(new EncodedResource(resource).equals(null)).isFalse();
assertThat(new EncodedResource(resource)).isNotEqualTo(null);
}
@Test

22
spring-core/src/test/java/org/springframework/core/type/AbstractAnnotationMetadataTests.java
View File

@@ -44,20 +44,20 @@ public abstract class AbstractAnnotationMetadataTests {
AnnotationMetadata testMemberClass1 = get(TestMemberClass.class);
AnnotationMetadata testMemberClass2 = get(TestMemberClass.class);
assertThat(testClass1.equals(null)).isFalse();
assertThat(testClass1).isNotEqualTo(null);
assertThat(testClass1.equals(testClass1)).isTrue();
assertThat(testClass2.equals(testClass2)).isTrue();
assertThat(testClass1.equals(testClass2)).isTrue();
assertThat(testClass2.equals(testClass1)).isTrue();
assertThat(testClass1).isEqualTo(testClass1);
assertThat(testClass2).isEqualTo(testClass2);
assertThat(testClass1).isEqualTo(testClass2);
assertThat(testClass2).isEqualTo(testClass1);
assertThat(testMemberClass1.equals(testMemberClass1)).isTrue();
assertThat(testMemberClass2.equals(testMemberClass2)).isTrue();
assertThat(testMemberClass1.equals(testMemberClass2)).isTrue();
assertThat(testMemberClass2.equals(testMemberClass1)).isTrue();
assertThat(testMemberClass1).isEqualTo(testMemberClass1);
assertThat(testMemberClass2).isEqualTo(testMemberClass2);
assertThat(testMemberClass1).isEqualTo(testMemberClass2);
assertThat(testMemberClass2).isEqualTo(testMemberClass1);
assertThat(testClass1.equals(testMemberClass1)).isFalse();
assertThat(testMemberClass1.equals(testClass1)).isFalse();
assertThat(testClass1).isNotEqualTo(testMemberClass1);
assertThat(testMemberClass1).isNotEqualTo(testClass1);
}
@Test

22
spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java
View File

@@ -44,20 +44,20 @@ public abstract class AbstractMethodMetadataTests {
MethodMetadata withMethodWithTwoArguments1 = getTagged(WithMethodWithTwoArguments.class);
MethodMetadata withMethodWithTwoArguments2 = getTagged(WithMethodWithTwoArguments.class);
assertThat(withMethod1.equals(null)).isFalse();
assertThat(withMethod1).isNotEqualTo(null);
assertThat(withMethod1.equals(withMethod1)).isTrue();
assertThat(withMethod2.equals(withMethod2)).isTrue();
assertThat(withMethod1.equals(withMethod2)).isTrue();
assertThat(withMethod2.equals(withMethod1)).isTrue();
assertThat(withMethod1).isEqualTo(withMethod1);
assertThat(withMethod2).isEqualTo(withMethod2);
assertThat(withMethod1).isEqualTo(withMethod2);
assertThat(withMethod2).isEqualTo(withMethod1);
assertThat(withMethodWithTwoArguments1.equals(withMethodWithTwoArguments1)).isTrue();
assertThat(withMethodWithTwoArguments2.equals(withMethodWithTwoArguments2)).isTrue();
assertThat(withMethodWithTwoArguments1.equals(withMethodWithTwoArguments2)).isTrue();
assertThat(withMethodWithTwoArguments2.equals(withMethodWithTwoArguments1)).isTrue();
assertThat(withMethodWithTwoArguments1).isEqualTo(withMethodWithTwoArguments1);
assertThat(withMethodWithTwoArguments2).isEqualTo(withMethodWithTwoArguments2);
assertThat(withMethodWithTwoArguments1).isEqualTo(withMethodWithTwoArguments2);
assertThat(withMethodWithTwoArguments2).isEqualTo(withMethodWithTwoArguments1);
assertThat(withMethod1.equals(withMethodWithTwoArguments1)).isFalse();
assertThat(withMethodWithTwoArguments1.equals(withMethod1)).isFalse();
assertThat(withMethod1).isNotEqualTo(withMethodWithTwoArguments1);
assertThat(withMethodWithTwoArguments1).isNotEqualTo(withMethod1);
}
@Test