From 71e7a688dcc7a23b1aa6349888595b016e745b90 Mon Sep 17 00:00:00 2001 From: Hyunwoo Jung Date: Tue, 8 Sep 2026 03:00:14 +0900 Subject: [PATCH] Fix CollectionToCollectionConverterTests Signed-off-by: Hyunwoo Jung --- .../CollectionToCollectionConverterTests.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) 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 65ffe4784f55..806949f278f3 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 @@ -163,30 +163,29 @@ void stringToCollection() throws Exception { @Test void convertEmptyVector_shouldReturnEmptyArrayList() { Vector vector = new Vector<>(); - vector.add("Element"); - testCollectionConversionToArrayList(vector); + CollectionToCollectionConverter converter = new CollectionToCollectionConverter(new GenericConversionService()); + Object convertedValue = converter.convert( + vector, TypeDescriptor.forObject(vector), TypeDescriptor.valueOf(ArrayList.class)); + assertThat(convertedValue).isInstanceOf(ArrayList.class); + assertThat(convertedValue).asInstanceOf(LIST).isEmpty(); } @Test void convertNonEmptyVector_shouldReturnNonEmptyArrayList() { Vector vector = new Vector<>(); vector.add("Element"); - testCollectionConversionToArrayList(vector); + CollectionToCollectionConverter converter = new CollectionToCollectionConverter(new GenericConversionService()); + Object convertedValue = converter.convert( + vector, TypeDescriptor.forObject(vector), TypeDescriptor.valueOf(ArrayList.class)); + assertThat(convertedValue).isInstanceOf(ArrayList.class); + assertThat(convertedValue).asInstanceOf(LIST).isNotEmpty(); } @Test void collectionsEmptyList() throws Exception { CollectionToCollectionConverter converter = new CollectionToCollectionConverter(new GenericConversionService()); TypeDescriptor type = new TypeDescriptor(getClass().getField("list")); - converter.convert(list, type, TypeDescriptor.valueOf(Class.forName("java.util.Collections$EmptyList"))); - } - - @SuppressWarnings("rawtypes") - 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); + assertThat(converter.convert(list, type, TypeDescriptor.valueOf(Class.forName("java.util.Collections$EmptyList")))).isSameAs(list); } @Test