From 01a23e32b55666786a3d1155498d9d9e76f82089 Mon Sep 17 00:00:00 2001 From: Hyunwoo Jung Date: Mon, 14 Sep 2026 21:41:06 +0900 Subject: [PATCH 1/2] Fix CollectionToCollectionConverterTests Closes gh-37254 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 65ffe4784f5..806949f278f 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 @@ class CollectionToCollectionConverterTests { @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 From f768641c080a1352e2bb2b5cf64ad1a867769046 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 14 Sep 2026 14:50:45 +0200 Subject: [PATCH 2/2] Polish contribution See gh-37254 --- .../CollectionToCollectionConverterTests.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 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 806949f278f..125631b7234 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 @@ -162,23 +162,20 @@ class CollectionToCollectionConverterTests { @Test void convertEmptyVector_shouldReturnEmptyArrayList() { - Vector vector = new 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(); + Object convertedValue = convertVectorToArrayList(new Vector<>()); + assertThat(convertedValue) + .isInstanceOf(ArrayList.class) + .asInstanceOf(LIST).isEmpty(); } @Test void convertNonEmptyVector_shouldReturnNonEmptyArrayList() { Vector vector = new Vector<>(); vector.add("Element"); - 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(); + Object convertedValue = convertVectorToArrayList(vector); + assertThat(convertedValue) + .isInstanceOf(ArrayList.class) + .asInstanceOf(LIST).containsOnly("Element"); } @Test @@ -255,6 +252,12 @@ class CollectionToCollectionConverterTests { } + private static Object convertVectorToArrayList(Vector vector) { + CollectionToCollectionConverter converter = new CollectionToCollectionConverter(new GenericConversionService()); + return converter.convert(vector, TypeDescriptor.forObject(vector), TypeDescriptor.valueOf(ArrayList.class)); + } + + public ArrayList scalarListTarget; public List emptyListTarget;