提交 6680699c authored 作者: 黄夏豪's avatar 黄夏豪

fix(base): 修了一些BUG

上级 57d092e5
...@@ -152,7 +152,7 @@ public class CaseActuator implements Actuator { ...@@ -152,7 +152,7 @@ public class CaseActuator implements Actuator {
TestDataExecuteResult testDataExecuteResult = new TestDataExecuteResult( TestDataExecuteResult testDataExecuteResult = new TestDataExecuteResult(
dataStartTime, dataStartTime,
LocalDateTime.now(), LocalDateTime.now(),
true, checkPointResult.getFailNum()>0?false:true,
testCaseBto.getTestCase().getId(), testCaseBto.getTestCase().getId(),
testData.getId(), testData.getId(),
baseTestCaseResponseDetail, baseTestCaseResponseDetail,
...@@ -169,7 +169,7 @@ public class CaseActuator implements Actuator { ...@@ -169,7 +169,7 @@ public class CaseActuator implements Actuator {
TestDataExecuteResult testDataExecuteResult = new TestDataExecuteResult( TestDataExecuteResult testDataExecuteResult = new TestDataExecuteResult(
dataStartTime, dataStartTime,
LocalDateTime.now(), LocalDateTime.now(),
true, false,
testCaseBto.getTestCase().getId(), testCaseBto.getTestCase().getId(),
testData.getId(), testData.getId(),
null, null,
...@@ -308,6 +308,7 @@ public class CaseActuator implements Actuator { ...@@ -308,6 +308,7 @@ public class CaseActuator implements Actuator {
if (testCaseListDataBto.getTestDataList() != null && testCaseListDataBto.getTestDataList().size() > 0) { if (testCaseListDataBto.getTestDataList() != null && testCaseListDataBto.getTestDataList().size() > 0) {
List<TestDataExecuteResult> resultList = List<TestDataExecuteResult> resultList =
executeTestCases(testCaseListDataBto, caseExecuteVo.getEnvId(), caseExecuteVo.getProjectId()); executeTestCases(testCaseListDataBto, caseExecuteVo.getEnvId(), caseExecuteVo.getProjectId());
long count = resultList.stream().filter(e -> !e.getExecutionStatus()).count();
TestCaseReport testCaseReport = new TestCaseReport( TestCaseReport testCaseReport = new TestCaseReport(
caseStartTime, caseStartTime,
LocalDateTime.now(), LocalDateTime.now(),
...@@ -319,7 +320,7 @@ public class CaseActuator implements Actuator { ...@@ -319,7 +320,7 @@ public class CaseActuator implements Actuator {
testCaseListDataBto.getTestCase().getMoveBefore(), testCaseListDataBto.getTestCase().getMoveBefore(),
testCaseListDataBto.getTestCase().getMoveAfterTest(), testCaseListDataBto.getTestCase().getMoveAfterTest(),
testCaseListDataBto.getTestCase().getMoveAfterCase(), testCaseListDataBto.getTestCase().getMoveAfterCase(),
true, count <= 0,
resultList resultList
); );
runCaseResult.getCaseReports().add(testCaseReport); runCaseResult.getCaseReports().add(testCaseReport);
......
...@@ -27,5 +27,7 @@ public class CaseExecuteVo extends SocketVo { ...@@ -27,5 +27,7 @@ public class CaseExecuteVo extends SocketVo {
private String uniqueKey; private String uniqueKey;
private Integer defaultEnv;
private List<TestCaseListDataBto> testCaseListDataBtoList = new ArrayList<>(); private List<TestCaseListDataBto> testCaseListDataBtoList = new ArrayList<>();
} }
...@@ -132,10 +132,11 @@ ...@@ -132,10 +132,11 @@
$(".clickClass").each((i, v) => { $(".clickClass").each((i, v) => {
v.onclick = function () { v.onclick = function () {
let data = handleData(v.getAttribute('data-message')) if(!v.getAttribute('data-message')){
if(v.getAttribute('data-message') == null) { alert('该条测试数据执行失败')
return '失败' return
} }
let data = handleData(v.getAttribute('data-message'))
$('#myModal').modal() $('#myModal').modal()
if (data) { if (data) {
console.log(data) console.log(data)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论