assert modify and code style.

pull/468/head
许路路 3 years ago
parent ea6c22b9d8
commit 5c5855ee45

@ -27,8 +27,8 @@ import com.tencent.cloud.polaris.loadbalancer.config.PolarisLoadBalancerProperti
import com.tencent.polaris.api.pojo.Instance; import com.tencent.polaris.api.pojo.Instance;
import com.tencent.polaris.router.api.core.RouterAPI; import com.tencent.polaris.router.api.core.RouterAPI;
import com.tencent.polaris.router.api.rpc.ProcessLoadBalanceResponse; import com.tencent.polaris.router.api.rpc.ProcessLoadBalanceResponse;
import org.assertj.core.api.Assertions;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; 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 * @author rod.xu
* @date 2022/7/21 5:44 * @date 2022/7/21 5:44
@ -114,16 +114,16 @@ public class PolarisLoadBalancerTest {
verify(supplierObjectProvider).getIfAvailable(any()); verify(supplierObjectProvider).getIfAvailable(any());
//result assert //result assert
Assert.assertNotNull(serviceInstance); Assertions.assertThat(serviceInstance).isNotNull();
Assert.assertTrue("polaris service instance", Assertions.assertThat(serviceInstance instanceof PolarisServiceInstance).isTrue();
serviceInstance instanceof PolarisServiceInstance);
PolarisServiceInstance polarisServiceInstance = (PolarisServiceInstance) serviceInstance; PolarisServiceInstance polarisServiceInstance = (PolarisServiceInstance) serviceInstance;
Assert.assertEquals("instance-id", polarisServiceInstance.getPolarisInstance().getId());
Assert.assertEquals(LOCAL_NAMESPACE, polarisServiceInstance.getPolarisInstance().getNamespace()); Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getId()).isEqualTo("instance-id");
Assert.assertEquals(LOCAL_SERVICE, polarisServiceInstance.getPolarisInstance().getService()); Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getNamespace()).isEqualTo(LOCAL_NAMESPACE);
Assert.assertEquals("host", polarisServiceInstance.getPolarisInstance().getHost()); Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getService()).isEqualTo(LOCAL_SERVICE);
Assert.assertEquals(8090, polarisServiceInstance.getPolarisInstance().getPort()); Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getHost()).isEqualTo("host");
Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getPort()).isEqualTo(8090);
} }
} }

@ -23,7 +23,7 @@ import java.util.List;
import com.tencent.cloud.common.pojo.PolarisServiceInstance; import com.tencent.cloud.common.pojo.PolarisServiceInstance;
import com.tencent.cloud.common.util.ApplicationContextAwareUtils; import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
import org.junit.Assert; import org.assertj.core.api.Assertions;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@ -39,7 +39,7 @@ import static com.tencent.cloud.common.metadata.MetadataContext.LOCAL_NAMESPACE;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
/** /**
* Test for {@link PolarisServiceInstanceListSupplier} * Test for {@link PolarisServiceInstanceListSupplier}.
* *
* @author rod.xu * @author rod.xu
* @date 2022/7/21 5:45 * @date 2022/7/21 5:45
@ -69,21 +69,22 @@ public class PolarisServiceInstanceListSupplierTest {
allServers.add(instance2); allServers.add(instance2);
List<ServiceInstance> polarisInstanceList = instanceListSupplier.chooseInstances(allServers); List<ServiceInstance> 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) { for (ServiceInstance serviceInstance : polarisInstanceList) {
Assert.assertTrue("", serviceInstance instanceof PolarisServiceInstance); Assertions.assertThat(serviceInstance instanceof PolarisServiceInstance).isTrue();
PolarisServiceInstance polarisServiceInstance = (PolarisServiceInstance) serviceInstance; PolarisServiceInstance polarisServiceInstance = (PolarisServiceInstance) serviceInstance;
Assert.assertFalse(polarisServiceInstance.isSecure()); Assertions.assertThat(polarisServiceInstance.isSecure()).isFalse();
Assert.assertEquals("unit-test-serviceId", polarisServiceInstance.getPolarisInstance().getService()); Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getService()).isEqualTo("unit-test-serviceId");
Assert.assertEquals(8090, polarisServiceInstance.getPolarisInstance().getPort()); Assertions.assertThat(polarisServiceInstance.getPolarisInstance().getNamespace()).isEqualTo(LOCAL_NAMESPACE);
Assert.assertEquals(LOCAL_NAMESPACE, polarisServiceInstance.getPolarisInstance().getNamespace()); 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"));
} }
} }
} }

Loading…
Cancel
Save