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

Replaces some deprecations

Browse Source
This commit is contained in:
Spencer Gibb
2020-01-22 11:15:13 -05:00
parent d510ba8693
commit 4debd04bd7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/ZookeeperServerListTests.java
View File

@@ -30,8 +30,8 @@ import org.springframework.cloud.zookeeper.discovery.ZookeeperServer;
import org.springframework.cloud.zookeeper.discovery.ZookeeperServerList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.cloud.zookeeper.support.StatusConstants.INSTANCE_STATUS_KEY;

10
spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java
View File

@@ -70,8 +70,9 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests {
"spring.cloud.zookeeper.discovery.instance-port:7001",
"spring.cloud.zookeeper.discovery.instance-host:foo",
"spring.cloud.config.discovery.service-id:configserver");
assertThat(this.context.getBeanNamesForType(
ZookeeperConfigServerAutoConfiguration.class).length).isEqualTo(1);
assertThat(this.context
.getBeanNamesForType(ZookeeperConfigServerAutoConfiguration.class).length)
.isEqualTo(1);
ZookeeperDiscoveryClient client = this.context.getParent()
.getBean(ZookeeperDiscoveryClient.class);
verify(client, atLeast(2)).getInstances("configserver");
@@ -105,8 +106,9 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests {
public ZookeeperDiscoveryClient zookeeperDiscoveryClient(
ZookeeperDiscoveryProperties properties) {
ZookeeperDiscoveryClient client = mock(ZookeeperDiscoveryClient.class);
ServiceInstance instance = new DefaultServiceInstance("configserver",
properties.getInstanceHost(), properties.getInstancePort(), false);
ServiceInstance instance = new DefaultServiceInstance("configserver1",
"configserver", properties.getInstanceHost(),
properties.getInstancePort(), false);
given(client.getInstances("configserver"))
.willReturn(Arrays.asList(instance));
return client;