Merge branch '7.0.x'

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

@@ -368,12 +368,12 @@ class BridgeMethodResolverTests {
 	}
 
 	@Test  // SPR-16103
-	void testClassHierarchy() throws Exception {
+	void classHierarchy() throws Exception {
 		doTestHierarchyResolution(FooClass.class);
 	}
 
 	@Test  // SPR-16103
-	void testInterfaceHierarchy() throws Exception {
+	void interfaceHierarchy() throws Exception {
 		doTestHierarchyResolution(FooInterface.class);
 	}
 

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

@@ -85,7 +85,7 @@ class GenericTypeResolverTests {
 	}
 
 	@Test
-	void testResolveType() {
+	void resolveTypeWithMap() {
 		Method intMessageMethod = method(MyTypeWithMethods.class, "readIntegerInputMessage", MyInterfaceType.class);
 		MethodParameter intMessageMethodParam = new MethodParameter(intMessageMethod, 0);
 		assertThat(resolveType(intMessageMethodParam.getGenericParameterType(), new HashMap<>())).isEqualTo(MyInterfaceType.class);
@@ -108,7 +108,7 @@ class GenericTypeResolverTests {
 	}
 
 	@Test
-	void testGetTypeVariableMap() {
+	void getTypeVariableMapBehavior() {
 		Map<TypeVariable, Type> map;
 
 		map = getTypeVariableMap(MySimpleInterfaceType.class);

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

@@ -96,7 +96,7 @@ class MethodParameterTests {
 	}
 
 	@Test
-	void testHashCode() throws NoSuchMethodException {
+	void hashCodeBehavior() throws NoSuchMethodException {
 		assertThat(stringParameter.hashCode()).isEqualTo(stringParameter.hashCode());
 		assertThat(longParameter.hashCode()).isEqualTo(longParameter.hashCode());
 		assertThat(intReturnType.hashCode()).isEqualTo(intReturnType.hashCode());
@@ -109,7 +109,7 @@ class MethodParameterTests {
 
 	@Test
 	@SuppressWarnings("deprecation")
-	void testFactoryMethods() {
+	void factoryMethods() {
 		assertThat(MethodParameter.forMethodOrConstructor(method, 0)).isEqualTo(stringParameter);
 		assertThat(MethodParameter.forMethodOrConstructor(method, 1)).isEqualTo(longParameter);
 

spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java

@@ -78,7 +78,7 @@ class SynthesizingMethodParameterTests {
 	}
 
 	@Test
-	void testHashCode() throws NoSuchMethodException {
+	void hashCodeBehavior() throws NoSuchMethodException {
 		assertThat(stringParameter.hashCode()).isEqualTo(stringParameter.hashCode());
 		assertThat(longParameter.hashCode()).isEqualTo(longParameter.hashCode());
 		assertThat(intReturnType.hashCode()).isEqualTo(intReturnType.hashCode());

spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java

@@ -80,7 +80,7 @@ class StringDecoderTests extends AbstractDecoderTests<StringDecoder> {
 	}
 
 	@Test // gh-30299
-	public void decodeAndCancelWithPendingChunks() {
+	void decodeAndCancelWithPendingChunks() {
 		Flux<DataBuffer> input = toDataBuffers("abc", 1, UTF_8).concatWith(Flux.never());
 		Flux<String> result = this.decoder.decode(input, TYPE, null, null);
 

spring-core/src/test/java/org/springframework/core/io/buffer/JettyDataBufferTests.java

@@ -58,7 +58,7 @@ public class JettyDataBufferTests {
 	}
 
 	@AfterEach
-	public void tearDown() throws Exception {
+	void tearDown() throws Exception {
 		this.byteBufferPool.clear();
 	}
 }

spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java

@@ -189,7 +189,7 @@ public abstract class AbstractMethodMetadataTests {
 	}
 
 	@Test // gh-24375
-	public void metadataLoadsForNestedAnnotations() {
+	void metadataLoadsForNestedAnnotations() {
 		AnnotationMetadata annotationMetadata = get(AnnotatedComponent.class);
 		assertThat(annotationMetadata.getAnnotationTypes()).containsExactly(EnclosingAnnotation.class.getName());
 	}

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

@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 class CompositeSetTests {
 
 	@Test
-	void testEquals() {
+	void equals() {
 		Set<String> first = Set.of("foo", "bar");
 		Set<String> second = Set.of("baz", "qux");
 		CompositeSet<String> composite = new CompositeSet<>(first, second);

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

@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 class FilteredSetTests {
 
 	@Test
-	void testEquals() {
+	void equals() {
 		Set<String> set = Set.of("foo", "bar", "baz");
 		FilteredSet<String> filtered = new FilteredSet<>(set, s -> !s.equals("bar"));
 

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

@@ -176,7 +176,7 @@ class MimeTypeTests {
 	}
 
 	@Test
-	void testToString() {
+	void toStringOutput() {
 		MimeType mimeType = new MimeType("text", "plain");
 		String result = mimeType.toString();
 		assertThat(result).as("Invalid toString() returned").isEqualTo("text/plain");

spring-core/src/testFixtures/java/org/springframework/core/testfixture/io/buffer/AbstractDataBufferAllocatingTests.java

@@ -177,7 +177,7 @@ public abstract class AbstractDataBufferAllocatingTests {
 	public @interface ParameterizedDataBufferAllocatingTest {
 	}
 
-	public static Stream<Arguments> dataBufferFactories() {
+	static Stream<Arguments> dataBufferFactories() {
 		return Stream.of(
 			// Netty 4
 			argumentSet("NettyDataBufferFactory - UnpooledByteBufAllocator - preferDirect = true",