root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Andy Wilkinson 2018-05-11 13:32:08 +01:00
parent 065f357e79 a9645a3d07
commit 45f4e8795e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/DelimitedStringToCollectionConverterTests.java
View File

@ -126,12 +126,14 @@ public class DelimitedStringToCollectionConverterTests {
assertThat(converted).containsExactly("a,b,c");
}
@SuppressWarnings("unchecked")
@Test
public void convertWhenHasCollectionObjectTypeShouldUseCollectionObjectType() {
TypeDescriptor sourceType = TypeDescriptor.valueOf(String.class);
TypeDescriptor targetType = TypeDescriptor
.nested(ReflectionUtils.findField(Values.class, "specificType"), 0);
MyCustomList<String> converted = (MyCustomList<String>) this.conversionService.convert("a*b", sourceType, targetType);
MyCustomList<String> converted = (MyCustomList<String>) this.conversionService
.convert("a*b", sourceType, targetType);
assertThat(converted).containsExactly("a", "b");
}