From 8baeca5a259354abc2ae0ca45c46dc75d9ec5e28 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@broadcom.com>
Date: Mon, 2 Feb 2026 15:00:24 -0600
Subject: [PATCH] Simplifies ProxyingHandlerMethodArgumentResolverUnitTests

- clarifies controller method names
- groups test methods by what they are doing

See #3301
---
 ...andlerMethodArgumentResolverUnitTests.java | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java
index c2d429621..c145b63e0 100755
--- a/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java
+++ b/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java
@@ -55,31 +55,31 @@ class ProxyingHandlerMethodArgumentResolverUnitTests {
 	@Test // DATACMNS-776
 	void supportsAnnotatedInterfaceFromSpringNamespace() {
 
-		var parameter = getParameter("with", AnnotatedInterface.class);
+		var parameter = getParameter("withSpringAnnotatedInterface");
 
 		assertThat(resolver.supportsParameter(parameter)).isTrue();
 	}
 
-	@Test // GH-3301
-	void supportsAnnotatedInterfaceFromUserPackage() {
+	@Test // DATACMNS-776
+	void doesNotSupportUnannotatedInterfaceFromSpringNamespace() {
 
-		var parameter = getParameter("with", ProjectedPayloadMarkedSampleInterface.class);
+		var parameter = getParameter("withSpringUnannotatedInterface");
 
-		assertThat(resolver.supportsParameter(parameter)).isTrue();
+		assertThat(resolver.supportsParameter(parameter)).isFalse();
 	}
 
 	@Test // GH-3301
-	void doesNotSupportUnannotatedInterfaceFromUserPackage() {
+	void supportsAnnotatedInterfaceFromUserPackage() {
 
-		var parameter = getParameter("with", SampleInterface.class);
+		var parameter = getParameter("withUserAnnotatedInterface");
 
-		assertThat(resolver.supportsParameter(parameter)).isFalse();
+		assertThat(resolver.supportsParameter(parameter)).isTrue();
 	}
 
-	@Test // DATACMNS-776
-	void doesNotSupportUnannotatedInterfaceFromSpringNamespace() {
+	@Test // GH-3301
+	void doesNotSupportUnannotatedInterfaceFromUserPackage() {
 
-		var parameter = getParameter("with", UnannotatedInterface.class);
+		var parameter = getParameter("withUserUnannotatedInterface");
 
 		assertThat(resolver.supportsParameter(parameter)).isFalse();
 	}
@@ -133,7 +133,7 @@ class ProxyingHandlerMethodArgumentResolverUnitTests {
 	}
 
 	@ParameterizedTest // GH-3300
-	@ValueSource(strings = { "withModelAttribute", "withUnannotatedInterface" })
+	@ValueSource(strings = { "withModelAttribute", "withUserUnannotatedInterface" })
 	@SuppressWarnings("unchecked")
 	void deprecationLoggerOnlyLogsOncePerParameter(String methodName) {
 
@@ -152,7 +152,7 @@ class ProxyingHandlerMethodArgumentResolverUnitTests {
 	}
 
 	@ParameterizedTest // GH-3300
-	@ValueSource(strings = { "withProjectedPayload", "withAnnotatedInterface" })
+	@ValueSource(strings = { "withProjectedPayload", "withSpringAnnotatedInterface", "withUserAnnotatedInterface" })
 	void shouldNotLogDeprecationForValidUsage(String methodName) {
 
 		var parameter = getParameter(methodName);
@@ -192,17 +192,13 @@ class ProxyingHandlerMethodArgumentResolverUnitTests {
 
 	interface Controller {
 
-		void with(AnnotatedInterface param);
-
-		void withAnnotatedInterface(@ModelAttribute AnnotatedInterface param);
-
-		void with(UnannotatedInterface param);
+		void withSpringAnnotatedInterface(AnnotatedInterface param);
 
-		void with(SampleInterface param);
+		void withSpringUnannotatedInterface(UnannotatedInterface param);
 
-		void with(ProjectedPayloadMarkedSampleInterface param);
+		void withUserAnnotatedInterface(ProjectedPayloadMarkedSampleInterface param);
 
-		void withUnannotatedInterface(SampleInterface param);
+		void withUserUnannotatedInterface(SampleInterface param);
 
 		void with(List<Object> param);