pull/933/head
seanyu 3 years ago
parent d5fb3ff250
commit 9de39ebc42

@ -16,6 +16,7 @@
*/ */
package com.tencent.cloud.polaris.endpoint; package com.tencent.cloud.polaris.endpoint;
import java.util.Collections;
import java.util.Map; import java.util.Map;
import com.tencent.cloud.polaris.PolarisDiscoveryProperties; 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.PolarisDiscoveryClient;
import com.tencent.cloud.polaris.discovery.PolarisDiscoveryClientConfiguration; import com.tencent.cloud.polaris.discovery.PolarisDiscoveryClientConfiguration;
import com.tencent.cloud.polaris.discovery.PolarisDiscoveryHandler; 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 com.tencent.polaris.test.mock.discovery.NamingServer;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; 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.PORT;
import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER; import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER;
import static org.assertj.core.api.Assertions.assertThat; 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. * Test for polaris discovery endpoint.
@ -79,12 +83,17 @@ public class PolarisDiscoveryEndpointTest {
.getBean(PolarisDiscoveryProperties.class); .getBean(PolarisDiscoveryProperties.class);
DiscoveryClient discoveryClient = context DiscoveryClient discoveryClient = context
.getBean(PolarisDiscoveryClient.class); .getBean(PolarisDiscoveryClient.class);
PolarisDiscoveryHandler polarisDiscoveryHandler = context.getBean(PolarisDiscoveryHandler.class); PolarisDiscoveryHandler polarisDiscoveryHandler = context.getBean(PolarisDiscoveryHandler.class);
PolarisDiscoveryEndpoint polarisDiscoveryEndpoint = new PolarisDiscoveryEndpoint(polarisDiscoveryProperties, discoveryClient, polarisDiscoveryHandler); PolarisDiscoveryEndpoint polarisDiscoveryEndpoint = new PolarisDiscoveryEndpoint(polarisDiscoveryProperties, discoveryClient, polarisDiscoveryHandler);
Map<String, Object> mapInfo = polarisDiscoveryEndpoint.polarisDiscovery("java_provider_test"); Map<String, Object> mapInfo = polarisDiscoveryEndpoint.polarisDiscovery("java_provider_test");
assertThat(polarisDiscoveryProperties).isEqualTo(mapInfo.get("PolarisDiscoveryProperties")); 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<String, Object> mapInfo2 = polarisDiscoveryEndpoint1.polarisDiscovery(null);
assertThat(polarisDiscoveryProperties).isEqualTo(mapInfo2.get("PolarisDiscoveryProperties"));
}); });
} }

@ -76,9 +76,17 @@ public class PolarisRegistrationTest {
doReturn(true).when(consulContextProperties).isRegister(); doReturn(true).when(consulContextProperties).isRegister();
// mock NacosContextProperties // mock NacosContextProperties
nacosContextProperties = mock(NacosContextProperties.class); nacosContextProperties = new NacosContextProperties();
doReturn(true).when(nacosContextProperties).isEnabled(); nacosContextProperties.setEnabled(true);
doReturn(true).when(nacosContextProperties).isRegisterEnabled(); nacosContextProperties.setRegisterEnabled(true);
nacosContextProperties.setContextPath("/");
nacosContextProperties.setClusterName("cluster");
nacosContextProperties.setGroup("");
nacosContextProperties.setDiscoveryEnabled(true);
nacosContextProperties.setPassword("");
nacosContextProperties.setUsername("");
nacosContextProperties.setServerAddr("");
nacosContextProperties.toString();
// mock SDKContext // mock SDKContext
APIConfig apiConfig = mock(APIConfig.class); APIConfig apiConfig = mock(APIConfig.class);
@ -162,7 +170,7 @@ public class PolarisRegistrationTest {
Map<String, String> metadata = polarisRegistration1.getMetadata(); Map<String, String> metadata = polarisRegistration1.getMetadata();
assertThat(metadata).isNotNull(); assertThat(metadata).isNotNull();
assertThat(metadata).isNotEmpty(); assertThat(metadata).isNotEmpty();
assertThat(metadata.size()).isEqualTo(3); assertThat(metadata.size()).isEqualTo(4);
assertThat(metadata.get("key1")).isEqualTo("value1"); assertThat(metadata.get("key1")).isEqualTo("value1");
} }

Loading…
Cancel
Save