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

fix(测试跟踪): 修复测试计划报告内的用例顺序和执行时用例顺序不一致的问题 

--bug=1013854 --user=宋天阳 【测试计划】jenkins调用执行测试计划-报告显示执行顺序错误
https://www.tapd.cn/55049933/s/1176636
This commit is contained in:
song-tianyang 2022-06-08 17:25:24 +08:00 committed by 刘瑞斌
parent 2ba598abfb
commit cfe6a75fa1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
View File

@ -955,11 +955,11 @@ public class TestPlanReportService {
}
public TestPlanExecuteReportDTO genTestPlanExecuteReportDTOByTestPlanReportContent(TestPlanReportContentWithBLOBs testPlanReportContentWithBLOBs) {
Map<String, String> testPlanApiCaseIdAndReportIdMap = new HashMap<>();
Map<String, String> testPlanScenarioIdAndReportIdMap = new HashMap<>();
Map<String, String> testPlanLoadCaseIdAndReportIdMap = new HashMap<>();
Map<String,TestPlanFailureApiDTO> apiCaseInfoDTOMap = new HashMap<>();
Map<String,TestPlanFailureScenarioDTO> scenarioInfoDTOMap = new HashMap<>();
Map<String, String> testPlanApiCaseIdAndReportIdMap = new LinkedHashMap<>();
Map<String, String> testPlanScenarioIdAndReportIdMap = new LinkedHashMap<>();
Map<String, String> testPlanLoadCaseIdAndReportIdMap = new LinkedHashMap<>();
Map<String,TestPlanFailureApiDTO> apiCaseInfoDTOMap = new LinkedHashMap<>();
Map<String,TestPlanFailureScenarioDTO> scenarioInfoDTOMap = new LinkedHashMap<>();
if (testPlanReportContentWithBLOBs != null) {
if (StringUtils.isNotEmpty(testPlanReportContentWithBLOBs.getPlanApiCaseReportStruct())) {

3
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -1049,7 +1049,7 @@ public class TestPlanService {
}
private Map<String, String> parseMsExecREsponseDTOToTestIdReportMap(List<MsExecResponseDTO> dtoList) {
Map<String, String> returnMap = new HashMap<>();
Map<String, String> returnMap = new LinkedHashMap<>();
if (CollectionUtils.isNotEmpty(dtoList)) {
dtoList.forEach(item -> {
if (StringUtils.isNotEmpty(item.getTestId()) && StringUtils.isNotEmpty(item.getReportId())) {
@ -1704,7 +1704,6 @@ public class TestPlanService {
} else {
return null;
}
}
public TestPlanSimpleReportDTO buildPlanReport(String planId, boolean saveResponse) {