Replace assertThat(x.contains(y)).isTrue() with assertThat(x).contains(y)

Search for   : assertThat\((.+)\.contains\((.+)\)\)\.isTrue\(\)
Replace with : assertThat($1).contains($2)

Search for   : assertThat\((.+)\.contains\((.+)\)\)\.isFalse\(\)
Replace with : assertThat($1).doesNotContain($2)

Closes gh-31762

spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java

@@ -39,8 +39,8 @@ public class ScopedProxyAutowireTests {
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				qualifiedResource(ScopedProxyAutowireTests.class, "scopedAutowireFalse.xml"));
 
-		assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, false, false)).contains("scoped")).isTrue();
-		assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, true, false)).contains("scoped")).isTrue();
+		assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, false, false))).contains("scoped");
+		assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, true, false))).contains("scoped");
 		assertThat(bf.containsSingleton("scoped")).isFalse();
 		TestBean autowired = (TestBean) bf.getBean("autowired");
 		TestBean unscoped = (TestBean) bf.getBean("unscoped");
@@ -53,8 +53,8 @@ public class ScopedProxyAutowireTests {
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				qualifiedResource(ScopedProxyAutowireTests.class, "scopedAutowireTrue.xml"));
 
-		assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, true, false)).contains("scoped")).isTrue();
-		assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, false, false)).contains("scoped")).isTrue();
+		assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, true, false))).contains("scoped");
+		assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, false, false))).contains("scoped");
 		assertThat(bf.containsSingleton("scoped")).isFalse();
 		TestBean autowired = (TestBean) bf.getBean("autowired");
 		TestBean scoped = (TestBean) bf.getBean("scoped");

spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java

@@ -72,14 +72,14 @@ public class LazyInitTargetSourceTests {
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(FACTORY_BEAN_CONTEXT);
 		bf.preInstantiateSingletons();
 
-		Set<?> set1 = (Set<?>) bf.getBean("proxy1");
+		Set<Object> set1 = (Set<Object>) bf.getBean("proxy1");
 		assertThat(bf.containsSingleton("target1")).isFalse();
-		assertThat(set1.contains("10")).isTrue();
+		assertThat(set1).contains("10");
 		assertThat(bf.containsSingleton("target1")).isTrue();
 
-		Set<?> set2 = (Set<?>) bf.getBean("proxy2");
+		Set<Object> set2 = (Set<Object>) bf.getBean("proxy2");
 		assertThat(bf.containsSingleton("target2")).isFalse();
-		assertThat(set2.contains("20")).isTrue();
+		assertThat(set2).contains("20");
 		assertThat(bf.containsSingleton("target2")).isTrue();
 	}
 

spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java

@@ -1143,12 +1143,12 @@ abstract class AbstractPropertyAccessorTests {
 		assertThat(target.getSet()).hasSize(1);
 		assertThat(target.getSet().contains("set1")).isTrue();
 		assertThat(target.getSortedSet()).hasSize(1);
-		assertThat(target.getSortedSet().contains("sortedSet1")).isTrue();
+		assertThat(target.getSortedSet()).contains("sortedSet1");
 		assertThat(target.getList()).hasSize(1);
-		assertThat(target.getList().contains("list1")).isTrue();
+		assertThat(target.getList()).contains("list1");
 
 		accessor.setPropertyValue("list", Collections.singletonList("list1 "));
-		assertThat(target.getList().contains("list1")).isTrue();
+		assertThat(target.getList()).contains("list1");
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java

@@ -92,7 +92,7 @@ public class BeanWrapperEnumTests {
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("customEnumSet", "VALUE_1");
 		assertThat(gb.getCustomEnumSet()).hasSize(1);
-		assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
+		assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_1);
 	}
 
 	@Test
@@ -101,8 +101,8 @@ public class BeanWrapperEnumTests {
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("customEnumSet", new String[] {"VALUE_1", "VALUE_2"});
 		assertThat(gb.getCustomEnumSet()).hasSize(2);
-		assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
-		assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
+		assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_1);
+		assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_2);
 	}
 
 	@Test
@@ -111,8 +111,8 @@ public class BeanWrapperEnumTests {
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("customEnumSet", "VALUE_1,VALUE_2");
 		assertThat(gb.getCustomEnumSet()).hasSize(2);
-		assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
-		assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
+		assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_1);
+		assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_2);
 	}
 
 	@Test
@@ -121,8 +121,8 @@ public class BeanWrapperEnumTests {
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("customEnumSetMismatch", new String[] {"VALUE_1", "VALUE_2"});
 		assertThat(gb.getCustomEnumSet()).hasSize(2);
-		assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
-		assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
+		assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_1);
+		assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_2);
 	}
 
 	@Test
@@ -133,8 +133,8 @@ public class BeanWrapperEnumTests {
 		assertThat(gb.getStandardEnumSet()).isNull();
 		bw.setPropertyValue("standardEnumSet", new String[] {"VALUE_1", "VALUE_2"});
 		assertThat(gb.getStandardEnumSet()).hasSize(2);
-		assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
-		assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
+		assertThat(gb.getStandardEnumSet()).contains(CustomEnum.VALUE_1);
+		assertThat(gb.getStandardEnumSet()).contains(CustomEnum.VALUE_2);
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java

@@ -58,8 +58,8 @@ class BeanWrapperGenericsTests {
 		input.add("4");
 		input.add("5");
 		bw.setPropertyValue("integerSet", input);
-		assertThat(gb.getIntegerSet().contains(4)).isTrue();
-		assertThat(gb.getIntegerSet().contains(5)).isTrue();
+		assertThat(gb.getIntegerSet()).contains(4);
+		assertThat(gb.getIntegerSet()).contains(5);
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java

@@ -112,7 +112,7 @@ public class BeanFactoryUtilsTests {
 		List<String> names = Arrays.asList(
 				BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, IndexedTestBean.class));
 		assertThat(names).hasSize(1);
-		assertThat(names.contains("indexedBean")).isTrue();
+		assertThat(names).contains("indexedBean");
 		// Distinguish from default ListableBeanFactory behavior
 		assertThat(listableBeanFactory.getBeanNamesForType(IndexedTestBean.class)).isEmpty();
 	}
@@ -123,10 +123,10 @@ public class BeanFactoryUtilsTests {
 				BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class));
 		// includes 2 TestBeans from FactoryBeans (DummyFactory definitions)
 		assertThat(names).hasSize(4);
-		assertThat(names.contains("test")).isTrue();
-		assertThat(names.contains("test3")).isTrue();
-		assertThat(names.contains("testFactory1")).isTrue();
-		assertThat(names.contains("testFactory2")).isTrue();
+		assertThat(names).contains("test");
+		assertThat(names).contains("test3");
+		assertThat(names).contains("testFactory1");
+		assertThat(names).contains("testFactory2");
 	}
 
 	@Test
@@ -282,7 +282,7 @@ public class BeanFactoryUtilsTests {
 		List<String> names = Arrays.asList(
 				BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class));
 		assertThat(names).hasSize(1);
-		assertThat(names.contains("annotatedBean")).isTrue();
+		assertThat(names).contains("annotatedBean");
 		// Distinguish from default ListableBeanFactory behavior
 		assertThat(listableBeanFactory.getBeanNamesForAnnotation(TestAnnotation.class)).isEmpty();
 	}
@@ -294,8 +294,8 @@ public class BeanFactoryUtilsTests {
 		List<String> names = Arrays.asList(
 				BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class));
 		assertThat(names).hasSize(2);
-		assertThat(names.contains("annotatedBean")).isTrue();
-		assertThat(names.contains("anotherAnnotatedBean")).isTrue();
+		assertThat(names).contains("annotatedBean");
+		assertThat(names).contains("anotherAnnotatedBean");
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java

@@ -1845,19 +1845,19 @@ class DefaultListableBeanFactoryTests {
 			resolved.add(instance);
 		}
 		assertThat(resolved).hasSize(2);
-		assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
-		assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
+		assertThat(resolved).contains(lbf.getBean("bd1"));
+		assertThat(resolved).contains(lbf.getBean("bd2"));
 
 		resolved = new HashSet<>();
 		provider.forEach(resolved::add);
 		assertThat(resolved).hasSize(2);
-		assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
-		assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
+		assertThat(resolved).contains(lbf.getBean("bd1"));
+		assertThat(resolved).contains(lbf.getBean("bd2"));
 
 		resolved = provider.stream().collect(Collectors.toSet());
 		assertThat(resolved).hasSize(2);
-		assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
-		assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
+		assertThat(resolved).contains(lbf.getBean("bd1"));
+		assertThat(resolved).contains(lbf.getBean("bd2"));
 	}
 
 	@Test
@@ -1894,19 +1894,19 @@ class DefaultListableBeanFactoryTests {
 			resolved.add(instance);
 		}
 		assertThat(resolved).hasSize(2);
-		assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
-		assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
+		assertThat(resolved).contains(lbf.getBean("bd1"));
+		assertThat(resolved).contains(lbf.getBean("bd2"));
 
 		resolved = new HashSet<>();
 		provider.forEach(resolved::add);
 		assertThat(resolved).hasSize(2);
-		assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
-		assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
+		assertThat(resolved).contains(lbf.getBean("bd1"));
+		assertThat(resolved).contains(lbf.getBean("bd2"));
 
 		resolved = provider.stream().collect(Collectors.toSet());
 		assertThat(resolved).hasSize(2);
-		assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
-		assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
+		assertThat(resolved).contains(lbf.getBean("bd1"));
+		assertThat(resolved).contains(lbf.getBean("bd2"));
 	}
 
 	@Test

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

@@ -1610,18 +1610,18 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.getUniqueTestBeanWithDefault()).isEqualTo(bf.getBean("testBean"));
 		assertThat(bean.consumeUniqueTestBean()).isEqualTo(bf.getBean("testBean"));
 
-		List<?> testBeans = bean.iterateTestBeans();
+		List<TestBean> testBeans = bean.iterateTestBeans();
 		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
+		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
 		testBeans = bean.forEachTestBeans();
 		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
+		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
 		testBeans = bean.streamTestBeans();
 		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
+		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
 		testBeans = bean.sortedTestBeans();
 		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
+		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
 	}
 
 	@Test
@@ -1638,18 +1638,18 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.getUniqueTestBeanWithDefault()).isSameAs(bf.getBean("testBean"));
 		assertThat(bean.consumeUniqueTestBean()).isEqualTo(bf.getBean("testBean"));
 
-		List<?> testBeans = bean.iterateTestBeans();
+		List<TestBean> testBeans = bean.iterateTestBeans();
 		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
+		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
 		testBeans = bean.forEachTestBeans();
 		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
+		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
 		testBeans = bean.streamTestBeans();
 		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
+		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
 		testBeans = bean.sortedTestBeans();
 		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
+		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java

@@ -199,8 +199,8 @@ public class FactoryMethodTests {
 		assertThat(xbf.getType("externalFactoryMethodWithoutArgs")).isEqualTo(TestBean.class);
 		assertThat(xbf.getType("externalFactoryMethodWithArgs")).isEqualTo(TestBean.class);
 		String[] names = xbf.getBeanNamesForType(TestBean.class);
-		assertThat(Arrays.asList(names).contains("externalFactoryMethodWithoutArgs")).isTrue();
-		assertThat(Arrays.asList(names).contains("externalFactoryMethodWithArgs")).isTrue();
+		assertThat(Arrays.asList(names)).contains("externalFactoryMethodWithoutArgs");
+		assertThat(Arrays.asList(names)).contains("externalFactoryMethodWithArgs");
 
 		TestBean tb = (TestBean) xbf.getBean("externalFactoryMethodWithoutArgs");
 		assertThat(tb.getAge()).isEqualTo(2);
@@ -212,8 +212,8 @@ public class FactoryMethodTests {
 		assertThat(xbf.getType("externalFactoryMethodWithoutArgs")).isEqualTo(TestBean.class);
 		assertThat(xbf.getType("externalFactoryMethodWithArgs")).isEqualTo(TestBean.class);
 		names = xbf.getBeanNamesForType(TestBean.class);
-		assertThat(Arrays.asList(names).contains("externalFactoryMethodWithoutArgs")).isTrue();
-		assertThat(Arrays.asList(names).contains("externalFactoryMethodWithArgs")).isTrue();
+		assertThat(Arrays.asList(names)).contains("externalFactoryMethodWithoutArgs");
+		assertThat(Arrays.asList(names)).contains("externalFactoryMethodWithArgs");
 	}
 
 	@Test
@@ -337,16 +337,16 @@ public class FactoryMethodTests {
 		// Check that listInstance is not considered a bean of type FactoryMethods.
 		assertThat(List.class.isAssignableFrom(xbf.getType("listInstance"))).isTrue();
 		String[] names = xbf.getBeanNamesForType(FactoryMethods.class);
-		assertThat(Arrays.asList(names).contains("listInstance")).isFalse();
+		assertThat(Arrays.asList(names)).doesNotContain("listInstance");
 		names = xbf.getBeanNamesForType(List.class);
-		assertThat(Arrays.asList(names).contains("listInstance")).isTrue();
+		assertThat(Arrays.asList(names)).contains("listInstance");
 
 		xbf.preInstantiateSingletons();
 		assertThat(List.class.isAssignableFrom(xbf.getType("listInstance"))).isTrue();
 		names = xbf.getBeanNamesForType(FactoryMethods.class);
-		assertThat(Arrays.asList(names).contains("listInstance")).isFalse();
+		assertThat(Arrays.asList(names)).doesNotContain("listInstance");
 		names = xbf.getBeanNamesForType(List.class);
-		assertThat(Arrays.asList(names).contains("listInstance")).isTrue();
+		assertThat(Arrays.asList(names)).contains("listInstance");
 		List<?> list = (List<?>) xbf.getBean("listInstance");
 		assertThat(list).isEqualTo(Collections.EMPTY_LIST);
 	}

spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java

@@ -154,7 +154,7 @@ public class XmlBeanCollectionTests {
 		TestBean loner = (TestBean) this.beanFactory.getBean("loner");
 		TestBean dave = (TestBean) this.beanFactory.getBean("david");
 		assertThat(loner.getFriends().size()).isEqualTo(1);
-		assertThat(loner.getFriends().contains(dave)).isTrue();
+		assertThat(loner.getFriends()).contains(dave);
 	}
 
 	@Test
@@ -296,8 +296,8 @@ public class XmlBeanCollectionTests {
 		HasMap hasMap = (HasMap) this.beanFactory.getBean("identityMap");
 		assertThat(hasMap.getIdentityMap().size()).isEqualTo(2);
 		HashSet set = new HashSet(hasMap.getIdentityMap().keySet());
-		assertThat(set.contains("foo")).isTrue();
-		assertThat(set.contains("jenny")).isTrue();
+		assertThat(set).contains("foo");
+		assertThat(set).contains("jenny");
 	}
 
 	@Test
@@ -384,8 +384,8 @@ public class XmlBeanCollectionTests {
 		Set set = (Set) this.beanFactory.getBean("setFactory");
 		assertThat(set).isInstanceOf(TreeSet.class);
 		assertThat(set.size()).isEqualTo(2);
-		assertThat(set.contains("bar")).isTrue();
-		assertThat(set.contains("jenny")).isTrue();
+		assertThat(set).contains("bar");
+		assertThat(set).contains("jenny");
 	}
 
 	@Test
@@ -393,8 +393,8 @@ public class XmlBeanCollectionTests {
 		Set set = (Set) this.beanFactory.getBean("pSetFactory");
 		assertThat(set).isInstanceOf(TreeSet.class);
 		assertThat(set.size()).isEqualTo(2);
-		assertThat(set.contains("bar")).isTrue();
-		assertThat(set.contains("jenny")).isTrue();
+		assertThat(set).contains("bar");
+		assertThat(set).contains("jenny");
 	}
 
 	@Test
@@ -430,8 +430,8 @@ public class XmlBeanCollectionTests {
 	public void testEnumSetFactory() {
 		Set set = (Set) this.beanFactory.getBean("enumSetFactory");
 		assertThat(set.size()).isEqualTo(2);
-		assertThat(set.contains("ONE")).isTrue();
-		assertThat(set.contains("TWO")).isTrue();
+		assertThat(set).contains("ONE");
+		assertThat(set).contains("TWO");
 	}
 
 

spring-context-support/src/test/java/org/springframework/cache/transaction/AbstractTransactionSupportingCacheManagerTests.java

@@ -79,10 +79,10 @@ public abstract class AbstractTransactionSupportingCacheManagerTests<T extends C
 	public void getOnNewCache() {
 		T cacheManager = getCacheManager(false);
 		addNativeCache(this.cacheName);
-		assertThat(cacheManager.getCacheNames().contains(this.cacheName)).isFalse();
+		assertThat(cacheManager.getCacheNames()).doesNotContain(this.cacheName);
 		try {
 			assertThat(cacheManager.getCache(this.cacheName)).isInstanceOf(getCacheType());
-			assertThat(cacheManager.getCacheNames().contains(this.cacheName)).isTrue();
+			assertThat(cacheManager.getCacheNames()).contains(this.cacheName);
 		}
 		finally {
 			removeNativeCache(this.cacheName);
@@ -92,7 +92,7 @@ public abstract class AbstractTransactionSupportingCacheManagerTests<T extends C
 	@Test
 	public void getOnUnknownCache() {
 		T cacheManager = getCacheManager(false);
-		assertThat(cacheManager.getCacheNames().contains(this.cacheName)).isFalse();
+		assertThat(cacheManager.getCacheNames()).doesNotContain(this.cacheName);
 		assertThat(cacheManager.getCache(this.cacheName)).isNull();
 	}
 
@@ -105,12 +105,12 @@ public abstract class AbstractTransactionSupportingCacheManagerTests<T extends C
 	@Test
 	public void getTransactionalOnNewCache() {
 		T cacheManager = getCacheManager(true);
-		assertThat(cacheManager.getCacheNames().contains(this.cacheName)).isFalse();
+		assertThat(cacheManager.getCacheNames()).doesNotContain(this.cacheName);
 		addNativeCache(this.cacheName);
 		try {
 			assertThat(cacheManager.getCache(this.cacheName))
 					.isInstanceOf(TransactionAwareCacheDecorator.class);
-			assertThat(cacheManager.getCacheNames().contains(this.cacheName)).isTrue();
+			assertThat(cacheManager.getCacheNames()).contains(this.cacheName);
 		}
 		finally {
 			removeNativeCache(this.cacheName);

spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java

@@ -56,11 +56,11 @@ public class SimpleMailMessageTests {
 		assertThat(message.getReplyTo()).isEqualTo("reply@mail.org");
 		assertThat(message.getTo()[0]).isEqualTo("you@mail.org");
 		List<String> ccs = Arrays.asList(message.getCc());
-		assertThat(ccs.contains("he@mail.org")).isTrue();
-		assertThat(ccs.contains("she@mail.org")).isTrue();
+		assertThat(ccs).contains("he@mail.org");
+		assertThat(ccs).contains("she@mail.org");
 		List<String> bccs = Arrays.asList(message.getBcc());
-		assertThat(bccs.contains("us@mail.org")).isTrue();
-		assertThat(bccs.contains("them@mail.org")).isTrue();
+		assertThat(bccs).contains("us@mail.org");
+		assertThat(bccs).contains("them@mail.org");
 		assertThat(message.getSentDate()).isEqualTo(sentDate);
 		assertThat(message.getSubject()).isEqualTo("my subject");
 		assertThat(message.getText()).isEqualTo("my text");
@@ -70,11 +70,11 @@ public class SimpleMailMessageTests {
 		assertThat(messageCopy.getReplyTo()).isEqualTo("reply@mail.org");
 		assertThat(messageCopy.getTo()[0]).isEqualTo("you@mail.org");
 		ccs = Arrays.asList(messageCopy.getCc());
-		assertThat(ccs.contains("he@mail.org")).isTrue();
-		assertThat(ccs.contains("she@mail.org")).isTrue();
+		assertThat(ccs).contains("he@mail.org");
+		assertThat(ccs).contains("she@mail.org");
 		bccs = Arrays.asList(message.getBcc());
-		assertThat(bccs.contains("us@mail.org")).isTrue();
-		assertThat(bccs.contains("them@mail.org")).isTrue();
+		assertThat(bccs).contains("us@mail.org");
+		assertThat(bccs).contains("them@mail.org");
 		assertThat(messageCopy.getSentDate()).isEqualTo(sentDate);
 		assertThat(messageCopy.getSubject()).isEqualTo("my subject");
 		assertThat(messageCopy.getText()).isEqualTo("my text");

spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java

@@ -137,10 +137,10 @@ public class ScopedProxyTests {
 		assertThat(scope.getMap().containsKey("scopedTarget.scopedList")).isTrue();
 		assertThat(scope.getMap().get("scopedTarget.scopedList").getClass()).isEqualTo(ArrayList.class);
 
-		ArrayList<?> deserialized = (ArrayList<?>) SerializationTestUtils.serializeAndDeserialize(tb.getFriends());
+		ArrayList<Object> deserialized = (ArrayList<Object>) SerializationTestUtils.serializeAndDeserialize(tb.getFriends());
 		assertThat(deserialized).isNotNull();
 		assertThat(AopUtils.isCglibProxy(deserialized)).isTrue();
-		assertThat(deserialized.contains("myFriend")).isTrue();
+		assertThat(deserialized).contains("myFriend");
 		boolean condition = deserialized instanceof ScopedObject;
 		assertThat(condition).isTrue();
 		ScopedObject scopedDeserialized = (ScopedObject) deserialized;

spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java

@@ -122,7 +122,7 @@ public class CustomNamespaceHandlerTests {
 	@Test
 	public void testProxyingDecoratorNoInstance() throws Exception {
 		String[] beanNames = this.beanFactory.getBeanNamesForType(ApplicationListener.class);
-		assertThat(Arrays.asList(beanNames).contains("debuggingTestBeanNoInstance")).isTrue();
+		assertThat(Arrays.asList(beanNames)).contains("debuggingTestBeanNoInstance");
 		assertThat(this.beanFactory.getType("debuggingTestBeanNoInstance")).isEqualTo(ApplicationListener.class);
 		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
 				this.beanFactory.getBean("debuggingTestBeanNoInstance"))

spring-context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java

@@ -56,9 +56,9 @@ public class NoOpCacheManagerTests {
 	@Test
 	public void testCacheName() throws Exception {
 		String name = "bucket";
-		assertThat(this.manager.getCacheNames().contains(name)).isFalse();
+		assertThat(this.manager.getCacheNames()).doesNotContain(name);
 		this.manager.getCache(name);
-		assertThat(this.manager.getCacheNames().contains(name)).isTrue();
+		assertThat(this.manager.getCacheNames()).contains(name);
 	}
 
 	@Test

spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTests.java

@@ -299,7 +299,7 @@ public class AnnotationCacheOperationSourceTests {
 		assertThat(actual.getCacheManager()).as("Wrong cache manager").isEqualTo(cacheManager);
 		assertThat(actual.getCacheResolver()).as("Wrong cache resolver").isEqualTo(cacheResolver);
 		assertThat(actual.getCacheNames()).as("Wrong number of cache names").hasSameSizeAs(cacheNames);
-		Arrays.stream(cacheNames).forEach(cacheName -> assertThat(actual.getCacheNames().contains(cacheName)).as("Cache '" + cacheName + "' not found in " + actual.getCacheNames()).isTrue());
+		Arrays.stream(cacheNames).forEach(cacheName -> assertThat(actual.getCacheNames()).as("Cache '" + cacheName + "' not found in " + actual.getCacheNames()).contains(cacheName));
 	}
 
 

spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java

@@ -71,11 +71,11 @@ public class ExpressionEvaluatorTests {
 		Iterator<CacheOperation> it = ops.iterator();
 		CacheOperation next = it.next();
 		assertThat(next).isInstanceOf(CacheableOperation.class);
-		assertThat(next.getCacheNames().contains("test")).isTrue();
+		assertThat(next.getCacheNames()).contains("test");
 		assertThat(next.getKey()).isEqualTo("#a");
 		next = it.next();
 		assertThat(next).isInstanceOf(CacheableOperation.class);
-		assertThat(next.getCacheNames().contains("test")).isTrue();
+		assertThat(next.getCacheNames()).contains("test");
 		assertThat(next.getKey()).isEqualTo("#b");
 	}
 

spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java

@@ -637,7 +637,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
 
 		@Override
 		public void onApplicationEvent(MyEvent event) {
-			assertThat(this.otherListener.seenEvents.contains(event)).isTrue();
+			assertThat(this.otherListener.seenEvents).contains(event);
 		}
 	}
 
@@ -689,7 +689,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
 
 		@Override
 		public void onApplicationEvent(MyEvent event) {
-			assertThat(this.otherListener.seenEvents.contains(event)).isTrue();
+			assertThat(this.otherListener.seenEvents).contains(event);
 		}
 	}
 

spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java

@@ -77,7 +77,7 @@ class PayloadApplicationEventTests {
 		PayloadApplicationEvent<NumberHolder<Integer>> event = new PayloadApplicationEvent<>(this,
 				new NumberHolder<>(42), ResolvableType.forClassWithGenerics(NumberHolder.class, Integer.class));
 		ac.publishEvent(event);
-		assertThat(ac.getBean(NumberHolderListener.class).events.contains(event.getPayload())).isTrue();
+		assertThat(ac.getBean(NumberHolderListener.class).events).contains(event.getPayload());
 		ac.close();
 	}
 
@@ -91,7 +91,7 @@ class PayloadApplicationEventTests {
 		PayloadApplicationEvent<NumberHolder<Integer>> event = new PayloadApplicationEvent<>(this,
 				new NumberHolder<>(42), ResolvableType.forClassWithGenerics(NumberHolder.class, Integer.class));
 		ac.publishEvent(event);
-		assertThat(parent.getBean(NumberHolderListener.class).events.contains(event.getPayload())).isTrue();
+		assertThat(parent.getBean(NumberHolderListener.class).events).contains(event.getPayload());
 		ac.close();
 		parent.close();
 	}
@@ -99,7 +99,7 @@ class PayloadApplicationEventTests {
 	@Test
 	@SuppressWarnings("resource")
 	void testPayloadObjectWithPayloadType() {
-		final Object payload = new NumberHolder<>(42);
+		final NumberHolder payload = new NumberHolder<>(42);
 
 		AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext(NumberHolderListener.class) {
 			@Override
@@ -110,14 +110,14 @@ class PayloadApplicationEventTests {
 			}
 		};
 
-		assertThat(ac.getBean(NumberHolderListener.class).events.contains(payload)).isTrue();
+		assertThat(ac.getBean(NumberHolderListener.class).events).contains(payload);
 		ac.close();
 	}
 
 	@Test
 	@SuppressWarnings("resource")
 	void testPayloadObjectWithPayloadTypeOnParentContext() {
-		final Object payload = new NumberHolder<>(42);
+		final NumberHolder payload = new NumberHolder<>(42);
 
 		ConfigurableApplicationContext parent = new AnnotationConfigApplicationContext(NumberHolderListener.class);
 		ConfigurableApplicationContext ac = new GenericApplicationContext(parent) {
@@ -130,7 +130,7 @@ class PayloadApplicationEventTests {
 		};
 		ac.refresh();
 
-		assertThat(parent.getBean(NumberHolderListener.class).events.contains(payload)).isTrue();
+		assertThat(parent.getBean(NumberHolderListener.class).events).contains(payload);
 		ac.close();
 		parent.close();
 	}
@@ -142,7 +142,7 @@ class PayloadApplicationEventTests {
 
 		AuditablePayloadEvent<String> event = new AuditablePayloadEvent<>(this, "xyz");
 		ac.publishEvent(event);
-		assertThat(ac.getBean(AuditableListener.class).events.contains(event)).isTrue();
+		assertThat(ac.getBean(AuditableListener.class).events).contains(event);
 		ac.close();
 	}
 
@@ -155,7 +155,7 @@ class PayloadApplicationEventTests {
 
 		AuditablePayloadEvent<String> event = new AuditablePayloadEvent<>(this, "xyz");
 		ac.publishEvent(event);
-		assertThat(parent.getBean(AuditableListener.class).events.contains(event)).isTrue();
+		assertThat(parent.getBean(AuditableListener.class).events).contains(event);
 		ac.close();
 		parent.close();
 	}
@@ -174,7 +174,7 @@ class PayloadApplicationEventTests {
 
 		AuditablePayloadEvent<String> event = new AuditablePayloadEvent<>(this, "xyz");
 		ac.publishEvent(event);
-		assertThat(events.contains(event)).isTrue();
+		assertThat(events).contains(event);
 		ac.close();
 	}
 
@@ -194,7 +194,7 @@ class PayloadApplicationEventTests {
 
 		AuditablePayloadEvent<String> event = new AuditablePayloadEvent<>(this, "xyz");
 		ac.publishEvent(event);
-		assertThat(events.contains(event)).isTrue();
+		assertThat(events).contains(event);
 		ac.close();
 		parent.close();
 	}
@@ -213,7 +213,7 @@ class PayloadApplicationEventTests {
 
 		String payload = "xyz";
 		ac.publishEvent(payload);
-		assertThat(events.contains(payload)).isTrue();
+		assertThat(events).contains(payload);
 		ac.close();
 	}
 
@@ -233,7 +233,7 @@ class PayloadApplicationEventTests {
 
 		String payload = "xyz";
 		ac.publishEvent(payload);
-		assertThat(events.contains(payload)).isTrue();
+		assertThat(events).contains(payload);
 		ac.close();
 		parent.close();
 	}
@@ -245,7 +245,7 @@ class PayloadApplicationEventTests {
 
 		String payload = "xyz";
 		ac.publishEvent(payload);
-		assertThat(ac.getBean(PlainPayloadListener.class).events.contains(payload)).isTrue();
+		assertThat(ac.getBean(PlainPayloadListener.class).events).contains(payload);
 		ac.close();
 	}
 
@@ -258,7 +258,7 @@ class PayloadApplicationEventTests {
 
 		String payload = "xyz";
 		ac.publishEvent(payload);
-		assertThat(parent.getBean(PlainPayloadListener.class).events.contains(payload)).isTrue();
+		assertThat(parent.getBean(PlainPayloadListener.class).events).contains(payload);
 		ac.close();
 		parent.close();
 	}

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

@@ -54,8 +54,8 @@ class BshScriptFactoryTests {
 	void staticScript() {
 		ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
 
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class)).contains("calculator")).isTrue();
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messenger")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class))).contains("calculator");
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messenger");
 
 		Calculator calc = (Calculator) ctx.getBean("calculator");
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -86,7 +86,7 @@ class BshScriptFactoryTests {
 	@Test
 	void staticScriptWithNullReturnValue() {
 		ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerWithConfig")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerWithConfig");
 
 		ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfig");
 		messenger.setMessage(null);
@@ -98,7 +98,7 @@ class BshScriptFactoryTests {
 	@Test
 	void staticScriptWithTwoInterfacesSpecified() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerWithConfigExtra")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerWithConfigExtra");
 
 		ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfigExtra");
 		messenger.setMessage(null);
@@ -112,7 +112,7 @@ class BshScriptFactoryTests {
 	@Test
 	void staticWithScriptReturningInstance() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstance")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstance");
 
 		Messenger messenger = (Messenger) ctx.getBean("messengerInstance");
 		String desiredMessage = "Hello World!";
@@ -126,7 +126,7 @@ class BshScriptFactoryTests {
 	@Test
 	void staticScriptImplementingInterface() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerImpl")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerImpl");
 
 		Messenger messenger = (Messenger) ctx.getBean("messengerImpl");
 		String desiredMessage = "Hello World!";
@@ -249,9 +249,9 @@ class BshScriptFactoryTests {
 		TestBean testBean = (TestBean) ctx.getBean("testBean");
 
 		Collection<String> beanNames = Arrays.asList(ctx.getBeanNamesForType(Messenger.class));
-		assertThat(beanNames.contains("messenger")).isTrue();
-		assertThat(beanNames.contains("messengerImpl")).isTrue();
-		assertThat(beanNames.contains("messengerInstance")).isTrue();
+		assertThat(beanNames).contains("messenger");
+		assertThat(beanNames).contains("messengerImpl");
+		assertThat(beanNames).contains("messengerInstance");
 
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
 		assertThat(messenger.getMessage()).isEqualTo("Hello World!");
@@ -271,11 +271,11 @@ class BshScriptFactoryTests {
 		assertThat(messengerByName.getTestBean()).isEqualTo(testBean);
 
 		Collection<Messenger> beans = ctx.getBeansOfType(Messenger.class).values();
-		assertThat(beans.contains(messenger)).isTrue();
-		assertThat(beans.contains(messengerImpl)).isTrue();
-		assertThat(beans.contains(messengerInstance)).isTrue();
-		assertThat(beans.contains(messengerByType)).isTrue();
-		assertThat(beans.contains(messengerByName)).isTrue();
+		assertThat(beans).contains(messenger);
+		assertThat(beans).contains(messengerImpl);
+		assertThat(beans).contains(messengerInstance);
+		assertThat(beans).contains(messengerByType);
+		assertThat(beans).contains(messengerByName);
 
 		ctx.close();
 		assertThat(messenger.getMessage()).isNull();

spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptEvaluatorTests.java

@@ -66,7 +66,7 @@ public class GroovyScriptEvaluatorTests {
 		evaluator.getCompilerConfiguration().setBytecodePostprocessor(processor);
 		Object result = evaluator.evaluate(new StaticScriptSource("return 3 * 2"));
 		assertThat(result).isEqualTo(6);
-		assertThat(processor.processed.contains("Script1")).isTrue();
+		assertThat(processor.processed).contains("Script1");
 	}
 
 	@Test

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

@@ -69,8 +69,8 @@ public class GroovyScriptFactoryTests {
 	public void testStaticScript() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
 
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class)).contains("calculator")).isTrue();
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messenger")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class))).contains("calculator");
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messenger");
 
 		Calculator calc = (Calculator) ctx.getBean("calculator");
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -102,8 +102,8 @@ public class GroovyScriptFactoryTests {
 	public void testStaticScriptUsingJsr223() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass());
 
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class)).contains("calculator")).isTrue();
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messenger")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class))).contains("calculator");
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messenger");
 
 		Calculator calc = (Calculator) ctx.getBean("calculator");
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -174,7 +174,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testStaticScriptWithInstance() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstance")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstance");
 		Messenger messenger = (Messenger) ctx.getBean("messengerInstance");
 
 		assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse();
@@ -189,7 +189,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testStaticScriptWithInstanceUsingJsr223() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstance")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstance");
 		Messenger messenger = (Messenger) ctx.getBean("messengerInstance");
 
 		assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse();
@@ -204,7 +204,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testStaticScriptWithInlineDefinedInstance() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstanceInline")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstanceInline");
 		Messenger messenger = (Messenger) ctx.getBean("messengerInstanceInline");
 
 		assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse();
@@ -219,7 +219,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testStaticScriptWithInlineDefinedInstanceUsingJsr223() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstanceInline")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstanceInline");
 		Messenger messenger = (Messenger) ctx.getBean("messengerInstanceInline");
 
 		assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse();
@@ -415,7 +415,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testRefreshableFromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("refreshableMessenger")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger");
 
 		Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger");
 		CallCounter countingAspect = (CallCounter) ctx.getBean("getMessageAspect");
@@ -434,7 +434,7 @@ public class GroovyScriptFactoryTests {
 	public void testRefreshableFromTagProxyTargetClass() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-proxy-target-class.xml",
 				getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("refreshableMessenger")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger");
 
 		Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger");
 
@@ -471,7 +471,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testJsr223FromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messenger")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messenger");
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
 		assertThat(AopUtils.isAopProxy(messenger)).isFalse();
 		assertThat(messenger.getMessage()).isEqualTo("Hello World!");
@@ -480,7 +480,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testJsr223FromTagWithInterface() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerWithInterface")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerWithInterface");
 		Messenger messenger = (Messenger) ctx.getBean("messengerWithInterface");
 		assertThat(AopUtils.isAopProxy(messenger)).isFalse();
 	}
@@ -488,7 +488,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testRefreshableJsr223FromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("refreshableMessenger")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger");
 		Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger");
 		assertThat(AopUtils.isAopProxy(messenger)).isTrue();
 		boolean condition = messenger instanceof Refreshable;
@@ -499,7 +499,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testInlineJsr223FromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("inlineMessenger")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("inlineMessenger");
 		Messenger messenger = (Messenger) ctx.getBean("inlineMessenger");
 		assertThat(AopUtils.isAopProxy(messenger)).isFalse();
 	}
@@ -507,7 +507,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testInlineJsr223FromTagWithInterface() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
-		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("inlineMessengerWithInterface")).isTrue();
+		assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("inlineMessengerWithInterface");
 		Messenger messenger = (Messenger) ctx.getBean("inlineMessengerWithInterface");
 		assertThat(AopUtils.isAopProxy(messenger)).isFalse();
 	}

spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java

@@ -159,19 +159,19 @@ class ValidatorFactoryTests {
 		assertThat(fieldError.getField()).isEqualTo("name");
 		List<String> errorCodes = Arrays.asList(fieldError.getCodes());
 		assertThat(errorCodes).hasSize(4);
-		assertThat(errorCodes.contains("NotNull.person.name")).isTrue();
-		assertThat(errorCodes.contains("NotNull.name")).isTrue();
-		assertThat(errorCodes.contains("NotNull.java.lang.String")).isTrue();
-		assertThat(errorCodes.contains("NotNull")).isTrue();
+		assertThat(errorCodes).contains("NotNull.person.name");
+		assertThat(errorCodes).contains("NotNull.name");
+		assertThat(errorCodes).contains("NotNull.java.lang.String");
+		assertThat(errorCodes).contains("NotNull");
 		fieldError = result.getFieldError("address.street");
 		assertThat(fieldError.getField()).isEqualTo("address.street");
 		errorCodes = Arrays.asList(fieldError.getCodes());
 		assertThat(errorCodes).hasSize(5);
-		assertThat(errorCodes.contains("NotNull.person.address.street")).isTrue();
-		assertThat(errorCodes.contains("NotNull.address.street")).isTrue();
-		assertThat(errorCodes.contains("NotNull.street")).isTrue();
-		assertThat(errorCodes.contains("NotNull.java.lang.String")).isTrue();
-		assertThat(errorCodes.contains("NotNull")).isTrue();
+		assertThat(errorCodes).contains("NotNull.person.address.street");
+		assertThat(errorCodes).contains("NotNull.address.street");
+		assertThat(errorCodes).contains("NotNull.street");
+		assertThat(errorCodes).contains("NotNull.java.lang.String");
+		assertThat(errorCodes).contains("NotNull");
 
 		validator.destroy();
 	}
@@ -191,8 +191,8 @@ class ValidatorFactoryTests {
 		ObjectError globalError = result.getGlobalError();
 		List<String> errorCodes = Arrays.asList(globalError.getCodes());
 		assertThat(errorCodes).hasSize(2);
-		assertThat(errorCodes.contains("NameAddressValid.person")).isTrue();
-		assertThat(errorCodes.contains("NameAddressValid")).isTrue();
+		assertThat(errorCodes).contains("NameAddressValid.person");
+		assertThat(errorCodes).contains("NameAddressValid");
 
 		validator.destroy();
 	}
@@ -213,8 +213,8 @@ class ValidatorFactoryTests {
 		ObjectError globalError = result.getGlobalError();
 		List<String> errorCodes = Arrays.asList(globalError.getCodes());
 		assertThat(errorCodes).hasSize(2);
-		assertThat(errorCodes.contains("NameAddressValid.person")).isTrue();
-		assertThat(errorCodes.contains("NameAddressValid")).isTrue();
+		assertThat(errorCodes).contains("NameAddressValid.person");
+		assertThat(errorCodes).contains("NameAddressValid");
 
 		validator.destroy();
 		ctx.close();

spring-core/src/test/java/org/springframework/core/ConstantsTests.java

@@ -56,44 +56,44 @@ class ConstantsTests {
 	void getNames() {
 		Constants c = new Constants(A.class);
 
-		Set<?> names = c.getNames("");
+		Set<String> names = c.getNames("");
 		assertThat(names).hasSize(c.getSize());
-		assertThat(names.contains("DOG")).isTrue();
-		assertThat(names.contains("CAT")).isTrue();
-		assertThat(names.contains("S1")).isTrue();
+		assertThat(names).contains("DOG");
+		assertThat(names).contains("CAT");
+		assertThat(names).contains("S1");
 
 		names = c.getNames("D");
 		assertThat(names).hasSize(1);
-		assertThat(names.contains("DOG")).isTrue();
+		assertThat(names).contains("DOG");
 
 		names = c.getNames("d");
 		assertThat(names).hasSize(1);
-		assertThat(names.contains("DOG")).isTrue();
+		assertThat(names).contains("DOG");
 	}
 
 	@Test
 	void getValues() {
 		Constants c = new Constants(A.class);
 
-		Set<?> values = c.getValues("");
+		Set<Object> values = c.getValues("");
 		assertThat(values).hasSize(7);
-		assertThat(values.contains(0)).isTrue();
-		assertThat(values.contains(66)).isTrue();
-		assertThat(values.contains("")).isTrue();
+		assertThat(values).contains(0);
+		assertThat(values).contains(66);
+		assertThat(values).contains("");
 
 		values = c.getValues("D");
 		assertThat(values).hasSize(1);
-		assertThat(values.contains(0)).isTrue();
+		assertThat(values).contains(0);
 
 		values = c.getValues("prefix");
 		assertThat(values).hasSize(2);
-		assertThat(values.contains(1)).isTrue();
-		assertThat(values.contains(2)).isTrue();
+		assertThat(values).contains(1);
+		assertThat(values).contains(2);
 
 		values = c.getValuesForProperty("myProperty");
 		assertThat(values).hasSize(2);
-		assertThat(values.contains(1)).isTrue();
-		assertThat(values.contains(2)).isTrue();
+		assertThat(values).contains(1);
+		assertThat(values).contains(2);
 	}
 
 	@Test
@@ -103,25 +103,25 @@ class ConstantsTests {
 		try {
 			Constants c = new Constants(A.class);
 
-			Set<?> values = c.getValues("");
+			Set<Object> values = c.getValues("");
 			assertThat(values).hasSize(7);
-			assertThat(values.contains(0)).isTrue();
-			assertThat(values.contains(66)).isTrue();
-			assertThat(values.contains("")).isTrue();
+			assertThat(values).contains(0);
+			assertThat(values).contains(66);
+			assertThat(values).contains("");
 
 			values = c.getValues("D");
 			assertThat(values).hasSize(1);
-			assertThat(values.contains(0)).isTrue();
+			assertThat(values).contains(0);
 
 			values = c.getValues("prefix");
 			assertThat(values).hasSize(2);
-			assertThat(values.contains(1)).isTrue();
-			assertThat(values.contains(2)).isTrue();
+			assertThat(values).contains(1);
+			assertThat(values).contains(2);
 
 			values = c.getValuesForProperty("myProperty");
 			assertThat(values).hasSize(2);
-			assertThat(values.contains(1)).isTrue();
-			assertThat(values.contains(2)).isTrue();
+			assertThat(values).contains(1);
+			assertThat(values).contains(2);
 		}
 		finally {
 			Locale.setDefault(oldLocale);
@@ -132,15 +132,15 @@ class ConstantsTests {
 	void suffixAccess() {
 		Constants c = new Constants(A.class);
 
-		Set<?> names = c.getNamesForSuffix("_PROPERTY");
+		Set<String> names = c.getNamesForSuffix("_PROPERTY");
 		assertThat(names).hasSize(2);
-		assertThat(names.contains("NO_PROPERTY")).isTrue();
-		assertThat(names.contains("YES_PROPERTY")).isTrue();
+		assertThat(names).contains("NO_PROPERTY");
+		assertThat(names).contains("YES_PROPERTY");
 
-		Set<?> values = c.getValuesForSuffix("_PROPERTY");
+		Set<Object> values = c.getValuesForSuffix("_PROPERTY");
 		assertThat(values).hasSize(2);
-		assertThat(values.contains(3)).isTrue();
-		assertThat(values.contains(4)).isTrue();
+		assertThat(values).contains(3);
+		assertThat(values).contains(4);
 	}
 
 	@Test

spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java

@@ -71,8 +71,8 @@ class PropertySourceTests {
 		ps1.getSource();
 		List<PropertySource<?>> propertySources = new ArrayList<>();
 		assertThat(propertySources.add(ps1)).isTrue();
-		assertThat(propertySources.contains(ps1)).isTrue();
-		assertThat(propertySources.contains(PropertySource.named("ps1"))).isTrue();
+		assertThat(propertySources).contains(ps1);
+		assertThat(propertySources).contains(PropertySource.named("ps1"));
 
 		PropertySource<?> ps1replacement = new MapPropertySource("ps1", map2); // notice - different map
 		assertThat(propertySources.add(ps1replacement)).isTrue(); // true because linkedlist allows duplicates

spring-core/src/test/java/org/springframework/core/io/ResourceTests.java

@@ -172,7 +172,7 @@ class ResourceTests {
 		@Test
 		void hasDescription() {
 			Resource resource = new ByteArrayResource("testString".getBytes(), "my description");
-			assertThat(resource.getDescription().contains("my description")).isTrue();
+			assertThat(resource.getDescription()).contains("my description");
 		}
 	}
 
@@ -212,7 +212,7 @@ class ResourceTests {
 		void hasDescription() {
 			InputStream is = new ByteArrayInputStream("testString".getBytes());
 			Resource resource = new InputStreamResource(is, "my description");
-			assertThat(resource.getDescription().contains("my description")).isTrue();
+			assertThat(resource.getDescription()).contains("my description");
 		}
 	}
 

spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java

@@ -488,17 +488,17 @@ class ConcurrentReferenceHashMapTests {
 		this.map.put(3, "3");
 		Set<Map.Entry<Integer, String>> entrySet = this.map.entrySet();
 		Set<Map.Entry<Integer, String>> copy = new HashMap<>(this.map).entrySet();
-		copy.forEach(entry -> assertThat(entrySet.contains(entry)).isTrue());
+		copy.forEach(entry -> assertThat(entrySet).contains(entry));
 		this.map.put(1, "A");
 		this.map.put(2, "B");
 		this.map.put(3, "C");
-		copy.forEach(entry -> assertThat(entrySet.contains(entry)).isFalse());
+		copy.forEach(entry -> assertThat(entrySet).doesNotContain(entry));
 		this.map.put(1, "1");
 		this.map.put(2, "2");
 		this.map.put(3, "3");
-		copy.forEach(entry -> assertThat(entrySet.contains(entry)).isTrue());
+		copy.forEach(entry -> assertThat(entrySet).contains(entry));
 		entrySet.clear();
-		copy.forEach(entry -> assertThat(entrySet.contains(entry)).isFalse());
+		copy.forEach(entry -> assertThat(entrySet).doesNotContain(entry));
 	}
 
 	@Test

spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSourceTests.java

@@ -50,8 +50,8 @@ public class BeanPropertySqlParameterSourceTests {
 	@Test
 	public void successfulPropertyAccess() {
 		BeanPropertySqlParameterSource source = new BeanPropertySqlParameterSource(new TestBean("tb", 99));
-		assertThat(Arrays.asList(source.getReadablePropertyNames()).contains("name")).isTrue();
-		assertThat(Arrays.asList(source.getReadablePropertyNames()).contains("age")).isTrue();
+		assertThat(Arrays.asList(source.getReadablePropertyNames())).contains("name");
+		assertThat(Arrays.asList(source.getReadablePropertyNames())).contains("age");
 		assertThat(source.getValue("name")).isEqualTo("tb");
 		assertThat(source.getValue("age")).isEqualTo(99);
 		assertThat(source.getSqlType("name")).isEqualTo(Types.VARCHAR);

spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java

@@ -102,9 +102,9 @@ public class MessageBrokerConfigurationTests {
 		Set<MessageHandler> handlers = channel.getSubscribers();
 
 		assertThat(handlers).hasSize(3);
-		assertThat(handlers.contains(context.getBean(SimpAnnotationMethodMessageHandler.class))).isTrue();
-		assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue();
-		assertThat(handlers.contains(context.getBean(SimpleBrokerMessageHandler.class))).isTrue();
+		assertThat(handlers).contains(context.getBean(SimpAnnotationMethodMessageHandler.class));
+		assertThat(handlers).contains(context.getBean(UserDestinationMessageHandler.class));
+		assertThat(handlers).contains(context.getBean(SimpleBrokerMessageHandler.class));
 	}
 
 	@Test
@@ -115,9 +115,9 @@ public class MessageBrokerConfigurationTests {
 		Set<MessageHandler> handlers = channel.getSubscribers();
 
 		assertThat(handlers).hasSize(3);
-		assertThat(handlers.contains(context.getBean(SimpAnnotationMethodMessageHandler.class))).isTrue();
-		assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue();
-		assertThat(handlers.contains(context.getBean(StompBrokerRelayMessageHandler.class))).isTrue();
+		assertThat(handlers).contains(context.getBean(SimpAnnotationMethodMessageHandler.class));
+		assertThat(handlers).contains(context.getBean(UserDestinationMessageHandler.class));
+		assertThat(handlers).contains(context.getBean(StompBrokerRelayMessageHandler.class));
 	}
 
 	@Test
@@ -222,8 +222,8 @@ public class MessageBrokerConfigurationTests {
 		Set<MessageHandler> handlers = channel.getSubscribers();
 
 		assertThat(handlers).hasSize(2);
-		assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue();
-		assertThat(handlers.contains(context.getBean(SimpleBrokerMessageHandler.class))).isTrue();
+		assertThat(handlers).contains(context.getBean(UserDestinationMessageHandler.class));
+		assertThat(handlers).contains(context.getBean(SimpleBrokerMessageHandler.class));
 
 		assertThat(channel.getExecutor()).isNull();
 	}
@@ -236,8 +236,8 @@ public class MessageBrokerConfigurationTests {
 		Set<MessageHandler> handlers = channel.getSubscribers();
 
 		assertThat(handlers).hasSize(2);
-		assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue();
-		assertThat(handlers.contains(context.getBean(StompBrokerRelayMessageHandler.class))).isTrue();
+		assertThat(handlers).contains(context.getBean(UserDestinationMessageHandler.class));
+		assertThat(handlers).contains(context.getBean(StompBrokerRelayMessageHandler.class));
 	}
 
 	@Test
@@ -364,11 +364,11 @@ public class MessageBrokerConfigurationTests {
 
 		List<HandlerMethodArgumentResolver> customResolvers = handler.getCustomArgumentResolvers();
 		assertThat(customResolvers).hasSize(1);
-		assertThat(handler.getArgumentResolvers().contains(customResolvers.get(0))).isTrue();
+		assertThat(handler.getArgumentResolvers()).contains(customResolvers.get(0));
 
 		List<HandlerMethodReturnValueHandler> customHandlers = handler.getCustomReturnValueHandlers();
 		assertThat(customHandlers).hasSize(1);
-		assertThat(handler.getReturnValueHandlers().contains(customHandlers.get(0))).isTrue();
+		assertThat(handler.getReturnValueHandlers()).contains(customHandlers.get(0));
 	}
 
 	@Test

spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java

@@ -89,8 +89,8 @@ class MockMultipartHttpServletRequestTests {
 			fileNames.add(fileIter.next());
 		}
 		assertThat(fileNames).hasSize(2);
-		assertThat(fileNames.contains("file1")).isTrue();
-		assertThat(fileNames.contains("file2")).isTrue();
+		assertThat(fileNames).contains("file1");
+		assertThat(fileNames).contains("file2");
 		MultipartFile file1 = request.getFile("file1");
 		MultipartFile file2 = request.getFile("file2");
 		Map<String, MultipartFile> fileMap = request.getFileMap();

spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java

@@ -55,14 +55,14 @@ class MockServletContextTests {
 		void getResourcePaths() {
 			Set<String> paths = servletContext.getResourcePaths("/web");
 			assertThat(paths).isNotNull();
-			assertThat(paths.contains("/web/MockServletContextTests.class")).isTrue();
+			assertThat(paths).contains("/web/MockServletContextTests.class");
 		}
 
 		@Test
 		void getResourcePathsWithSubdirectories() {
 			Set<String> paths = servletContext.getResourcePaths("/");
 			assertThat(paths).isNotNull();
-			assertThat(paths.contains("/web/")).isTrue();
+			assertThat(paths).contains("/web/");
 		}
 
 		@Test

spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java

@@ -160,8 +160,8 @@ public class ServletContextSupportTests {
 			foundPaths.add(((ServletContextResource) resource).getPath());
 		}
 		assertThat(foundPaths).hasSize(2);
-		assertThat(foundPaths.contains("/WEB-INF/context1.xml")).isTrue();
-		assertThat(foundPaths.contains("/WEB-INF/context2.xml")).isTrue();
+		assertThat(foundPaths).contains("/WEB-INF/context1.xml");
+		assertThat(foundPaths).contains("/WEB-INF/context2.xml");
 	}
 
 	@Test
@@ -193,8 +193,8 @@ public class ServletContextSupportTests {
 			foundPaths.add(((ServletContextResource) resource).getPath());
 		}
 		assertThat(foundPaths).hasSize(2);
-		assertThat(foundPaths.contains("/WEB-INF/mydir1/context1.xml")).isTrue();
-		assertThat(foundPaths.contains("/WEB-INF/mydir2/context2.xml")).isTrue();
+		assertThat(foundPaths).contains("/WEB-INF/mydir1/context1.xml");
+		assertThat(foundPaths).contains("/WEB-INF/mydir2/context2.xml");
 	}
 
 	@Test
@@ -233,9 +233,9 @@ public class ServletContextSupportTests {
 			foundPaths.add(((ServletContextResource) resource).getPath());
 		}
 		assertThat(foundPaths).hasSize(3);
-		assertThat(foundPaths.contains("/WEB-INF/mydir1/context1.xml")).isTrue();
-		assertThat(foundPaths.contains("/WEB-INF/mydir2/context2.xml")).isTrue();
-		assertThat(foundPaths.contains("/WEB-INF/mydir2/mydir3/context3.xml")).isTrue();
+		assertThat(foundPaths).contains("/WEB-INF/mydir1/context1.xml");
+		assertThat(foundPaths).contains("/WEB-INF/mydir2/context2.xml");
+		assertThat(foundPaths).contains("/WEB-INF/mydir2/mydir3/context3.xml");
 	}
 
 	@Test
@@ -262,8 +262,8 @@ public class ServletContextSupportTests {
 			foundPaths.add(((ServletContextResource) resource).getPath());
 		}
 		assertThat(foundPaths).hasSize(2);
-		assertThat(foundPaths.contains("/WEB-INF/context1.xml")).isTrue();
-		assertThat(foundPaths.contains("/WEB-INF/context2.xml")).isTrue();
+		assertThat(foundPaths).contains("/WEB-INF/context1.xml");
+		assertThat(foundPaths).contains("/WEB-INF/context2.xml");
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java

@@ -160,7 +160,7 @@ class DefaultEntityResponseBuilderTests {
 		EntityResponse<String> result =
 				EntityResponse.fromObject("foo").cookie(cookie)
 						.build();
-		assertThat(result.cookies().get("name").contains(cookie)).isTrue();
+		assertThat(result.cookies().get("name")).contains(cookie);
 	}
 
 	@Test

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java

@@ -120,7 +120,7 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.setCustomArgumentResolvers(Collections.singletonList(argumentResolver));
 		this.resolver.afterPropertiesSet();
 
-		assertThat(this.resolver.getArgumentResolvers().getResolvers().contains(argumentResolver)).isTrue();
+		assertThat(this.resolver.getArgumentResolvers().getResolvers()).contains(argumentResolver);
 		assertMethodProcessorCount(DEFAULT_RESOLVER_COUNT + 1, DEFAULT_HANDLER_COUNT);
 	}
 
@@ -139,7 +139,7 @@ public class ExceptionHandlerExceptionResolverTests {
 		this.resolver.setCustomReturnValueHandlers(Collections.singletonList(handler));
 		this.resolver.afterPropertiesSet();
 
-		assertThat(this.resolver.getReturnValueHandlers().getHandlers().contains(handler)).isTrue();
+		assertThat(this.resolver.getReturnValueHandlers().getHandlers()).contains(handler);
 		assertMethodProcessorCount(DEFAULT_RESOLVER_COUNT, DEFAULT_HANDLER_COUNT + 1);
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java

@@ -154,7 +154,7 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.setCustomArgumentResolvers(Collections.singletonList(resolver));
 		this.handlerAdapter.afterPropertiesSet();
 
-		assertThat(this.handlerAdapter.getArgumentResolvers().contains(resolver)).isTrue();
+		assertThat(this.handlerAdapter.getArgumentResolvers()).contains(resolver);
 		assertMethodProcessorCount(RESOLVER_COUNT + 1, INIT_BINDER_RESOLVER_COUNT + 1, HANDLER_COUNT);
 	}
 
@@ -182,7 +182,7 @@ public class RequestMappingHandlerAdapterTests {
 		this.handlerAdapter.setCustomReturnValueHandlers(Collections.singletonList(handler));
 		this.handlerAdapter.afterPropertiesSet();
 
-		assertThat(this.handlerAdapter.getReturnValueHandlers().contains(handler)).isTrue();
+		assertThat(this.handlerAdapter.getReturnValueHandlers()).contains(handler);
 		assertMethodProcessorCount(RESOLVER_COUNT, INIT_BINDER_RESOLVER_COUNT, HANDLER_COUNT + 1);
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java

@@ -377,7 +377,7 @@ public class UrlTagTests extends AbstractTagTests {
 		String uri = tag.replaceUriTemplateParams("url/{name}", params, usedParams);
 		assertThat(uri).isEqualTo("url/value");
 		assertThat(usedParams).hasSize(1);
-		assertThat(usedParams.contains("name")).isTrue();
+		assertThat(usedParams).contains("name");
 	}
 
 	@Test
@@ -393,7 +393,7 @@ public class UrlTagTests extends AbstractTagTests {
 		String uri = tag.replaceUriTemplateParams("url/{n me}", params, usedParams);
 		assertThat(uri).isEqualTo("url/value");
 		assertThat(usedParams).hasSize(1);
-		assertThat(usedParams.contains("n me")).isTrue();
+		assertThat(usedParams).contains("n me");
 	}
 
 	@Test
@@ -411,7 +411,7 @@ public class UrlTagTests extends AbstractTagTests {
 
 		assertThat(uri).isEqualTo("url/v%20lue");
 		assertThat(usedParams).hasSize(1);
-		assertThat(usedParams.contains("name")).isTrue();
+		assertThat(usedParams).contains("name");
 	}
 
 	@Test  // SPR-11401
@@ -428,7 +428,7 @@ public class UrlTagTests extends AbstractTagTests {
 
 		assertThat(uri).isEqualTo("url/my%2FId");
 		assertThat(usedParams).hasSize(1);
-		assertThat(usedParams.contains("name")).isTrue();
+		assertThat(usedParams).contains("name");
 	}
 
 	@Test
@@ -444,7 +444,7 @@ public class UrlTagTests extends AbstractTagTests {
 		String uri = tag.replaceUriTemplateParams("url/{name}", params, usedParams);
 		assertThat(uri).isEqualTo("url/my/Id");
 		assertThat(usedParams).hasSize(1);
-		assertThat(usedParams.contains("name")).isTrue();
+		assertThat(usedParams).contains("name");
 	}
 
 	@Test

spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java

@@ -400,13 +400,13 @@ public class MessageBrokerBeanDefinitionParserTests {
 
 		List<HandlerMethodArgumentResolver> customResolvers = handler.getCustomArgumentResolvers();
 		assertThat(customResolvers).hasSize(2);
-		assertThat(handler.getArgumentResolvers().contains(customResolvers.get(0))).isTrue();
-		assertThat(handler.getArgumentResolvers().contains(customResolvers.get(1))).isTrue();
+		assertThat(handler.getArgumentResolvers()).contains(customResolvers.get(0));
+		assertThat(handler.getArgumentResolvers()).contains(customResolvers.get(1));
 
 		List<HandlerMethodReturnValueHandler> customHandlers = handler.getCustomReturnValueHandlers();
 		assertThat(customHandlers).hasSize(2);
-		assertThat(handler.getReturnValueHandlers().contains(customHandlers.get(0))).isTrue();
-		assertThat(handler.getReturnValueHandlers().contains(customHandlers.get(1))).isTrue();
+		assertThat(handler.getReturnValueHandlers()).contains(customHandlers.get(0));
+		assertThat(handler.getReturnValueHandlers()).contains(customHandlers.get(1));
 	}
 
 	@Test

spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java

@@ -109,7 +109,7 @@ class WebMvcStompWebSocketEndpointRegistrationTests {
 		SockJsHttpRequestHandler requestHandler = (SockJsHttpRequestHandler)mappings.entrySet().iterator().next().getKey();
 		assertThat(requestHandler.getSockJsService()).isNotNull();
 		DefaultSockJsService sockJsService = (DefaultSockJsService)requestHandler.getSockJsService();
-		assertThat(sockJsService.getAllowedOrigins().contains(origin)).isTrue();
+		assertThat(sockJsService.getAllowedOrigins()).contains(origin);
 		assertThat(sockJsService.shouldSuppressCors()).isFalse();
 
 		registration =
@@ -120,7 +120,7 @@ class WebMvcStompWebSocketEndpointRegistrationTests {
 		requestHandler = (SockJsHttpRequestHandler)mappings.entrySet().iterator().next().getKey();
 		assertThat(requestHandler.getSockJsService()).isNotNull();
 		sockJsService = (DefaultSockJsService)requestHandler.getSockJsService();
-		assertThat(sockJsService.getAllowedOrigins().contains(origin)).isTrue();
+		assertThat(sockJsService.getAllowedOrigins()).contains(origin);
 		assertThat(sockJsService.shouldSuppressCors()).isFalse();
 	}
 
@@ -137,7 +137,7 @@ class WebMvcStompWebSocketEndpointRegistrationTests {
 		SockJsHttpRequestHandler requestHandler = (SockJsHttpRequestHandler)mappings.entrySet().iterator().next().getKey();
 		assertThat(requestHandler.getSockJsService()).isNotNull();
 		DefaultSockJsService sockJsService = (DefaultSockJsService)requestHandler.getSockJsService();
-		assertThat(sockJsService.getAllowedOriginPatterns().contains(origin)).isTrue();
+		assertThat(sockJsService.getAllowedOriginPatterns()).contains(origin);
 
 		registration =
 				new WebMvcStompWebSocketEndpointRegistration(new String[] {"/foo"}, this.handler, this.scheduler);
@@ -147,7 +147,7 @@ class WebMvcStompWebSocketEndpointRegistrationTests {
 		requestHandler = (SockJsHttpRequestHandler)mappings.entrySet().iterator().next().getKey();
 		assertThat(requestHandler.getSockJsService()).isNotNull();
 		sockJsService = (DefaultSockJsService)requestHandler.getSockJsService();
-		assertThat(sockJsService.getAllowedOriginPatterns().contains(origin)).isTrue();
+		assertThat(sockJsService.getAllowedOriginPatterns()).contains(origin);
 	}
 
 	@Test  // SPR-12283
@@ -273,7 +273,7 @@ class WebMvcStompWebSocketEndpointRegistrationTests {
 		assertThat(sockJsService.getHandshakeInterceptors()).hasSize(2);
 		assertThat(sockJsService.getHandshakeInterceptors()).element(0).isEqualTo(interceptor);
 		assertThat(sockJsService.getHandshakeInterceptors().get(1).getClass()).isEqualTo(OriginHandshakeInterceptor.class);
-		assertThat(sockJsService.getAllowedOrigins().contains(origin)).isTrue();
+		assertThat(sockJsService.getAllowedOrigins()).contains(origin);
 	}
 
 }

spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java

@@ -155,7 +155,7 @@ public class WebSocketHandlerRegistrationTests {
 		assertThat(mapping.webSocketHandler).isEqualTo(handler);
 		assertThat(mapping.path).isEqualTo("/foo/**");
 		assertThat(mapping.sockJsService).isNotNull();
-		assertThat(mapping.sockJsService.getAllowedOrigins().contains("https://mydomain1.example")).isTrue();
+		assertThat(mapping.sockJsService.getAllowedOrigins()).contains("https://mydomain1.example");
 		List<HandshakeInterceptor> interceptors = mapping.sockJsService.getHandshakeInterceptors();
 		assertThat(interceptors).element(0).isEqualTo(interceptor);