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

fix(UI自动化): 测试计划UI报告未执行完毕不展示问题，失败停止发送消息统计数据错误问题 

--bug=1016930 --user=张大海 【项目设置】消息通知，接口用例、场景、UI用例未执行数量显示错误，UI成功失败数量显示错误 https://www.tapd.cn/55049933/s/1248555
--bug=1016819 --user=张大海 【测试跟踪】测试计划里有UI用例，不过没执行，测试计划报告里就没显示UI用例 https://www.tapd.cn/55049933/s/1249382
This commit is contained in:
zhangdahai112 2022-09-21 20:35:00 +08:00 committed by zhangdahai112
parent e5b6461519
commit dbf4f07935
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.LogUtil;
import io.metersphere.constants.RunModeConstants; import io.metersphere.constants.RunModeConstants;
import io.metersphere.constants.SystemConstants;
import io.metersphere.dto.ResultDTO; import io.metersphere.dto.ResultDTO;
import io.metersphere.dto.RunModeConfigDTO; import io.metersphere.dto.RunModeConfigDTO;
import io.metersphere.track.service.TestPlanReportService; import io.metersphere.track.service.TestPlanReportService;
@ -222,9 +223,15 @@ public class ApiExecutionQueueService {
} }
} }
} else { } else {
ApiDefinitionExecResult result = apiDefinitionExecResultMapper.selectByPrimaryKey(executionQueue.getCompletedReportId()); if (StringUtils.startsWith(executionQueue.getRunMode(), SystemConstants.TestTypeEnum.UI.name())) {
if (result != null && StringUtils.equalsIgnoreCase(result.getStatus(), "Error")) { //UI 失败停止
isError = true; isError = ApiScenarioReportService.getUiErrorSize(dto) > 0;
} else {
ApiDefinitionExecResult result = apiDefinitionExecResultMapper.selectByPrimaryKey(executionQueue.getCompletedReportId());
if (result != null && StringUtils.equalsIgnoreCase(result.getStatus(), "Error")) {
isError = true;
}
} }
} }
if (isError) { if (isError) {
@ -232,7 +239,7 @@ public class ApiExecutionQueueService {
example.createCriteria().andQueueIdEqualTo(dto.getQueueId()); example.createCriteria().andQueueIdEqualTo(dto.getQueueId());
if (StringUtils.isNotEmpty(dto.getTestPlanReportId())) { if (StringUtils.isNotEmpty(dto.getTestPlanReportId())) {
CommonBeanFactory.getBean(TestPlanReportService.class).finishedTestPlanReport(dto.getTestPlanReportId(), "Stopped"); this.testPlanReportTestEnded(dto.getTestPlanReportId());
} }
// 更新未执行的报告状态 // 更新未执行的报告状态
List<ApiExecutionQueueDetail> details = executionQueueDetailMapper.selectByExample(example); List<ApiExecutionQueueDetail> details = executionQueueDetailMapper.selectByExample(example);

2
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
View File

@ -988,7 +988,7 @@ public class ApiScenarioReportService {
* @param dto * @param dto
* @return * @return
*/ */
private long getUiErrorSize(ResultDTO dto) { public static long getUiErrorSize(ResultDTO dto) {
int errorSize = 0; int errorSize = 0;
int successSize = 0; int successSize = 0;
try { try {

2
frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanUiReport.vue
View File

@ -21,7 +21,7 @@
<ui-scenario-result :is-db="isDb" :share-id="shareId" :is-share="isShare" <ui-scenario-result :is-db="isDb" :share-id="shareId" :is-share="isShare"
:report="report" :is-template="isTemplate" :plan-id="planId" :report="report" :is-template="isTemplate" :plan-id="planId"
:ui-all-cases="uiAllCases" :ui-all-cases="uiAllCases"
:filter-status="['unexecute']" :filter-status="['unexecute', 'STOP']"
@setSize="setUnExecuteSize"/> @setSize="setUnExecuteSize"/>
</el-tab-pane> </el-tab-pane>