Use AssertJ's isEmpty() instead of hasSize(0)

Achieved via global search-and-replace.

Author: sbrannen

spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -16,14 +16,93 @@
 
 package org.springframework.aop.support;
 
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.testfixture.beans.TestBean;
+import org.springframework.core.testfixture.io.SerializationTestUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
+ * @author Rod Johnson
+ * @author Dmitriy Kopylenko
+ * @author Chris Beams
  * @author Dmitriy Kopylenko
  */
-public class JdkRegexpMethodPointcutTests extends AbstractRegexpMethodPointcutTests {
+class JdkRegexpMethodPointcutTests {
+
+	private AbstractRegexpMethodPointcut rpc = new JdkRegexpMethodPointcut();
+
+
+	@Test
+	void noPatternSupplied() throws Exception {
+		noPatternSuppliedTests(rpc);
+	}
+
+	@Test
+	void serializationWithNoPatternSupplied() throws Exception {
+		rpc = SerializationTestUtils.serializeAndDeserialize(rpc);
+		noPatternSuppliedTests(rpc);
+	}
+
+	private void noPatternSuppliedTests(AbstractRegexpMethodPointcut rpc) throws Exception {
+		assertThat(rpc.matches(Object.class.getMethod("hashCode"), String.class)).isFalse();
+		assertThat(rpc.matches(Object.class.getMethod("wait"), Object.class)).isFalse();
+		assertThat(rpc.getPatterns()).isEmpty();
+	}
+
+	@Test
+	void exactMatch() throws Exception {
+		rpc.setPattern("java.lang.Object.hashCode");
+		exactMatchTests(rpc);
+		rpc = SerializationTestUtils.serializeAndDeserialize(rpc);
+		exactMatchTests(rpc);
+	}
+
+	private void exactMatchTests(AbstractRegexpMethodPointcut rpc) throws Exception {
+		// assumes rpc.setPattern("java.lang.Object.hashCode");
+		assertThat(rpc.matches(Object.class.getMethod("hashCode"), String.class)).isTrue();
+		assertThat(rpc.matches(Object.class.getMethod("hashCode"), Object.class)).isTrue();
+		assertThat(rpc.matches(Object.class.getMethod("wait"), Object.class)).isFalse();
+	}
+
+	@Test
+	void specificMatch() throws Exception {
+		rpc.setPattern("java.lang.String.hashCode");
+		assertThat(rpc.matches(Object.class.getMethod("hashCode"), String.class)).isTrue();
+		assertThat(rpc.matches(Object.class.getMethod("hashCode"), Object.class)).isFalse();
+	}
+
+	@Test
+	void wildcard() throws Exception {
+		rpc.setPattern(".*Object.hashCode");
+		assertThat(rpc.matches(Object.class.getMethod("hashCode"), Object.class)).isTrue();
+		assertThat(rpc.matches(Object.class.getMethod("wait"), Object.class)).isFalse();
+	}
+
+	@Test
+	void wildcardForOneClass() throws Exception {
+		rpc.setPattern("java.lang.Object.*");
+		assertThat(rpc.matches(Object.class.getMethod("hashCode"), String.class)).isTrue();
+		assertThat(rpc.matches(Object.class.getMethod("wait"), String.class)).isTrue();
+	}
+
+	@Test
+	void matchesObjectClass() throws Exception {
+		rpc.setPattern("java.lang.Object.*");
+		assertThat(rpc.matches(Exception.class.getMethod("hashCode"), IOException.class)).isTrue();
+		// Doesn't match a method from Throwable
+		assertThat(rpc.matches(Exception.class.getMethod("getMessage"), Exception.class)).isFalse();
+	}
 
-	@Override
-	protected AbstractRegexpMethodPointcut getRegexpMethodPointcut() {
-		return new JdkRegexpMethodPointcut();
+	@Test
+	void withExclusion() throws Exception {
+		this.rpc.setPattern(".*get.*");
+		this.rpc.setExcludedPattern(".*Age.*");
+		assertThat(this.rpc.matches(TestBean.class.getMethod("getName"), TestBean.class)).isTrue();
+		assertThat(this.rpc.matches(TestBean.class.getMethod("getAge"), TestBean.class)).isFalse();
 	}
 
 }

spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java

@@ -144,7 +144,7 @@ public void testStandardEnumSetWithAutoGrowing() {
 		bw.setAutoGrowNestedPaths(true);
 		assertThat(gb.getStandardEnumSet()).isNull();
 		bw.getPropertyValue("standardEnumSet.class");
-		assertThat(gb.getStandardEnumSet()).hasSize(0);
+		assertThat(gb.getStandardEnumSet()).isEmpty();
 	}
 
 	@Test

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

@@ -103,7 +103,7 @@ public void testHierarchicalCountBeansWithOverride() {
 	public void testHierarchicalNamesWithNoMatch() {
 		List<String> names = Arrays.asList(
 				BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, NoOp.class));
-		assertThat(names).hasSize(0);
+		assertThat(names).isEmpty();
 	}
 
 	@Test
@@ -278,7 +278,7 @@ public void testHierarchicalResolutionWithOverride() {
 	public void testHierarchicalNamesForAnnotationWithNoMatch() {
 		List<String> names = Arrays.asList(
 				BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, Override.class));
-		assertThat(names).hasSize(0);
+		assertThat(names).isEmpty();
 	}
 
 	@Test

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

@@ -577,7 +577,7 @@ public void testPropertyPlaceholderConfigurerWithSelfReferencingPlaceholderInAli
 
 		TestBean tb = (TestBean) factory.getBean("tb");
 		assertThat(tb).isNotNull();
-		assertThat(factory.getAliases("tb")).hasSize(0);
+		assertThat(factory.getAliases("tb")).isEmpty();
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java

@@ -47,7 +47,7 @@ public class YamlMapFactoryBeanTests {
 	public void testSetIgnoreResourceNotFound() {
 		this.factory.setResolutionMethod(YamlMapFactoryBean.ResolutionMethod.OVERRIDE_AND_IGNORE);
 		this.factory.setResources(new FileSystemResource("non-exsitent-file.yml"));
-		assertThat(this.factory.getObject()).hasSize(0);
+		assertThat(this.factory.getObject()).isEmpty();
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java

@@ -762,7 +762,7 @@ void parameterizedInstanceFactoryMethodWithInvalidClassName() {
 		assertThat(bf.getType("mock")).isNull();
 		assertThat(bf.getType("mock")).isNull();
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans).hasSize(0);
+		assertThat(beans).isEmpty();
 	}
 
 	@Test
@@ -828,8 +828,8 @@ void testGenericMatchingWithBeanNameDifferentiation() {
 		assertThat(numberStoreNames).hasSize(2);
 		assertThat(numberStoreNames[0]).isEqualTo("doubleStore");
 		assertThat(numberStoreNames[1]).isEqualTo("floatStore");
-		assertThat(doubleStoreNames).hasSize(0);
-		assertThat(floatStoreNames).hasSize(0);
+		assertThat(doubleStoreNames).isEmpty();
+		assertThat(floatStoreNames).isEmpty();
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java

@@ -51,7 +51,7 @@ public void testSingletons() {
 
 		beanRegistry.destroySingletons();
 		assertThat(beanRegistry.getSingletonCount()).isEqualTo(0);
-		assertThat(beanRegistry.getSingletonNames()).hasSize(0);
+		assertThat(beanRegistry.getSingletonNames()).isEmpty();
 	}
 
 	@Test
@@ -72,7 +72,7 @@ public void testDisposableBean() {
 
 		beanRegistry.destroySingletons();
 		assertThat(beanRegistry.getSingletonCount()).isEqualTo(0);
-		assertThat(beanRegistry.getSingletonNames()).hasSize(0);
+		assertThat(beanRegistry.getSingletonNames()).isEmpty();
 		assertThat(tb.wasDestroyed()).isTrue();
 	}
 

spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java

@@ -90,7 +90,7 @@ void beanEventReceived() throws Exception {
 		assertThat(componentDefinition1.getBeanDefinitions()).hasSize(1);
 		BeanDefinition beanDefinition2 = componentDefinition2.getBeanDefinitions()[0];
 		assertThat(beanDefinition2.getPropertyValues().getPropertyValue("name").getValue()).isEqualTo(new TypedStringValue("Juergen Hoeller"));
-		assertThat(componentDefinition2.getBeanReferences()).hasSize(0);
+		assertThat(componentDefinition2.getBeanReferences()).isEmpty();
 		assertThat(componentDefinition2.getInnerBeanDefinitions()).hasSize(1);
 		BeanDefinition innerBd2 = componentDefinition2.getInnerBeanDefinitions()[0];
 		assertThat(innerBd2.getPropertyValues().getPropertyValue("name").getValue()).isEqualTo(new TypedStringValue("Eva Schallmeiner"));

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

@@ -139,7 +139,7 @@ public void nullValue() {
 		PropertiesEditor pe= new PropertiesEditor();
 		pe.setAsText(null);
 		Properties p = (Properties) pe.getValue();
-		assertThat(p).hasSize(0);
+		assertThat(p).isEmpty();
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java

@@ -82,13 +82,13 @@ void createCompiler(@TempDir Path tempDir) throws IOException {
 	@Test
 	void noCandidate() {
 		CandidateComponentsMetadata metadata = compile(SampleNone.class);
-		assertThat(metadata.getItems()).hasSize(0);
+		assertThat(metadata.getItems()).isEmpty();
 	}
 
 	@Test
 	void noAnnotation() {
 		CandidateComponentsMetadata metadata = compile(CandidateComponentsIndexerTests.class);
-		assertThat(metadata.getItems()).hasSize(0);
+		assertThat(metadata.getItems()).isEmpty();
 	}
 
 	@Test
@@ -214,7 +214,7 @@ void embeddedCandidatesAreDetected()
 	@Test
 	void embeddedNonStaticCandidateAreIgnored() {
 		CandidateComponentsMetadata metadata = compile(SampleNonStaticEmbedded.class);
-		assertThat(metadata.getItems()).hasSize(0);
+		assertThat(metadata.getItems()).isEmpty();
 	}
 
 	private void testComponent(Class<?>... classes) {

spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java

@@ -42,7 +42,7 @@ public void simpleRemoveAll() {
 		CacheRemoveAllOperation operation = createSimpleOperation();
 
 		CacheInvocationParameter[] allParameters = operation.getAllParameters();
-		assertThat(allParameters).hasSize(0);
+		assertThat(allParameters).isEmpty();
 	}
 
 }

spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheRemoveAllOperationTests.java

@@ -796,7 +796,7 @@ public void testCannotRemoveAdvisorWhenFrozen() throws Throwable {
 		advised.removeAdvisor(0);
 		// Check it still works: proxy factory state shouldn't have been corrupted
 		assertThat(proxied.getAge()).isEqualTo(target.getAge());
-		assertThat(advised.getAdvisors()).hasSize(0);
+		assertThat(advised.getAdvisors()).isEmpty();
 	}
 
 	@Test

spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java

@@ -1530,7 +1530,7 @@ void stringConstructorArrayNoType() {
 		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType");
 		assertThat(bean.array instanceof String[]).isTrue();
-		assertThat(((String[]) bean.array)).hasSize(0);
+		assertThat(((String[]) bean.array)).isEmpty();
 	}
 
 	@Test
@@ -1541,7 +1541,7 @@ void stringConstructorArrayNoTypeNonLenient() {
 		bd.setLenientConstructorResolution(false);
 		ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType");
 		assertThat(bean.array instanceof String[]).isTrue();
-		assertThat(((String[]) bean.array)).hasSize(0);
+		assertThat(((String[]) bean.array)).isEmpty();
 	}
 
 	@Test