SpringCloud/spring-cloud-zookeeper
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:55:56 -05:00
parent c25114985f
commit a2f8ca793b
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java
View File

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

4
spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperNoConfigClientTests.java
View File

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

4
spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDiscoveryWithDyingDependenciesTests.java
View File

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

4
spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/test/CommonTestConfig.java
View File

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

5
spring-cloud-zookeeper-sample/pom.xml
View File

@@ -52,6 +52,11 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-test-support</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>

6
spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java
View File

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