root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify RestTestClientIntegrationTests and remove duplicate field

This commit is contained in:
Sam Brannen 2025-12-05 16:00:42 +01:00
parent b916dc962e
commit 44689b9ec0
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-test/src/test/java/org/springframework/test/web/servlet/client/RestTestClientIntegrationTests.java
View File

@ -26,7 +26,7 @@ import java.util.stream.Stream;
import mockwebserver3.MockResponse;
import mockwebserver3.MockWebServer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.AutoClose;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@ -45,8 +45,6 @@ import static org.junit.jupiter.params.provider.Arguments.argumentSet;
*/
class RestTestClientIntegrationTests {
private RestTestClient client;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
@ParameterizedTest
@ -64,13 +62,13 @@ class RestTestClientIntegrationTests {
);
}
private MockWebServer server;
@AutoClose
private MockWebServer server = new MockWebServer();
private RestTestClient testClient;
private void startServer(ClientHttpRequestFactory requestFactory) throws IOException {
this.server = new MockWebServer();
this.server.start();
this.testClient = RestTestClient.bindToServer(requestFactory)
.baseUrl(this.server.url("/").toString())
@ -92,11 +90,4 @@ class RestTestClientIntegrationTests {
this.server.enqueue(f.apply(builder).build());
}
@AfterEach
void shutdown() throws IOException {
if (server != null) {
this.server.close();
}
}
}