From b1c34a152195f8208de08755c22f4f5feb9d7382 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 9 Mar 2022 12:16:55 -0500 Subject: [PATCH] Migrates to TestSocketUtils from spring-cloud-test-support --- pom.xml | 1 - spring-cloud-gateway-integration-tests/grpc/pom.xml | 4 ++++ .../cloud/gateway/tests/grpc/GRPCApplication.java | 4 ++-- spring-cloud-gateway-integration-tests/http2/pom.xml | 4 ++++ .../cloud/gateway/tests/http2/nossl/NosslTests.java | 4 ++-- .../cloud/gateway/sample/GatewaySampleApplicationTests.java | 4 ++-- .../sample/GatewaySampleApplicationWithoutMetricsTests.java | 4 ++-- .../GatewayNoLoadBalancerClientAutoConfigurationTests.java | 4 ++-- .../cloud/gateway/filter/NettyRoutingFilterTests.java | 4 ++-- .../ratelimit/PrincipalNameKeyResolverIntegrationTests.java | 4 ++-- .../handler/RoutePredicateHandlerMappingIntegrationTests.java | 4 ++-- ...icateHandlerMappingSameManagementPortIntegrationTests.java | 4 ++-- 12 files changed, 26 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 9f380b32..fb86301c 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,6 @@ org.springframework.cloud spring-cloud-test-support - test ${spring-cloud-commons.version} diff --git a/spring-cloud-gateway-integration-tests/grpc/pom.xml b/spring-cloud-gateway-integration-tests/grpc/pom.xml index 7f097cee..68f9e88c 100644 --- a/spring-cloud-gateway-integration-tests/grpc/pom.xml +++ b/spring-cloud-gateway-integration-tests/grpc/pom.xml @@ -60,6 +60,10 @@ spring-boot-starter-test test + + org.springframework.cloud + spring-cloud-test-support + io.projectreactor reactor-test diff --git a/spring-cloud-gateway-integration-tests/grpc/src/main/java/org/springframework/cloud/gateway/tests/grpc/GRPCApplication.java b/spring-cloud-gateway-integration-tests/grpc/src/main/java/org/springframework/cloud/gateway/tests/grpc/GRPCApplication.java index 5436d0cc..95b1800f 100644 --- a/spring-cloud-gateway-integration-tests/grpc/src/main/java/org/springframework/cloud/gateway/tests/grpc/GRPCApplication.java +++ b/spring-cloud-gateway-integration-tests/grpc/src/main/java/org/springframework/cloud/gateway/tests/grpc/GRPCApplication.java @@ -33,10 +33,10 @@ import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.annotation.Bean; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Component; -import org.springframework.util.SocketUtils; /** * @author Alberto C. Ríos @@ -45,7 +45,7 @@ import org.springframework.util.SocketUtils; @EnableAutoConfiguration public class GRPCApplication { - private static final int GRPC_SERVER_PORT = SocketUtils.findAvailableTcpPort(); + private static final int GRPC_SERVER_PORT = TestSocketUtils.findAvailableTcpPort(); public static void main(String[] args) { SpringApplication.run(GRPCApplication.class, args); diff --git a/spring-cloud-gateway-integration-tests/http2/pom.xml b/spring-cloud-gateway-integration-tests/http2/pom.xml index 0a31ec73..e3d4a649 100644 --- a/spring-cloud-gateway-integration-tests/http2/pom.xml +++ b/spring-cloud-gateway-integration-tests/http2/pom.xml @@ -42,6 +42,10 @@ spring-boot-starter-test test + + org.springframework.cloud + spring-cloud-test-support + io.projectreactor reactor-test diff --git a/spring-cloud-gateway-integration-tests/http2/src/test/java/org/springframework/cloud/gateway/tests/http2/nossl/NosslTests.java b/spring-cloud-gateway-integration-tests/http2/src/test/java/org/springframework/cloud/gateway/tests/http2/nossl/NosslTests.java index b0d76ef4..9a7d7a95 100644 --- a/spring-cloud-gateway-integration-tests/http2/src/test/java/org/springframework/cloud/gateway/tests/http2/nossl/NosslTests.java +++ b/spring-cloud-gateway-integration-tests/http2/src/test/java/org/springframework/cloud/gateway/tests/http2/nossl/NosslTests.java @@ -29,9 +29,9 @@ import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.gateway.tests.http2.Http2Application; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.util.SocketUtils; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import static org.springframework.cloud.gateway.tests.http2.Http2ApplicationTests.assertResponse; @@ -49,7 +49,7 @@ public class NosslTests { @BeforeAll static void beforeAll() { - int noSslPort = SocketUtils.findAvailableTcpPort(); + int noSslPort = TestSocketUtils.findAvailableTcpPort(); System.setProperty("nossl.port", String.valueOf(noSslPort)); } diff --git a/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java b/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java index db99c232..396e89ce 100644 --- a/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java +++ b/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java @@ -39,12 +39,12 @@ import org.springframework.cloud.gateway.test.HttpBinCompatibleController; import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.env.Environment; import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -70,7 +70,7 @@ public class GatewaySampleApplicationTests { @BeforeAll public static void beforeClass() { - managementPort = SocketUtils.findAvailableTcpPort(); + managementPort = TestSocketUtils.findAvailableTcpPort(); System.setProperty("test.port", String.valueOf(managementPort)); } diff --git a/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationWithoutMetricsTests.java b/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationWithoutMetricsTests.java index a750fd7f..cdb79f36 100644 --- a/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationWithoutMetricsTests.java +++ b/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationWithoutMetricsTests.java @@ -29,10 +29,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.gateway.sample.GatewaySampleApplicationTests.TestConfig; import org.springframework.cloud.test.ClassPathExclusions; import org.springframework.cloud.test.ModifiedClassPathRunner; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.util.SocketUtils; @RunWith(ModifiedClassPathRunner.class) @ClassPathExclusions({ "micrometer-*.jar", "spring-boot-actuator-*.jar", "spring-boot-actuator-autoconfigure-*.jar" }) @@ -47,7 +47,7 @@ public class GatewaySampleApplicationWithoutMetricsTests { @BeforeClass public static void beforeClass() { - port = SocketUtils.findAvailableTcpPort(); + port = TestSocketUtils.findAvailableTcpPort(); System.setProperty("server.port", Integer.toString(port)); } diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayNoLoadBalancerClientAutoConfigurationTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayNoLoadBalancerClientAutoConfigurationTests.java index 8d79c7b5..9600bca8 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayNoLoadBalancerClientAutoConfigurationTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayNoLoadBalancerClientAutoConfigurationTests.java @@ -28,12 +28,12 @@ import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; import org.springframework.cloud.gateway.test.PermitAllSecurityConfiguration; import org.springframework.cloud.test.ClassPathExclusions; import org.springframework.cloud.test.ModifiedClassPathRunner; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.http.HttpHeaders; import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.util.SocketUtils; @RunWith(ModifiedClassPathRunner.class) @ClassPathExclusions({ "spring-cloud-loadbalancer-*.jar" }) @@ -43,7 +43,7 @@ public class GatewayNoLoadBalancerClientAutoConfigurationTests { @BeforeClass public static void init() { - port = SocketUtils.findAvailableTcpPort(); + port = TestSocketUtils.findAvailableTcpPort(); } @Test diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterTests.java index 0415c332..4d6ec433 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterTests.java @@ -32,11 +32,11 @@ import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; import org.springframework.cloud.gateway.test.BaseWebClientTests; import org.springframework.cloud.gateway.test.PermitAllSecurityConfiguration; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -50,7 +50,7 @@ class NettyRoutingFilterTests extends BaseWebClientTests { @BeforeAll public static void beforeAll() { - port = SocketUtils.findAvailableTcpPort(); + port = TestSocketUtils.findAvailableTcpPort(); } @Test diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/PrincipalNameKeyResolverIntegrationTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/PrincipalNameKeyResolverIntegrationTests.java index 201b547c..100c1e7f 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/PrincipalNameKeyResolverIntegrationTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/PrincipalNameKeyResolverIntegrationTests.java @@ -35,6 +35,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.security.config.web.server.ServerHttpSecurity; @@ -45,7 +46,6 @@ import org.springframework.security.web.server.SecurityWebFilterChain; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.util.SocketUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -68,7 +68,7 @@ public class PrincipalNameKeyResolverIntegrationTests { @BeforeClass public static void beforeClass() { - System.setProperty("server.port", String.valueOf(SocketUtils.findAvailableTcpPort())); + System.setProperty("server.port", String.valueOf(TestSocketUtils.findAvailableTcpPort())); } @AfterClass diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java index ea3e3338..1f3b1fe3 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java @@ -27,10 +27,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; import org.springframework.cloud.gateway.test.BaseWebClientTests; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.util.SocketUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -45,7 +45,7 @@ public class RoutePredicateHandlerMappingIntegrationTests extends BaseWebClientT @BeforeAll public static void beforeClass() { - managementPort = SocketUtils.findAvailableTcpPort(); + managementPort = TestSocketUtils.findAvailableTcpPort(); System.setProperty("test.port", String.valueOf(managementPort)); } diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingSameManagementPortIntegrationTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingSameManagementPortIntegrationTests.java index c539666a..d089d47f 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingSameManagementPortIntegrationTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingSameManagementPortIntegrationTests.java @@ -24,9 +24,9 @@ import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.gateway.test.BaseWebClientTests; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.util.SocketUtils; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT; @@ -38,7 +38,7 @@ public class RoutePredicateHandlerMappingSameManagementPortIntegrationTests exte @BeforeAll public static void beforeClass() { - samePort = SocketUtils.findAvailableTcpPort(); + samePort = TestSocketUtils.findAvailableTcpPort(); System.setProperty("server.port", String.valueOf(samePort)); System.setProperty("management.server.port", String.valueOf(samePort)); }