Polishing in RestTestClient tests

rstoyanchev · rstoyanchev · commit f57828708a55 · 2025-07-30T07:13:48.000+01:00
See gh-34428
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/RestTestClientTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/RestTestClientTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.servlet.client.samples;
+package org.springframework.test.web.servlet.client;
 
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
@@ -36,7 +36,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -51,11 +50,13 @@ class RestTestClientTests {
 
 	private RestTestClient client;
 
+
 	@BeforeEach
 	void setUp() {
 		this.client = RestTestClient.bindToController(new TestController()).build();
 	}
 
+
 	@Nested
 	class HttpMethods {
 
@@ -127,6 +128,7 @@ void testOptions() {
 
 	}
 
+
 	@Nested
 	class Mutation {
 
@@ -149,6 +151,7 @@ void test() {
 		}
 	}
 
+
 	@Nested
 	class Uris {
 
@@ -193,6 +196,7 @@ void testURI() {
 		}
 	}
 
+
 	@Nested
 	class Cookies {
 		@Test
@@ -214,6 +218,7 @@ void testCookies() {
 		}
 	}
 
+
 	@Nested
 	class Headers {
 		@Test
@@ -271,6 +276,7 @@ void testIfNoneMatch() {
 		}
 	}
 
+
 	@Nested
 	class Expectations {
 		@Test
@@ -281,6 +287,7 @@ void testExpectCookie() {
 		}
 	}
 
+
 	@Nested
 	class ReturnResults {
 		@Test
@@ -312,6 +319,7 @@ void testReturnResultParameterizedTypeReference() {
 		}
 	}
 
+
 	@RestController
 	static class TestController {
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ApiVersionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ApiVersionTests.java
@@ -94,7 +94,7 @@ private Map<String, String> performRequest(
 
 
 	@RestController
-	static class TestController {
+	private static class TestController {
 
 		private static final String HEADER = "X-API-Version";
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ErrorTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ErrorTests.java
@@ -47,8 +47,9 @@ void serverException() {
 				.expectStatus().isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
 	}
 
+
 	@RestController
-	static class TestController {
+	private static class TestController {
 
 		@GetMapping("/server-error")
 		void handleAndThrowException() {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/HeaderAndCookieTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/HeaderAndCookieTests.java
@@ -36,6 +36,7 @@ class HeaderAndCookieTests {
 
 	private final RestTestClient client = RestTestClient.bindToController(new TestController()).build();
 
+
 	@Test
 	void requestResponseHeaderPair() {
 		this.client.get().uri("/header-echo")
@@ -61,8 +62,9 @@ void setCookies() {
 				.expectHeader().valueMatches("Set-Cookie", "k1=v1");
 	}
 
+
 	@RestController
-	static class TestController {
+	private static class TestController {
 
 		@GetMapping("header-echo")
 		ResponseEntity<Void> handleHeader(@RequestHeader("h1") String myHeader) {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/JsonContentTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/JsonContentTests.java
@@ -129,7 +129,7 @@ void postJsonContent() {
 
 	@RestController
 	@RequestMapping("/persons")
-	static class PersonController {
+	private static class PersonController {
 
 		@GetMapping
 		List<Person> getPersons() {
@@ -143,11 +143,13 @@ Person getPerson(@PathVariable String firstName, @PathVariable String lastName)
 
 		@PostMapping
 		ResponseEntity<String> savePerson(@RequestBody Person person) {
-			return ResponseEntity.created(URI.create(String.format("/persons/%s/%s", person.getFirstName(), person.getLastName()))).build();
+			URI location = URI.create(String.format("/persons/%s/%s", person.getFirstName(), person.getLastName()));
+			return ResponseEntity.created(location).build();
 		}
 	}
 
-	static class Person {
+
+	private static class Person {
 		private String firstName;
 		private String lastName;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ResponseEntityTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ResponseEntityTests.java
@@ -43,10 +43,12 @@
  * @author Rob Worsnop
  */
 class ResponseEntityTests {
+
 	private final RestTestClient client = RestTestClient.bindToController(new PersonController())
 			.baseUrl("/persons")
 			.build();
 
+
 	@Test
 	void entity() {
 		this.client.get().uri("/John")
@@ -126,7 +128,7 @@ void postEntity() {
 
 	@RestController
 	@RequestMapping("/persons")
-	static class PersonController {
+	private static class PersonController {
 
 		@GetMapping(path = "/{name}", produces = MediaType.APPLICATION_JSON_VALUE)
 		Person getPerson(@PathVariable String name) {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/SoftAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/SoftAssertionTests.java
@@ -61,7 +61,7 @@ Multiple Exceptions (2):
 
 
 	@RestController
-	static class TestController {
+	private static class TestController {
 
 		@GetMapping("/test")
 		String handle() {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/XmlContentTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/XmlContentTests.java
@@ -172,9 +172,10 @@ public List<Person> getpersons() {
 		}
 	}
 
+
 	@RestController
 	@RequestMapping("/persons")
-	static class PersonController {
+	private static class PersonController {
 
 		@GetMapping(produces = MediaType.APPLICATION_XML_VALUE)
 		PersonsWrapper getPersons() {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/ApplicationContextTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/ApplicationContextTests.java
@@ -37,17 +37,21 @@
 class ApplicationContextTests {
 
 	private RestTestClient client;
+
 	private final WebApplicationContext context;
 
+
 	public ApplicationContextTests(WebApplicationContext context) {
 		this.context = context;
 	}
 
+
 	@BeforeEach
 	void setUp() {
 		this.client = RestTestClient.bindToApplicationContext(context).build();
 	}
 
+
 	@Test
 	void test() {
 		this.client.get().uri("/test")
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java
@@ -21,7 +21,6 @@
 
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpFilter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -44,7 +43,7 @@ void filter() {
 
 		Filter filter = new HttpFilter() {
 			@Override
-			protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain) throws IOException, ServletException {
+			protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain) throws IOException {
 				res.getWriter().write("It works!");
 			}
 		};
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/HttpServerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/HttpServerTests.java
@@ -43,6 +43,7 @@ class HttpServerTests {
 
 	@BeforeEach
 	void start() throws Exception {
+
 		HttpHandler httpHandler = RouterFunctions.toHttpHandler(
 				route(GET("/test"), request -> ServerResponse.ok().bodyValue("It works!")));
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/RouterFunctionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/RouterFunctionTests.java
@@ -37,16 +37,13 @@ class RouterFunctionTests {
 
 
 	@BeforeEach
-	void setUp() throws Exception {
-
-		RouterFunction<?> route = route(GET("/test"), request ->
-				ServerResponse.ok().body("It works!"));
-
+	void setUp() {
+		RouterFunction<?> route = route(GET("/test"), request -> ServerResponse.ok().body("It works!"));
 		this.testClient = RestTestClient.bindToRouterFunction(route).build();
 	}
 
 	@Test
-	void test() throws Exception {
+	void test() {
 		this.testClient.get().uri("/test")
 				.exchange()
 				.expectStatus().isOk()

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
`17`		`-package org.springframework.test.web.servlet.client.samples;`
	`17`	`+package org.springframework.test.web.servlet.client;`
`18`	`18`
`19`	`19`	`import java.net.URI;`
`20`	`20`	`import java.nio.charset.StandardCharsets;`
`@@ -36,7 +36,6 @@`
`36`	`36`	`import org.springframework.http.HttpHeaders;`
`37`	`37`	`import org.springframework.http.HttpMethod;`
`38`	`38`	`import org.springframework.http.MediaType;`
`39`		`-import org.springframework.test.web.servlet.client.RestTestClient;`
`40`	`39`	`import org.springframework.web.bind.annotation.RequestHeader;`
`41`	`40`	`import org.springframework.web.bind.annotation.RequestMapping;`
`42`	`41`	`import org.springframework.web.bind.annotation.RestController;`
`@@ -51,11 +50,13 @@ class RestTestClientTests {`
`51`	`50`
`52`	`51`	`private RestTestClient client;`
`53`	`52`
	`53`	`+`
`54`	`54`	`@BeforeEach`
`55`	`55`	`void setUp() {`
`56`	`56`	`this.client = RestTestClient.bindToController(new TestController()).build();`
`57`	`57`	`}`
`58`	`58`
	`59`	`+`
`59`	`60`	`@Nested`
`60`	`61`	`class HttpMethods {`
`61`	`62`
`@@ -127,6 +128,7 @@ void testOptions() {`
`127`	`128`
`128`	`129`	`}`
`129`	`130`
	`131`	`+`
`130`	`132`	`@Nested`
`131`	`133`	`class Mutation {`
`132`	`134`
`@@ -149,6 +151,7 @@ void test() {`
`149`	`151`	`}`
`150`	`152`	`}`
`151`	`153`
	`154`	`+`
`152`	`155`	`@Nested`
`153`	`156`	`class Uris {`
`154`	`157`
`@@ -193,6 +196,7 @@ void testURI() {`
`193`	`196`	`}`
`194`	`197`	`}`
`195`	`198`
	`199`	`+`
`196`	`200`	`@Nested`
`197`	`201`	`class Cookies {`
`198`	`202`	`@Test`
`@@ -214,6 +218,7 @@ void testCookies() {`
`214`	`218`	`}`
`215`	`219`	`}`
`216`	`220`
	`221`	`+`
`217`	`222`	`@Nested`
`218`	`223`	`class Headers {`
`219`	`224`	`@Test`
`@@ -271,6 +276,7 @@ void testIfNoneMatch() {`
`271`	`276`	`}`
`272`	`277`	`}`
`273`	`278`
	`279`	`+`
`274`	`280`	`@Nested`
`275`	`281`	`class Expectations {`
`276`	`282`	`@Test`
`@@ -281,6 +287,7 @@ void testExpectCookie() {`
`281`	`287`	`}`
`282`	`288`	`}`
`283`	`289`
	`290`	`+`
`284`	`291`	`@Nested`
`285`	`292`	`class ReturnResults {`
`286`	`293`	`@Test`
`@@ -312,6 +319,7 @@ void testReturnResultParameterizedTypeReference() {`
`312`	`319`	`}`
`313`	`320`	`}`
`314`	`321`
	`322`	`+`
`315`	`323`	`@RestController`
`316`	`324`	`static class TestController {`
`317`	`325`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,9 @@ void serverException() {`
`47`	`47`	`.expectStatus().isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);`
`48`	`48`	`}`
`49`	`49`
	`50`	`+`
`50`	`51`	`@RestController`
`51`		`- static class TestController {`
	`52`	`+ private static class TestController {`
`52`	`53`
`53`	`54`	`@GetMapping("/server-error")`
`54`	`55`	`void handleAndThrowException() {`
Original file line number	Diff line number	Diff line change
`@@ -172,9 +172,10 @@ public List<Person> getpersons() {`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
	`175`	`+`
`175`	`176`	`@RestController`
`176`	`177`	`@RequestMapping("/persons")`
`177`		`- static class PersonController {`
	`178`	`+ private static class PersonController {`
`178`	`179`
`179`	`180`	`@GetMapping(produces = MediaType.APPLICATION_XML_VALUE)`
`180`	`181`	`PersonsWrapper getPersons() {`