From de33056c831b0a0f2b2c9d6e130cd4a54f891916 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:08:38 +0200 Subject: [PATCH] Use new features from JUnit Jupiter 5.11 This commit migrates additional parameterized tests (that were missed in the previous commit) to the new argumentSet() feature. See gh-33395 --- .../client/RestClientIntegrationTests.java | 20 +++++++++---------- .../client/RestTemplateIntegrationTests.java | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/web/client/RestClientIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestClientIntegrationTests.java index 48d83e6c45..f4e38d8ba8 100644 --- a/spring-web/src/test/java/org/springframework/web/client/RestClientIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/RestClientIntegrationTests.java @@ -33,8 +33,8 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Named; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.core.ParameterizedTypeReference; @@ -59,7 +59,7 @@ import org.springframework.web.testfixture.xml.Pojo; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.junit.jupiter.api.Assumptions.assumeFalse; -import static org.junit.jupiter.api.Named.named; +import static org.junit.jupiter.params.provider.Arguments.argumentSet; /** * Integration tests for {@link RestClient}. @@ -71,20 +71,20 @@ class RestClientIntegrationTests { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) - @ParameterizedTest(name = "[{index}] {0}") + @ParameterizedTest @MethodSource("clientHttpRequestFactories") @interface ParameterizedRestClientTest { } @SuppressWarnings("removal") - static Stream> clientHttpRequestFactories() { + static Stream clientHttpRequestFactories() { return Stream.of( - named("JDK HttpURLConnection", new SimpleClientHttpRequestFactory()), - named("HttpComponents", new HttpComponentsClientHttpRequestFactory()), - named("OkHttp", new org.springframework.http.client.OkHttp3ClientHttpRequestFactory()), - named("Jetty", new JettyClientHttpRequestFactory()), - named("JDK HttpClient", new JdkClientHttpRequestFactory()), - named("Reactor Netty", new ReactorNettyClientRequestFactory()) + argumentSet("JDK HttpURLConnection", new SimpleClientHttpRequestFactory()), + argumentSet("HttpComponents", new HttpComponentsClientHttpRequestFactory()), + argumentSet("OkHttp", new org.springframework.http.client.OkHttp3ClientHttpRequestFactory()), + argumentSet("Jetty", new JettyClientHttpRequestFactory()), + argumentSet("JDK HttpClient", new JdkClientHttpRequestFactory()), + argumentSet("Reactor Netty", new ReactorNettyClientRequestFactory()) ); } diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java index 05c9a100b5..769783d3c9 100644 --- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java @@ -30,10 +30,10 @@ import java.util.stream.Stream; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonView; -import org.junit.jupiter.api.Named; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.TestExecutionExceptionHandler; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.core.ParameterizedTypeReference; @@ -60,7 +60,7 @@ import org.springframework.util.MultiValueMap; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.junit.jupiter.api.Assumptions.assumeFalse; -import static org.junit.jupiter.api.Named.named; +import static org.junit.jupiter.params.provider.Arguments.argumentSet; import static org.springframework.http.HttpMethod.POST; import static org.springframework.http.MediaType.MULTIPART_MIXED; @@ -85,20 +85,20 @@ class RestTemplateIntegrationTests extends AbstractMockWebServerTests { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) - @ParameterizedTest(name = "[{index}] {0}") + @ParameterizedTest @MethodSource("clientHttpRequestFactories") @interface ParameterizedRestTemplateTest { } @SuppressWarnings("removal") - static Stream> clientHttpRequestFactories() { + static Stream clientHttpRequestFactories() { return Stream.of( - named("JDK HttpURLConnection", new SimpleClientHttpRequestFactory()), - named("HttpComponents", new HttpComponentsClientHttpRequestFactory()), - named("OkHttp", new org.springframework.http.client.OkHttp3ClientHttpRequestFactory()), - named("Jetty", new JettyClientHttpRequestFactory()), - named("JDK HttpClient", new JdkClientHttpRequestFactory()), - named("Reactor Netty", new ReactorNettyClientRequestFactory()) + argumentSet("JDK HttpURLConnection", new SimpleClientHttpRequestFactory()), + argumentSet("HttpComponents", new HttpComponentsClientHttpRequestFactory()), + argumentSet("OkHttp", new org.springframework.http.client.OkHttp3ClientHttpRequestFactory()), + argumentSet("Jetty", new JettyClientHttpRequestFactory()), + argumentSet("JDK HttpClient", new JdkClientHttpRequestFactory()), + argumentSet("Reactor Netty", new ReactorNettyClientRequestFactory()) ); }