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

fix(测试跟踪): 修复批量执行测试计划会报错的问题 

--bug=1015268 --user=宋天阳 【测试计划】批量执行测试计划报错了
https://www.tapd.cn/55049933/s/1208597
This commit is contained in:
song-tianyang 2022-07-24 15:42:04 +08:00 committed by 建国
parent 3ac615a2cd
commit 2b017ba90e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReferenceIdMapper.xml
View File

@ -6,8 +6,10 @@
from api_scenario_reference_id
WHERE api_scenario_id in (SELECT id
from api_scenario
WHERE project_id = #{0}
AND latest = 1)
WHERE status
!= 'Trash'
AND project_id = #{0}
AND latest = 1)
AND reference_id IS NOT NULL;
</select>

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

@ -47,7 +47,6 @@ import io.metersphere.track.request.testplan.LoadCaseRequest;
import io.metersphere.track.request.testplan.TestplanRunRequest;
import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
import io.metersphere.utils.LoggerUtil;
import io.metersphere.dto.RunUiScenarioRequest;
import org.apache.commons.beanutils.BeanMap;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
@ -1028,7 +1027,7 @@ public class TestPlanService {
LoggerUtil.info("开始执行测试计划 UI 场景用例 " + planReportId);
uiScenarioReportMap = this.executeUiScenarioCase(planReportId, testPlanID, projectID, runModeConfig, triggerMode, userId, reportInfoDTO.getUiScenarioIdMap());
}
if (apiCaseReportMap != null && scenarioReportMap != null && loadCaseReportMap != null && uiScenarioReportMap!= null) {
if (apiCaseReportMap != null && scenarioReportMap != null && loadCaseReportMap != null && uiScenarioReportMap != null) {
LoggerUtil.info("开始生成测试计划报告内容 " + planReportId);
testPlanReportService.createTestPlanReportContentReportIds(planReportId, apiCaseReportMap, scenarioReportMap, loadCaseReportMap, uiScenarioReportMap);
}
@ -2236,12 +2235,11 @@ public class TestPlanService {
TestPlanWithBLOBs testPlan = testPlanMap.get(id);
String planReportId = UUID.randomUUID().toString();
//创建测试报告
// TODO: 2022/5/16 genTestPlanReport的runModeConfig先赋值为null，日后这里需要将前台传递的具体数据填写进来
this.genTestPlanReport(planReportId, testPlan.getId(), request.getUserId(), request.getTriggerMode(), null);
RunModeConfigDTO runModeConfigDTO = JSONObject.parseObject(testPlan.getRunModeConfig(), RunModeConfigDTO.class);
this.genTestPlanReport(planReportId, testPlan.getId(), request.getUserId(), request.getTriggerMode(), runModeConfigDTO);
//测试计划准备执行，取消测试计划的实际结束时间
extTestPlanMapper.updateActualEndTimeIsNullById(testPlan.getId());
executeQueue.put(testPlan.getId(), planReportId);
}
LoggerUtil.info("开始生成测试计划队列");