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-03-23 15:54:30 +08:00 committed by CountryBuilder
parent 41d2707eae
commit 9943a1d507
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ public class ApiScenarioReportStructureService {
private ApiDefinitionExecResultMapper definitionExecResultMapper; private ApiDefinitionExecResultMapper definitionExecResultMapper;
private static final List<String> requests = Arrays.asList("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "JSR223Processor", "AbstractSampler"); private static final List<String> requests = Arrays.asList("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "JSR223Processor", "AbstractSampler");
private static final List<String> controls = Arrays.asList("Assertions","IfController","ConstantTimer");
public void save(List<ApiScenarioWithBLOBs> apiScenarios, String reportId, String reportType) { public void save(List<ApiScenarioWithBLOBs> apiScenarios, String reportId, String reportType) {
List<StepTreeDTO> dtoList = new LinkedList<>(); List<StepTreeDTO> dtoList = new LinkedList<>();
@ -238,6 +239,9 @@ public class ApiScenarioReportStructureService {
public static void reportFormatting(List<StepTreeDTO> dtoList, Map<String, List<ApiScenarioReportResult>> maps) { public static void reportFormatting(List<StepTreeDTO> dtoList, Map<String, List<ApiScenarioReportResult>> maps) {
for (int index = 0; index < dtoList.size(); index++) { for (int index = 0; index < dtoList.size(); index++) {
StepTreeDTO dto = dtoList.get(index); StepTreeDTO dto = dtoList.get(index);
if(dto.getResourceId().equals("a1db7c43-9d07-4c35-b36e-d4498a1dc78a_19")){
System.out.println("-----");
}
dto.setIndex((index + 1)); dto.setIndex((index + 1));
List<ApiScenarioReportResult> reportResults = maps.get(dto.getResourceId()); List<ApiScenarioReportResult> reportResults = maps.get(dto.getResourceId());
if (CollectionUtils.isNotEmpty(reportResults)) { if (CollectionUtils.isNotEmpty(reportResults)) {
@ -265,6 +269,12 @@ public class ApiScenarioReportStructureService {
requestResultExpandDTO.setName(dto.getLabel()); requestResultExpandDTO.setName(dto.getLabel());
dto.setTotalStatus("unexecute"); dto.setTotalStatus("unexecute");
dto.setValue(requestResultExpandDTO); dto.setValue(requestResultExpandDTO);
} else if(StringUtils.isNotEmpty(dto.getType()) && controls.contains(dto.getType()) && dto.getValue() == null){
RequestResultExpandDTO requestResultExpandDTO = new RequestResultExpandDTO();
requestResultExpandDTO.setStatus("success");
requestResultExpandDTO.setName(dto.getLabel());
dto.setTotalStatus("success");
dto.setValue(requestResultExpandDTO);
} else { } else {
if (dto.getValue() instanceof RequestResultExpandDTO && StringUtils.isNotEmpty(((RequestResultExpandDTO) dto.getValue()).getStatus())) { if (dto.getValue() instanceof RequestResultExpandDTO && StringUtils.isNotEmpty(((RequestResultExpandDTO) dto.getValue()).getStatus())) {
dto.setTotalStatus(((RequestResultExpandDTO) dto.getValue()).getStatus()); dto.setTotalStatus(((RequestResultExpandDTO) dto.getValue()).getStatus());
@ -324,9 +334,9 @@ public class ApiScenarioReportStructureService {
dto.setTotalStatus("success"); dto.setTotalStatus("success");
} }
} else { } else {
if (errorReportCount > 0) { if (failCount > 0) {
dto.setTotalStatus("fail"); dto.setTotalStatus("fail");
} else if (failCount > 0) { } else if (errorReportCount > 0) {
dto.setTotalStatus("errorCode"); dto.setTotalStatus("errorCode");
} else { } else {
dto.setTotalStatus("success"); dto.setTotalStatus("success");