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

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-core/src/main/java/org/springframework/core/CollectionFactory.java
This commit is contained in:
Juergen Hoeller
2023-06-05 13:59:37 +02:00
parent 4fb4c95220 cdc4497664
commit 53f891226e
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,15 +219,15 @@ class CollectionFactoryTests {
// concrete types
testCollection(ArrayList.class, ArrayList.class);
testCollection(HashSet.class, LinkedHashSet.class);
testCollection(HashSet.class, HashSet.class);
testCollection(LinkedHashSet.class, LinkedHashSet.class);
testCollection(TreeSet.class, TreeSet.class);
}
private void testCollection(Class<?> collectionType, Class<?> resultType) {
assertThat(CollectionFactory.isApproximableCollectionType(collectionType)).isTrue();
assertThat(createCollection(collectionType, 0)).isInstanceOf(resultType);
assertThat(createCollection(collectionType, String.class, 0)).isInstanceOf(resultType);
assertThat(createCollection(collectionType, 0)).isExactlyInstanceOf(resultType);
assertThat(createCollection(collectionType, String.class, 0)).isExactlyInstanceOf(resultType);
}
@Test
@@ -269,7 +269,7 @@ class CollectionFactoryTests {
testMap(MultiValueMap.class, LinkedMultiValueMap.class);
// concrete types
testMap(HashMap.class, LinkedHashMap.class);
testMap(HashMap.class, HashMap.class);
testMap(LinkedHashMap.class, LinkedHashMap.class);
testMap(TreeMap.class, TreeMap.class);
testMap(LinkedMultiValueMap.class, LinkedMultiValueMap.class);
@@ -277,8 +277,8 @@ class CollectionFactoryTests {
private void testMap(Class<?> mapType, Class<?> resultType) {
assertThat(CollectionFactory.isApproximableMapType(mapType)).isTrue();
assertThat(createMap(mapType, 0)).isInstanceOf(resultType);
assertThat(createMap(mapType, String.class, 0)).isInstanceOf(resultType);
assertThat(createMap(mapType, 0)).isExactlyInstanceOf(resultType);
assertThat(createMap(mapType, String.class, 0)).isExactlyInstanceOf(resultType);
}
@Test