test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(接口测试): 修复失败误报归类为失败时接口状态是误报的缺陷 

修复失败误报归类为失败时接口状态是误报的缺陷
This commit is contained in:
song-tianyang 2022-07-22 19:34:35 +08:00 committed by 建国
parent efbf710ad7
commit ecbdb4734c
1 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
backend/src/main/java/io/metersphere/commons/utils/ErrorReportLibraryUtil.java
View File

@ -67,7 +67,7 @@ public class ErrorReportLibraryUtil {
} }
//根据配置来筛选断言、获取误报编码、获取接口状态是否是误报 //根据配置来筛选断言、获取误报编码、获取接口状态是否是误报
AssertionFilterResult filterResult = filterAssertions(passedErrorReportAssertionMap,successAssertionMessageMap,errorAssertionMessageMap,higherThanSuccess,higherThanError); AssertionFilterResult filterResult = filterAssertions(passedErrorReportAssertionMap, successAssertionMessageMap, errorAssertionMessageMap, result.isSuccess(), higherThanSuccess, higherThanError);
int filteredSuccessAssertionCount = unMatchErrorReportAssertions.size() + filterResult.filteredSuccessAssertionList.size(); int filteredSuccessAssertionCount = unMatchErrorReportAssertions.size() + filterResult.filteredSuccessAssertionList.size();
unMatchErrorReportAssertions.addAll(filterResult.filteredSuccessAssertionList); unMatchErrorReportAssertions.addAll(filterResult.filteredSuccessAssertionList);
unMatchErrorReportAssertions.addAll(filterResult.filteredErrorAssertionList); unMatchErrorReportAssertions.addAll(filterResult.filteredErrorAssertionList);
@ -112,13 +112,13 @@ public class ErrorReportLibraryUtil {
* @param errorReportAssertionMap 匹配到的误报断言 * @param errorReportAssertionMap 匹配到的误报断言
* @param successAssertionMap 匹配到的成功断言 * @param successAssertionMap 匹配到的成功断言
* @param errorAssertionMap 匹配到的失败断言 * @param errorAssertionMap 匹配到的失败断言
* @param higherThanSuccess 误报断言优先级小于成功断言优先级 * @param higherThanSuccess 误报断言优先级小于成功断言优先级
* @param higherThanError 误报断言优先级大于成功断言优先级 * @param higherThanError 误报断言优先级大于成功断言优先级
*/ */
private static AssertionFilterResult filterAssertions(Map<String, List<ResponseAssertionResult>> errorReportAssertionMap, private static AssertionFilterResult filterAssertions(Map<String, List<ResponseAssertionResult>> errorReportAssertionMap,
Map<String, List<ResponseAssertionResult>> successAssertionMap, Map<String, List<ResponseAssertionResult>> successAssertionMap,
Map<String, List<ResponseAssertionResult>> errorAssertionMap, Map<String, List<ResponseAssertionResult>> errorAssertionMap,
boolean higherThanSuccess, boolean higherThanError) { boolean resultIsSuccess, boolean higherThanSuccess, boolean higherThanError) {
AssertionFilterResult result = new AssertionFilterResult(); AssertionFilterResult result = new AssertionFilterResult();
if (MapUtils.isNotEmpty(errorReportAssertionMap)) { if (MapUtils.isNotEmpty(errorReportAssertionMap)) {
List<ResponseAssertionResult> removedSuccessList = removeAssertions(errorReportAssertionMap, successAssertionMap, higherThanSuccess); List<ResponseAssertionResult> removedSuccessList = removeAssertions(errorReportAssertionMap, successAssertionMap, higherThanSuccess);
@ -127,14 +127,14 @@ public class ErrorReportLibraryUtil {
} }
List<ResponseAssertionResult> removedErrorList = removeAssertions(errorReportAssertionMap, errorAssertionMap, higherThanError); List<ResponseAssertionResult> removedErrorList = removeAssertions(errorReportAssertionMap, errorAssertionMap, higherThanError);
if (CollectionUtils.isNotEmpty(removedErrorList)) { if (CollectionUtils.isNotEmpty(removedErrorList)) {
if(higherThanError){ if (higherThanError) {
result.filteredErrorAssertionList.addAll(removedErrorList); result.filteredErrorAssertionList.addAll(removedErrorList);
}else { } else {
result.filteredSuccessAssertionList.addAll(removedErrorList); result.filteredSuccessAssertionList.addAll(removedErrorList);
} }
} }
for (List<ResponseAssertionResult> list: errorReportAssertionMap.values()) { for (List<ResponseAssertionResult> list : errorReportAssertionMap.values()) {
list.forEach(item -> { list.forEach(item -> {
String assertionName = item.getName(); String assertionName = item.getName();
if (StringUtils.startsWith(assertionName, ERROR_REPORT_NAME_START)) { if (StringUtils.startsWith(assertionName, ERROR_REPORT_NAME_START)) {
@ -144,14 +144,8 @@ public class ErrorReportLibraryUtil {
}); });
} }
if(MapUtils.isNotEmpty(errorReportAssertionMap)){ if (MapUtils.isNotEmpty(errorReportAssertionMap)) {
if (MapUtils.isNotEmpty(errorAssertionMap)) { if ((higherThanError && !resultIsSuccess) || (higherThanSuccess && resultIsSuccess)) {
if(higherThanError){
result.requestStatus = ExecuteResult.ERROR_REPORT_RESULT.toString();
}
}else if(higherThanSuccess){
result.requestStatus = ExecuteResult.ERROR_REPORT_RESULT.toString();
}else if(MapUtils.isEmpty(successAssertionMap)){
result.requestStatus = ExecuteResult.ERROR_REPORT_RESULT.toString(); result.requestStatus = ExecuteResult.ERROR_REPORT_RESULT.toString();
} }
} }
@ -161,26 +155,27 @@ public class ErrorReportLibraryUtil {
/** /**
* 将匹配的断言移除 * 将匹配的断言移除
* @param map1 *
* @param map2 * @param firstMap
* @param removeDataInMap2 是否移除map2中的数据？true:移除map2中的数据 false：移除map1中的数据 * @param secondMap
* @param removeDataInSecondMap 是否移除map2中的数据？true:移除map2中的数据 false：移除map1中的数据
* @return * @return
*/ */
private static List<ResponseAssertionResult> removeAssertions(Map<String, List<ResponseAssertionResult>> map1, Map<String, List<ResponseAssertionResult>> map2, boolean removeDataInMap2) { private static List<ResponseAssertionResult> removeAssertions(Map<String, List<ResponseAssertionResult>> firstMap, Map<String, List<ResponseAssertionResult>> secondMap, boolean removeDataInSecondMap) {
List<ResponseAssertionResult> returnList = new ArrayList<>(); List<ResponseAssertionResult> returnList = new ArrayList<>();
if (MapUtils.isNotEmpty(map1) && MapUtils.isNotEmpty(map2)) { if (MapUtils.isNotEmpty(firstMap) && MapUtils.isNotEmpty(secondMap)) {
if (removeDataInMap2) { if (removeDataInSecondMap) {
for (String regex : map1.keySet()) { for (String regex : firstMap.keySet()) {
if(map2.containsKey(regex)){ if (secondMap.containsKey(regex)) {
returnList.addAll(map2.get(regex)); returnList.addAll(secondMap.get(regex));
map2.remove(regex); secondMap.remove(regex);
} }
} }
} else { } else {
for (String regex : map2.keySet()) { for (String regex : secondMap.keySet()) {
if(map1.containsKey(regex)){ if (firstMap.containsKey(regex)) {
returnList.addAll(map1.get(regex)); returnList.addAll(firstMap.get(regex));
map1.remove(regex); firstMap.remove(regex);
} }
} }
} }
@ -190,13 +185,14 @@ public class ErrorReportLibraryUtil {
/** /**
* 解析并重新格式化请求中的所有断言 * 解析并重新格式化请求中的所有断言
*
* @param assertions * @param assertions
* @return * @return
*/ */
private static AssertionParserResult parserAndFormatAssertion(List<ResponseAssertionResult> assertions){ private static AssertionParserResult parserAndFormatAssertion(List<ResponseAssertionResult> assertions) {
AssertionParserResult result = new AssertionParserResult(); AssertionParserResult result = new AssertionParserResult();
for (ResponseAssertionResult assertion : assertions) { for (ResponseAssertionResult assertion : assertions) {
if (assertion instanceof ErrorReportAssertionResult || StringUtils.startsWith(assertion.getName(),ERROR_REPORT_NAME_START)) { if (assertion instanceof ErrorReportAssertionResult || StringUtils.startsWith(assertion.getName(), ERROR_REPORT_NAME_START)) {
String expression = assertion.getContent().trim(); String expression = assertion.getContent().trim();
if (StringUtils.contains(expression, ASSERTION_CONTENT_REGEX_DELIMITER)) { if (StringUtils.contains(expression, ASSERTION_CONTENT_REGEX_DELIMITER)) {
String[] contentArr = expression.split(ASSERTION_CONTENT_REGEX_DELIMITER); String[] contentArr = expression.split(ASSERTION_CONTENT_REGEX_DELIMITER);