msb-public
/
spring-cloud-tencent
mirror of https://github.com/Tencent/spring-cloud-tencent
3
1
Code Issues Projects Releases Wiki Activity

fix ut

Browse Source
pull/964/head
seanyu 2 years ago
parent dbfad4bed5
commit 279d57b54e
2 changed files with 325 additions and 165 deletions
Show Stats Download Patch File Download Diff File

6
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/AbstractPolarisReporterAdapter.java
Unescape View File

@ -186,7 +186,7 @@ public abstract class AbstractPolarisReporterAdapter {
* @param httpStatus request http status code * @param httpStatus request http status code
* @return true , otherwise return false . * @return true , otherwise return false .
*/ */
private boolean apply(@Nullable HttpStatus httpStatus) { protected boolean apply(@Nullable HttpStatus httpStatus) {
if (Objects.isNull(httpStatus)) { if (Objects.isNull(httpStatus)) {
return false; return false;
} }
@ -221,7 +221,7 @@ public abstract class AbstractPolarisReporterAdapter {
return false; return false;
} }
private RetStatus getRetStatusFromRequest(HttpHeaders headers, RetStatus defaultVal) { protected RetStatus getRetStatusFromRequest(HttpHeaders headers, RetStatus defaultVal) {
if (headers != null && headers.containsKey(HeaderConstant.INTERNAL_CALLEE_RET_STATUS)) { if (headers != null && headers.containsKey(HeaderConstant.INTERNAL_CALLEE_RET_STATUS)) {
List<String> values = headers.get(HeaderConstant.INTERNAL_CALLEE_RET_STATUS); List<String> values = headers.get(HeaderConstant.INTERNAL_CALLEE_RET_STATUS);
if (CollectionUtils.isNotEmpty(values)) { if (CollectionUtils.isNotEmpty(values)) {
@ -237,7 +237,7 @@ public abstract class AbstractPolarisReporterAdapter {
return defaultVal; return defaultVal;
} }
private String getActiveRuleNameFromRequest(HttpHeaders headers) { protected String getActiveRuleNameFromRequest(HttpHeaders headers) {
if (headers != null && headers.containsKey(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME)) { if (headers != null && headers.containsKey(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME)) {
Collection<String> values = headers.get(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME); Collection<String> values = headers.get(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME);
if (CollectionUtils.isNotEmpty(values)) { if (CollectionUtils.isNotEmpty(values)) {

484
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/AbstractPolarisReporterAdapterTest.java
Unescape View File

@ -1,162 +1,322 @@
///* /*
// * Tencent is pleased to support the open source community by making Spring Cloud Tencent available. * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
// * *
// * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
// * *
// * Licensed under the BSD 3-Clause License (the "License"); * Licensed under the BSD 3-Clause License (the "License");
// * you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at * You may obtain a copy of the License at
// * *
// * https://opensource.org/licenses/BSD-3-Clause * https://opensource.org/licenses/BSD-3-Clause
// * *
// * Unless required by applicable law or agreed to in writing, software distributed * Unless required by applicable law or agreed to in writing, software distributed
// * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// * CONDITIONS OF ANY KIND, either express or implied. See the License for the * CONDITIONS OF ANY KIND, either express or implied. See the License for the
// * specific language governing permissions and limitations under the License. * specific language governing permissions and limitations under the License.
// */ */
//
//package com.tencent.cloud.rpc.enhancement; package com.tencent.cloud.rpc.enhancement;
//
//import com.tencent.cloud.common.constant.HeaderConstant; import java.net.SocketTimeoutException;
//import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import java.net.URI;
//import com.tencent.polaris.api.pojo.RetStatus; import java.net.URISyntaxException;
//import org.assertj.core.api.Assertions;
//import org.junit.jupiter.api.Test; import com.tencent.cloud.common.constant.HeaderConstant;
// import com.tencent.cloud.common.constant.RouterConstant;
//import org.springframework.http.HttpHeaders; import com.tencent.cloud.common.metadata.MetadataContext;
//import org.springframework.http.HttpStatus; import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
// import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
///** import com.tencent.polaris.api.config.Configuration;
// * Test For {@link AbstractPolarisReporterAdapter}. import com.tencent.polaris.api.config.global.APIConfig;
// * import com.tencent.polaris.api.config.global.GlobalConfig;
// * @author <a href="mailto:iskp.me@gmail.com">Elve.Xu</a> 2022/7/11 import com.tencent.polaris.api.plugin.circuitbreaker.ResourceStat;
// */ import com.tencent.polaris.api.pojo.RetStatus;
//public class AbstractPolarisReporterAdapterTest { import com.tencent.polaris.api.rpc.ServiceCallResult;
// import com.tencent.polaris.client.api.SDKContext;
// @Test import org.junit.jupiter.api.AfterAll;
// public void testApplyWithDefaultConfig() { import org.junit.jupiter.api.BeforeAll;
// RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); import org.junit.jupiter.api.BeforeEach;
// // Mock Condition import org.junit.jupiter.api.Test;
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); import org.junit.jupiter.api.extension.ExtendWith;
// import org.mockito.Mock;
// // Assert import org.mockito.MockedStatic;
// Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); import org.mockito.Mockito;
// Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false); import org.mockito.junit.jupiter.MockitoExtension;
// Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
// } import org.springframework.http.HttpHeaders;
// import org.springframework.http.HttpStatus;
// @Test
// public void testApplyWithoutIgnoreInternalServerError() { import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST;
// RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER;
// // Mock Condition import static org.assertj.core.api.Assertions.assertThat;
// properties.getStatuses().clear(); import static org.mockito.ArgumentMatchers.anyString;
// properties.setIgnoreInternalServerError(false); import static org.mockito.Mockito.doReturn;
// import static org.mockito.Mockito.mock;
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties);
// /**
// // Assert * Test For {@link AbstractPolarisReporterAdapter}.
// Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); *
// Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(true); * @author <a href="mailto:iskp.me@gmail.com">Elve.Xu</a> 2022/7/11
// Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true); */
// } @ExtendWith(MockitoExtension.class)
// public class AbstractPolarisReporterAdapterTest {
// @Test
// public void testApplyWithIgnoreInternalServerError() { private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils;
// RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); private final RpcEnhancementReporterProperties reporterProperties = new RpcEnhancementReporterProperties();
// // Mock Condition @Mock
// properties.getStatuses().clear(); private SDKContext sdkContext;
// properties.setIgnoreInternalServerError(true);
// @BeforeAll
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); static void beforeAll() {
// mockedApplicationContextAwareUtils = Mockito.mockStatic(ApplicationContextAwareUtils.class);
// // Assert mockedApplicationContextAwareUtils.when(() -> ApplicationContextAwareUtils.getProperties(anyString()))
// Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); .thenReturn("unit-test");
// Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false); }
// Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
// } @AfterAll
// static void afterAll() {
// @Test mockedApplicationContextAwareUtils.close();
// public void testApplyWithoutSeries() { }
// RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// // Mock Condition @BeforeEach
// properties.getStatuses().clear(); void setUp() {
// properties.getSeries().clear(); MetadataContext.LOCAL_NAMESPACE = NAMESPACE_TEST;
// MetadataContext.LOCAL_SERVICE = SERVICE_PROVIDER;
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); }
//
// // Assert @Test
// Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); public void testServiceCallResult() throws URISyntaxException {
// Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false); APIConfig apiConfig = mock(APIConfig.class);
// Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true); doReturn("0.0.0.0").when(apiConfig).getBindIP();
// }
// GlobalConfig globalConfig = mock(GlobalConfig.class);
// @Test doReturn(apiConfig).when(globalConfig).getAPI();
// public void testApplyWithSeries() {
// RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); Configuration configuration = mock(Configuration.class);
// // Mock Condition doReturn(globalConfig).when(configuration).getGlobal();
// properties.getStatuses().clear();
// properties.getSeries().clear(); doReturn(configuration).when(sdkContext).getConfig();
// properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR);
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(reporterProperties, sdkContext);
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties);
// ServiceCallResult serviceCallResult;
// // Assert
// Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); HttpHeaders requestHeaders = new HttpHeaders();
// Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false); requestHeaders.add(RouterConstant.ROUTER_LABEL_HEADER, "{\"k1\":\"v1\"}");
// Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(false);
// Assertions.assertThat(adapter.apply(HttpStatus.FORBIDDEN)).isEqualTo(true); serviceCallResult = adapter.createServiceCallResult(
// } "test",
// new URI("http://0.0.0.0/"),
// requestHeaders,
// @Test new HttpHeaders(),
// public void testGetRetStatusFromRequest() { 200,
// RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); 0,
// // Mock Condition null
// properties.getStatuses().clear(); );
// properties.getSeries().clear(); assertThat(serviceCallResult.getRetStatus()).isEqualTo(RetStatus.RetSuccess);
// properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR);
// serviceCallResult = adapter.createServiceCallResult(
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); "test",
// new URI("http://0.0.0.0/"),
// HttpHeaders headers = new HttpHeaders(); requestHeaders,
// RetStatus ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail); new HttpHeaders(),
// Assertions.assertThat(ret).isEqualTo(RetStatus.RetFail); 502,
// 0,
// headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetFlowControl.getDesc()); null
// ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail); );
// Assertions.assertThat(ret).isEqualTo(RetStatus.RetFlowControl); assertThat(serviceCallResult.getRetStatus()).isEqualTo(RetStatus.RetFail);
//
// headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetReject.getDesc()); serviceCallResult = adapter.createServiceCallResult(
// ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail); "test",
// Assertions.assertThat(ret).isEqualTo(RetStatus.RetReject); new URI("http://0.0.0.0/"),
// } requestHeaders,
// new HttpHeaders(),
// @Test 200,
// public void testGetActiveRuleNameFromRequest() { 0,
// RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); new SocketTimeoutException()
// // Mock Condition );
// properties.getStatuses().clear(); assertThat(serviceCallResult.getRetStatus()).isEqualTo(RetStatus.RetTimeout);
// properties.getSeries().clear();
// properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR); serviceCallResult = adapter.createServiceCallResult(
// "test",
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); "0.0.0.0",
// 8080,
// HttpHeaders headers = new HttpHeaders(); new URI("/"),
// String ruleName = adapter.getActiveRuleNameFromRequest(headers); requestHeaders,
// Assertions.assertThat(ruleName).isEqualTo(""); new HttpHeaders(),
// 200,
// headers.set(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME, "mock_rule"); 0,
// ruleName = adapter.getActiveRuleNameFromRequest(headers); null
// Assertions.assertThat(ruleName).isEqualTo("mock_rule"); );
// } assertThat(serviceCallResult.getRetStatus()).isEqualTo(RetStatus.RetSuccess);
// assertThat(serviceCallResult.getHost()).isEqualTo("0.0.0.0");
// /** assertThat(serviceCallResult.getPort()).isEqualTo(8080);
// * Simple Polaris CircuitBreak Adapter Implements . }
// */
// public static class SimplePolarisReporterAdapter extends AbstractPolarisReporterAdapter { @Test
// public void testResourceStat() throws URISyntaxException {
// public SimplePolarisReporterAdapter(RpcEnhancementReporterProperties properties) {
// super(properties); SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(reporterProperties, sdkContext);
// }
// } ResourceStat resourceStat;
//}
resourceStat = adapter.createInstanceResourceStat("test",
new URI("http://0.0.0.0/"),
200,
0,
null
);
assertThat(resourceStat.getRetStatus()).isEqualTo(RetStatus.RetSuccess);
resourceStat = adapter.createInstanceResourceStat("test",
new URI("http://0.0.0.0/"),
200,
0,
new SocketTimeoutException()
);
assertThat(resourceStat.getRetStatus()).isEqualTo(RetStatus.RetTimeout);
resourceStat = adapter.createInstanceResourceStat("test",
null,
null,
new URI("http://0.0.0.0/"),
200,
0,
null
);
assertThat(resourceStat.getRetStatus()).isEqualTo(RetStatus.RetSuccess);
}
@Test
public void testApplyWithDefaultConfig() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties, sdkContext);
// Assert
assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
}
@Test
public void testApplyWithoutIgnoreInternalServerError() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition
properties.getStatuses().clear();
properties.setIgnoreInternalServerError(false);
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties, sdkContext);
// Assert
assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(true);
assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
}
@Test
public void testApplyWithIgnoreInternalServerError() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition
properties.getStatuses().clear();
properties.setIgnoreInternalServerError(true);
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties, sdkContext);
// Assert
assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
}
@Test
public void testApplyWithoutSeries() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition
properties.getStatuses().clear();
properties.getSeries().clear();
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties, sdkContext);
// Assert
assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
}
@Test
public void testApplyWithSeries() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition
properties.getStatuses().clear();
properties.getSeries().clear();
properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR);
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties, sdkContext);
// Assert
assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(false);
assertThat(adapter.apply(HttpStatus.FORBIDDEN)).isEqualTo(true);
}
@Test
public void testGetRetStatusFromRequest() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition
properties.getStatuses().clear();
properties.getSeries().clear();
properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR);
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties, sdkContext);
HttpHeaders headers = new HttpHeaders();
RetStatus ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail);
assertThat(ret).isEqualTo(RetStatus.RetFail);
headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetFlowControl.getDesc());
ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail);
assertThat(ret).isEqualTo(RetStatus.RetFlowControl);
headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetReject.getDesc());
ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail);
assertThat(ret).isEqualTo(RetStatus.RetReject);
}
@Test
public void testGetActiveRuleNameFromRequest() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition
properties.getStatuses().clear();
properties.getSeries().clear();
properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR);
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties, sdkContext);
HttpHeaders headers = new HttpHeaders();
String ruleName = adapter.getActiveRuleNameFromRequest(headers);
assertThat(ruleName).isEqualTo("");
headers.set(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME, "mock_rule");
ruleName = adapter.getActiveRuleNameFromRequest(headers);
assertThat(ruleName).isEqualTo("mock_rule");
}
/**
* Simple Polaris CircuitBreak Adapter Implements .
*/
public static class SimplePolarisReporterAdapter extends AbstractPolarisReporterAdapter {
/**
* Constructor With {@link RpcEnhancementReporterProperties} .
*
* @param reportProperties instance of {@link RpcEnhancementReporterProperties}.
* @param context
*/
protected SimplePolarisReporterAdapter(RpcEnhancementReporterProperties reportProperties, SDKContext context) {
super(reportProperties, context);
}
}
}

Write Preview
Loading…
Cancel
Save