From 7b94143d657341a58290a35cae0ce1b0fce37130 Mon Sep 17 00:00:00 2001 From: lepdou Date: Fri, 6 Jan 2023 12:05:34 +0800 Subject: [PATCH] fix LoadBalancerUtilsTest (#798) --- .../loadbalancer/LoadBalancerUtilsTest.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtilsTest.java b/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtilsTest.java index d4a894de3..130eec813 100644 --- a/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtilsTest.java +++ b/spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtilsTest.java @@ -23,7 +23,9 @@ import java.util.List; import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.metadata.MetadataContextHolder; +import com.tencent.cloud.common.pojo.PolarisServiceInstance; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; +import com.tencent.polaris.api.pojo.DefaultInstance; import com.tencent.polaris.api.pojo.Instance; import com.tencent.polaris.api.pojo.ServiceInstances; import org.junit.AfterClass; @@ -36,7 +38,6 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import reactor.core.publisher.Flux; -import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import static org.mockito.ArgumentMatchers.anyString; @@ -80,11 +81,17 @@ public class LoadBalancerUtilsTest { @Test public void testTransferNotEmptyInstances() { int instanceSize = 100; + int weight = 50; List instances = new ArrayList<>(); for (int i = 0; i < instanceSize; i++) { - instances.add(new DefaultServiceInstance("ins" + i, testNamespaceAndService, "127.0.0." + i, - 8080, false)); + DefaultInstance instance = new DefaultInstance(); + instance.setService(testNamespaceAndService); + instance.setId("ins" + i); + instance.setPort(8080); + instance.setHost("127.0.0." + i); + instance.setWeight(weight); + instances.add(new PolarisServiceInstance(instance)); } ServiceInstances serviceInstances = LoadBalancerUtils.transferServersToServiceInstances(Flux.just(instances)); @@ -100,7 +107,7 @@ public class LoadBalancerUtilsTest { Assert.assertEquals("ins" + i, instance.getId()); Assert.assertEquals("127.0.0." + i, instance.getHost()); Assert.assertEquals(8080, instance.getPort()); - Assert.assertEquals(100, instance.getWeight()); + Assert.assertEquals(weight, instance.getWeight()); } } }