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

User AssertJ's hasSize() for arrays

Browse Source 
Achieved via global search-and-replace.
This commit is contained in:
Sam Brannen
2022-11-22 17:03:45 +01:00
parent 36f7597f25
commit d5b0b2b1a1
72 changed files with 277 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
View File

@@ -168,7 +168,7 @@ class GenericTypeResolverTests {
void resolveIncompleteTypeVariables() {
Class<?>[] resolved = GenericTypeResolver.resolveTypeArguments(IdFixingRepository.class, Repository.class);
assertThat(resolved).isNotNull();
assertThat(resolved.length).isEqualTo(2);
assertThat(resolved).hasSize(2);
assertThat(resolved[0]).isEqualTo(Object.class);
assertThat(resolved[1]).isEqualTo(Long.class);
}

14
spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
View File

@@ -162,23 +162,23 @@ class LocalVariableTableParameterNameDiscovererTests {
Constructor<?> ctor = clazz.getDeclaredConstructor(Object.class);
String[] names = discoverer.getParameterNames(ctor);
assertThat(names.length).isEqualTo(1);
assertThat(names).hasSize(1);
assertThat(names[0]).isEqualTo("key");
ctor = clazz.getDeclaredConstructor(Object.class, Object.class);
names = discoverer.getParameterNames(ctor);
assertThat(names.length).isEqualTo(2);
assertThat(names).hasSize(2);
assertThat(names[0]).isEqualTo("key");
assertThat(names[1]).isEqualTo("value");
Method m = clazz.getMethod("generifiedStaticMethod", Object.class);
names = discoverer.getParameterNames(m);
assertThat(names.length).isEqualTo(1);
assertThat(names).hasSize(1);
assertThat(names[0]).isEqualTo("param");
m = clazz.getMethod("generifiedMethod", Object.class, long.class, Object.class, Object.class);
names = discoverer.getParameterNames(m);
assertThat(names.length).isEqualTo(4);
assertThat(names).hasSize(4);
assertThat(names[0]).isEqualTo("param");
assertThat(names[1]).isEqualTo("x");
assertThat(names[2]).isEqualTo("key");
@@ -186,21 +186,21 @@ class LocalVariableTableParameterNameDiscovererTests {
m = clazz.getMethod("voidStaticMethod", Object.class, long.class, int.class);
names = discoverer.getParameterNames(m);
assertThat(names.length).isEqualTo(3);
assertThat(names).hasSize(3);
assertThat(names[0]).isEqualTo("obj");
assertThat(names[1]).isEqualTo("x");
assertThat(names[2]).isEqualTo("i");
m = clazz.getMethod("nonVoidStaticMethod", Object.class, long.class, int.class);
names = discoverer.getParameterNames(m);
assertThat(names.length).isEqualTo(3);
assertThat(names).hasSize(3);
assertThat(names[0]).isEqualTo("obj");
assertThat(names[1]).isEqualTo("x");
assertThat(names[2]).isEqualTo("i");
m = clazz.getMethod("getDate");
names = discoverer.getParameterNames(m);
assertThat(names.length).isEqualTo(0);
assertThat(names).hasSize(0);
}
@Disabled("Ignored because Ubuntu packages OpenJDK with debug symbols enabled. See SPR-8078.")

8
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
View File

@@ -535,7 +535,7 @@ class ResolvableTypeTests {
void getGenericsFromParameterizedType() throws Exception {
ResolvableType type = ResolvableType.forClass(List.class, ExtendsList.class);
ResolvableType[] generics = type.getGenerics();
assertThat(generics.length).isEqualTo(1);
assertThat(generics).hasSize(1);
assertThat(generics[0].resolve()).isEqualTo(CharSequence.class);
}
@@ -543,7 +543,7 @@ class ResolvableTypeTests {
void getGenericsFromClass() throws Exception {
ResolvableType type = ResolvableType.forClass(List.class);
ResolvableType[] generics = type.getGenerics();
assertThat(generics.length).isEqualTo(1);
assertThat(generics).hasSize(1);
assertThat(generics[0].getType().toString()).isEqualTo("E");
}
@@ -558,7 +558,7 @@ class ResolvableTypeTests {
void getResolvedGenerics() throws Exception {
ResolvableType type = ResolvableType.forClass(List.class, ExtendsList.class);
Class<?>[] generics = type.resolveGenerics();
assertThat(generics.length).isEqualTo(1);
assertThat(generics).hasSize(1);
assertThat(generics[0]).isEqualTo(CharSequence.class);
}
@@ -1307,7 +1307,7 @@ class ResolvableTypeTests {
Type type = resolvableType.getType();
assertThat(type).isInstanceOf(ParameterizedType.class);
assertThat(((ParameterizedType) type).getRawType()).isEqualTo(Callable.class);
assertThat(((ParameterizedType) type).getActualTypeArguments().length).isEqualTo(1);
assertThat(((ParameterizedType) type).getActualTypeArguments()).hasSize(1);
assertThat(((ParameterizedType) type).getActualTypeArguments()[0]).isEqualTo(String.class);
}

6
spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
View File

@@ -108,12 +108,12 @@ class AnnotationAttributesTests {
AnnotationAttributes[] array = attributes.getAnnotationArray("nestedAttributes");
assertThat(array).isNotNull();
assertThat(array.length).isEqualTo(1);
assertThat(array).hasSize(1);
assertThat(array[0].getString("name")).isEqualTo("Dilbert");
Filter[] filters = attributes.getAnnotationArray("filters", Filter.class);
assertThat(filters).isNotNull();
assertThat(filters.length).isEqualTo(1);
assertThat(filters).hasSize(1);
assertThat(filters[0].pattern()).isEqualTo("foo");
}
@@ -130,7 +130,7 @@ class AnnotationAttributesTests {
Filter[] retrievedFilters = attributes.getAnnotationArray("filters", Filter.class);
assertThat(retrievedFilters).isNotNull();
assertThat(retrievedFilters.length).isEqualTo(2);
assertThat(retrievedFilters).hasSize(2);
assertThat(retrievedFilters[1].pattern()).isEqualTo("foo");
}

6
spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
View File

@@ -507,7 +507,7 @@ class AnnotationUtilsTests {
@Test
void getValueFromNonPublicAnnotation() throws Exception {
Annotation[] declaredAnnotations = NonPublicAnnotatedClass.class.getDeclaredAnnotations();
assertThat(declaredAnnotations.length).isEqualTo(1);
assertThat(declaredAnnotations).hasSize(1);
Annotation annotation = declaredAnnotations[0];
assertThat(annotation).isNotNull();
assertThat(annotation.annotationType().getSimpleName()).isEqualTo("NonPublicAnnotation");
@@ -527,7 +527,7 @@ class AnnotationUtilsTests {
@Test
void getDefaultValueFromNonPublicAnnotation() {
Annotation[] declaredAnnotations = NonPublicAnnotatedClass.class.getDeclaredAnnotations();
assertThat(declaredAnnotations.length).isEqualTo(1);
assertThat(declaredAnnotations).hasSize(1);
Annotation annotation = declaredAnnotations[0];
assertThat(annotation).isNotNull();
assertThat(annotation.annotationType().getSimpleName()).isEqualTo("NonPublicAnnotation");
@@ -706,7 +706,7 @@ class AnnotationUtilsTests {
// Java 8
MyRepeatable[] array = clazz.getDeclaredAnnotationsByType(MyRepeatable.class);
assertThat(array).isNotNull();
assertThat(array.length).isEqualTo(0);
assertThat(array).hasSize(0);
// Spring
Set<MyRepeatable> set = getDeclaredRepeatableAnnotations(clazz, MyRepeatable.class, MyRepeatableContainer.class);

24
spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
View File

@@ -65,7 +65,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("int");
assertThat(desc.toString()).isEqualTo("int");
assertThat(desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isFalse();
assertThat(desc.isMap()).isFalse();
}
@@ -78,7 +78,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("java.lang.String");
assertThat(desc.toString()).isEqualTo("java.lang.String");
assertThat(!desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isFalse();
assertThat(desc.isArray()).isFalse();
assertThat(desc.isMap()).isFalse();
@@ -93,7 +93,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("java.util.List");
assertThat(desc.toString()).isEqualTo("java.util.List<java.util.List<java.util.Map<java.lang.Integer, java.lang.Enum<?>>>>");
assertThat(!desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isTrue();
assertThat(desc.isArray()).isFalse();
assertThat(desc.getElementTypeDescriptor().getType()).isEqualTo(List.class);
@@ -114,7 +114,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("java.util.List");
assertThat(desc.toString()).isEqualTo("java.util.List<?>");
assertThat(!desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isTrue();
assertThat(desc.isArray()).isFalse();
assertThat((Object) desc.getElementTypeDescriptor()).isNull();
@@ -130,7 +130,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("java.lang.Integer[]");
assertThat(desc.toString()).isEqualTo("java.lang.Integer[]");
assertThat(!desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isFalse();
assertThat(desc.isArray()).isTrue();
assertThat(desc.getElementTypeDescriptor().getType()).isEqualTo(Integer.class);
@@ -147,7 +147,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("java.util.Map");
assertThat(desc.toString()).isEqualTo("java.util.Map<java.lang.Integer, java.util.List<java.lang.String>>");
assertThat(!desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isFalse();
assertThat(desc.isArray()).isFalse();
assertThat(desc.isMap()).isTrue();
@@ -162,7 +162,7 @@ class TypeDescriptorTests {
void parameterAnnotated() throws Exception {
TypeDescriptor t1 = new TypeDescriptor(new MethodParameter(getClass().getMethod("testAnnotatedMethod", String.class), 0));
assertThat(t1.getType()).isEqualTo(String.class);
assertThat(t1.getAnnotations().length).isEqualTo(1);
assertThat(t1.getAnnotations()).hasSize(1);
assertThat(t1.getAnnotation(ParameterAnnotation.class)).isNotNull();
assertThat(t1.hasAnnotation(ParameterAnnotation.class)).isTrue();
assertThat(t1.getAnnotation(ParameterAnnotation.class).value()).isEqualTo(123);
@@ -335,7 +335,7 @@ class TypeDescriptorTests {
@Test
void fieldAnnotated() throws Exception {
TypeDescriptor typeDescriptor = new TypeDescriptor(getClass().getField("fieldAnnotated"));
assertThat(typeDescriptor.getAnnotations().length).isEqualTo(1);
assertThat(typeDescriptor.getAnnotations()).hasSize(1);
assertThat(typeDescriptor.getAnnotation(FieldAnnotation.class)).isNotNull();
}
@@ -463,7 +463,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("java.util.List");
assertThat(desc.toString()).isEqualTo("java.util.List<java.lang.Integer>");
assertThat(!desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isTrue();
assertThat(desc.isArray()).isFalse();
assertThat(desc.getElementTypeDescriptor().getType()).isEqualTo(Integer.class);
@@ -479,7 +479,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("java.util.List");
assertThat(desc.toString()).isEqualTo("java.util.List<java.util.List<java.lang.Integer>>");
assertThat(!desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isTrue();
assertThat(desc.isArray()).isFalse();
assertThat(desc.getElementTypeDescriptor().getType()).isEqualTo(List.class);
@@ -495,7 +495,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("java.util.Map");
assertThat(desc.toString()).isEqualTo("java.util.Map<java.lang.String, java.lang.Integer>");
assertThat(!desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isFalse();
assertThat(desc.isArray()).isFalse();
assertThat(desc.isMap()).isTrue();
@@ -512,7 +512,7 @@ class TypeDescriptorTests {
assertThat(desc.getName()).isEqualTo("java.util.Map");
assertThat(desc.toString()).isEqualTo("java.util.Map<java.lang.String, java.util.Map<java.lang.String, java.lang.Integer>>");
assertThat(!desc.isPrimitive()).isTrue();
assertThat(desc.getAnnotations().length).isEqualTo(0);
assertThat(desc.getAnnotations()).hasSize(0);
assertThat(desc.isCollection()).isFalse();
assertThat(desc.isArray()).isFalse();
assertThat(desc.isMap()).isTrue();

2
spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
View File

@@ -452,7 +452,7 @@ class DefaultConversionServiceTests {
@Test
void convertObjectToArray() {
Object[] result = conversionService.convert(3L, Object[].class);
assertThat(result.length).isEqualTo(1);
assertThat(result).hasSize(1);
assertThat(result[0]).isEqualTo(3L);
}

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

@@ -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)).length).isEqualTo(0);
assertThat(((String[]) conversionService.convert(list, sourceType, targetType))).hasSize(0);
}
@Test

22
spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java vendored
View File

@@ -113,12 +113,12 @@ public class StandardEnvironmentTests {
@Test
void activeProfilesIsEmptyByDefault() {
assertThat(environment.getActiveProfiles().length).isEqualTo(0);
assertThat(environment.getActiveProfiles()).hasSize(0);
}
@Test
void defaultProfilesContainsDefaultProfileByDefault() {
assertThat(environment.getDefaultProfiles().length).isEqualTo(1);
assertThat(environment.getDefaultProfiles()).hasSize(1);
assertThat(environment.getDefaultProfiles()[0]).isEqualTo("default");
}
@@ -127,7 +127,7 @@ public class StandardEnvironmentTests {
environment.setActiveProfiles("local", "embedded");
String[] activeProfiles = environment.getActiveProfiles();
assertThat(activeProfiles).contains("local", "embedded");
assertThat(activeProfiles.length).isEqualTo(2);
assertThat(activeProfiles).hasSize(2);
}
@Test
@@ -172,17 +172,17 @@ public class StandardEnvironmentTests {
@Test
void addActiveProfile() {
assertThat(environment.getActiveProfiles().length).isEqualTo(0);
assertThat(environment.getActiveProfiles()).hasSize(0);
environment.setActiveProfiles("local", "embedded");
assertThat(environment.getActiveProfiles()).contains("local", "embedded");
assertThat(environment.getActiveProfiles().length).isEqualTo(2);
assertThat(environment.getActiveProfiles()).hasSize(2);
environment.addActiveProfile("p1");
assertThat(environment.getActiveProfiles()).contains("p1");
assertThat(environment.getActiveProfiles().length).isEqualTo(3);
assertThat(environment.getActiveProfiles()).hasSize(3);
environment.addActiveProfile("p2");
environment.addActiveProfile("p3");
assertThat(environment.getActiveProfiles()).contains("p2", "p3");
assertThat(environment.getActiveProfiles().length).isEqualTo(5);
assertThat(environment.getActiveProfiles()).hasSize(5);
}
@Test
@@ -218,9 +218,9 @@ public class StandardEnvironmentTests {
@Test
void getActiveProfiles_systemPropertiesEmpty() {
assertThat(environment.getActiveProfiles().length).isEqualTo(0);
assertThat(environment.getActiveProfiles()).hasSize(0);
System.setProperty(ACTIVE_PROFILES_PROPERTY_NAME, "");
assertThat(environment.getActiveProfiles().length).isEqualTo(0);
assertThat(environment.getActiveProfiles()).hasSize(0);
System.clearProperty(ACTIVE_PROFILES_PROPERTY_NAME);
}
@@ -249,14 +249,14 @@ public class StandardEnvironmentTests {
void getDefaultProfiles() {
assertThat(environment.getDefaultProfiles()).isEqualTo(new String[] {RESERVED_DEFAULT_PROFILE_NAME});
environment.getPropertySources().addFirst(new MockPropertySource().withProperty(DEFAULT_PROFILES_PROPERTY_NAME, "pd1"));
assertThat(environment.getDefaultProfiles().length).isEqualTo(1);
assertThat(environment.getDefaultProfiles()).hasSize(1);
assertThat(Arrays.asList(environment.getDefaultProfiles())).contains("pd1");
}
@Test
void setDefaultProfiles() {
environment.setDefaultProfiles();
assertThat(environment.getDefaultProfiles().length).isEqualTo(0);
assertThat(environment.getDefaultProfiles()).hasSize(0);
environment.setDefaultProfiles("pd1");
assertThat(Arrays.asList(environment.getDefaultProfiles())).contains("pd1");
environment.setDefaultProfiles("pd2", "pd3");

14
spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
View File

@@ -90,7 +90,7 @@ class AnnotationMetadataTests {
assertThat(metadata.isConcrete()).isTrue();
assertThat(metadata.hasSuperClass()).isTrue();
assertThat(metadata.getSuperClassName()).isEqualTo(AnnotatedComponent.class.getName());
assertThat(metadata.getInterfaceNames().length).isEqualTo(0);
assertThat(metadata.getInterfaceNames()).hasSize(0);
assertThat(metadata.isAnnotated(Component.class.getName())).isFalse();
assertThat(metadata.isAnnotated(Scope.class.getName())).isFalse();
assertThat(metadata.isAnnotated(SpecialAttr.class.getName())).isFalse();
@@ -141,7 +141,7 @@ class AnnotationMetadataTests {
assertThat(metadata.isConcrete()).isFalse();
assertThat(metadata.hasSuperClass()).isFalse();
assertThat(metadata.getSuperClassName()).isNull();
assertThat(metadata.getInterfaceNames().length).isEqualTo(2);
assertThat(metadata.getInterfaceNames()).hasSize(2);
assertThat(metadata.getInterfaceNames()[0]).isEqualTo(ClassMetadata.class.getName());
assertThat(metadata.getInterfaceNames()[1]).isEqualTo(AnnotatedTypeMetadata.class.getName());
assertThat(metadata.getAnnotationTypes()).hasSize(0);
@@ -169,7 +169,7 @@ class AnnotationMetadataTests {
assertThat(metadata.isConcrete()).isFalse();
assertThat(metadata.hasSuperClass()).isFalse();
assertThat(metadata.getSuperClassName()).isNull();
assertThat(metadata.getInterfaceNames().length).isEqualTo(1);
assertThat(metadata.getInterfaceNames()).hasSize(1);
assertThat(metadata.getInterfaceNames()[0]).isEqualTo(Annotation.class.getName());
assertThat(metadata.isAnnotated(Documented.class.getName())).isFalse();
assertThat(metadata.isAnnotated(Scope.class.getName())).isFalse();
@@ -287,7 +287,7 @@ class AnnotationMetadataTests {
assertThat(metadata.isConcrete()).isTrue();
assertThat(metadata.hasSuperClass()).isTrue();
assertThat(metadata.getSuperClassName()).isEqualTo(Object.class.getName());
assertThat(metadata.getInterfaceNames().length).isEqualTo(1);
assertThat(metadata.getInterfaceNames()).hasSize(1);
assertThat(metadata.getInterfaceNames()[0]).isEqualTo(Serializable.class.getName());
assertThat(metadata.isAnnotated(Component.class.getName())).isTrue();
@@ -335,7 +335,7 @@ class AnnotationMetadataTests {
assertThat((Class<?>[]) nestedAnno.get("classArray")).isEqualTo(new Class<?>[] {String.class});
AnnotationAttributes[] nestedAnnoArray = specialAttrs.getAnnotationArray("nestedAnnoArray");
assertThat(nestedAnnoArray.length).isEqualTo(2);
assertThat(nestedAnnoArray).hasSize(2);
assertThat(nestedAnnoArray[0].getString("value")).isEqualTo("default");
assertThat(nestedAnnoArray[0].getEnum("anEnum").equals(SomeEnum.DEFAULT)).isTrue();
assertThat((Class<?>[]) nestedAnnoArray[0].get("classArray")).isEqualTo(new Class<?>[] {Void.class});
@@ -351,7 +351,7 @@ class AnnotationMetadataTests {
assertThat(optional.getClassArray("classArray")).isEqualTo(new Class<?>[] {Void.class});
AnnotationAttributes[] optionalArray = specialAttrs.getAnnotationArray("optionalArray");
assertThat(optionalArray.length).isEqualTo(1);
assertThat(optionalArray).hasSize(1);
assertThat(optionalArray[0].getString("value")).isEqualTo("optional");
assertThat(optionalArray[0].getEnum("anEnum").equals(SomeEnum.DEFAULT)).isTrue();
assertThat((Class<?>[]) optionalArray[0].get("classArray")).isEqualTo(new Class<?>[] {Void.class});
@@ -363,7 +363,7 @@ class AnnotationMetadataTests {
allMeta = metadata.getAllAnnotationAttributes(DirectAnnotation.class.getName()).get("additional");
assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet<Object>(Arrays.asList("direct", "")));
assertThat(metadata.getAnnotationAttributes(DirectAnnotation.class.getName()).get("additional")).isEqualTo("");
assertThat(((String[]) metadata.getAnnotationAttributes(DirectAnnotation.class.getName()).get("additionalArray")).length).isEqualTo(0);
assertThat(((String[]) metadata.getAnnotationAttributes(DirectAnnotation.class.getName()).get("additionalArray"))).hasSize(0);
}
{ // perform tests with classValuesAsString = true
AnnotationAttributes specialAttrs = (AnnotationAttributes) metadata.getAnnotationAttributes(

4
spring-core/src/test/java/org/springframework/util/FastByteArrayOutputStreamTests.java
View File

@@ -45,7 +45,7 @@ class FastByteArrayOutputStreamTests {
@Test
void size() throws Exception {
this.os.write(this.helloBytes);
assertThat(this.helloBytes.length).isEqualTo(this.os.size());
assertThat(this.helloBytes).hasSize(this.os.size());
}
@Test
@@ -123,7 +123,7 @@ class FastByteArrayOutputStreamTests {
@Test
void getInputStreamAvailable() throws Exception {
this.os.write(this.helloBytes);
assertThat(this.helloBytes.length).isEqualTo(this.os.getInputStream().available());
assertThat(this.helloBytes).hasSize(this.os.getInputStream().available());
}
@Test

2
spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
View File

@@ -151,7 +151,7 @@ class ObjectUtilsTests {
void toObjectArrayWithNull() {
Object[] objects = ObjectUtils.toObjectArray(null);
assertThat(objects).isNotNull();
assertThat(objects.length).isEqualTo(0);
assertThat(objects).hasSize(0);
}
@Test

16
spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
View File

@@ -441,7 +441,7 @@ class StringUtilsTests {
String[] input1 = new String[] {"myString2"};
String[] input2 = new String[] {"myString1", "myString2"};
String[] result = StringUtils.concatenateStringArrays(input1, input2);
assertThat(result.length).isEqualTo(3);
assertThat(result).hasSize(3);
assertThat(result[0]).isEqualTo("myString2");
assertThat(result[1]).isEqualTo("myString1");
assertThat(result[2]).isEqualTo("myString2");
@@ -490,21 +490,21 @@ class StringUtilsTests {
@Test
void tokenizeToStringArray() {
String[] sa = StringUtils.tokenizeToStringArray("a,b , ,c", ",");
assertThat(sa.length).isEqualTo(3);
assertThat(sa).hasSize(3);
assertThat(sa[0].equals("a") && sa[1].equals("b") && sa[2].equals("c")).as("components are correct").isTrue();
}
@Test
void tokenizeToStringArrayWithNotIgnoreEmptyTokens() {
String[] sa = StringUtils.tokenizeToStringArray("a,b , ,c", ",", true, false);
assertThat(sa.length).isEqualTo(4);
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();
}
@Test
void tokenizeToStringArrayWithNotTrimTokens() {
String[] sa = StringUtils.tokenizeToStringArray("a,b ,c", ",", false, true);
assertThat(sa.length).isEqualTo(3);
assertThat(sa).hasSize(3);
assertThat(sa[0].equals("a") && sa[1].equals("b ") && sa[2].equals("c")).as("components are correct").isTrue();
}
@@ -525,7 +525,7 @@ class StringUtilsTests {
@Test
void delimitedListToStringArrayWithComma() {
String[] sa = StringUtils.delimitedListToStringArray("a,b", ",");
assertThat(sa.length).isEqualTo(2);
assertThat(sa).hasSize(2);
assertThat(sa[0]).isEqualTo("a");
assertThat(sa[1]).isEqualTo("b");
}
@@ -533,7 +533,7 @@ class StringUtilsTests {
@Test
void delimitedListToStringArrayWithSemicolon() {
String[] sa = StringUtils.delimitedListToStringArray("a;b", ";");
assertThat(sa.length).isEqualTo(2);
assertThat(sa).hasSize(2);
assertThat(sa[0]).isEqualTo("a");
assertThat(sa[1]).isEqualTo("b");
}
@@ -541,7 +541,7 @@ class StringUtilsTests {
@Test
void delimitedListToStringArrayWithEmptyDelimiter() {
String[] sa = StringUtils.delimitedListToStringArray("a,b", "");
assertThat(sa.length).isEqualTo(3);
assertThat(sa).hasSize(3);
assertThat(sa[0]).isEqualTo("a");
assertThat(sa[1]).isEqualTo(",");
assertThat(sa[2]).isEqualTo("b");
@@ -550,7 +550,7 @@ class StringUtilsTests {
@Test
void delimitedListToStringArrayWithNullDelimiter() {
String[] sa = StringUtils.delimitedListToStringArray("a,b", null);
assertThat(sa.length).isEqualTo(1);
assertThat(sa).hasSize(1);
assertThat(sa[0]).isEqualTo("a,b");
}