diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java index 6fe6680c..4e13cd20 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java @@ -60,7 +60,8 @@ public class NacosDiscoveryClientTests { NamingService namingService = mock(NamingService.class); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService); - when(namingService.selectInstances(eq(serviceName), eq(true))) + when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); + when(namingService.selectInstances(eq(serviceName),eq("DEFAULT"), eq(true))) .thenReturn(instances); NacosDiscoveryClient discoveryClient = new NacosDiscoveryClient( @@ -103,7 +104,8 @@ public class NacosDiscoveryClientTests { nacosDiscoveryProperties); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService); - when(namingService.getServicesOfServer(eq(1), eq(Integer.MAX_VALUE))) + when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); + when(namingService.getServicesOfServer(eq(1), eq(Integer.MAX_VALUE),eq("DEFAULT"))) .thenReturn(nacosServices); List services = discoveryClient.getServices(); diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java index 2732f2b4..84ec00aa 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java @@ -52,7 +52,8 @@ public class NacosServerListTests { NamingService namingService = mock(NamingService.class); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService); - when(namingService.selectInstances(anyString(), eq(true))).thenReturn(null); + when(namingService.selectInstances(anyString(), eq("DEFAULT"), eq(true))) + .thenReturn(null); NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties); List servers = serverList.getInitialListOfServers(); @@ -73,7 +74,9 @@ public class NacosServerListTests { NamingService namingService = mock(NamingService.class); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService); - when(namingService.selectInstances(eq("test-service"), eq(true))) + when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); + when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); + when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true))) .thenReturn(instances); IClientConfig clientConfig = mock(IClientConfig.class); @@ -105,7 +108,8 @@ public class NacosServerListTests { NamingService namingService = mock(NamingService.class); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService); - when(namingService.selectInstances(eq("test-service"), eq(true))) + when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); + when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true))) .thenReturn(instances.stream().filter(Instance::isHealthy) .collect(Collectors.toList())); @@ -142,7 +146,8 @@ public class NacosServerListTests { NamingService namingService = mock(NamingService.class); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService); - when(namingService.selectInstances(eq("test-service"), eq(true))) + when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); + when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true))) .thenReturn(instances.stream().filter(Instance::isHealthy) .collect(Collectors.toList()));