refactor(接口测试): 优化执行列表显示
This commit is contained in:
parent
3fa5a7dc6e
commit
f2318eb253
|
@ -13,7 +13,10 @@ import io.metersphere.api.service.definition.ApiTestCaseBatchRunService;
|
||||||
import io.metersphere.api.service.definition.ApiTestCaseService;
|
import io.metersphere.api.service.definition.ApiTestCaseService;
|
||||||
import io.metersphere.api.service.queue.ApiExecutionQueueService;
|
import io.metersphere.api.service.queue.ApiExecutionQueueService;
|
||||||
import io.metersphere.api.service.queue.ApiExecutionSetService;
|
import io.metersphere.api.service.queue.ApiExecutionSetService;
|
||||||
import io.metersphere.plan.domain.*;
|
import io.metersphere.plan.domain.TestPlan;
|
||||||
|
import io.metersphere.plan.domain.TestPlanCollection;
|
||||||
|
import io.metersphere.plan.domain.TestPlanReportApiCase;
|
||||||
|
import io.metersphere.plan.domain.TestPlanReportApiCaseExample;
|
||||||
import io.metersphere.plan.mapper.ExtTestPlanReportApiCaseMapper;
|
import io.metersphere.plan.mapper.ExtTestPlanReportApiCaseMapper;
|
||||||
import io.metersphere.plan.mapper.TestPlanMapper;
|
import io.metersphere.plan.mapper.TestPlanMapper;
|
||||||
import io.metersphere.plan.mapper.TestPlanReportApiCaseMapper;
|
import io.metersphere.plan.mapper.TestPlanReportApiCaseMapper;
|
||||||
|
@ -70,6 +73,7 @@ public class PlanRunTestPlanApiCaseService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 串行批量执行
|
* 串行批量执行
|
||||||
|
*
|
||||||
* @Return 是否执行完毕
|
* @Return 是否执行完毕
|
||||||
*/
|
*/
|
||||||
public boolean serialExecute(TestPlanExecutionQueue testPlanExecutionQueue) {
|
public boolean serialExecute(TestPlanExecutionQueue testPlanExecutionQueue) {
|
||||||
|
@ -97,6 +101,7 @@ public class PlanRunTestPlanApiCaseService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 并行批量执行
|
* 并行批量执行
|
||||||
|
*
|
||||||
* @return 是否执行完毕
|
* @return 是否执行完毕
|
||||||
*/
|
*/
|
||||||
public boolean parallelExecute(TestPlanExecutionQueue testPlanExecutionQueue) {
|
public boolean parallelExecute(TestPlanExecutionQueue testPlanExecutionQueue) {
|
||||||
|
@ -206,7 +211,7 @@ public class PlanRunTestPlanApiCaseService {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public Map<String, String> initApiReport(ApiRunModeConfigDTO runModeConfig, List<TestPlanReportApiCase> testPlanReportApiCases,
|
public Map<String, String> initApiReport(ApiRunModeConfigDTO runModeConfig, List<TestPlanReportApiCase> testPlanReportApiCases,
|
||||||
Map<String, ApiTestCase> caseMap, String userId) {
|
Map<String, ApiTestCase> caseMap, String userId) {
|
||||||
|
|
||||||
Map<String, String> resourceReportMap = new HashMap<>();
|
Map<String, String> resourceReportMap = new HashMap<>();
|
||||||
List<ApiReport> apiReports = new ArrayList<>();
|
List<ApiReport> apiReports = new ArrayList<>();
|
||||||
|
@ -238,7 +243,7 @@ public class PlanRunTestPlanApiCaseService {
|
||||||
private ApiReport getApiReport(ApiRunModeConfigDTO runModeConfig, TestPlanReportApiCase testPlanReportApiCase, ApiTestCase apiTestCase, String userId) {
|
private ApiReport getApiReport(ApiRunModeConfigDTO runModeConfig, TestPlanReportApiCase testPlanReportApiCase, ApiTestCase apiTestCase, String userId) {
|
||||||
ApiReport apiReport = apiTestCaseBatchRunService.getApiReport(runModeConfig, apiTestCase, userId);
|
ApiReport apiReport = apiTestCaseBatchRunService.getApiReport(runModeConfig, apiTestCase, userId);
|
||||||
apiReport.setEnvironmentId(apiBatchRunBaseService.getEnvId(runModeConfig, testPlanReportApiCase.getEnvironmentId()));
|
apiReport.setEnvironmentId(apiBatchRunBaseService.getEnvId(runModeConfig, testPlanReportApiCase.getEnvironmentId()));
|
||||||
apiReport.setTestPlanCaseId(testPlanReportApiCase.getApiCaseId());
|
apiReport.setTestPlanCaseId(testPlanReportApiCase.getTestPlanApiCaseId());
|
||||||
return apiReport;
|
return apiReport;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -723,7 +723,7 @@ public class TestPlanApiCaseService extends TestPlanResourceService {
|
||||||
// 初始化报告
|
// 初始化报告
|
||||||
ApiReport apiReport = apiTestCaseService.getApiReport(apiTestCase, reportId, runModeConfig.getPoolId(), userId);
|
ApiReport apiReport = apiTestCaseService.getApiReport(apiTestCase, reportId, runModeConfig.getPoolId(), userId);
|
||||||
apiReport.setEnvironmentId(runModeConfig.getEnvironmentId());
|
apiReport.setEnvironmentId(runModeConfig.getEnvironmentId());
|
||||||
apiReport.setTestPlanCaseId(testPlanApiCase.getTestPlanId());
|
apiReport.setTestPlanCaseId(testPlanApiCase.getId());
|
||||||
|
|
||||||
// 创建报告和用例的关联关系
|
// 创建报告和用例的关联关系
|
||||||
ApiTestCaseRecord apiTestCaseRecord = apiTestCaseService.getApiTestCaseRecord(apiTestCase, apiReport);
|
ApiTestCaseRecord apiTestCaseRecord = apiTestCaseService.getApiTestCaseRecord(apiTestCase, apiReport);
|
||||||
|
|
|
@ -123,7 +123,7 @@
|
||||||
dataIndex: 'id',
|
dataIndex: 'id',
|
||||||
slotName: 'num',
|
slotName: 'num',
|
||||||
fixed: 'left',
|
fixed: 'left',
|
||||||
width: 180,
|
width: 280,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'apiScenario.executeHistory.execution.triggerMode',
|
title: 'apiScenario.executeHistory.execution.triggerMode',
|
||||||
|
|
|
@ -55,7 +55,7 @@ export default {
|
||||||
'system.project.endTitle': '结束项目',
|
'system.project.endTitle': '结束项目',
|
||||||
'system.project.enableContent': '开启后的项目展示在项目切换列表',
|
'system.project.enableContent': '开启后的项目展示在项目切换列表',
|
||||||
'system.project.endContent': '结束后的项目不展示在项目切换列表',
|
'system.project.endContent': '结束后的项目不展示在项目切换列表',
|
||||||
'system.project.projectNamePlaceholder': '请输入项目名称,不可与其他项目名称重复',
|
'system.project.projectNamePlaceholder': '请输入项目名称,不可与其他项目名称重复',
|
||||||
'system.project.updateProject': '更新项目',
|
'system.project.updateProject': '更新项目',
|
||||||
'system.project.createProject': '创建项目',
|
'system.project.createProject': '创建项目',
|
||||||
'system.project.affiliatedOrg': '所属组织',
|
'system.project.affiliatedOrg': '所属组织',
|
||||||
|
|
|
@ -57,7 +57,7 @@ export default {
|
||||||
'system.project.endTitle': '结束项目',
|
'system.project.endTitle': '结束项目',
|
||||||
'system.project.enableContent': '开启后的项目展示在项目切换列表',
|
'system.project.enableContent': '开启后的项目展示在项目切换列表',
|
||||||
'system.project.endContent': '结束后的项目不展示在项目切换列表',
|
'system.project.endContent': '结束后的项目不展示在项目切换列表',
|
||||||
'system.project.projectNamePlaceholder': '请输入项目名称,不可与其他项目名称重复',
|
'system.project.projectNamePlaceholder': '请输入项目名称,不可与其他项目名称重复',
|
||||||
'system.project.updateProject': '更新项目',
|
'system.project.updateProject': '更新项目',
|
||||||
'system.project.createProject': '创建项目',
|
'system.project.createProject': '创建项目',
|
||||||
'system.project.affiliatedOrg': '所属组织',
|
'system.project.affiliatedOrg': '所属组织',
|
||||||
|
|
Loading…
Reference in New Issue