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

fix(测试跟踪): 修复测试计划部分情况下场景失败重跑日志未更新的问题 

--bug=1025750 --user=宋天阳 【测试跟踪】测试计划-失败重跑后接口控制台日志未更新
https://www.tapd.cn/55049933/s/1369503
This commit is contained in:
song-tianyang 2023-05-08 15:26:10 +08:00 committed by 建国
parent 9139471fc8
commit edf8d8bd2e
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioRerunService.java
View File

@ -30,13 +30,14 @@ import io.metersphere.dto.RunModeConfigDTO;
import io.metersphere.dto.TestPlanRerunParametersDTO; import io.metersphere.dto.TestPlanRerunParametersDTO;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
import io.metersphere.utils.LoggerUtil; import io.metersphere.utils.LoggerUtil;
import jakarta.annotation.Resource;
import org.apache.commons.beanutils.BeanComparator; import org.apache.commons.beanutils.BeanComparator;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.collections4.comparators.FixedOrderComparator; import org.apache.commons.collections4.comparators.FixedOrderComparator;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -234,9 +235,9 @@ public class ApiScenarioRerunService {
request.setUserId(parametersDTO.getCases().get(0).getUserId()); request.setUserId(parametersDTO.getCases().get(0).getUserId());
Map<String, ApiDefinitionExecResultWithBLOBs> executeQueue = new LinkedHashMap<>(); Map<String, ApiDefinitionExecResultWithBLOBs> executeQueue = new LinkedHashMap<>();
if (com.alibaba.nacos.common.utils.CollectionUtils.isNotEmpty(ids)) { if (CollectionUtils.isNotEmpty(ids)) {
List<TestPlanApiCase> planApiCases = extTestPlanApiCaseMapper.selectByIdsAndStatusIsNotTrash(ids); List<TestPlanApiCase> planApiCases = extTestPlanApiCaseMapper.selectByIdsAndStatusIsNotTrash(ids);
if (com.alibaba.nacos.common.utils.CollectionUtils.isNotEmpty(planApiCases)) { if (CollectionUtils.isNotEmpty(planApiCases)) {
for (KeyValueDTO testPlanApiCase : parametersDTO.getCases()) { for (KeyValueDTO testPlanApiCase : parametersDTO.getCases()) {
ApiDefinitionExecResultWithBLOBs report = apiDefinitionExecResultMapper.selectByPrimaryKey(testPlanApiCase.getReportId()); ApiDefinitionExecResultWithBLOBs report = apiDefinitionExecResultMapper.selectByPrimaryKey(testPlanApiCase.getReportId());
if (report == null) { if (report == null) {
@ -261,21 +262,34 @@ public class ApiScenarioRerunService {
} }
} }
// 场景 // 场景
if (com.alibaba.nacos.common.utils.CollectionUtils.isNotEmpty(parametersDTO.getScenarios())) { if (CollectionUtils.isNotEmpty(parametersDTO.getScenarios())) {
List<String> ids = parametersDTO.getScenarios().stream().map(KeyValueDTO::getId).collect(Collectors.toList()); Map<String, String> planScenarioReportMap = new LinkedHashMap<>();
if (com.alibaba.nacos.common.utils.CollectionUtils.isEmpty(ids)) { parametersDTO.getScenarios().forEach(item -> {
if (StringUtils.isNoneBlank(item.getId(), item.getReportId())) {
planScenarioReportMap.put(item.getId(), item.getReportId());
}
});
if (MapUtils.isEmpty(planScenarioReportMap)) {
return isStart; return isStart;
} }
List<TestPlanApiScenario> apiScenarios = extTestPlanApiScenarioMapper.selectByIdsAndStatusIsNotTrash(ids); List<String> paramPlanScenarioIds = new ArrayList<>(planScenarioReportMap.keySet());
if (com.alibaba.nacos.common.utils.CollectionUtils.isEmpty(apiScenarios)) { List<TestPlanApiScenario> apiScenarios = extTestPlanApiScenarioMapper.selectByIdsAndStatusIsNotTrash(paramPlanScenarioIds);
if (CollectionUtils.isEmpty(apiScenarios)) {
return isStart; return isStart;
} }
List<String> scenarioIds = apiScenarios.stream().map(TestPlanApiScenario::getApiScenarioId).collect(Collectors.toList()); List<String> scenarioIds = apiScenarios.stream().map(TestPlanApiScenario::getApiScenarioId).collect(Collectors.toList());
LoggerUtil.info("重跑测试计划报告：【" + parametersDTO.getReportId() + "】,对应重跑场景资源：" + scenarioIds.size()); LoggerUtil.info("重跑测试计划报告：【" + parametersDTO.getReportId() + "】,对应重跑场景资源：" + scenarioIds.size());
List<String> planScenarioIds = apiScenarios.stream().map(TestPlanApiScenario::getId).collect(Collectors.toList()); List<String> planScenarioIds = apiScenarios.stream().map(TestPlanApiScenario::getId).collect(Collectors.toList());
// 查出原始报告 // 查出原始报告
List<String> reportIds = apiScenarios.stream().map(TestPlanApiScenario::getReportId).collect(Collectors.toList()); List<String> reportIds = new ArrayList<>();
if (com.alibaba.nacos.common.utils.CollectionUtils.isEmpty(reportIds)) { apiScenarios.forEach(item -> {
if (planScenarioReportMap.containsKey(item.getId())) {
reportIds.add(planScenarioReportMap.get(item.getId()));
}
});
if (CollectionUtils.isEmpty(reportIds)) {
return isStart; return isStart;
} }
ApiScenarioReportExample reportExample = new ApiScenarioReportExample(); ApiScenarioReportExample reportExample = new ApiScenarioReportExample();