From 5c5855ee45f0d0d79d9d574deae4fcfe6cc7a602 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 15:27:01 +0800 Subject: [PATCH] assert modify and code style. --- .../loadbalancer/PolarisLoadBalancerTest.java | 20 +++++++------- ...olarisServiceInstanceListSupplierTest.java | 27 ++++++++++--------- 2 files changed, 24 insertions(+), 23 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 708bd351f..26ed7cbd1 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 @@ -27,8 +27,8 @@ import com.tencent.cloud.polaris.loadbalancer.config.PolarisLoadBalancerProperti import com.tencent.polaris.api.pojo.Instance; import com.tencent.polaris.router.api.core.RouterAPI; import com.tencent.polaris.router.api.rpc.ProcessLoadBalanceResponse; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,7 +54,7 @@ import static org.mockito.Mockito.when; /** - * Test for {@link PolarisLoadBalancer} + * Test for {@link PolarisLoadBalancer}. * * @author rod.xu * @date 2022/7/21 5:44 下午 @@ -114,16 +114,16 @@ public class PolarisLoadBalancerTest { verify(supplierObjectProvider).getIfAvailable(any()); //result assert - Assert.assertNotNull(serviceInstance); - Assert.assertTrue("polaris service instance", - serviceInstance instanceof PolarisServiceInstance); + Assertions.assertThat(serviceInstance).isNotNull(); + Assertions.assertThat(serviceInstance instanceof PolarisServiceInstance).isTrue(); PolarisServiceInstance polarisServiceInstance = (PolarisServiceInstance) serviceInstance; - Assert.assertEquals("instance-id", polarisServiceInstance.getPolarisInstance().getId()); - Assert.assertEquals(LOCAL_NAMESPACE, polarisServiceInstance.getPolarisInstance().getNamespace()); - Assert.assertEquals(LOCAL_SERVICE, polarisServiceInstance.getPolarisInstance().getService()); - Assert.assertEquals("host", polarisServiceInstance.getPolarisInstance().getHost()); - Assert.assertEquals(8090, polarisServiceInstance.getPolarisInstance().getPort()); + + Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getId()).isEqualTo("instance-id"); + Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getNamespace()).isEqualTo(LOCAL_NAMESPACE); + Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getService()).isEqualTo(LOCAL_SERVICE); + 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 02fac4b95..098b53050 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 @@ -23,7 +23,7 @@ import java.util.List; import com.tencent.cloud.common.pojo.PolarisServiceInstance; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; -import org.junit.Assert; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -39,7 +39,7 @@ import static com.tencent.cloud.common.metadata.MetadataContext.LOCAL_NAMESPACE; import static org.mockito.ArgumentMatchers.anyString; /** - * Test for {@link PolarisServiceInstanceListSupplier} + * Test for {@link PolarisServiceInstanceListSupplier}. * * @author rod.xu * @date 2022/7/21 5:45 下午 @@ -69,21 +69,22 @@ public class PolarisServiceInstanceListSupplierTest { allServers.add(instance2); List polarisInstanceList = instanceListSupplier.chooseInstances(allServers); - Assert.assertNotNull(polarisInstanceList); - Assert.assertEquals(polarisInstanceList.size(), allServers.size()); + + Assertions.assertThat(polarisInstanceList).isNotNull(); + Assertions.assertThat(polarisInstanceList.size()).isEqualTo(allServers.size()); + for (ServiceInstance serviceInstance : polarisInstanceList) { - Assert.assertTrue("", serviceInstance instanceof PolarisServiceInstance); + Assertions.assertThat(serviceInstance instanceof PolarisServiceInstance).isTrue(); + PolarisServiceInstance polarisServiceInstance = (PolarisServiceInstance) serviceInstance; - Assert.assertFalse(polarisServiceInstance.isSecure()); - Assert.assertEquals("unit-test-serviceId", polarisServiceInstance.getPolarisInstance().getService()); - Assert.assertEquals(8090, polarisServiceInstance.getPolarisInstance().getPort()); - Assert.assertEquals(LOCAL_NAMESPACE, polarisServiceInstance.getPolarisInstance().getNamespace()); + Assertions.assertThat(polarisServiceInstance.isSecure()).isFalse(); + Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getService()).isEqualTo("unit-test-serviceId"); + Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getNamespace()).isEqualTo(LOCAL_NAMESPACE); + 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(); - Assert.assertTrue("instance id assert", - polarisServiceInstance.getPolarisInstance().getId().startsWith("unit-test-instanceId")); - Assert.assertTrue("host assert", - polarisServiceInstance.getPolarisInstance().getHost().startsWith("unit-test-host")); } } }