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

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2019-07-20 16:35:05 +02:00
parent 69d3e89814 0d37209b78
commit 8ea3aa512f
3 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,8 +134,8 @@ public class ResolvableTypeTests {
assertThat(type.isAssignableFrom(String.class)).isTrue();
}
@Test
public void forRawClassAssignableFromTypeVariable() { // gh-23321
@Test // gh-23321
public void forRawClassAssignableFromTypeVariable() throws Exception {
ResolvableType typeVariable = ResolvableType.forClass(ExtendsList.class).as(List.class).getGeneric();
ResolvableType raw = ResolvableType.forRawClass(CharSequence.class);
assertThat(raw.resolve()).isEqualTo(CharSequence.class);
@@ -442,12 +442,8 @@ public class ResolvableTypeTests {
interfaces.add(interfaceType.toString());
}
assertThat(interfaces.toString()).isEqualTo(
"["
+ "java.io.Serializable, "
+ "java.lang.Cloneable, "
+ "java.util.List<java.lang.CharSequence>, "
+ "java.util.RandomAccess"
+ "]");
"[java.io.Serializable, java.lang.Cloneable, " +
"java.util.List<java.lang.CharSequence>, java.util.RandomAccess]");
}
@Test