diff --git a/spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java b/spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java index 671baed6c91..328aba93d1d 100644 --- a/spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java +++ b/spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java @@ -40,11 +40,8 @@ public class LinkedMultiValueMapTests { public void add() { map.add("key", "value1"); map.add("key", "value2"); - assertThat(map.size()).isEqualTo(1); - List expected = new ArrayList<>(2); - expected.add("value1"); - expected.add("value2"); - assertThat(map.get("key")).isEqualTo(expected); + assertThat(map).hasSize(1); + assertThat(map.get("key")).containsExactly("value1", "value2"); } @Test @@ -64,27 +61,22 @@ public class LinkedMultiValueMapTests { public void set() { map.set("key", "value1"); map.set("key", "value2"); - assertThat(map.size()).isEqualTo(1); - assertThat(map.get("key")).isEqualTo(Collections.singletonList("value2")); + assertThat(map.get("key")).containsExactly("value2"); } @Test public void addAll() { map.add("key", "value1"); map.addAll("key", Arrays.asList("value2", "value3")); - assertThat(map.size()).isEqualTo(1); - List expected = new ArrayList<>(2); - expected.add("value1"); - expected.add("value2"); - expected.add("value3"); - assertThat(map.get("key")).isEqualTo(expected); + assertThat(map).hasSize(1); + assertThat(map.get("key")).containsExactly("value1","value2","value3"); } @Test public void addAllWithEmptyList() { map.addAll("key", Collections.emptyList()); - assertThat(map.size()).isEqualTo(1); - assertThat(map.get("key")).isEqualTo(Collections.emptyList()); + assertThat(map).hasSize(1); + assertThat(map.get("key")).isEmpty(); assertThat(map.getFirst("key")).isNull(); } @@ -111,17 +103,17 @@ public class LinkedMultiValueMapTests { values.add("value1"); values.add("value2"); map.put("key", values); - Map svm = map.toSingleValueMap(); - assertThat(svm.size()).isEqualTo(1); - assertThat(svm.get("key")).isEqualTo("value1"); + Map singleValueMap = map.toSingleValueMap(); + assertThat(singleValueMap).hasSize(1); + assertThat(singleValueMap.get("key")).isEqualTo("value1"); } @Test public void toSingleValueMapWithEmptyList() { map.put("key", Collections.emptyList()); - Map svm = map.toSingleValueMap(); - assertThat(svm.size()).isEqualTo(0); - assertThat(svm.get("key")).isNull(); + Map singleValueMap = map.toSingleValueMap(); + assertThat(singleValueMap).isEmpty(); + assertThat(singleValueMap.get("key")).isNull(); } @Test