use TestSocketUtils.findAvailableTcpPort

DanielLiu1123 · Dec 1, 2024 · b1b5184 · b1b5184
1 parent 7161c96
commit b1b5184
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 68 deletions.
diff --git a/httpexchange-spring-boot-autoconfigure/src/test/java/io/github/danielliu1123/PortGetter.java b/httpexchange-spring-boot-autoconfigure/src/test/java/io/github/danielliu1123/PortGetter.java
diff --git a/...g-boot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/BaseUrlTests.java b/...g-boot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/BaseUrlTests.java
@@ -1,8 +1,8 @@
 package io.github.danielliu1123.httpexchange;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -19,7 +19,7 @@ class BaseUrlTests {
 
     @Test
     void testDefaultBaseUrl() {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(BaseUrlController.class)
                 .properties("server.port=" + port)
                 .properties(HttpExchangeProperties.PREFIX + ".base-url=localhost:" + port)
@@ -32,7 +32,7 @@ void testDefaultBaseUrl() {
 
     @Test
     void testNoBaseUrl() {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(BaseUrlController.class)
                 .properties("server.port=" + port)
                 .run()) {
@@ -46,7 +46,7 @@ void testNoBaseUrl() {
 
     @Test
     void testBaseUrl_whenClientHasBaseUrl_thenOverrideDefaultBaseUrl() {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(BaseUrlController.class)
                 .properties("server.port=" + port)
                 .properties(HttpExchangeProperties.PREFIX + ".base-url=localhost:" + port)

diff --git a/...re/src/test/java/io/github/danielliu1123/httpexchange/BeanParamArgumentResolverTests.java b/...re/src/test/java/io/github/danielliu1123/httpexchange/BeanParamArgumentResolverTests.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import java.net.URI;
 import java.util.Date;
 import java.util.List;
@@ -32,7 +32,7 @@ class BeanParamArgumentResolverTests {
 
     @Test
     void convertObjectPropertiesToRequestParameters() {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(FooController.class)
                 .properties("server.port=" + port)
                 .properties(HttpExchangeProperties.PREFIX + ".base-url=http://localhost:" + port)
@@ -81,7 +81,7 @@ void convertObjectPropertiesToRequestParameters() {
 
     @Test
     void convertObjectPropertiesToRequestParameters_whenBeanToQueryDisabled() {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(FooController.class)
                 .properties("server.port=" + port)
                 .properties(HttpExchangeProperties.PREFIX + ".base-url=http://localhost:" + port)
@@ -130,7 +130,7 @@ void convertObjectPropertiesToRequestParameters_whenBeanToQueryDisabled() {
 
     @Test
     void hasQueryMapArgumentResolverBean_whenDefaultConfig() {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(FooController.class)
                 .web(WebApplicationType.NONE)
                 .properties("server.port=" + port)

diff --git a/...-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ClassesConfigTests.java b/...-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ClassesConfigTests.java
@@ -1,8 +1,8 @@
 package io.github.danielliu1123.httpexchange;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -19,7 +19,7 @@ class ClassesConfigTests {
 
     @Test
     void clientClassConfig() {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(FooController.class)
                 .profiles("ClassesConfigTests")
                 .properties("server.port=" + port)

diff --git a/...oot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ClientTypeTests.java b/...oot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ClientTypeTests.java
@@ -1,7 +1,7 @@
 package io.github.danielliu1123.httpexchange;
 
-import static io.github.danielliu1123.PortGetter.availablePort;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -20,7 +20,7 @@ class ClientTypeTests {
     @ParameterizedTest
     @ValueSource(strings = {"rest_client", "web_client", "rest_template"})
     void testRestClient(String clientType) {
-        int port = availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(Cfg.class)
                 .properties("server.port=" + port)
                 .properties("http-exchange.client-type=" + clientType)

diff --git a/...-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ClientsConfigTests.java b/...-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ClientsConfigTests.java
@@ -1,8 +1,8 @@
 package io.github.danielliu1123.httpexchange;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.boot.WebApplicationType;
@@ -28,7 +28,7 @@ class ClientsConfigTests {
                 "com.**",
             })
     void notThrow_whenClientMatchesCanonicalClassName(String client) {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(Cfg.class)
                 .web(WebApplicationType.NONE)
                 .properties("server.port=" + port)

diff --git a/...autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/DynamicRefreshTests.java b/...autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/DynamicRefreshTests.java
@@ -1,8 +1,8 @@
 package io.github.danielliu1123.httpexchange;
 
-import static io.github.danielliu1123.PortGetter.availablePort;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
 import io.github.danielliu1123.httpexchange.shaded.requestfactory.EnhancedJdkClientHttpRequestFactory;
 import jakarta.validation.ConstraintViolationException;
@@ -36,7 +36,7 @@ void reset() {
     @ParameterizedTest
     @ValueSource(strings = {"REST_CLIENT", "REST_TEMPLATE"})
     void testDynamicRefresh(String clientType) {
-        int port = availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(Cfg.class)
                 .properties("server.port=" + port)
                 .properties("http-exchange.base-url=http://localhost:" + port)

diff --git a/...ng-boot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ExtendTests.java b/...ng-boot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ExtendTests.java
@@ -1,8 +1,8 @@
 package io.github.danielliu1123.httpexchange;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -20,7 +20,7 @@ class ExtendTests {
 
     @Test
     void userApiFirst_whenHaveControllerAndApiBeans() {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(FooController.class)
                 .profiles("ControllerApiTests")
                 .properties("server.port=" + port)

diff --git a/...oconfigure/src/test/java/io/github/danielliu1123/httpexchange/HttpClientCustomizerIT.java b/...oconfigure/src/test/java/io/github/danielliu1123/httpexchange/HttpClientCustomizerIT.java
@@ -1,8 +1,8 @@
 package io.github.danielliu1123.httpexchange;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -25,7 +25,7 @@ class HttpClientCustomizerIT {
     @ParameterizedTest
     @ValueSource(strings = {"REST_CLIENT", "REST_TEMPLATE", "WEB_CLIENT"})
     void testRestClient(String clientType, CapturedOutput output) {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(RestClientCfg.class)
                 .web(WebApplicationType.SERVLET)
                 .properties("server.port=" + port)

diff --git a/...nfigure/src/test/java/io/github/danielliu1123/httpexchange/RegisterBeanManuallyTests.java b/...nfigure/src/test/java/io/github/danielliu1123/httpexchange/RegisterBeanManuallyTests.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -22,7 +22,7 @@ class RegisterBeanManuallyTests {
 
     @Test
     void useAutoRegisteredBean_whenNoManualRegisteredBean() {
-        var port = PortGetter.availablePort();
+        var port = findAvailableTcpPort();
 
         try (var ctx = new SpringApplicationBuilder(Cfg.class)
                 .properties("server.port=" + port)
@@ -39,7 +39,7 @@ void useAutoRegisteredBean_whenNoManualRegisteredBean() {
 
     @Test
     void useManualRegisteredBean_whenManualRegisteredBeanExists() {
-        var port = PortGetter.availablePort();
+        var port = findAvailableTcpPort();
 
         try (var ctx = new SpringApplicationBuilder(Cfg.class, ApiCfg.class)
                 .properties("server.port=" + port)

diff --git a/...onfigure/src/test/java/io/github/danielliu1123/httpexchange/RequestConfiguratorTests.java b/...onfigure/src/test/java/io/github/danielliu1123/httpexchange/RequestConfiguratorTests.java
@@ -5,8 +5,8 @@
 import static java.util.concurrent.CompletableFuture.runAsync;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import io.github.danielliu1123.httpexchange.shaded.requestfactory.EnhancedJdkClientHttpRequestFactory;
 import java.util.List;
 import java.util.Map;
@@ -35,7 +35,7 @@ class RequestConfiguratorTests {
     @ParameterizedTest
     @ValueSource(strings = {"REST_CLIENT", "REST_TEMPLATE"})
     void testRequestConfigurator(String clientType) {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(Cfg.class)
                 .properties("server.port=" + port)
                 .properties(PREFIX + ".read-timeout=100")

diff --git a/...boot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/RequesterTests.java b/...boot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/RequesterTests.java
@@ -1,11 +1,11 @@
 package io.github.danielliu1123.httpexchange;
 
-import static io.github.danielliu1123.PortGetter.availablePort;
 import static io.github.danielliu1123.httpexchange.HttpExchangeClientHttpRequestInterceptor.REQUEST_TIMEOUT_HEADER;
 import static io.github.danielliu1123.httpexchange.HttpExchangeProperties.PREFIX;
 import static java.util.concurrent.CompletableFuture.runAsync;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
 import io.github.danielliu1123.httpexchange.shaded.requestfactory.EnhancedJdkClientHttpRequestFactory;
 import java.util.List;
@@ -35,7 +35,7 @@ class RequesterTests {
     @ParameterizedTest
     @ValueSource(strings = {"REST_CLIENT", "REST_TEMPLATE"})
     void testRequester(String clientType) {
-        int port = availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(Cfg.class)
                 .properties("server.port=" + port)
                 .properties(PREFIX + ".read-timeout=100")

diff --git a/...gure/src/test/java/io/github/danielliu1123/httpexchange/RestClientConfigurationTests.java b/...gure/src/test/java/io/github/danielliu1123/httpexchange/RestClientConfigurationTests.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
@@ -26,7 +26,7 @@ class RestClientConfigurationTests {
 
     @Test
     void testRestClientCustomizer(CapturedOutput output) {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(Controller.class)
                 .properties("server.port=" + port)
                 .properties(HttpExchangeProperties.PREFIX + ".base-url=localhost:" + port)

diff --git a/...oconfigure/src/test/java/io/github/danielliu1123/httpexchange/RestClientCustomizerIT.java b/...oconfigure/src/test/java/io/github/danielliu1123/httpexchange/RestClientCustomizerIT.java
@@ -1,8 +1,8 @@
 package io.github.danielliu1123.httpexchange;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
-import io.github.danielliu1123.PortGetter;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
@@ -27,7 +27,7 @@ class RestClientCustomizerIT {
 
     @Test
     void testAddInterceptor(CapturedOutput output) {
-        int port = PortGetter.availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(Cfg.class)
                 .properties("server.port=" + port)
                 .properties(HttpExchangeProperties.PREFIX + ".base-url=localhost:" + port)

diff --git a/...oot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ReturnTypeTests.java b/...oot-autoconfigure/src/test/java/io/github/danielliu1123/httpexchange/ReturnTypeTests.java
@@ -1,8 +1,8 @@
 package io.github.danielliu1123.httpexchange;
 
-import static io.github.danielliu1123.PortGetter.availablePort;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.springframework.test.util.TestSocketUtils.findAvailableTcpPort;
 
 import java.util.List;
 import java.util.Map;
@@ -27,7 +27,7 @@ class ReturnTypeTests {
 
     @Test
     void testReturnType() {
-        int port = availablePort();
+        int port = findAvailableTcpPort();
         try (var ctx = new SpringApplicationBuilder(Cfg.class)
                 .properties("server.port=" + port)
                 .properties("http-exchange.base-url=localhost:" + port)