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

Use idiomatic AssertJ map assertions 

See gh-31752
This commit is contained in:
Yanming Zhou 2023-12-05 10:35:18 +08:00 committed by Stéphane Nicoll
parent 47fe61ef79
commit 6f11716b6f
6 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
View File

@ -1274,17 +1274,17 @@ public class AutowiredAnnotationBeanPostProcessorTests {
MapFieldInjectionBean bean = bf.getBean("annotatedBean", MapFieldInjectionBean.class); MapFieldInjectionBean bean = bf.getBean("annotatedBean", MapFieldInjectionBean.class);
assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap()).hasSize(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean1");
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean2");
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb1);
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb2);
bean = bf.getBean("annotatedBean", MapFieldInjectionBean.class); bean = bf.getBean("annotatedBean", MapFieldInjectionBean.class);
assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap()).hasSize(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean1");
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean2");
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb1);
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb2);
} }
@Test @Test
@ -1297,14 +1297,14 @@ public class AutowiredAnnotationBeanPostProcessorTests {
MapMethodInjectionBean bean = bf.getBean("annotatedBean", MapMethodInjectionBean.class); MapMethodInjectionBean bean = bf.getBean("annotatedBean", MapMethodInjectionBean.class);
assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap()).hasSize(1);
assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean");
assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb);
assertThat(bean.getTestBean()).isSameAs(tb); assertThat(bean.getTestBean()).isSameAs(tb);
bean = bf.getBean("annotatedBean", MapMethodInjectionBean.class); bean = bf.getBean("annotatedBean", MapMethodInjectionBean.class);
assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap()).hasSize(1);
assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean");
assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb);
assertThat(bean.getTestBean()).isSameAs(tb); assertThat(bean.getTestBean()).isSameAs(tb);
} }
@ -1329,8 +1329,8 @@ public class AutowiredAnnotationBeanPostProcessorTests {
MapMethodInjectionBean bean = bf.getBean("annotatedBean", MapMethodInjectionBean.class); MapMethodInjectionBean bean = bf.getBean("annotatedBean", MapMethodInjectionBean.class);
TestBean tb = bf.getBean("testBean1", TestBean.class); TestBean tb = bf.getBean("testBean1", TestBean.class);
assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap()).hasSize(1);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean1");
assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb);
assertThat(bean.getTestBean()).isSameAs(tb); assertThat(bean.getTestBean()).isSameAs(tb);
} }

44
spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
View File

@ -222,17 +222,17 @@ public class InjectAnnotationBeanPostProcessorTests {
MapConstructorInjectionBean bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); MapConstructorInjectionBean bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap()).hasSize(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean1");
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean2");
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb1);
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb2);
bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap()).hasSize(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean1");
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean2");
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb1);
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb2);
} }
@Test @Test
@ -247,17 +247,17 @@ public class InjectAnnotationBeanPostProcessorTests {
MapFieldInjectionBean bean = (MapFieldInjectionBean) bf.getBean("annotatedBean"); MapFieldInjectionBean bean = (MapFieldInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap()).hasSize(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean1");
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean2");
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb1);
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb2);
bean = (MapFieldInjectionBean) bf.getBean("annotatedBean"); bean = (MapFieldInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap()).hasSize(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean1");
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean2");
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb1);
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb2);
} }
@Test @Test
@ -270,14 +270,14 @@ public class InjectAnnotationBeanPostProcessorTests {
MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap()).hasSize(1);
assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean");
assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb);
assertThat(bean.getTestBean()).isSameAs(tb); assertThat(bean.getTestBean()).isSameAs(tb);
bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); bean = (MapMethodInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap()).hasSize(1);
assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean");
assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb);
assertThat(bean.getTestBean()).isSameAs(tb); assertThat(bean.getTestBean()).isSameAs(tb);
} }
@ -301,8 +301,8 @@ public class InjectAnnotationBeanPostProcessorTests {
MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean");
TestBean tb = (TestBean) bf.getBean("testBean1"); TestBean tb = (TestBean) bf.getBean("testBean1");
assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap()).hasSize(1);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap()).containsKey("testBean1");
assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBeanMap()).containsValue(tb);
assertThat(bean.getTestBean()).isSameAs(tb); assertThat(bean.getTestBean()).isSameAs(tb);
} }

12
spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
View File

@ -78,8 +78,8 @@ class BshScriptFactoryTests {
String desiredMessage = "Hello World!"; String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Calculator.class).values().contains(calc)).isTrue(); assertThat(ctx.getBeansOfType(Calculator.class)).containsValue(calc);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close(); ctx.close();
} }
@ -91,7 +91,7 @@ class BshScriptFactoryTests {
ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfig"); ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfig");
messenger.setMessage(null); messenger.setMessage(null);
assertThat(messenger.getMessage()).isNull(); assertThat(messenger.getMessage()).isNull();
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close(); ctx.close();
} }
@ -103,7 +103,7 @@ class BshScriptFactoryTests {
ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfigExtra"); ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfigExtra");
messenger.setMessage(null); messenger.setMessage(null);
assertThat(messenger.getMessage()).isNull(); assertThat(messenger.getMessage()).isNull();
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close(); ctx.close();
assertThat(messenger.getMessage()).isNull(); assertThat(messenger.getMessage()).isNull();
@ -117,7 +117,7 @@ class BshScriptFactoryTests {
Messenger messenger = (Messenger) ctx.getBean("messengerInstance"); Messenger messenger = (Messenger) ctx.getBean("messengerInstance");
String desiredMessage = "Hello World!"; String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close(); ctx.close();
assertThat(messenger.getMessage()).isNull(); assertThat(messenger.getMessage()).isNull();
@ -131,7 +131,7 @@ class BshScriptFactoryTests {
Messenger messenger = (Messenger) ctx.getBean("messengerImpl"); Messenger messenger = (Messenger) ctx.getBean("messengerImpl");
String desiredMessage = "Hello World!"; String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close(); ctx.close();
assertThat(messenger.getMessage()).isNull(); assertThat(messenger.getMessage()).isNull();

20
spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
View File

@ -94,8 +94,8 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!"; String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Calculator.class).values().contains(calc)).isTrue(); assertThat(ctx.getBeansOfType(Calculator.class)).containsValue(calc);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
} }
@Test @Test
@ -127,8 +127,8 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!"; String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Calculator.class).values().contains(calc)).isTrue(); assertThat(ctx.getBeansOfType(Calculator.class)).containsValue(calc);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
} }
@Test @Test
@ -183,7 +183,7 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!"; String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
} }
@Test @Test
@ -198,7 +198,7 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!"; String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
} }
@Test @Test
@ -213,7 +213,7 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!"; String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
} }
@Test @Test
@ -228,7 +228,7 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!"; String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
} }
@Test @Test
@ -427,7 +427,7 @@ public class GroovyScriptFactoryTests {
assertThat(messenger.getMessage()).isEqualTo("Hello World!"); assertThat(messenger.getMessage()).isEqualTo("Hello World!");
assertThat(countingAspect.getCalls()).isEqualTo(1); assertThat(countingAspect.getCalls()).isEqualTo(1);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
} }
@Test // SPR-6268 @Test // SPR-6268
@ -443,7 +443,7 @@ public class GroovyScriptFactoryTests {
assertThat(condition).isTrue(); assertThat(condition).isTrue();
assertThat(messenger.getMessage()).isEqualTo("Hello World!"); assertThat(messenger.getMessage()).isEqualTo("Hello World!");
assertThat(ctx.getBeansOfType(ConcreteMessenger.class).values().contains(messenger)).isTrue(); assertThat(ctx.getBeansOfType(ConcreteMessenger.class)).containsValue((ConcreteMessenger) messenger);
// Check that AnnotationUtils works with concrete proxied script classes // Check that AnnotationUtils works with concrete proxied script classes
assertThat(AnnotationUtils.findAnnotation(messenger.getClass(), Component.class)).isNotNull(); assertThat(AnnotationUtils.findAnnotation(messenger.getClass(), Component.class)).isNotNull();

4
spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java
View File

@ -98,8 +98,8 @@ public class SpringHandlerInstantiatorTests {
public void autowiredKeyDeserializer() throws IOException { public void autowiredKeyDeserializer() throws IOException {
String json = "{\"credentials\":{\"bob\":\"admin\"}}"; String json = "{\"credentials\":{\"bob\":\"admin\"}}";
SecurityRegistry registry = this.objectMapper.readValue(json, SecurityRegistry.class); SecurityRegistry registry = this.objectMapper.readValue(json, SecurityRegistry.class);
assertThat(registry.getCredentials().keySet().contains("BOB")).isTrue(); assertThat(registry.getCredentials()).containsKey("BOB");
assertThat(registry.getCredentials().keySet().contains("bob")).isFalse(); assertThat(registry.getCredentials()).doesNotContainKey("bob");
} }
@Test @Test

2
spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java
View File

@ -88,7 +88,7 @@ public class HandlersBeanDefinitionParserTests {
assertThat(condition2).isTrue(); assertThat(condition2).isTrue();
SimpleUrlHandlerMapping shm = (SimpleUrlHandlerMapping) hm; SimpleUrlHandlerMapping shm = (SimpleUrlHandlerMapping) hm;
if (shm.getUrlMap().keySet().contains("/foo")) { if (shm.getUrlMap().containsKey("/foo")) {
assertThat(shm.getUrlMap()).containsOnlyKeys("/foo", "/bar"); assertThat(shm.getUrlMap()).containsOnlyKeys("/foo", "/bar");
WebSocketHttpRequestHandler handler = (WebSocketHttpRequestHandler) shm.getUrlMap().get("/foo"); WebSocketHttpRequestHandler handler = (WebSocketHttpRequestHandler) shm.getUrlMap().get("/foo");
assertThat(handler).isNotNull(); assertThat(handler).isNotNull();