diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpointTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpointTest.java index 6d985da92..f8e0879f4 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpointTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpointTest.java @@ -16,6 +16,7 @@ */ package com.tencent.cloud.polaris.endpoint; +import java.util.Collections; import java.util.Map; import com.tencent.cloud.polaris.PolarisDiscoveryProperties; @@ -23,6 +24,7 @@ import com.tencent.cloud.polaris.discovery.PolarisDiscoveryAutoConfiguration; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryClient; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryClientConfiguration; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryHandler; +import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext; import com.tencent.polaris.test.mock.discovery.NamingServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -38,6 +40,8 @@ import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST; import static com.tencent.polaris.test.common.Consts.PORT; import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; /** * Test for polaris discovery endpoint. @@ -75,14 +79,21 @@ public class PolarisDiscoveryEndpointTest { @Test public void testPolarisDiscoveryEndpoint() { this.contextRunner.run(context -> { - PolarisDiscoveryProperties polarisDiscoveryProperties = context.getBean(PolarisDiscoveryProperties.class); - DiscoveryClient discoveryClient = context.getBean(PolarisDiscoveryClient.class); + PolarisDiscoveryProperties polarisDiscoveryProperties = context + .getBean(PolarisDiscoveryProperties.class); + DiscoveryClient discoveryClient = context + .getBean(PolarisDiscoveryClient.class); + PolarisDiscoveryHandler polarisDiscoveryHandler = context.getBean(PolarisDiscoveryHandler.class); PolarisDiscoveryEndpoint polarisDiscoveryEndpoint = new PolarisDiscoveryEndpoint(polarisDiscoveryProperties, discoveryClient, polarisDiscoveryHandler); - Map mapInfo = polarisDiscoveryEndpoint.polarisDiscovery("java_provider_test"); - assertThat(polarisDiscoveryProperties).isEqualTo(mapInfo.get("PolarisDiscoveryProperties")); + + DiscoveryClient discoveryClient1 = mock(DiscoveryClient.class); + doReturn(Collections.singletonList("xx")).when(discoveryClient1).getServices(); + PolarisDiscoveryEndpoint polarisDiscoveryEndpoint1 = new PolarisDiscoveryEndpoint(polarisDiscoveryProperties, discoveryClient1, polarisDiscoveryHandler); + Map mapInfo2 = polarisDiscoveryEndpoint1.polarisDiscovery(null); + assertThat(polarisDiscoveryProperties).isEqualTo(mapInfo2.get("PolarisDiscoveryProperties")); }); } diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisRegistrationTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisRegistrationTest.java index ff8de26a1..ebcc5ea4b 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisRegistrationTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisRegistrationTest.java @@ -76,9 +76,17 @@ public class PolarisRegistrationTest { doReturn(true).when(consulContextProperties).isRegister(); // mock NacosContextProperties - nacosContextProperties = mock(NacosContextProperties.class); - doReturn(true).when(nacosContextProperties).isEnabled(); - doReturn(true).when(nacosContextProperties).isRegisterEnabled(); + nacosContextProperties = new NacosContextProperties(); + nacosContextProperties.setEnabled(true); + nacosContextProperties.setRegisterEnabled(true); + nacosContextProperties.setContextPath("/"); + nacosContextProperties.setClusterName("cluster"); + nacosContextProperties.setGroup(""); + nacosContextProperties.setDiscoveryEnabled(true); + nacosContextProperties.setPassword(""); + nacosContextProperties.setUsername(""); + nacosContextProperties.setServerAddr(""); + nacosContextProperties.toString(); // mock SDKContext APIConfig apiConfig = mock(APIConfig.class); @@ -162,7 +170,7 @@ public class PolarisRegistrationTest { Map metadata = polarisRegistration1.getMetadata(); assertThat(metadata).isNotNull(); assertThat(metadata).isNotEmpty(); - assertThat(metadata.size()).isEqualTo(3); + assertThat(metadata.size()).isEqualTo(4); assertThat(metadata.get("key1")).isEqualTo("value1"); }