提交 25ed9221 authored 作者: 黄夏豪's avatar 黄夏豪

fix(base): 修复了没有正确的执行行为执行器的BUG

上级 4dc76ffa
...@@ -80,7 +80,8 @@ public class CaseActuator implements Actuator { ...@@ -80,7 +80,8 @@ public class CaseActuator implements Actuator {
LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "开始执行用例!!"); LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "开始执行用例!!");
LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, String.format("当前正在执行用例ID: %s 用例名: %s", testCaseBto.getTestCase().getId(), testCaseBto.getTestCase().getName())); LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, String.format("当前正在执行用例ID: %s 用例名: %s", testCaseBto.getTestCase().getId(), testCaseBto.getTestCase().getName()));
//执行前置动作 //执行前置动作
executeMove(testCaseBto.getTestCase().getMoveAfterCase() LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "[用例执行器] 开始执行前置动作!!");
executeMove(testCaseBto.getTestCase().getMoveBefore()
, envId, projectId, null, MoveStrategy.PRE_MOVE); , envId, projectId, null, MoveStrategy.PRE_MOVE);
//向线程中设置当前正在执行的DataId //向线程中设置当前正在执行的DataId
LogQueueRuntime.setTestData(testCaseBto.getTestData().getId()); LogQueueRuntime.setTestData(testCaseBto.getTestData().getId());
...@@ -101,7 +102,7 @@ public class CaseActuator implements Actuator { ...@@ -101,7 +102,7 @@ public class CaseActuator implements Actuator {
projectId, projectId,
baseTestCaseResponseDetail); baseTestCaseResponseDetail);
//执行后置动作 //执行后置动作
executeMove(testCaseBto.getTestCase().getMoveAfterTest() executeMove(testCaseBto.getTestCase().getMoveAfterCase()
, envId, projectId, baseTestCaseResponseDetail!=null?baseTestCaseResponseDetail.getResponseBody():null, MoveStrategy.AFT_MOVE); , envId, projectId, baseTestCaseResponseDetail!=null?baseTestCaseResponseDetail.getResponseBody():null, MoveStrategy.AFT_MOVE);
TestDataExecuteResult testDataExecuteResult = new TestDataExecuteResult( TestDataExecuteResult testDataExecuteResult = new TestDataExecuteResult(
dataStartTime, dataStartTime,
...@@ -130,9 +131,9 @@ public class CaseActuator implements Actuator { ...@@ -130,9 +131,9 @@ public class CaseActuator implements Actuator {
try { try {
LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, String.format("[用例执行器] 当前正在执行用例ID: %s 用例名: %s", testCaseBto.getTestCase().getId(), testCaseBto.getTestCase().getName())); LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, String.format("[用例执行器] 当前正在执行用例ID: %s 用例名: %s", testCaseBto.getTestCase().getId(), testCaseBto.getTestCase().getName()));
//执行前置动作 //执行前置动作
executeMove(testCaseBto.getTestCase().getMoveAfterCase()
, envId, projectId, null, MoveStrategy.PRE_MOVE);
LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "[用例执行器] 开始执行前置动作!!"); LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "[用例执行器] 开始执行前置动作!!");
executeMove(testCaseBto.getTestCase().getMoveBefore()
, envId, projectId, null, MoveStrategy.PRE_MOVE);
//执行测试用例的本体内容 //执行测试用例的本体内容
for (TestData testData : testCaseBto.getTestDataList()) { for (TestData testData : testCaseBto.getTestDataList()) {
LocalDateTime dataStartTime = LocalDateTime.now(); LocalDateTime dataStartTime = LocalDateTime.now();
...@@ -168,7 +169,7 @@ public class CaseActuator implements Actuator { ...@@ -168,7 +169,7 @@ public class CaseActuator implements Actuator {
resultList.add(testDataExecuteResult); resultList.add(testDataExecuteResult);
LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "用例执行结果:" + JSON.toJSONString(testDataExecuteResult)); LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "用例执行结果:" + JSON.toJSONString(testDataExecuteResult));
//执行后置动作 //执行后置动作
executeMove(testCaseBto.getTestCase().getMoveAfterTest() executeMove(testCaseBto.getTestCase().getMoveAfterCase()
, envId, projectId, baseTestCaseResponseDetail!=null?baseTestCaseResponseDetail.getResponseBody():null, MoveStrategy.AFT_MOVE); , envId, projectId, baseTestCaseResponseDetail!=null?baseTestCaseResponseDetail.getResponseBody():null, MoveStrategy.AFT_MOVE);
changeExecutionHistoryStatus(ExecutionHistoryStatus.FINISH); changeExecutionHistoryStatus(ExecutionHistoryStatus.FINISH);
} catch (Exception e) { } catch (Exception e) {
......
...@@ -36,4 +36,5 @@ public class TestDataExecuteResult extends BaseTime{ ...@@ -36,4 +36,5 @@ public class TestDataExecuteResult extends BaseTime{
this.baseTestCaseResponseDetail = baseTestCaseResponseDetail; this.baseTestCaseResponseDetail = baseTestCaseResponseDetail;
this.checkPointResult = checkPointResult; this.checkPointResult = checkPointResult;
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论