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

feat(接口测试): 修复场景报告中含有执行失败的dubbo组件时不展示dubbo组件的问题 

--bug=1012669 --user=宋天阳
【接口测试】-场景中包含dubbo协议的api或case-调试生成报告中没有dubbo协议的结果
https://www.tapd.cn/55049933/s/1146411
This commit is contained in:
song-tianyang 2022-04-25 15:32:37 +08:00 committed by TIanyang
parent d2021973fa
commit ef33aa45bf
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
View File

@ -228,9 +228,9 @@ public class ApiScenarioReportStructureService {
if (CollectionUtils.isNotEmpty(root.getChildren())) { if (CollectionUtils.isNotEmpty(root.getChildren())) {
stepTotal.set((stepTotal.longValue() + root.getChildren().size())); stepTotal.set((stepTotal.longValue() + root.getChildren().size()));
for (StepTreeDTO step : root.getChildren()) { for (StepTreeDTO step : root.getChildren()) {
if (StringUtils.equalsAnyIgnoreCase(step.getTotalStatus(), "fail","error")) { if (StringUtils.equalsAnyIgnoreCase(step.getTotalStatus(), "fail", "error")) {
stepError.set(stepError.longValue() + 1); stepError.set(stepError.longValue() + 1);
} else if (StringUtils.equalsAnyIgnoreCase(step.getTotalStatus(), "errorCode","errorReportResult")) { } else if (StringUtils.equalsAnyIgnoreCase(step.getTotalStatus(), "errorCode", "errorReportResult")) {
stepErrorCode.set(stepErrorCode.longValue() + 1); stepErrorCode.set(stepErrorCode.longValue() + 1);
} else if (!StringUtils.equalsIgnoreCase(step.getTotalStatus(), "success")) { } else if (!StringUtils.equalsIgnoreCase(step.getTotalStatus(), "success")) {
stepUnExecute.set(stepUnExecute.longValue() + 1); stepUnExecute.set(stepUnExecute.longValue() + 1);
@ -373,7 +373,7 @@ public class ApiScenarioReportStructureService {
} }
if (StringUtils.isEmpty(dto.getTotalStatus())) { if (StringUtils.isEmpty(dto.getTotalStatus())) {
dto.setTotalStatus(ExecuteResult.unexecute.name()); dto.setTotalStatus(ExecuteResult.unexecute.name());
}else if(StringUtils.equalsAnyIgnoreCase(dto.getTotalStatus(),"error")){ } else if (StringUtils.equalsAnyIgnoreCase(dto.getTotalStatus(), "error")) {
dto.setTotalStatus("fail"); dto.setTotalStatus("fail");
} }
} }
@ -381,7 +381,8 @@ public class ApiScenarioReportStructureService {
try { try {
if (dtoList.stream().filter(e -> e.getValue() != null && ElementUtil.requests.contains(e.getType())).collect(Collectors.toList()).size() == dtoList.size()) { if (dtoList.stream().filter(e -> e.getValue() != null && ElementUtil.requests.contains(e.getType())).collect(Collectors.toList()).size() == dtoList.size()) {
List<StepTreeDTO> unList = dtoList.stream().filter(e -> e.getValue() != null List<StepTreeDTO> unList = dtoList.stream().filter(e -> e.getValue() != null
&& StringUtils.equalsIgnoreCase(e.getTotalStatus(), ExecuteResult.unexecute.name())).collect(Collectors.toList()); && ((StringUtils.equalsIgnoreCase(e.getType(), "DubboSampler") && e.getValue().getStartTime() == 0) || StringUtils.equalsIgnoreCase(e.getTotalStatus(), ExecuteResult.unexecute.name())))
.collect(Collectors.toList());
List<StepTreeDTO> list = dtoList.stream().filter(e -> e.getValue().getStartTime() != 0).collect(Collectors.toList()); List<StepTreeDTO> list = dtoList.stream().filter(e -> e.getValue().getStartTime() != 0).collect(Collectors.toList());
list = list.stream().sorted(Comparator.comparing(x -> x.getValue().getStartTime())).collect(Collectors.toList()); list = list.stream().sorted(Comparator.comparing(x -> x.getValue().getStartTime())).collect(Collectors.toList());
unList = unList.stream().sorted(Comparator.comparing(x -> x.getIndex())).collect(Collectors.toList()); unList = unList.stream().sorted(Comparator.comparing(x -> x.getIndex())).collect(Collectors.toList());
@ -542,7 +543,7 @@ public class ApiScenarioReportStructureService {
// 组装报告 // 组装报告
if (CollectionUtils.isNotEmpty(reportStructureWithBLOBs) && CollectionUtils.isNotEmpty(reportResults)) { if (CollectionUtils.isNotEmpty(reportStructureWithBLOBs) && CollectionUtils.isNotEmpty(reportResults)) {
ApiScenarioReportStructureWithBLOBs scenarioReportStructure = reportStructureWithBLOBs.get(0); ApiScenarioReportStructureWithBLOBs scenarioReportStructure = reportStructureWithBLOBs.get(0);
List<StepTreeDTO> stepList = JSONArray.parseArray(new String(scenarioReportStructure.getResourceTree(), StandardCharsets.UTF_8), StepTreeDTO.class); List<StepTreeDTO> stepList = JSONArray.parseArray(new String(scenarioReportStructure.getResourceTree(), StandardCharsets.UTF_8), StepTreeDTO.class);
//判断是否含有全局前后置脚本，如果有的话需要将脚本内容添加到stepDTO中 //判断是否含有全局前后置脚本，如果有的话需要将脚本内容添加到stepDTO中
reportResults = this.filterProcessResult(reportResults); reportResults = this.filterProcessResult(reportResults);
@ -590,7 +591,7 @@ public class ApiScenarioReportStructureService {
for (ApiScenarioReportResultWithBLOBs item : reportResults) { for (ApiScenarioReportResultWithBLOBs item : reportResults) {
if (item.getBaseInfo() != null) { if (item.getBaseInfo() != null) {
ApiScenarioReportBaseInfoDTO dto = JSONObject.parseObject(item.getBaseInfo(), ApiScenarioReportBaseInfoDTO.class); ApiScenarioReportBaseInfoDTO dto = JSONObject.parseObject(item.getBaseInfo(), ApiScenarioReportBaseInfoDTO.class);
if (!StringUtils.startsWithAny(dto.getReqName(), ResultParseUtil.PRE_PROCESS_SCRIPT,ResultParseUtil.POST_PROCESS_SCRIPT)) { if (!StringUtils.startsWithAny(dto.getReqName(), ResultParseUtil.PRE_PROCESS_SCRIPT, ResultParseUtil.POST_PROCESS_SCRIPT)) {
withOutProcessList.add(item); withOutProcessList.add(item);
} }
} else { } else {
@ -683,7 +684,7 @@ public class ApiScenarioReportStructureService {
RequestResult result = new RequestResult(); RequestResult result = new RequestResult();
try { try {
result = selectReportContent(stepId, RequestResult.class); result = selectReportContent(stepId, RequestResult.class);
}catch (Exception ignore){ } catch (Exception ignore) {
} }
return result; return result;
} }