Skip to content

Fix and strengthen tests in CollectionToCollectionConverterTests #37254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noojung wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −12
Open

Fix and strengthen tests in CollectionToCollectionConverterTests #37254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions ...t/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,30 +163,29 @@ void stringToCollection() throws Exception {
@Test
void convertEmptyVector_shouldReturnEmptyArrayList() {
Vector<String> 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<String> 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<String> 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
Expand Down