diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisContextGetHostTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisContextGetHostTest.java index 71a332cba..188904f7a 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisContextGetHostTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisContextGetHostTest.java @@ -20,7 +20,6 @@ package com.tencent.cloud.polaris.context; import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration; import com.tencent.cloud.polaris.context.config.PolarisContextProperties; import com.tencent.polaris.client.api.SDKContext; -import org.junit.Assert; import org.junit.Test; import org.junit.platform.commons.util.StringUtils; import org.junit.runner.RunWith; @@ -30,6 +29,13 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Test for {@link SDKContext}. + * + * @author Haotian Zhang + */ @RunWith(SpringRunner.class) @SpringBootTest(classes = PolarisContextApplication.class, properties = {"spring.config.location = classpath:bootstrap.yml"}) @@ -45,8 +51,8 @@ public class PolarisContextGetHostTest { @Test public void testGetConfigHost() { String bindIP = polarisContext.getConfig().getGlobal().getAPI().getBindIP(); - Assert.assertFalse(StringUtils.isBlank(bindIP)); - Assert.assertEquals(bindIP, "192.168.1.1"); - Assert.assertEquals(polarisContextProperties.getNamespace(), "dev"); + assertThat(StringUtils.isBlank(bindIP)).isFalse(); + assertThat(bindIP).isEqualTo("192.168.1.1"); + assertThat(polarisContextProperties.getNamespace()).isEqualTo("dev"); } } 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..b4aea4c00 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 @@ -49,7 +49,7 @@ import static org.mockito.ArgumentMatchers.anyString; @RunWith(MockitoJUnitRunner.class) public class LoadBalancerUtilsTest { - private static final String testNamespaceAndService = "testNamespaceAndService"; + private static final String TEST_NAMESPACE_AND_SERVICE = "testNamespaceAndService"; private static MockedStatic mockedApplicationContextAwareUtils; private static MockedStatic mockedMetadataContextHolder; @@ -57,7 +57,7 @@ public class LoadBalancerUtilsTest { public static void beforeClass() { mockedApplicationContextAwareUtils = Mockito.mockStatic(ApplicationContextAwareUtils.class); mockedApplicationContextAwareUtils.when(() -> ApplicationContextAwareUtils.getProperties(anyString())) - .thenReturn(testNamespaceAndService); + .thenReturn(TEST_NAMESPACE_AND_SERVICE); MetadataContext metadataContext = Mockito.mock(MetadataContext.class); mockedMetadataContextHolder = Mockito.mockStatic(MetadataContextHolder.class); @@ -83,7 +83,7 @@ public class LoadBalancerUtilsTest { List instances = new ArrayList<>(); for (int i = 0; i < instanceSize; i++) { - instances.add(new DefaultServiceInstance("ins" + i, testNamespaceAndService, "127.0.0." + i, + instances.add(new DefaultServiceInstance("ins" + i, TEST_NAMESPACE_AND_SERVICE, "127.0.0." + i, 8080, false)); } @@ -95,8 +95,8 @@ public class LoadBalancerUtilsTest { List polarisInstances = serviceInstances.getInstances(); for (int i = 0; i < instanceSize; i++) { Instance instance = polarisInstances.get(i); - Assert.assertEquals(testNamespaceAndService, instance.getNamespace()); - Assert.assertEquals(testNamespaceAndService, instance.getService()); + Assert.assertEquals(TEST_NAMESPACE_AND_SERVICE, instance.getNamespace()); + Assert.assertEquals(TEST_NAMESPACE_AND_SERVICE, instance.getService()); Assert.assertEquals("ins" + i, instance.getId()); Assert.assertEquals("127.0.0." + i, instance.getHost()); Assert.assertEquals(8080, instance.getPort());