diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index 69b4fa5fe59..a3e80efa004 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -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 diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index 8912f7bf737..305e07e5a27 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -1274,17 +1274,17 @@ public class AutowiredAnnotationBeanPostProcessorTests { MapFieldInjectionBean bean = bf.getBean("annotatedBean", MapFieldInjectionBean.class); assertThat(bean.getTestBeanMap()).hasSize(2); - assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); - assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean1"); + assertThat(bean.getTestBeanMap()).containsKey("testBean2"); + assertThat(bean.getTestBeanMap()).containsValue(tb1); + assertThat(bean.getTestBeanMap()).containsValue(tb2); bean = bf.getBean("annotatedBean", MapFieldInjectionBean.class); assertThat(bean.getTestBeanMap()).hasSize(2); - assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); - assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean1"); + assertThat(bean.getTestBeanMap()).containsKey("testBean2"); + assertThat(bean.getTestBeanMap()).containsValue(tb1); + assertThat(bean.getTestBeanMap()).containsValue(tb2); } @Test @@ -1297,14 +1297,14 @@ public class AutowiredAnnotationBeanPostProcessorTests { MapMethodInjectionBean bean = bf.getBean("annotatedBean", MapMethodInjectionBean.class); assertThat(bean.getTestBeanMap()).hasSize(1); - assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean"); + assertThat(bean.getTestBeanMap()).containsValue(tb); assertThat(bean.getTestBean()).isSameAs(tb); bean = bf.getBean("annotatedBean", MapMethodInjectionBean.class); assertThat(bean.getTestBeanMap()).hasSize(1); - assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean"); + assertThat(bean.getTestBeanMap()).containsValue(tb); assertThat(bean.getTestBean()).isSameAs(tb); } @@ -1329,8 +1329,8 @@ public class AutowiredAnnotationBeanPostProcessorTests { MapMethodInjectionBean bean = bf.getBean("annotatedBean", MapMethodInjectionBean.class); TestBean tb = bf.getBean("testBean1", TestBean.class); assertThat(bean.getTestBeanMap()).hasSize(1); - assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean1"); + assertThat(bean.getTestBeanMap()).containsValue(tb); assertThat(bean.getTestBean()).isSameAs(tb); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java index e94e472d0af..e7ccfb45cc8 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java @@ -222,17 +222,17 @@ public class InjectAnnotationBeanPostProcessorTests { MapConstructorInjectionBean bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBeanMap()).hasSize(2); - assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); - assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean1"); + assertThat(bean.getTestBeanMap()).containsKey("testBean2"); + assertThat(bean.getTestBeanMap()).containsValue(tb1); + assertThat(bean.getTestBeanMap()).containsValue(tb2); bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBeanMap()).hasSize(2); - assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); - assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean1"); + assertThat(bean.getTestBeanMap()).containsKey("testBean2"); + assertThat(bean.getTestBeanMap()).containsValue(tb1); + assertThat(bean.getTestBeanMap()).containsValue(tb2); } @Test @@ -247,17 +247,17 @@ public class InjectAnnotationBeanPostProcessorTests { MapFieldInjectionBean bean = (MapFieldInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBeanMap()).hasSize(2); - assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); - assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean1"); + assertThat(bean.getTestBeanMap()).containsKey("testBean2"); + assertThat(bean.getTestBeanMap()).containsValue(tb1); + assertThat(bean.getTestBeanMap()).containsValue(tb2); bean = (MapFieldInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBeanMap()).hasSize(2); - assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); - assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean1"); + assertThat(bean.getTestBeanMap()).containsKey("testBean2"); + assertThat(bean.getTestBeanMap()).containsValue(tb1); + assertThat(bean.getTestBeanMap()).containsValue(tb2); } @Test @@ -270,14 +270,14 @@ public class InjectAnnotationBeanPostProcessorTests { MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBeanMap()).hasSize(1); - assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean"); + assertThat(bean.getTestBeanMap()).containsValue(tb); assertThat(bean.getTestBean()).isSameAs(tb); bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBeanMap()).hasSize(1); - assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean"); + assertThat(bean.getTestBeanMap()).containsValue(tb); assertThat(bean.getTestBean()).isSameAs(tb); } @@ -301,8 +301,8 @@ public class InjectAnnotationBeanPostProcessorTests { MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); TestBean tb = (TestBean) bf.getBean("testBean1"); assertThat(bean.getTestBeanMap()).hasSize(1); - assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); - assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); + assertThat(bean.getTestBeanMap()).containsKey("testBean1"); + assertThat(bean.getTestBeanMap()).containsValue(tb); assertThat(bean.getTestBean()).isSameAs(tb); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java index e86c9f561bd..54ff586495e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java @@ -59,12 +59,10 @@ public class Spr8954Tests { @SuppressWarnings("rawtypes") Map fbBeans = bf.getBeansOfType(FactoryBean.class); - assertThat(fbBeans).hasSize(1); - assertThat(fbBeans.keySet()).contains("&foo"); + assertThat(fbBeans).containsOnlyKeys("&foo"); Map 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 fbBeans = bf.getBeansOfType(FactoryBean.class); - assertThat(fbBeans.size()).isEqualTo(1); - assertThat(fbBeans.keySet().iterator().next()).isEqualTo("&foo"); + assertThat(fbBeans).containsOnlyKeys("&foo"); Map 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 beans = bf.getBeansOfType(AnInterface.class, false, false); - assertThat(beans).hasSize(1); - assertThat(beans.keySet()).contains("&foo"); + assertThat(beans).containsOnlyKeys("&foo"); } diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java index 8daf7d1b35c..ab5a36fdb18 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java @@ -386,9 +386,9 @@ class JavaMailSenderTests { assertThat(sender.transport.isCloseCalled()).isTrue(); assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0).getAllRecipients()[0]).isEqualTo(new InternetAddress("she@mail.org")); - assertThat(ex.getFailedMessages().keySet()).containsExactly(simpleMessage1); - Exception subEx = ex.getFailedMessages().values().iterator().next(); - assertThat(subEx).isInstanceOf(MessagingException.class).hasMessage("failed"); + assertThat(ex.getFailedMessages()).containsOnlyKeys(simpleMessage1); + assertThat(ex.getFailedMessages().get(simpleMessage1)) + .isInstanceOf(MessagingException.class).hasMessage("failed"); } } @@ -413,9 +413,9 @@ class JavaMailSenderTests { assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); assertThat(sender.transport.getSentMessages()).containsExactly(mimeMessage2); - assertThat(ex.getFailedMessages().keySet()).containsExactly(mimeMessage1); - Exception subEx = ex.getFailedMessages().values().iterator().next(); - assertThat(subEx).isInstanceOf(MessagingException.class).hasMessage("failed"); + assertThat(ex.getFailedMessages()).containsOnlyKeys(mimeMessage1); + assertThat(ex.getFailedMessages().get(mimeMessage1)) + .isInstanceOf(MessagingException.class).hasMessage("failed"); } } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java index 5ae586619df..e4e6f1bd913 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -145,16 +145,14 @@ public class ConfigurationClassWithConditionTests { public void noConditionOnOverriddenMethodHonored() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConfigWithBeanReactivated.class); Map beans = context.getBeansOfType(ExampleBean.class); - assertThat(beans).hasSize(1); - assertThat(beans.keySet().iterator().next()).isEqualTo("baz"); + assertThat(beans).containsOnlyKeys("baz"); } @Test public void configWithAlternativeBeans() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConfigWithAlternativeBeans.class); Map beans = context.getBeansOfType(ExampleBean.class); - assertThat(beans).hasSize(1); - assertThat(beans.keySet().iterator().next()).isEqualTo("baz"); + assertThat(beans).containsOnlyKeys("baz"); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java index e4f5168c823..836ab69380e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -141,10 +140,8 @@ public class ImportSelectorTests { ordered.verify(beanFactory).registerBeanDefinition(eq("c"), any()); ordered.verify(beanFactory).registerBeanDefinition(eq("d"), any()); assertThat(TestImportGroup.instancesCount.get()).isEqualTo(1); - assertThat(TestImportGroup.imports).hasSize(2); - Iterator iterator = TestImportGroup.imports.keySet().iterator(); - assertThat(iterator.next().getClassName()).isEqualTo(GroupedConfig2.class.getName()); - assertThat(iterator.next().getClassName()).isEqualTo(GroupedConfig1.class.getName()); + assertThat(TestImportGroup.imports.keySet().stream().map(AnnotationMetadata::getClassName)) + .containsExactly(GroupedConfig2.class.getName(),GroupedConfig1.class.getName()); } @Test diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr8954Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr8954Tests.java index f25328bcc5e..4f892e08094 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/Spr8954Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr8954Tests.java @@ -57,12 +57,10 @@ public class Spr8954Tests { @SuppressWarnings("rawtypes") Map fbBeans = bf.getBeansOfType(FactoryBean.class); - assertThat(fbBeans.size()).isEqualTo(1); - assertThat(fbBeans.keySet().iterator().next()).isEqualTo("&foo"); + assertThat(fbBeans).containsOnlyKeys("&foo"); Map aiBeans = bf.getBeansOfType(AnInterface.class); - assertThat(aiBeans.size()).isEqualTo(1); - assertThat(aiBeans.keySet().iterator().next()).isEqualTo("&foo"); + assertThat(aiBeans).containsOnlyKeys("&foo"); } @Test @@ -76,12 +74,10 @@ public class Spr8954Tests { @SuppressWarnings("rawtypes") Map fbBeans = bf.getBeansOfType(FactoryBean.class); - assertThat(fbBeans.size()).isEqualTo(1); - assertThat(fbBeans.keySet().iterator().next()).isEqualTo("&foo"); + assertThat(fbBeans).containsOnlyKeys("&foo"); Map aiBeans = bf.getBeansOfType(AnInterface.class); - assertThat(aiBeans.size()).isEqualTo(1); - assertThat(aiBeans.keySet().iterator().next()).isEqualTo("&foo"); + assertThat(aiBeans).containsOnlyKeys("&foo"); } diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java index e265610c69d..d9ea27b5417 100644 --- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java @@ -78,8 +78,8 @@ class BshScriptFactoryTests { String desiredMessage = "Hello World!"; assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); - assertThat(ctx.getBeansOfType(Calculator.class).values().contains(calc)).isTrue(); - assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); + assertThat(ctx.getBeansOfType(Calculator.class)).containsValue(calc); + assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger); ctx.close(); } @@ -91,7 +91,7 @@ class BshScriptFactoryTests { ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfig"); messenger.setMessage(null); assertThat(messenger.getMessage()).isNull(); - assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); + assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger); ctx.close(); } @@ -103,7 +103,7 @@ class BshScriptFactoryTests { ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfigExtra"); messenger.setMessage(null); assertThat(messenger.getMessage()).isNull(); - assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); + assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger); ctx.close(); assertThat(messenger.getMessage()).isNull(); @@ -117,7 +117,7 @@ class BshScriptFactoryTests { Messenger messenger = (Messenger) ctx.getBean("messengerInstance"); String desiredMessage = "Hello World!"; 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(); assertThat(messenger.getMessage()).isNull(); @@ -131,7 +131,7 @@ class BshScriptFactoryTests { Messenger messenger = (Messenger) ctx.getBean("messengerImpl"); String desiredMessage = "Hello World!"; 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(); assertThat(messenger.getMessage()).isNull(); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index ffe5a19f2a0..f26f0aa9312 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -94,8 +94,8 @@ public class GroovyScriptFactoryTests { String desiredMessage = "Hello World!"; assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); - assertThat(ctx.getBeansOfType(Calculator.class).values().contains(calc)).isTrue(); - assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); + assertThat(ctx.getBeansOfType(Calculator.class)).containsValue(calc); + assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger); } @Test @@ -127,8 +127,8 @@ public class GroovyScriptFactoryTests { String desiredMessage = "Hello World!"; assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage); - assertThat(ctx.getBeansOfType(Calculator.class).values().contains(calc)).isTrue(); - assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); + assertThat(ctx.getBeansOfType(Calculator.class)).containsValue(calc); + assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger); } @Test @@ -183,7 +183,7 @@ public class GroovyScriptFactoryTests { String desiredMessage = "Hello World!"; 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 @@ -198,7 +198,7 @@ public class GroovyScriptFactoryTests { String desiredMessage = "Hello World!"; 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 @@ -213,7 +213,7 @@ public class GroovyScriptFactoryTests { String desiredMessage = "Hello World!"; 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 @@ -228,7 +228,7 @@ public class GroovyScriptFactoryTests { String desiredMessage = "Hello World!"; 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 @@ -427,7 +427,7 @@ public class GroovyScriptFactoryTests { assertThat(messenger.getMessage()).isEqualTo("Hello World!"); assertThat(countingAspect.getCalls()).isEqualTo(1); - assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue(); + assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger); } @Test // SPR-6268 @@ -443,7 +443,7 @@ public class GroovyScriptFactoryTests { assertThat(condition).isTrue(); 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 assertThat(AnnotationUtils.findAnnotation(messenger.getClass(), Component.class)).isNotNull(); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java index bfd2b1d2f3f..14423eaf692 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -189,8 +189,7 @@ class SelectionAndProjectionTests { Expression exp = parser.parseExpression("colors.^[key.startsWith('b')]"); Map colorsMap = (Map) exp.getValue(context); - assertThat(colorsMap).hasSize(1); - assertThat(colorsMap.keySet().iterator().next()).isEqualTo("beige"); + assertThat(colorsMap).containsOnlyKeys("beige"); } @Test @@ -201,8 +200,7 @@ class SelectionAndProjectionTests { Expression exp = parser.parseExpression("colors.$[key.startsWith('b')]"); Map colorsMap = (Map) exp.getValue(context); - assertThat(colorsMap).hasSize(1); - assertThat(colorsMap.keySet().iterator().next()).isEqualTo("brown"); + assertThat(colorsMap).containsOnlyKeys("brown"); } @Test diff --git a/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java b/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java index aae1eb45fa4..9820f51548d 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package org.springframework.messaging; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; @@ -153,9 +152,7 @@ public class MessageHeadersTests { map.put("key1", "val1"); map.put("key2", 123); MessageHeaders headers = new MessageHeaders(map); - Set keys = headers.keySet(); - assertThat(keys.contains("key1")).isTrue(); - assertThat(keys.contains("key2")).isTrue(); + assertThat(headers).containsKeys("key1", "key2"); } @Test diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java index 2ac2be9f3df..78680e7c47a 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,7 +66,6 @@ public class MethodMessageHandlerTests { TestMethodMessageHandler messageHandler = initMethodMessageHandler(TestController.class); Map mappings = messageHandler.getHandlerMethods(); - assertThat(mappings.keySet()).hasSize(5); assertThat(mappings).containsOnlyKeys( "/handleMessage", "/handleMessageWithArgument", "/handleMessageWithError", "/handleMessageMatch1", "/handleMessageMatch2"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java index 54d750f4385..04c013d95d3 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java @@ -157,8 +157,7 @@ public class MessageHeaderAccessorTests { headers.copyHeaders(null); headers.copyHeadersIfAbsent(null); - assertThat(headers.getMessageHeaders()).hasSize(1); - assertThat(headers.getMessageHeaders().keySet()).isEqualTo(Collections.singleton("id")); + assertThat(headers.getMessageHeaders()).containsOnlyKeys(Collections.singleton("id")); } @Test diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java index 3efd5d4a3b9..0a2c98f2ee8 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java @@ -19,7 +19,6 @@ package org.springframework.orm.jpa.persistenceunit; import java.net.URL; import java.util.HashMap; import java.util.Map; -import java.util.Properties; import javax.sql.DataSource; @@ -37,6 +36,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup; import org.springframework.jdbc.datasource.lookup.MapDataSourceLookup; +import static java.util.Map.entry; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatRuntimeException; @@ -95,7 +95,7 @@ public class PersistenceXmlParsingTests { assertThat(info[0].getMappingFileNames()).hasSize(1); assertThat(info[0].getMappingFileNames().get(0)).isEqualTo("mappings.xml"); - assertThat(info[0].getProperties().keySet()).isEmpty(); + assertThat(info[0].getProperties()).isEmpty(); assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should default false in 1.0.").isFalse(); } @@ -115,7 +115,7 @@ public class PersistenceXmlParsingTests { assertThat(info[0].getJarFileUrls().get(0)).isEqualTo(new ClassPathResource("order.jar").getURL()); assertThat(info[0].getJarFileUrls().get(1)).isEqualTo(new ClassPathResource("order-supplemental.jar").getURL()); - assertThat(info[0].getProperties().keySet()).isEmpty(); + assertThat(info[0].getProperties()).isEmpty(); assertThat(info[0].getJtaDataSource()).isNull(); assertThat(info[0].getNonJtaDataSource()).isNull(); @@ -148,7 +148,7 @@ public class PersistenceXmlParsingTests { assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should be true when no value.").isTrue(); assertThat(info[0].getTransactionType()).isSameAs(PersistenceUnitTransactionType.RESOURCE_LOCAL); - assertThat(info[0].getProperties().keySet()).isEmpty(); + assertThat(info[0].getProperties()).isEmpty(); builder.clear(); } @@ -173,7 +173,7 @@ public class PersistenceXmlParsingTests { assertThat(info[0].getJarFileUrls().get(1)).isEqualTo(new ClassPathResource("order-supplemental.jar").getURL()); assertThat(info[0].getPersistenceProviderClassName()).isEqualTo("com.acme.AcmePersistence"); - assertThat(info[0].getProperties().keySet()).isEmpty(); + assertThat(info[0].getProperties()).isEmpty(); assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should default false in 1.0.").isFalse(); } @@ -210,10 +210,8 @@ public class PersistenceXmlParsingTests { assertThat(pu1.getTransactionType()).isSameAs(PersistenceUnitTransactionType.RESOURCE_LOCAL); - Properties props = pu1.getProperties(); - assertThat(props.keySet()).hasSize(2); - assertThat(props.getProperty("com.acme.persistence.sql-logging")).isEqualTo("on"); - assertThat(props.getProperty("foo")).isEqualTo("bar"); + assertThat(pu1.getProperties()).containsOnly( + entry("com.acme.persistence.sql-logging", "on"), entry("foo", "bar")); assertThat(pu1.getNonJtaDataSource()).isNull(); @@ -249,7 +247,7 @@ public class PersistenceXmlParsingTests { PersistenceUnitInfo[] info = reader.readPersistenceUnitInfos(resource); assertThat(info).hasSize(1); assertThat(info[0].getPersistenceUnitName()).isEqualTo("pu"); - assertThat(info[0].getProperties().keySet()).isEmpty(); + assertThat(info[0].getProperties()).isEmpty(); assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should default false in 1.0.").isFalse(); } diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java index 429cbfd1645..f5f1021369f 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java @@ -98,8 +98,8 @@ public class SpringHandlerInstantiatorTests { public void autowiredKeyDeserializer() throws IOException { String json = "{\"credentials\":{\"bob\":\"admin\"}}"; SecurityRegistry registry = this.objectMapper.readValue(json, SecurityRegistry.class); - assertThat(registry.getCredentials().keySet().contains("BOB")).isTrue(); - assertThat(registry.getCredentials().keySet().contains("bob")).isFalse(); + assertThat(registry.getCredentials()).containsKey("BOB"); + assertThat(registry.getCredentials()).doesNotContainKey("bob"); } @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java index 18c31b5d4e5..02254ccf3c6 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java @@ -88,7 +88,7 @@ public class HandlersBeanDefinitionParserTests { assertThat(condition2).isTrue(); SimpleUrlHandlerMapping shm = (SimpleUrlHandlerMapping) hm; - if (shm.getUrlMap().keySet().contains("/foo")) { + if (shm.getUrlMap().containsKey("/foo")) { assertThat(shm.getUrlMap()).containsOnlyKeys("/foo", "/bar"); WebSocketHttpRequestHandler handler = (WebSocketHttpRequestHandler) shm.getUrlMap().get("/foo"); assertThat(handler).isNotNull();