SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrates to TestSocketUtils from spring-cloud-test-support

Browse Source
This commit is contained in:
spencergibb
2022-03-09 12:16:55 -05:00
parent 66611ab36d
commit b1c34a1521
12 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@@ -78,7 +78,6 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-test-support</artifactId>
<scope>test</scope>
<version>${spring-cloud-commons.version}</version>
</dependency>
<dependency>

4
spring-cloud-gateway-integration-tests/grpc/pom.xml
View File

@@ -60,6 +60,10 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-test-support</artifactId>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>

4
spring-cloud-gateway-integration-tests/grpc/src/main/java/org/springframework/cloud/gateway/tests/grpc/GRPCApplication.java
View File

@@ -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);

4
spring-cloud-gateway-integration-tests/http2/pom.xml
View File

@@ -42,6 +42,10 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-test-support</artifactId>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>

4
spring-cloud-gateway-integration-tests/http2/src/test/java/org/springframework/cloud/gateway/tests/http2/nossl/NosslTests.java
View File

@@ -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));
}

4
spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java
View File

@@ -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));
}

4
spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationWithoutMetricsTests.java
View File

@@ -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));
}

4
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayNoLoadBalancerClientAutoConfigurationTests.java
View File

@@ -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

4
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterTests.java
View File

@@ -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

4
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/PrincipalNameKeyResolverIntegrationTests.java
View File

@@ -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

4
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java
View File

@@ -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));
}

4
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingSameManagementPortIntegrationTests.java
View File

@@ -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));
}