From 55ef4c8bd54cb78c0114894395a4d4a1c1b78e90 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 9 Mar 2022 12:27:08 -0500 Subject: [PATCH] Migrates to TestSocketUtils from spring-cloud-test-support --- spring-cloud-config-client-tls-tests/pom.xml | 15 +++++++-------- .../cloud/config/client/tls/AppRunner.java | 4 ++-- spring-cloud-config-sample/pom.xml | 5 +++++ .../java/sample/ApplicationBootstrapTests.java | 4 ++-- .../src/test/java/sample/ApplicationTests.java | 4 ++-- ...ConfigDataCustomMediaTypeIntegrationTests.java | 4 ++-- .../java/sample/ConfigDataIntegrationTests.java | 4 ++-- .../ConfigDataOrderingIntegrationTests.java | 4 ++-- .../ConfigDataOrderingVaultIntegrationTests.java | 6 +++--- .../sample/ConfigDataRetryIntegrationTests.java | 4 ++-- 10 files changed, 29 insertions(+), 25 deletions(-) diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 2bc0f989..f00c8299 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -1,7 +1,6 @@ + xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-config-client-tls-tests jar @@ -15,11 +14,7 @@ https://spring.io - - - + Spring Cloud Config Client TLS Tests @@ -91,7 +86,11 @@ spring-boot-starter-test test - + + org.springframework.cloud + spring-cloud-test-support + test + org.junit.vintage junit-vintage-engine diff --git a/spring-cloud-config-client-tls-tests/src/test/java/org/springframework/cloud/config/client/tls/AppRunner.java b/spring-cloud-config-client-tls-tests/src/test/java/org/springframework/cloud/config/client/tls/AppRunner.java index 77d5096e..c03f57af 100644 --- a/spring-cloud-config-client-tls-tests/src/test/java/org/springframework/cloud/config/client/tls/AppRunner.java +++ b/spring-cloud-config-client-tls-tests/src/test/java/org/springframework/cloud/config/client/tls/AppRunner.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.util.SocketUtils; public class AppRunner implements AutoCloseable { @@ -55,7 +55,7 @@ public class AppRunner implements AutoCloseable { } private int availabeTcpPort() { - return SocketUtils.findAvailableTcpPort(); + return TestSocketUtils.findAvailableTcpPort(); } private String[] props() { diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index d9f8d088..9b70c36e 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -42,6 +42,11 @@ test ${project.version} + + org.springframework.cloud + spring-cloud-test-support + test + org.springframework.boot spring-boot-starter-test diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java index 0f18678c..00482694 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java @@ -31,9 +31,9 @@ import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.config.server.environment.MultipleJGitEnvironmentProperties; import org.springframework.cloud.config.server.test.ConfigServerTestUtils; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -59,7 +59,7 @@ public class ApplicationBootstrapTests { private static final String BASE_PATH = new WebEndpointProperties().getBasePath(); - private static int configPort = SocketUtils.findAvailableTcpPort(); + private static int configPort = TestSocketUtils.findAvailableTcpPort(); private static ConfigurableApplicationContext server; diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java index 2085e21a..70058c4c 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java @@ -30,9 +30,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.config.server.test.ConfigServerTestUtils; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -50,7 +50,7 @@ public class ApplicationTests { private static final String BASE_PATH = new WebEndpointProperties().getBasePath(); - private static int configPort = SocketUtils.findAvailableTcpPort(); + private static int configPort = TestSocketUtils.findAvailableTcpPort(); private static ConfigurableApplicationContext server; diff --git a/spring-cloud-config-sample/src/test/java/sample/ConfigDataCustomMediaTypeIntegrationTests.java b/spring-cloud-config-sample/src/test/java/sample/ConfigDataCustomMediaTypeIntegrationTests.java index e752f87b..a14d5f2b 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ConfigDataCustomMediaTypeIntegrationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ConfigDataCustomMediaTypeIntegrationTests.java @@ -31,11 +31,11 @@ import org.springframework.boot.origin.OriginLookup; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.config.server.test.ConfigServerTestUtils; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MutablePropertySources; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -52,7 +52,7 @@ public class ConfigDataCustomMediaTypeIntegrationTests { private static final String BASE_PATH = new WebEndpointProperties().getBasePath(); - private static int configPort = SocketUtils.findAvailableTcpPort(); + private static int configPort = TestSocketUtils.findAvailableTcpPort(); private static ConfigurableApplicationContext server; diff --git a/spring-cloud-config-sample/src/test/java/sample/ConfigDataIntegrationTests.java b/spring-cloud-config-sample/src/test/java/sample/ConfigDataIntegrationTests.java index 5e1d4963..cbd76bf3 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ConfigDataIntegrationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ConfigDataIntegrationTests.java @@ -30,9 +30,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.config.server.test.ConfigServerTestUtils; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -48,7 +48,7 @@ public class ConfigDataIntegrationTests { private static final String BASE_PATH = new WebEndpointProperties().getBasePath(); - private static int configPort = SocketUtils.findAvailableTcpPort(); + private static int configPort = TestSocketUtils.findAvailableTcpPort(); private static ConfigurableApplicationContext server; diff --git a/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java b/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java index 4d861988..32a9f4be 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java @@ -28,11 +28,11 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointPr import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -51,7 +51,7 @@ public class ConfigDataOrderingIntegrationTests { private static final String BASE_PATH = new WebEndpointProperties().getBasePath(); - private static final int configPort = SocketUtils.findAvailableTcpPort(); + private static final int configPort = TestSocketUtils.findAvailableTcpPort(); private static ConfigurableApplicationContext server; diff --git a/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java b/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java index 481fe8e2..a1d6ceb3 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java @@ -30,8 +30,8 @@ import org.testcontainers.vault.VaultContainer; import org.springframework.boot.SpringApplication; import org.springframework.cloud.config.server.ConfigServerApplication; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -44,9 +44,9 @@ import static org.assertj.core.api.Assertions.assertThat; @Testcontainers public class ConfigDataOrderingVaultIntegrationTests { - private static final int configServerPort = SocketUtils.findAvailableTcpPort(); + private static final int configServerPort = TestSocketUtils.findAvailableTcpPort(); - private static final int configClientPort = SocketUtils.findAvailableTcpPort(); + private static final int configClientPort = TestSocketUtils.findAvailableTcpPort(); private static ConfigurableApplicationContext client; diff --git a/spring-cloud-config-sample/src/test/java/sample/ConfigDataRetryIntegrationTests.java b/spring-cloud-config-sample/src/test/java/sample/ConfigDataRetryIntegrationTests.java index 443a9eef..f98ee4a5 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ConfigDataRetryIntegrationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ConfigDataRetryIntegrationTests.java @@ -35,10 +35,10 @@ import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.config.server.EnableConfigServer; import org.springframework.cloud.config.server.test.ConfigServerTestUtils; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.util.SocketUtils; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -59,7 +59,7 @@ public class ConfigDataRetryIntegrationTests { private static final String BASE_PATH = new WebEndpointProperties().getBasePath(); - private static int configPort = SocketUtils.findAvailableTcpPort(); + private static int configPort = TestSocketUtils.findAvailableTcpPort(); private static ConfigurableApplicationContext server;