From a2f8ca793b1b87af81ef42a7290f29220e66f0da Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 9 Mar 2022 12:55:56 -0500 Subject: [PATCH] Migrates to TestSocketUtils from spring-cloud-test-support --- .../discovery/ZookeeprDiscoveryNonWebAppTests.java | 4 ++-- ...ookeeperConfigServerBootstrapperNoConfigClientTests.java | 4 ++-- .../ZookeeperDiscoveryWithDyingDependenciesTests.java | 4 ++-- .../cloud/zookeeper/discovery/test/CommonTestConfig.java | 4 ++-- spring-cloud-zookeeper-sample/pom.xml | 5 +++++ .../cloud/zookeeper/sample/SampleApplicationTests.java | 6 +++--- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java index 564cb1fd..fd1b2f99 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java @@ -31,10 +31,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.loadbalancer.LoadBalanced; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.util.SocketUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; @@ -54,7 +54,7 @@ public class ZookeeprDiscoveryNonWebAppTests { @Before public void setup() throws Exception { - this.server = new TestingServer(SocketUtils.findAvailableTcpPort()); + this.server = new TestingServer(TestSocketUtils.findAvailableTcpPort()); this.connectionString = "--spring.cloud.zookeeper.connectString=" + this.server.getConnectString(); } diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperNoConfigClientTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperNoConfigClientTests.java index 7b2fcb85..112854e4 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperNoConfigClientTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperNoConfigClientTests.java @@ -26,8 +26,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; 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.util.SocketUtils; @RunWith(ModifiedClassPathRunner.class) @ClassPathExclusions({ "spring-cloud-config-client-*.jar", "spring-cloud-config-server-*.jar" }) @@ -39,7 +39,7 @@ public class ZookeeperConfigServerBootstrapperNoConfigClientTests { ConfigurableApplicationContext context = null; try { TomcatURLStreamHandlerFactory.disable(); - int port = SocketUtils.findAvailableTcpPort(); + int port = TestSocketUtils.findAvailableTcpPort(); testingServer = new TestingServer(port); context = new SpringApplicationBuilder(TestConfig.class).properties("--server.port=0", "spring.cloud.config.discovery.enabled=true", "spring.cloud.zookeeper.connect-string=localhost:" + port, diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDiscoveryWithDyingDependenciesTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDiscoveryWithDyingDependenciesTests.java index 483f15c9..aa2b92ba 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDiscoveryWithDyingDependenciesTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDiscoveryWithDyingDependenciesTests.java @@ -30,12 +30,12 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.cloud.zookeeper.discovery.test.TestLoadBalancedClient; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.util.SocketUtils; import static com.jayway.awaitility.Awaitility.await; @@ -57,7 +57,7 @@ public class ZookeeperDiscoveryWithDyingDependenciesTests { TestingServer testingServer = null; try { // given: - int zookeeperPort = SocketUtils.findAvailableTcpPort(); + int zookeeperPort = TestSocketUtils.findAvailableTcpPort(); testingServer = new TestingServer(zookeeperPort); System.setProperty("spring.jmx.enabled", "false"); System.setProperty("spring.cloud.zookeeper.connectString", diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/test/CommonTestConfig.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/test/CommonTestConfig.java index 5db6f6b8..69c786e5 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/test/CommonTestConfig.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/test/CommonTestConfig.java @@ -19,10 +19,10 @@ package org.springframework.cloud.zookeeper.discovery.test; import org.apache.curator.test.TestingServer; import org.springframework.cloud.client.loadbalancer.LoadBalanced; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.cloud.zookeeper.ZookeeperProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.util.SocketUtils; import org.springframework.web.client.RestTemplate; /** @@ -39,7 +39,7 @@ public class CommonTestConfig { @Bean(destroyMethod = "close") TestingServer testingServer() throws Exception { - return new TestingServer(SocketUtils.findAvailableTcpPort()); + return new TestingServer(TestSocketUtils.findAvailableTcpPort()); } @Bean diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 740c0361..1bf890ec 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -52,6 +52,11 @@ org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-test-support + test + org.springframework.boot spring-boot-starter-test diff --git a/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java b/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java index 0fef1aa5..a8ac137f 100644 --- a/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java +++ b/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java @@ -21,10 +21,10 @@ import org.junit.Test; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -32,10 +32,10 @@ public class SampleApplicationTests { @Test public void contextLoads() throws Exception { - int zkPort = SocketUtils.findAvailableTcpPort(); + int zkPort = TestSocketUtils.findAvailableTcpPort(); TestingServer server = new TestingServer(zkPort); - int port = SocketUtils.findAvailableTcpPort(zkPort + 1); + int port = TestSocketUtils.findAvailableTcpPort(zkPort + 1); ConfigurableApplicationContext context = new SpringApplicationBuilder( SampleZookeeperApplication.class).run("--server.port=" + port,