From 43a93a2e6aa88a1dd61ce6c0311c61de398d11eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E8=B7=AF=E8=B7=AF?= <499319126@qq.com> Date: Tue, 26 Jul 2022 17:19:41 +0800 Subject: [PATCH] code review fix --- .../polaris/loadbalancer/PolarisLoadBalancerTest.java | 11 ++++------- .../PolarisServiceInstanceListSupplierTest.java | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerTest.java b/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerTest.java index 26ed7cbd1..b5cdabb60 100644 --- a/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerTest.java +++ b/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerTest.java @@ -57,7 +57,6 @@ import static org.mockito.Mockito.when; * Test for {@link PolarisLoadBalancer}. * * @author rod.xu - * @date 2022/7/21 5:44 下午 */ @RunWith(MockitoJUnitRunner.class) public class PolarisLoadBalancerTest { @@ -70,7 +69,7 @@ public class PolarisLoadBalancerTest { private PolarisLoadBalancerProperties loadBalancerProperties; private static MockedStatic mockedApplicationContextAwareUtils; - private static Instance TestInstance; + private static Instance testInstance; @BeforeClass public static void beforeClass() { @@ -78,7 +77,7 @@ public class PolarisLoadBalancerTest { mockedApplicationContextAwareUtils.when(() -> ApplicationContextAwareUtils.getProperties(anyString())) .thenReturn("unit-test"); - TestInstance = Instance.createDefaultInstance("instance-id", LOCAL_NAMESPACE, + testInstance = Instance.createDefaultInstance("instance-id", LOCAL_NAMESPACE, LOCAL_SERVICE, "host", 8090); } @@ -89,10 +88,9 @@ public class PolarisLoadBalancerTest { @Test public void chooseNormalLogicTest_thenReturnAvailablePolarisInstance() { - Request request = Mockito.mock(Request.class); List mockInstanceList = new ArrayList<>(); - mockInstanceList.add(new PolarisServiceInstance(TestInstance)); + mockInstanceList.add(new PolarisServiceInstance(testInstance)); ServiceInstanceListSupplier serviceInstanceListSupplier = Mockito.mock(ServiceInstanceListSupplier.class); when(serviceInstanceListSupplier.get(request)).thenReturn(Flux.just(mockInstanceList)); @@ -100,7 +98,7 @@ public class PolarisLoadBalancerTest { when(supplierObjectProvider.getIfAvailable(any())).thenReturn(serviceInstanceListSupplier); when(loadBalancerProperties.getEnabled()).thenReturn(true); - ProcessLoadBalanceResponse mockLbRes = new ProcessLoadBalanceResponse(TestInstance); + ProcessLoadBalanceResponse mockLbRes = new ProcessLoadBalanceResponse(testInstance); when(routerAPI.processLoadBalance(any())).thenReturn(mockLbRes); // request construct and execute invoke @@ -125,5 +123,4 @@ public class PolarisLoadBalancerTest { Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getHost()).isEqualTo("host"); Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getPort()).isEqualTo(8090); } - } diff --git a/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisServiceInstanceListSupplierTest.java b/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisServiceInstanceListSupplierTest.java index 098b53050..17f28543a 100644 --- a/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisServiceInstanceListSupplierTest.java +++ b/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisServiceInstanceListSupplierTest.java @@ -42,7 +42,6 @@ import static org.mockito.ArgumentMatchers.anyString; * Test for {@link PolarisServiceInstanceListSupplier}. * * @author rod.xu - * @date 2022/7/21 5:45 下午 */ @RunWith(MockitoJUnitRunner.class) public class PolarisServiceInstanceListSupplierTest { @@ -84,7 +83,6 @@ public class PolarisServiceInstanceListSupplierTest { Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getPort()).isEqualTo(8090); Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getId().startsWith("unit-test-instanceId")).isTrue(); Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getHost().startsWith("unit-test-host")).isTrue(); - } } }