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

Polish "Use idiomatic AssertJ map assertions"

Browse Source 
See gh-31752
This commit is contained in:
Stéphane Nicoll
2023-12-05 10:39:33 +01:00
parent 6f11716b6f
commit 1da40b84e7
11 changed files with 48 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
View File

@@ -39,6 +39,7 @@ import org.springframework.core.io.UrlResource;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import static java.util.Map.entry;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -384,8 +385,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("genericMap", inputMap);
assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(1);
assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getGenericMap()).containsOnly(entry(List.of(1), List.of(10L)));
}
@Test
@@ -401,8 +401,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("genericMap", inputMap);
assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(1);
assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getGenericMap()).containsOnly(entry(List.of(1), List.of(10L)));
}
@Test
@@ -414,8 +413,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("genericIndexedMap[1]", inputValue);
assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(1);
assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getGenericIndexedMap()).containsOnly(entry(1, List.of(10L)));
}
@Test
@@ -427,8 +425,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("genericIndexedMap[1]", inputValue);
assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(1);
assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getGenericIndexedMap()).containsOnly(entry(1, List.of(10L)));
}
@Test
@@ -439,8 +436,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("genericIndexedMap[1]", inputValue);
assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(1);
assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getGenericIndexedMap()).containsOnly(entry(1, List.of(10L)));
}
@Test
@@ -452,8 +448,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("derivedIndexedMap[1]", inputValue);
assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(1);
assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getDerivedIndexedMap()).containsOnly(entry(1, List.of(10L)));
}
@Test
@@ -465,8 +460,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("derivedIndexedMap[1]", inputValue);
assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(1);
assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getDerivedIndexedMap()).containsOnly(entry(1, List.of(10L)));
}
@Test
@@ -477,8 +471,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("derivedIndexedMap[1]", inputValue);
assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(1);
assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getDerivedIndexedMap()).containsOnly(entry(1, List.of(10L)));
}
@Test
@@ -490,8 +483,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("multiValueMap[1]", inputValue);
assertThat(holder.getMultiValueMap().keySet().iterator().next()).isEqualTo(1);
assertThat(holder.getMultiValueMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getMultiValueMap()).containsOnly(entry(1, List.of(10L)));
}
@Test
@@ -503,8 +495,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("multiValueMap[1]", inputValue);
assertThat(holder.getMultiValueMap().keySet().iterator().next()).isEqualTo(1);
assertThat(holder.getMultiValueMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getMultiValueMap()).containsOnly(entry(1, List.of(10L)));
}
@Test
@@ -515,8 +506,7 @@ class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("multiValueMap[1]", inputValue);
assertThat(holder.getMultiValueMap().keySet().iterator().next()).isEqualTo(1);
assertThat(holder.getMultiValueMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
assertThat(holder.getMultiValueMap()).containsOnly(entry(1, List.of(10L)));
}
@Test

15
spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java
View File

@@ -59,12 +59,10 @@ public class Spr8954Tests {
@SuppressWarnings("rawtypes")
Map<String, FactoryBean> fbBeans = bf.getBeansOfType(FactoryBean.class);
assertThat(fbBeans).hasSize(1);
assertThat(fbBeans.keySet()).contains("&foo");
assertThat(fbBeans).containsOnlyKeys("&foo");
Map<String, AnInterface> aiBeans = bf.getBeansOfType(AnInterface.class);
assertThat(aiBeans).hasSize(1);
assertThat(aiBeans.keySet()).contains("&foo");
assertThat(aiBeans).containsOnlyKeys("&foo");
}
@Test
@@ -73,12 +71,10 @@ public class Spr8954Tests {
@SuppressWarnings("rawtypes")
Map<String, FactoryBean> fbBeans = bf.getBeansOfType(FactoryBean.class);
assertThat(fbBeans.size()).isEqualTo(1);
assertThat(fbBeans.keySet().iterator().next()).isEqualTo("&foo");
assertThat(fbBeans).containsOnlyKeys("&foo");
Map<String, AnInterface> aiBeans = bf.getBeansOfType(AnInterface.class);
assertThat(aiBeans).hasSize(1);
assertThat(aiBeans.keySet()).contains("&foo");
assertThat(aiBeans).containsOnlyKeys("&foo");
}
/**
@@ -90,8 +86,7 @@ public class Spr8954Tests {
assertThat(Arrays.asList(names)).contains("&foo");
Map<String, AnInterface> beans = bf.getBeansOfType(AnInterface.class, false, false);
assertThat(beans).hasSize(1);
assertThat(beans.keySet()).contains("&foo");
assertThat(beans).containsOnlyKeys("&foo");
}