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

refactor(测试计划执行): 优化测试计划场景的报告存储方式 

优化测试计划场景的报告存储方式，并升级fit2cloud.qurtz包到0.09
This commit is contained in:
song-tianyang 2021-12-15 16:22:40 +08:00 committed by song-tianyang
parent 23be3bf6d7
commit 6be05e2c17
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/pom.xml
View File

@ -285,7 +285,7 @@
<dependency> <dependency>
<groupId>com.fit2cloud</groupId> <groupId>com.fit2cloud</groupId>
<artifactId>quartz-spring-boot-starter</artifactId> <artifactId>quartz-spring-boot-starter</artifactId>
<version>0.0.7</version> <version>0.0.9</version>
</dependency> </dependency>
<dependency> <dependency>

15
backend/src/main/java/io/metersphere/api/cache/TestPlanExecuteInfo.java vendored
View File

@ -19,6 +19,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/** /**
* @author song.tianyang * @author song.tianyang
@ -29,13 +30,13 @@ import java.util.Map;
public class TestPlanExecuteInfo { public class TestPlanExecuteInfo {
private String reportId; private String reportId;
private String creator; private String creator;
private Map<String, String> apiCaseExecInfo = new HashMap<>(); private Map<String, String> apiCaseExecInfo = new ConcurrentHashMap<>();
private Map<String, String> apiScenarioCaseExecInfo = new HashMap<>(); private Map<String, String> apiScenarioCaseExecInfo = new ConcurrentHashMap<>();
private Map<String, String> loadCaseExecInfo = new HashMap<>(); private Map<String, String> loadCaseExecInfo = new ConcurrentHashMap<>();
private Map<String, String> apiCaseExecuteThreadMap = new HashMap<>(); private Map<String, String> apiCaseExecuteThreadMap = new ConcurrentHashMap<>();
private Map<String, String> apiScenarioThreadMap = new HashMap<>(); private Map<String, String> apiScenarioThreadMap = new ConcurrentHashMap<>();
private Map<String, String> loadCaseReportIdMap = new HashMap<>(); private Map<String, String> loadCaseReportIdMap = new ConcurrentHashMap<>();
private Map<String, String> apiCaseReportMap = new HashMap<>(); private Map<String, String> apiCaseReportMap = new HashMap<>();
private Map<String, String> apiScenarioReportMap = new HashMap<>(); private Map<String, String> apiScenarioReportMap = new HashMap<>();
@ -227,7 +228,7 @@ public class TestPlanExecuteInfo {
this.countUnFinishedNum(); this.countUnFinishedNum();
} }
public void updateReport(Map<String, String> apiCaseExecResultInfo, Map<String, String> apiScenarioCaseExecResultInfo) { public synchronized void updateReport(Map<String, String> apiCaseExecResultInfo, Map<String, String> apiScenarioCaseExecResultInfo) {
if (MapUtils.isNotEmpty(apiCaseExecResultInfo)) { if (MapUtils.isNotEmpty(apiCaseExecResultInfo)) {
this.apiCaseReportMap.putAll(apiCaseExecResultInfo); this.apiCaseReportMap.putAll(apiCaseExecResultInfo);
} }

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

@ -160,6 +160,8 @@ public class ApiScenarioReportService {
LogUtil.info("从缓存中获取场景报告：【" + test.getName() + "】"); LogUtil.info("从缓存中获取场景报告：【" + test.getName() + "】");
report = MessageCache.scenarioExecResourceLock.get(test.getName()); report = MessageCache.scenarioExecResourceLock.get(test.getName());
LogUtil.info("从缓存中获取场景报告：【" + test.getName() + "】是否为空：" + (report == null)); LogUtil.info("从缓存中获取场景报告：【" + test.getName() + "】是否为空：" + (report == null));
} else {
LogUtil.info("数据库中获取场景报告结束：" + report.getId());
} }
if (report != null) { if (report != null) {
report.setName(report.getScenarioName() + "-" + DateUtils.getTimeStr(System.currentTimeMillis())); report.setName(report.getScenarioName() + "-" + DateUtils.getTimeStr(System.currentTimeMillis()));
@ -365,7 +367,8 @@ public class ApiScenarioReportService {
testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario); testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
scenarioIdList.add(testPlanApiScenario.getApiScenarioId()); scenarioIdList.add(testPlanApiScenario.getApiScenarioId());
} else { } else {
LogUtil.info("TestPlanReport_Id is null. scenario report id : [" + report.getId() + "]; planScenarioIdArr:[" + report.getScenarioId() + "] DATA:" + JSON.toJSONString(scenarioResult)); LogUtil.info("Cannot find TestPlanApiScenario!");
LogUtil.error("TestPlanReport_Id is null. scenario report id : [" + report.getId() + "]; planScenarioIdArr:[" + report.getScenarioId() + "]. plan_scenario_id:" + planScenarioId + ". DATA:" + JSON.toJSONString(scenarioResult));
} }
report.setEndTime(System.currentTimeMillis()); report.setEndTime(System.currentTimeMillis());
@ -375,17 +378,26 @@ public class ApiScenarioReportService {
// 报告详情内容 // 报告详情内容
ApiScenarioReportDetail detail = new ApiScenarioReportDetail(); ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8)); detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
detail.setReportId(report.getId());
detail.setProjectId(report.getProjectId()); detail.setProjectId(report.getProjectId());
if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) { if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
report.setTriggerMode(TriggerMode.MANUAL.name()); report.setTriggerMode(TriggerMode.MANUAL.name());
} }
if (StringUtils.equalsIgnoreCase(report.getId(), scenarioResult.getName())) {
detail.setReportId(report.getId());
} else {
detail.setReportId(scenarioResult.getName());
LogUtil.info("ReportId" + scenarioResult.getName() + " has changed!");
LogUtil.error("ReportId was changed. ScenarioResultData:" + JSON.toJSONString(scenarioResult) + "; ApiScenarioReport:" + JSON.toJSONString(report));
}
try { try {
apiScenarioReportDetailMapper.insert(detail); apiScenarioReportDetailMapper.insert(detail);
} catch (Exception e) { } catch (Exception e) {
LogUtil.error("存储场景报告出错：" + e.getMessage() + "; 步骤信息:" + JSON.toJSONString(scenarioResult)); LogUtil.error("Save scenario report error! errorInfo:" + e.getMessage() + "; ScenarioResultData:" + JSON.toJSONString(scenarioResult));
LogUtil.error(e); LogUtil.error(e);
} }
scenarioNames.append(report.getName()).append(","); scenarioNames.append(report.getName()).append(",");
// 更新场景状态 // 更新场景状态
ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId()); ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId());
@ -409,7 +421,7 @@ public class ApiScenarioReportService {
MessageCache.executionQueue.remove(report.getId()); MessageCache.executionQueue.remove(report.getId());
reportIds.add(report.getId()); reportIds.add(report.getId());
} else { } else {
LogUtil.error("测试计划场景[" + result.getTestId() + "]的场景报告未找到。报告ID:" + scenarioResult.getName() + "。 步骤信息:" + JSON.toJSONString(scenarioResult)); LogUtil.error("未获取到场景报告。 报告ID：" + scenarioResult.getName() + "。 步骤信息:" + JSON.toJSONString(scenarioResult));
} }
} }
testPlanLog.info("TestPlanReportId" + JSONArray.toJSONString(testPlanReportIdList) + " EXECUTE OVER. SCENARIO STATUS : " + JSONObject.toJSONString(scenarioAndErrorMap)); testPlanLog.info("TestPlanReportId" + JSONArray.toJSONString(testPlanReportIdList) + " EXECUTE OVER. SCENARIO STATUS : " + JSONObject.toJSONString(scenarioAndErrorMap));