fix:fix discovery junit. (#730)

CHANGELOG.md

@@ -15,4 +15,4 @@
 - [docs:update README.](https://github.com/Tencent/spring-cloud-tencent/pull/718)
 - [Fix:fix javadoc.](https://github.com/Tencent/spring-cloud-tencent/pull/721)
 - [Code optimization & correct comment](https://github.com/Tencent/spring-cloud-tencent/pull/722)
-- [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/725)
+- [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/730)

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClientTest.java

@@ -66,8 +66,7 @@ public class PolarisDiscoveryClientTest {
 
 		List<String> services = client.getServices();
 
-		assertThat(services).size().isEqualTo(1);
+		assertThat(services).contains(SERVICE_PROVIDER).size().isEqualTo(1);
-		assertThat(services.contains(SERVICE_PROVIDER)).isTrue();
 	}
 
 	@Test

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java

@@ -19,89 +19,67 @@ package com.tencent.cloud.polaris.discovery;
 
 import java.util.List;
 
-import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
 import com.tencent.polaris.api.exception.PolarisException;
-import com.tencent.polaris.api.pojo.ServiceKey;
+import com.tencent.polaris.api.pojo.DefaultInstance;
-import com.tencent.polaris.test.mock.discovery.NamingServer;
+import com.tencent.polaris.api.pojo.DefaultServiceInstances;
-import com.tencent.polaris.test.mock.discovery.NamingService;
+import com.tencent.polaris.api.pojo.ServiceInfo;
-import org.junit.AfterClass;
+import com.tencent.polaris.api.rpc.InstancesResponse;
-import org.junit.BeforeClass;
+import com.tencent.polaris.api.rpc.ServicesResponse;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.context.annotation.Configuration;
 
-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 java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * Test for {@link PolarisServiceDiscovery}.
  *
  * @author Haotian Zhang
  */
-public class PolarisServiceDiscoveryTest {
+@RunWith(MockitoJUnitRunner.class)
 
-	private static NamingServer namingServer;
+public class PolarisServiceDiscoveryTest {
-
-	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(
-					PolarisContextAutoConfiguration.class,
-					PolarisServiceDiscoveryTest.PolarisPropertiesConfiguration.class,
-					PolarisDiscoveryClientConfiguration.class,
-					PolarisDiscoveryAutoConfiguration.class,
-					PolarisContextAutoConfiguration.class))
-			.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
-			.withPropertyValues("server.port=" + PORT)
-			.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")
-			.withPropertyValues("spring.cloud.polaris.discovery.namespace=" + NAMESPACE_TEST)
-			.withPropertyValues("spring.cloud.polaris.discovery.token=xxxxxx");
-
-	@BeforeClass
-	public static void beforeClass() throws Exception {
-		namingServer = NamingServer.startNamingServer(10081);
-
-		// add service with 3 instances
-		NamingService.InstanceParameter instanceParameter = new NamingService.InstanceParameter();
-		instanceParameter.setHealthy(true);
-		instanceParameter.setIsolated(false);
-		instanceParameter.setWeight(100);
-		ServiceKey serviceKey = new ServiceKey(NAMESPACE_TEST, SERVICE_PROVIDER);
-		namingServer.getNamingService().batchAddInstances(serviceKey, PORT, 3, instanceParameter);
-	}
 
-	@AfterClass
+	@Mock
-	public static void afterClass() {
+	private PolarisDiscoveryHandler polarisDiscoveryHandler;
-		if (null != namingServer) {
+	@InjectMocks
-			namingServer.terminate();
+	private PolarisServiceDiscovery polarisServiceDiscovery;
-		}
-	}
 
 	@Test
 	public void testGetInstances() {
-		this.contextRunner.run(context -> {
+		DefaultServiceInstances mockDefaultServiceInstances = mock(DefaultServiceInstances.class);
-			PolarisServiceDiscovery polarisServiceDiscovery = context.getBean(PolarisServiceDiscovery.class);
+		when(mockDefaultServiceInstances.getInstances()).thenReturn(singletonList(mock(DefaultInstance.class)));
-			List<ServiceInstance> serviceInstances = polarisServiceDiscovery.getInstances(SERVICE_PROVIDER);
+		InstancesResponse mockInstancesResponse = mock(InstancesResponse.class);
-			assertThat(serviceInstances.isEmpty()).isFalse();
+		when(mockInstancesResponse.toServiceInstances()).thenReturn(mockDefaultServiceInstances);
-			assertThat(serviceInstances).hasSize(3);
+		when(polarisDiscoveryHandler.getHealthyInstances(anyString())).thenReturn(mockInstancesResponse);
-			assertThat(serviceInstances.get(0).getPort()).isEqualTo(PORT);
+
-			assertThat(serviceInstances.get(1).getPort()).isEqualTo(PORT + 1);
+		List<ServiceInstance> serviceInstances = polarisServiceDiscovery.getInstances(SERVICE_PROVIDER);
-			assertThat(serviceInstances.get(2).getPort()).isEqualTo(PORT + 2);
+
-		});
+		assertThat(serviceInstances).isNotEmpty();
 	}
 
 	@Test
 	public void testGetServices() throws PolarisException {
-		this.contextRunner.run(context -> {
+		ServiceInfo mockServiceInfo = mock(ServiceInfo.class);
-			PolarisServiceDiscovery polarisServiceDiscovery = context.getBean(PolarisServiceDiscovery.class);
+		when(mockServiceInfo.getService()).thenReturn(SERVICE_PROVIDER);
-			List<String> services = polarisServiceDiscovery.getServices();
+		ServicesResponse mockServicesResponse = mock(ServicesResponse.class);
-			assertThat(services.size()).isEqualTo(1);
+		when(mockServicesResponse.getServices()).thenReturn(singletonList(mockServiceInfo));
-		});
+		when(polarisDiscoveryHandler.getServices()).thenReturn(mockServicesResponse);
+
+		List<String> services = polarisServiceDiscovery.getServices();
 
+		assertThat(services).size().isEqualTo(1);
 	}
 
 	@Configuration