From 342d53531f750ad9181825114457f5a2270e1078 Mon Sep 17 00:00:00 2001 From: pandaapo <1052156701@qq.com> Date: Fri, 16 Sep 2022 11:37:55 +0800 Subject: [PATCH] modify as review suggestions:change junit Assert to assertj Assetions... --- .../resttemplate/PolarisLoadBalancerInterceptorTest.java | 3 ++- .../enhancement/resttemplate/EnhancedRestTemplateReporter.java | 2 +- .../resttemplate/EnhancedRestTemplateReporterTest.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/resttemplate/PolarisLoadBalancerInterceptorTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/resttemplate/PolarisLoadBalancerInterceptorTest.java index df988ac36..25dfff963 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/resttemplate/PolarisLoadBalancerInterceptorTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/resttemplate/PolarisLoadBalancerInterceptorTest.java @@ -37,6 +37,7 @@ import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.common.util.expresstion.SpringWebExpressionLabelUtils; import com.tencent.cloud.polaris.router.RouterRuleLabelResolver; import com.tencent.cloud.polaris.router.spi.SpringWebRouterLabelResolver; +import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -149,7 +150,7 @@ public class PolarisLoadBalancerInterceptorTest { catch (UnsupportedEncodingException e) { throw new RuntimeException("unsupported charset exception " + UTF_8); } - Assert.assertEquals(mockedResponse.getHeaders().get(PolarisRouterContext.ROUTER_LABELS).get(0), encodedLabelsContent); + Assertions.assertThat(mockedResponse.getHeaders().get(PolarisRouterContext.ROUTER_LABELS).get(0)).isEqualTo(encodedLabelsContent); } } } diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java index 2b40b78c1..bd2a07be9 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java @@ -137,7 +137,7 @@ public class EnhancedRestTemplateReporter extends AbstractPolarisReporterAdapter } List labels = response.getHeaders().get(PolarisRouterContext.ROUTER_LABELS); - if (CollectionUtils.isNotEmpty(labels) && labels.size() > 0) { + if (CollectionUtils.isNotEmpty(labels)) { String label = labels.get(0); try { label = URLDecoder.decode(label, UTF_8); diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporterTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporterTest.java index 5d7ffd4ab..9cf31c09e 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporterTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporterTest.java @@ -31,6 +31,7 @@ import com.tencent.cloud.common.util.ApplicationContextAwareUtils; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.rpc.ServiceCallResult; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; @@ -133,7 +134,7 @@ public class EnhancedRestTemplateReporterTest { verify(consumerAPI, times(2)).updateServiceCallResult((ServiceCallResult) captor.capture()); ServiceCallResult value = (ServiceCallResult) captor.getValue(); - Assert.assertEquals(value.getLabels(), "k1:v1|k2:v2"); + Assertions.assertThat(value.getLabels()).isEqualTo("k1:v1|k2:v2"); verify(delegate).handleError(uri, HttpMethod.GET, response); }