diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index d6bad7a6..5ba95c1d 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -46,6 +46,11 @@ spring-cloud-deployer-local test + + org.springframework.cloud + spring-cloud-test-support + test + org.springframework.boot spring-boot-starter-test diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderTests.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderTests.java index 15a16662..f0064635 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderTests.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderTests.java @@ -35,9 +35,9 @@ import org.springframework.cloud.deployer.spi.core.AppDefinition; import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest; import org.springframework.cloud.deployer.spi.local.LocalAppDeployer; import org.springframework.cloud.deployer.spi.local.LocalDeployerProperties; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; -import org.springframework.util.SocketUtils; import org.springframework.web.client.ResourceAccessException; import org.springframework.web.client.RestTemplate; @@ -153,7 +153,7 @@ public class ConsulBinderTests { Map appProperties = new HashMap<>(); int consumerCount = groups == null ? 1 : groups.length; for (int i = 0; i < consumerCount; i++) { - int consumerPort = SocketUtils.findAvailableTcpPort(); + int consumerPort = TestSocketUtils.findAvailableTcpPort(); appProperties.put("server.port", String.valueOf(consumerPort)); List args = new ArrayList<>(); args.add(String.format("--server.port=%d", consumerPort)); @@ -178,7 +178,7 @@ public class ConsulBinderTests { * @return {@link AppId} for producer */ private AppId launchProducer() { - int producerPort = SocketUtils.findAvailableTcpPort(); + int producerPort = TestSocketUtils.findAvailableTcpPort(); Map appProperties = new HashMap<>(); appProperties.put("server.port", String.valueOf(producerPort)); List args = new ArrayList<>(); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java index 1d5d2a7b..4618b1dd 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java @@ -30,10 +30,10 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationC import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.test.ConsulTestcontainers; +import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; 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.DEFINED_PORT; @@ -55,7 +55,7 @@ public class ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests { @BeforeClass public static void initClass() { - Integer port = SocketUtils.findAvailableTcpPort(); + Integer port = TestSocketUtils.findAvailableTcpPort(); System.setProperty("spring.cloud.consul.discovery.port", port.toString()); System.setProperty("server.port", port.toString()); }