refactor(测试计划): 增加测试计划查看用例报告
This commit is contained in:
wxg0103
wxg0103
parent
39febe26dd
commit
c5cc5b2e5a
|
|
@ -2,16 +2,15 @@ package io.metersphere.plan.controller;
|
|||
|
||||
import com.github.pagehelper.Page;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import io.metersphere.api.dto.definition.ApiReportDTO;
|
||||
import io.metersphere.api.dto.definition.ApiReportDetailDTO;
|
||||
import io.metersphere.api.service.definition.ApiReportService;
|
||||
import io.metersphere.plan.constants.TestPlanResourceConfig;
|
||||
import io.metersphere.plan.dto.request.*;
|
||||
import io.metersphere.plan.dto.response.TestPlanApiCasePageResponse;
|
||||
import io.metersphere.plan.dto.response.TestPlanAssociationResponse;
|
||||
import io.metersphere.plan.service.TestPlanApiCaseBatchRunService;
|
||||
import io.metersphere.plan.dto.response.TestPlanOperationResponse;
|
||||
import io.metersphere.plan.service.TestPlanApiCaseLogService;
|
||||
import io.metersphere.plan.service.TestPlanApiCaseService;
|
||||
import io.metersphere.plan.service.TestPlanManagementService;
|
||||
import io.metersphere.plan.service.TestPlanService;
|
||||
import io.metersphere.plan.service.*;
|
||||
import io.metersphere.sdk.constants.HttpMethodConstants;
|
||||
import io.metersphere.sdk.constants.PermissionConstants;
|
||||
import io.metersphere.sdk.dto.api.task.TaskRequestDTO;
|
||||
|
|
@ -50,6 +49,8 @@ public class TestPlanApiCaseController {
|
|||
private TestPlanManagementService testPlanManagementService;
|
||||
@Resource
|
||||
private TestPlanService testPlanService;
|
||||
@Resource
|
||||
private ApiReportService apiReportService;
|
||||
|
||||
@PostMapping(value = "/sort")
|
||||
@Operation(summary = "测试计划功能用例-功能用例拖拽排序")
|
||||
|
|
@ -144,4 +145,23 @@ public class TestPlanApiCaseController {
|
|||
}
|
||||
|
||||
//TODO 批量移动 （计划集内）
|
||||
|
||||
@GetMapping("/report/get/{id}")
|
||||
@Operation(summary = "测试计划-用例列表-执行结果获取")
|
||||
@CheckOwner(resourceId = "#id", resourceType = "api_report")
|
||||
@RequiresPermissions(PermissionConstants.TEST_PLAN_READ)
|
||||
public ApiReportDTO get(@PathVariable String id) {
|
||||
testPlanApiCaseService.checkReportIsTestPlan(id);
|
||||
return apiReportService.get(id);
|
||||
}
|
||||
|
||||
@GetMapping("/report/get/detail/{reportId}/{stepId}")
|
||||
@Operation(summary = "测试计划-用例列表-执行结果获取-报告详情获取")
|
||||
@CheckOwner(resourceId = "#reportId", resourceType = "api_report")
|
||||
@RequiresPermissions(PermissionConstants.TEST_PLAN_READ)
|
||||
public List<ApiReportDetailDTO> getDetail(@PathVariable String reportId,
|
||||
@PathVariable String stepId) {
|
||||
testPlanApiCaseService.checkReportIsTestPlan(reportId);
|
||||
return apiReportService.getDetail(reportId, stepId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,16 @@ package io.metersphere.plan.controller;
|
|||
|
||||
import com.github.pagehelper.Page;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import io.metersphere.api.dto.scenario.ApiScenarioReportDTO;
|
||||
import io.metersphere.api.dto.scenario.ApiScenarioReportDetailDTO;
|
||||
import io.metersphere.api.service.scenario.ApiScenarioReportService;
|
||||
import io.metersphere.plan.dto.request.*;
|
||||
import io.metersphere.plan.dto.response.TestPlanApiScenarioPageResponse;
|
||||
import io.metersphere.plan.dto.response.TestPlanAssociationResponse;
|
||||
import io.metersphere.plan.service.*;
|
||||
import io.metersphere.plan.service.TestPlanApiScenarioBatchRunService;
|
||||
import io.metersphere.plan.service.TestPlanApiScenarioLogService;
|
||||
import io.metersphere.plan.service.TestPlanApiScenarioService;
|
||||
import io.metersphere.plan.service.TestPlanService;
|
||||
import io.metersphere.sdk.constants.HttpMethodConstants;
|
||||
import io.metersphere.sdk.constants.PermissionConstants;
|
||||
import io.metersphere.sdk.dto.api.task.TaskRequestDTO;
|
||||
|
|
@ -39,6 +45,8 @@ public class TestPlanApiScenarioController {
|
|||
private TestPlanApiScenarioBatchRunService testPlanApiScenarioBatchRunService;
|
||||
@Resource
|
||||
private TestPlanService testPlanService;
|
||||
@Resource
|
||||
private ApiScenarioReportService apiScenarioReportService;
|
||||
|
||||
@PostMapping("/page")
|
||||
@Operation(summary = "测试计划-已关联场景用例列表分页查询")
|
||||
|
|
@ -114,4 +122,23 @@ public class TestPlanApiScenarioController {
|
|||
public void batchUpdateExecutor(@Validated @RequestBody TestPlanApiScenarioUpdateRequest request) {
|
||||
testPlanApiScenarioService.batchUpdateExecutor(request);
|
||||
}
|
||||
|
||||
@GetMapping("/report/get/{id}")
|
||||
@Operation(summary = "测试计划-计划详情-场景用例列表-查看执行结果")
|
||||
@CheckOwner(resourceId = "#id", resourceType = "api_scenario_report")
|
||||
@RequiresPermissions(PermissionConstants.TEST_PLAN_READ)
|
||||
public ApiScenarioReportDTO get(@PathVariable String id) {
|
||||
testPlanApiScenarioService.checkReportIsTestPlan(id);
|
||||
return apiScenarioReportService.get(id);
|
||||
}
|
||||
|
||||
@GetMapping("report/get/detail/{reportId}/{stepId}")
|
||||
@Operation(summary = "测试计划-计划详情-场景用例列表-执行结果详情获取")
|
||||
@CheckOwner(resourceId = "#reportId", resourceType = "api_scenario_report")
|
||||
@RequiresPermissions(PermissionConstants.TEST_PLAN_READ)
|
||||
public List<ApiScenarioReportDetailDTO> getDetail(@PathVariable String reportId,
|
||||
@PathVariable String stepId) {
|
||||
testPlanApiScenarioService.checkReportIsTestPlan(reportId);
|
||||
return apiScenarioReportService.getDetail(reportId, stepId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import io.metersphere.api.domain.*;
|
|||
import io.metersphere.api.dto.definition.ApiDefinitionDTO;
|
||||
import io.metersphere.api.dto.definition.ApiTestCaseDTO;
|
||||
import io.metersphere.api.invoker.GetRunScriptServiceRegister;
|
||||
import io.metersphere.api.mapper.ApiReportMapper;
|
||||
import io.metersphere.api.mapper.ApiTestCaseMapper;
|
||||
import io.metersphere.api.service.ApiExecuteService;
|
||||
import io.metersphere.api.service.GetRunScriptService;
|
||||
|
|
@ -97,6 +98,8 @@ public class TestPlanApiCaseService extends TestPlanResourceService implements G
|
|||
private ExtTestPlanCollectionMapper extTestPlanCollectionMapper;
|
||||
@Resource
|
||||
private TestPlanConfigService testPlanConfigService;
|
||||
@Resource
|
||||
private ApiReportMapper apiReportMapper;
|
||||
|
||||
public TestPlanApiCaseService() {
|
||||
GetRunScriptServiceRegister.register(ApiExecuteResourceType.TEST_PLAN_API_CASE, this);
|
||||
|
|
@ -656,4 +659,12 @@ public class TestPlanApiCaseService extends TestPlanResourceService implements G
|
|||
taskRequest.getTaskInfo().setNeedParseScript(true);
|
||||
return taskRequest;
|
||||
}
|
||||
|
||||
public void checkReportIsTestPlan(String id) {
|
||||
ApiReportExample example = new ApiReportExample();
|
||||
example.createCriteria().andIdEqualTo(id).andTestPlanCaseIdNotEqualTo("NONE");
|
||||
if (apiReportMapper.countByExample(example) == 0) {
|
||||
throw new MSException("api_case_report_not_exist");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@ package io.metersphere.plan.service;
|
|||
|
||||
import io.metersphere.api.domain.ApiScenario;
|
||||
import io.metersphere.api.domain.ApiScenarioReport;
|
||||
import io.metersphere.api.domain.ApiScenarioReportExample;
|
||||
import io.metersphere.api.dto.scenario.ApiScenarioDTO;
|
||||
import io.metersphere.api.invoker.GetRunScriptServiceRegister;
|
||||
import io.metersphere.api.mapper.ApiScenarioReportMapper;
|
||||
import io.metersphere.api.service.ApiExecuteService;
|
||||
import io.metersphere.api.service.GetRunScriptService;
|
||||
import io.metersphere.api.service.scenario.ApiScenarioModuleService;
|
||||
|
|
@ -88,6 +90,8 @@ public class TestPlanApiScenarioService extends TestPlanResourceService implemen
|
|||
private ApiScenarioModuleService apiScenarioModuleService;
|
||||
@Resource
|
||||
private TestPlanCollectionMapper testPlanCollectionMapper;
|
||||
@Resource
|
||||
private ApiScenarioReportMapper apiScenarioReportMapper;
|
||||
|
||||
public TestPlanApiScenarioService() {
|
||||
GetRunScriptServiceRegister.register(ApiExecuteResourceType.TEST_PLAN_API_SCENARIO, this);
|
||||
|
|
@ -526,4 +530,13 @@ public class TestPlanApiScenarioService extends TestPlanResourceService implemen
|
|||
extTestPlanApiScenarioMapper.batchUpdateExecutor(ids, request.getUserId());
|
||||
}
|
||||
}
|
||||
|
||||
public void checkReportIsTestPlan(String id) {
|
||||
ApiScenarioReportExample example = new ApiScenarioReportExample();
|
||||
example.createCriteria().andIdEqualTo(id).andTestPlanScenarioIdNotEqualTo("NONE");
|
||||
if (apiScenarioReportMapper.countByExample(example) == 0) {
|
||||
throw new MSException(Translator.get("api_scenario_report_not_exist"));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,15 +3,19 @@ package io.metersphere.plan.controller;
|
|||
import io.metersphere.api.constants.ApiConstants;
|
||||
import io.metersphere.api.constants.ApiDefinitionStatus;
|
||||
import io.metersphere.api.controller.result.ApiResultCode;
|
||||
import io.metersphere.api.domain.ApiDefinition;
|
||||
import io.metersphere.api.domain.ApiTestCase;
|
||||
import io.metersphere.api.domain.*;
|
||||
import io.metersphere.api.dto.ApiRunModeRequest;
|
||||
import io.metersphere.api.dto.definition.ApiDefinitionAddRequest;
|
||||
import io.metersphere.api.dto.definition.ApiReportDTO;
|
||||
import io.metersphere.api.dto.definition.ApiTestCaseAddRequest;
|
||||
import io.metersphere.api.dto.request.http.MsHTTPElement;
|
||||
import io.metersphere.api.dto.request.http.body.Body;
|
||||
import io.metersphere.api.dto.request.http.body.RawBody;
|
||||
import io.metersphere.api.mapper.ApiReportDetailMapper;
|
||||
import io.metersphere.api.mapper.ApiReportLogMapper;
|
||||
import io.metersphere.api.mapper.ApiReportMapper;
|
||||
import io.metersphere.api.service.definition.ApiDefinitionService;
|
||||
import io.metersphere.api.service.definition.ApiReportService;
|
||||
import io.metersphere.api.service.definition.ApiTestCaseService;
|
||||
import io.metersphere.api.utils.ApiDataUtils;
|
||||
import io.metersphere.plan.constants.AssociateCaseType;
|
||||
|
|
@ -23,7 +27,9 @@ import io.metersphere.plan.mapper.TestPlanApiCaseMapper;
|
|||
import io.metersphere.plan.service.TestPlanApiCaseService;
|
||||
import io.metersphere.project.mapper.ExtBaseProjectVersionMapper;
|
||||
import io.metersphere.sdk.constants.ApiBatchRunMode;
|
||||
import io.metersphere.sdk.constants.ApiExecuteResourceType;
|
||||
import io.metersphere.sdk.constants.PermissionConstants;
|
||||
import io.metersphere.sdk.constants.ReportStatus;
|
||||
import io.metersphere.sdk.dto.api.task.GetRunScriptRequest;
|
||||
import io.metersphere.sdk.dto.api.task.TaskItem;
|
||||
import io.metersphere.sdk.util.CommonBeanFactory;
|
||||
|
|
@ -31,10 +37,12 @@ import io.metersphere.sdk.util.JSON;
|
|||
import io.metersphere.system.base.BaseTest;
|
||||
import io.metersphere.system.controller.handler.ResultHolder;
|
||||
import io.metersphere.system.dto.sdk.enums.MoveTypeEnum;
|
||||
import io.metersphere.system.uid.IDGenerator;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.junit.jupiter.api.*;
|
||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.test.context.jdbc.Sql;
|
||||
import org.springframework.test.context.jdbc.SqlConfig;
|
||||
import org.springframework.test.web.servlet.MvcResult;
|
||||
|
|
@ -43,6 +51,8 @@ import java.nio.charset.StandardCharsets;
|
|||
import java.util.*;
|
||||
|
||||
import static io.metersphere.system.controller.handler.result.MsHttpResultCode.NOT_FOUND;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
|
||||
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
|
||||
@AutoConfigureMockMvc
|
||||
|
|
@ -69,6 +79,14 @@ public class TestPlanApiCaseControllerTests extends BaseTest {
|
|||
private ApiDefinitionService apiDefinitionService;
|
||||
@Resource
|
||||
private TestPlanApiCaseMapper testPlanApiCaseMapper;
|
||||
@Resource
|
||||
private ApiReportService apiReportService;
|
||||
@Resource
|
||||
private ApiReportMapper apiReportMapper;
|
||||
@Resource
|
||||
private ApiReportLogMapper apiReportLogMapper;
|
||||
@Resource
|
||||
private ApiReportDetailMapper apiReportDetailMapper;
|
||||
|
||||
private static ApiTestCase apiTestCase;
|
||||
private static TestPlanApiCase testPlanApiCase;
|
||||
|
|
@ -355,4 +373,89 @@ public class TestPlanApiCaseControllerTests extends BaseTest {
|
|||
private Object getTestElementParam(MsHTTPElement msHttpElement) {
|
||||
return JSON.parseObject(ApiDataUtils.toJSONString(msHttpElement));
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
@Order(10)
|
||||
public void testGet() throws Exception {
|
||||
|
||||
List<ApiReport> reports = new ArrayList<>();
|
||||
ApiReport apiReport = new ApiReport();
|
||||
apiReport.setId("plan-test-report-id");
|
||||
apiReport.setProjectId(DEFAULT_PROJECT_ID);
|
||||
apiReport.setName("plan-test-report-name");
|
||||
apiReport.setStartTime(System.currentTimeMillis());
|
||||
apiReport.setCreateUser("admin");
|
||||
apiReport.setUpdateUser("admin");
|
||||
apiReport.setUpdateTime(System.currentTimeMillis());
|
||||
apiReport.setPoolId("resource_pool");
|
||||
apiReport.setEnvironmentId("test-env");
|
||||
apiReport.setRunMode("api-run-mode");
|
||||
apiReport.setTestPlanCaseId("test-plan-case-id");
|
||||
apiReport.setStatus(ReportStatus.SUCCESS.name());
|
||||
apiReport.setTriggerMode("api-trigger-mode");
|
||||
apiReport.setIntegrated(true);
|
||||
reports.add(apiReport);
|
||||
ApiTestCaseRecord record = new ApiTestCaseRecord();
|
||||
record.setApiTestCaseId("api-resource-id");
|
||||
record.setApiReportId(apiReport.getId());
|
||||
apiReportService.insertApiReport(reports, List.of(record));
|
||||
List<ApiReportStep> steps = new ArrayList<>();
|
||||
for (int i = 0; i < 5; i++) {
|
||||
ApiReportStep apiReportStep = new ApiReportStep();
|
||||
apiReportStep.setStepId("plan-test-report-step-id" + i);
|
||||
apiReportStep.setReportId("plan-test-report-id");
|
||||
apiReportStep.setSort((long) i);
|
||||
apiReportStep.setStepType(ApiExecuteResourceType.API_CASE.name());
|
||||
steps.add(apiReportStep);
|
||||
}
|
||||
|
||||
apiReportService.insertApiReportStep(steps);
|
||||
ApiReportLog apiReportLog = new ApiReportLog();
|
||||
apiReportLog.setReportId("plan-test-report-id");
|
||||
apiReportLog.setId(IDGenerator.nextStr());
|
||||
apiReportLog.setConsole("test-console".getBytes());
|
||||
apiReportLogMapper.insert(apiReportLog);
|
||||
|
||||
MvcResult mvcResult = this.requestGetWithOk("/report/get/plan-test-report-id")
|
||||
.andReturn();
|
||||
ApiReportDTO apiReportDTO = ApiDataUtils.parseObject(JSON.toJSONString(parseResponse(mvcResult).get("data")), ApiReportDTO.class);
|
||||
|
||||
Assertions.assertNotNull(apiReportDTO);
|
||||
Assertions.assertEquals(apiReportDTO.getId(), "plan-test-report-id");
|
||||
ApiReport apiReport1 = apiReportMapper.selectByPrimaryKey("plan-test-report-id");
|
||||
apiReport1.setTestPlanCaseId("NONE");
|
||||
apiReportMapper.updateByPrimaryKey(apiReport1);
|
||||
|
||||
mockMvc.perform(getRequestBuilder("/report/get/plan-test-report-id"))
|
||||
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
|
||||
.andExpect(status().is5xxServerError());
|
||||
|
||||
apiReport1.setTestPlanCaseId("test-plan-case-id");
|
||||
apiReportMapper.updateByPrimaryKey(apiReport1);
|
||||
|
||||
|
||||
// @@校验权限
|
||||
requestGetPermissionTest(PermissionConstants.TEST_PLAN_READ, "/report/get/plan-test-report-id");
|
||||
|
||||
List<ApiReportDetail> reportsDetail = new ArrayList<>();
|
||||
for (int i = 0; i < 2; i++) {
|
||||
ApiReportDetail apiReportDetail = new ApiReportDetail();
|
||||
apiReportDetail.setId("test-report-detail-id" + i);
|
||||
apiReportDetail.setReportId("plan-test-report-id");
|
||||
apiReportDetail.setStepId("plan-test-report-step-id1");
|
||||
apiReportDetail.setStatus("success");
|
||||
apiReportDetail.setResponseSize(0L);
|
||||
apiReportDetail.setRequestTime((long) i);
|
||||
apiReportDetail.setContent("{\"resourceId\":\"\",\"stepId\":null,\"threadName\":\"Thread Group\",\"name\":\"HTTP Request1\",\"url\":\"https://www.baidu.com/\",\"requestSize\":195,\"startTime\":1705570589125,\"endTime\":1705570589310,\"error\":1,\"headers\":\"Connection: keep-alive\\nContent-Length: 0\\nContent-Type: application/x-www-form-urlencoded; charset=UTF-8\\nHost: www.baidu.com\\nUser-Agent: Apache-HttpClient/4.5.14 (Java/21)\\n\",\"cookies\":\"\",\"body\":\"POST https://www.baidu.com/\\n\\nPOST data:\\n\\n\\n[no cookies]\\n\",\"status\":\"ERROR\",\"method\":\"POST\",\"assertionTotal\":1,\"passAssertionsTotal\":0,\"subRequestResults\":[],\"responseResult\":{\"responseCode\":\"200\",\"responseMessage\":\"OK\",\"responseTime\":185,\"latency\":180,\"responseSize\":2559,\"headers\":\"HTTP/1.1 200 OK\\nContent-Length: 2443\\nContent-Type: text/html\\nServer: bfe\\nDate: Thu, 18 Jan 2024 09:36:29 GMT\\n\",\"body\":\"<!DOCTYPE html>\\r\\n<!--STATUS OK--><html> <head><meta http-equiv=content-type content=text/html;charset=utf-8><meta http-equiv=X-UA-Compatible content=IE=Edge><meta content=always name=referrer><link rel=stylesheet type=text/css href=https://ss1.bdstatic.com/5eN1bjq8AAUYm2zgoY3K/r/www/cache/bdorz/baidu.min.css><title>百度一下，你就知道</title></head> <body link=#0000cc> <div id=wrapper> <div id=head> <div class=head_wrapper> <div class=s_form> <div class=s_form_wrapper> <div id=lg> <img hidefocus=true src=//www.baidu.com/img/bd_logo1.png width=270 height=129> </div> <form id=form name=f action=//www.baidu.com/s class=fm> <input type=hidden name=bdorz_come value=1> <input type=hidden name=ie value=utf-8> <input type=hidden name=f value=8> <input type=hidden name=rsv_bp value=1> <input type=hidden name=rsv_idx value=1> <input type=hidden name=tn value=baidu><span class=\\\"bg s_ipt_wr\\\"><input id=kw name=wd class=s_ipt value maxlength=255 autocomplete=off autofocus=autofocus></span><span class=\\\"bg s_btn_wr\\\"><input type=submit id=su value=百度一下 class=\\\"bg s_btn\\\" autofocus></span> </form> </div> </div> <div id=u1> <a href=http://news.baidu.com name=tj_trnews class=mnav>新闻</a> <a href=https://www.hao123.com name=tj_trhao123 class=mnav>hao123</a> <a href=http://map.baidu.com name=tj_trmap class=mnav>地图</a> <a href=http://v.baidu.com name=tj_trvideo class=mnav>视频</a> <a href=http://tieba.baidu.com name=tj_trtieba class=mnav>贴吧</a> <noscript> <a href=http://www.baidu.com/bdorz/login.gif?login&tpl=mn&u=http%3A%2F%2Fwww.baidu.com%2f%3fbdorz_come%3d1 name=tj_login class=lb>登录</a> </noscript> <script>document.write('<a href=\\\"http://www.baidu.com/bdorz/login.gif?login&tpl=mn&u='+ encodeURIComponent(window.location.href+ (window.location.search === \\\"\\\" ? \\\"?\\\" : \\\"&\\\")+ \\\"bdorz_come=1\\\")+ '\\\" name=\\\"tj_login\\\" class=\\\"lb\\\">登录</a>');\\r\\n </script> <a href=//www.baidu.com/more/ name=tj_briicon class=bri style=\\\"display: block;\\\">更多产品</a> </div> </div> </div> <div id=ftCon> <div id=ftConw> <p id=lh> <a href=http://home.baidu.com>关于百度</a> <a href=http://ir.baidu.com>About Baidu</a> </p> <p id=cp>©2017 Baidu <a href=http://www.baidu.com/duty/>使用百度前必读</a> <a href=http://jianyi.baidu.com/ class=cp-feedback>意见反馈</a> 京ICP证030173号 <img src=//www.baidu.com/img/gs.gif> </p> </div> </div> </div> </body> </html>\\r\\n\",\"contentType\":\"text/html\",\"vars\":null,\"imageUrl\":null,\"socketInitTime\":14,\"dnsLookupTime\":0,\"tcpHandshakeTime\":0,\"sslHandshakeTime\":0,\"transferStartTime\":166,\"downloadTime\":5,\"bodySize\":2443,\"headerSize\":116,\"assertions\":[{\"name\":\"JSON Assertion\",\"content\":null,\"script\":null,\"message\":\"Expected to find an object with property ['test'] in path $ but found 'java.lang.String'. This is not a json object according to the JsonProvider: 'com.jayway.jsonpath.spi.json.JsonSmartJsonProvider'.\",\"pass\":false}]},\"isSuccessful\":false,\"fakeErrorMessage\":\"\",\"fakeErrorCode\":null}\n".getBytes());
|
||||
reportsDetail.add(apiReportDetail);
|
||||
}
|
||||
apiReportDetailMapper.batchInsert(reportsDetail);
|
||||
|
||||
this.requestGetWithOk("/report/get/detail/plan-test-report-id" + "/" + "plan-test-report-step-id1")
|
||||
.andReturn();
|
||||
requestGetPermissionTest(PermissionConstants.TEST_PLAN_READ, "/report/get/detail/plan-test-report-id" + "/" + "plan-test-report-step-id1");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,18 @@ import io.metersphere.api.constants.ApiScenarioStatus;
|
|||
import io.metersphere.api.constants.ApiScenarioStepRefType;
|
||||
import io.metersphere.api.constants.ApiScenarioStepType;
|
||||
import io.metersphere.api.controller.result.ApiResultCode;
|
||||
import io.metersphere.api.domain.ApiScenario;
|
||||
import io.metersphere.api.domain.*;
|
||||
import io.metersphere.api.dto.ApiRunModeRequest;
|
||||
import io.metersphere.api.dto.assertion.MsAssertionConfig;
|
||||
import io.metersphere.api.dto.request.http.MsHTTPElement;
|
||||
import io.metersphere.api.dto.request.http.body.Body;
|
||||
import io.metersphere.api.dto.request.http.body.RawBody;
|
||||
import io.metersphere.api.dto.scenario.*;
|
||||
import io.metersphere.api.mapper.ApiScenarioReportDetailBlobMapper;
|
||||
import io.metersphere.api.mapper.ApiScenarioReportDetailMapper;
|
||||
import io.metersphere.api.mapper.ApiScenarioReportLogMapper;
|
||||
import io.metersphere.api.mapper.ApiScenarioReportMapper;
|
||||
import io.metersphere.api.service.scenario.ApiScenarioReportService;
|
||||
import io.metersphere.api.service.scenario.ApiScenarioService;
|
||||
import io.metersphere.api.utils.ApiDataUtils;
|
||||
import io.metersphere.plan.domain.TestPlanApiScenario;
|
||||
|
|
@ -23,6 +28,7 @@ import io.metersphere.project.mapper.ExtBaseProjectVersionMapper;
|
|||
import io.metersphere.sdk.constants.ApiBatchRunMode;
|
||||
import io.metersphere.sdk.constants.MsAssertionCondition;
|
||||
import io.metersphere.sdk.constants.PermissionConstants;
|
||||
import io.metersphere.sdk.constants.ReportStatus;
|
||||
import io.metersphere.sdk.dto.api.task.GetRunScriptRequest;
|
||||
import io.metersphere.sdk.dto.api.task.TaskItem;
|
||||
import io.metersphere.sdk.util.JSON;
|
||||
|
|
@ -33,6 +39,7 @@ import jakarta.annotation.Resource;
|
|||
import org.junit.jupiter.api.*;
|
||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.test.context.jdbc.Sql;
|
||||
import org.springframework.test.context.jdbc.SqlConfig;
|
||||
import org.springframework.test.web.servlet.MvcResult;
|
||||
|
|
@ -41,6 +48,8 @@ import java.nio.charset.StandardCharsets;
|
|||
import java.util.*;
|
||||
|
||||
import static io.metersphere.system.controller.handler.result.MsHttpResultCode.NOT_FOUND;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
|
||||
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
|
||||
@AutoConfigureMockMvc
|
||||
|
|
@ -64,6 +73,16 @@ public class TestPlanApiScenarioControllerTests extends BaseTest {
|
|||
private ApiScenarioService apiScenarioService;
|
||||
@Resource
|
||||
private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
|
||||
@Resource
|
||||
private ApiScenarioReportMapper apiScenarioReportMapper;
|
||||
@Resource
|
||||
private ApiScenarioReportService apiScenarioReportService;
|
||||
@Resource
|
||||
private ApiScenarioReportDetailMapper apiScenarioReportDetailMapper;
|
||||
@Resource
|
||||
private ApiScenarioReportDetailBlobMapper apiScenarioReportDetailBlobMapper;
|
||||
@Resource
|
||||
private ApiScenarioReportLogMapper apiScenarioReportLogMapper;
|
||||
|
||||
private static ApiScenario apiScenario;
|
||||
private static TestPlanApiScenario testPlanApiScenario;
|
||||
|
|
@ -316,4 +335,125 @@ public class TestPlanApiScenarioControllerTests extends BaseTest {
|
|||
request.setSelectIds(List.of("wxxx_plan_scenario_1"));
|
||||
this.requestPostWithOk(API_SCENARIO_BATCH_UPDATE_EXECUTOR_URL, request);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Order(6)
|
||||
public void testGet() throws Exception {
|
||||
List<ApiScenarioReport> reports = new ArrayList<>();
|
||||
ApiScenarioReport scenarioReport = new ApiScenarioReport();
|
||||
scenarioReport.setId("plan-test-scenario-report-id");
|
||||
scenarioReport.setProjectId(DEFAULT_PROJECT_ID);
|
||||
scenarioReport.setName("plan-test-scenario-report-name");
|
||||
scenarioReport.setStartTime(System.currentTimeMillis());
|
||||
scenarioReport.setCreateUser("admin");
|
||||
scenarioReport.setUpdateUser("admin");
|
||||
scenarioReport.setUpdateTime(System.currentTimeMillis());
|
||||
scenarioReport.setPoolId("11");
|
||||
scenarioReport.setEnvironmentId("env");
|
||||
scenarioReport.setTestPlanScenarioId("test-scenario-id");
|
||||
scenarioReport.setRunMode("api-run-mode");
|
||||
scenarioReport.setTriggerMode("api-trigger-mode");
|
||||
reports.add(scenarioReport);
|
||||
ApiScenarioRecord apiScenarioRecord = new ApiScenarioRecord();
|
||||
apiScenarioRecord.setApiScenarioId("test-scenario-record-id");
|
||||
apiScenarioRecord.setApiScenarioReportId(scenarioReport.getId());
|
||||
apiScenarioReportService.insertApiScenarioReport(reports, List.of(apiScenarioRecord));
|
||||
List<ApiScenarioReportStep> steps = new ArrayList<>();
|
||||
for (int i = 0; i < 20; i++) {
|
||||
ApiScenarioReportStep apiScenarioReportStep = new ApiScenarioReportStep();
|
||||
apiScenarioReportStep.setStepId("plan-test-scenario-report-step-id" + i);
|
||||
apiScenarioReportStep.setReportId("plan-test-scenario-report-id");
|
||||
apiScenarioReportStep.setSort((long) i);
|
||||
if (i % 2 == 0) {
|
||||
apiScenarioReportStep.setStepType(ApiScenarioStepType.API_CASE.name());
|
||||
apiScenarioReportStep.setParentId("NONE");
|
||||
} else if (i % 3 == 0) {
|
||||
apiScenarioReportStep.setStepType(ApiScenarioStepType.IF_CONTROLLER.name());
|
||||
apiScenarioReportStep.setParentId("plan-test-scenario-report-step-id" + (i - 1));
|
||||
} else {
|
||||
apiScenarioReportStep.setStepType(ApiScenarioStepType.API_SCENARIO.name());
|
||||
apiScenarioReportStep.setParentId("plan-test-scenario-report-step-id" + (i - 2));
|
||||
}
|
||||
steps.add(apiScenarioReportStep);
|
||||
}
|
||||
apiScenarioReportService.insertApiScenarioReportStep(steps);
|
||||
List<ApiScenarioReportDetail> details = new ArrayList<>();
|
||||
for (int i = 1; i < 20; i++) {
|
||||
ApiScenarioReportDetail apiReportDetail = new ApiScenarioReportDetail();
|
||||
apiReportDetail.setId("plan-test-report-detail-id" + i + 2);
|
||||
apiReportDetail.setReportId("plan-test-scenario-report-id");
|
||||
apiReportDetail.setStepId("plan-test-scenario-report-step-id" + i);
|
||||
apiReportDetail.setSort((long) i);
|
||||
if (i % 2 == 0) {
|
||||
apiReportDetail.setStatus(ReportStatus.SUCCESS.name());
|
||||
apiReportDetail.setResponseSize(1L);
|
||||
apiReportDetail.setRequestTime(2L);
|
||||
} else if (i % 3 == 0) {
|
||||
apiReportDetail.setStatus(null);
|
||||
apiReportDetail.setResponseSize(0L);
|
||||
apiReportDetail.setRequestTime(2L);
|
||||
} else {
|
||||
apiReportDetail.setStatus(ReportStatus.FAKE_ERROR.name());
|
||||
apiReportDetail.setResponseSize(1L);
|
||||
apiReportDetail.setRequestTime(2L);
|
||||
}
|
||||
details.add(apiReportDetail);
|
||||
}
|
||||
apiScenarioReportDetailMapper.batchInsert(details);
|
||||
|
||||
//插入console 资源池 环境
|
||||
ApiScenarioReportLog apiScenarioReportLog = new ApiScenarioReportLog();
|
||||
apiScenarioReportLog.setId(IDGenerator.nextStr());
|
||||
apiScenarioReportLog.setReportId("test-scenario-report-id");
|
||||
apiScenarioReportLog.setConsole("console".getBytes());
|
||||
apiScenarioReportLogMapper.insert(apiScenarioReportLog);
|
||||
|
||||
|
||||
MvcResult mvcResult = this.requestGetWithOk("/report/get/plan-test-scenario-report-id")
|
||||
.andReturn();
|
||||
ApiScenarioReportDTO apiReportDTO = ApiDataUtils.parseObject(JSON.toJSONString(parseResponse(mvcResult).get("data")), ApiScenarioReportDTO.class);
|
||||
|
||||
Assertions.assertNotNull(apiReportDTO);
|
||||
Assertions.assertEquals(apiReportDTO.getId(), "plan-test-scenario-report-id");
|
||||
|
||||
ApiScenarioReport scenarioReport1 = apiScenarioReportMapper.selectByPrimaryKey("plan-test-scenario-report-id");
|
||||
scenarioReport1.setTestPlanScenarioId("NONE");
|
||||
apiScenarioReportMapper.updateByPrimaryKeySelective(scenarioReport1);
|
||||
mockMvc.perform(getRequestBuilder("/report/get/plan-test-scenario-report-id"))
|
||||
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
|
||||
.andExpect(status().is5xxServerError());
|
||||
scenarioReport1.setTestPlanScenarioId("test-scenario-id");
|
||||
apiScenarioReportMapper.updateByPrimaryKeySelective(scenarioReport1);
|
||||
|
||||
// @@校验权限
|
||||
requestGetPermissionTest(PermissionConstants.TEST_PLAN_READ, "/report/get/plan-test-scenario-report-id");
|
||||
List<ApiScenarioReportDetail> reportsDetails = new ArrayList<>();
|
||||
List<ApiScenarioReportDetailBlob> reportBlogs = new ArrayList<>();
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
ApiScenarioReportDetail apiReportDetail = new ApiScenarioReportDetail();
|
||||
apiReportDetail.setId("plan-test-report-detail-id" + i);
|
||||
apiReportDetail.setReportId("plan-test-scenario-report-id");
|
||||
apiReportDetail.setStepId("plan-test-scenario-report-step-id1");
|
||||
apiReportDetail.setStatus("success");
|
||||
apiReportDetail.setResponseSize(0L);
|
||||
apiReportDetail.setRequestTime((long) i);
|
||||
apiReportDetail.setSort((long) i);
|
||||
reportsDetails.add(apiReportDetail);
|
||||
|
||||
reportBlogs.add(new ApiScenarioReportDetailBlob() {{
|
||||
setId(apiReportDetail.getId());
|
||||
setReportId(apiReportDetail.getReportId());
|
||||
setContent("{\"resourceId\":\"\",\"stepId\":null,\"threadName\":\"Thread Group\",\"name\":\"HTTP Request1\",\"url\":\"https://www.baidu.com/\",\"requestSize\":195,\"startTime\":1705570589125,\"endTime\":1705570589310,\"error\":1,\"headers\":\"Connection: keep-alive\\nContent-Length: 0\\nContent-Type: application/x-www-form-urlencoded; charset=UTF-8\\nHost: www.baidu.com\\nUser-Agent: Apache-HttpClient/4.5.14 (Java/21)\\n\",\"cookies\":\"\",\"body\":\"POST https://www.baidu.com/\\n\\nPOST data:\\n\\n\\n[no cookies]\\n\",\"status\":\"ERROR\",\"method\":\"POST\",\"assertionTotal\":1,\"passAssertionsTotal\":0,\"subRequestResults\":[],\"responseResult\":{\"responseCode\":\"200\",\"responseMessage\":\"OK\",\"responseTime\":185,\"latency\":180,\"responseSize\":2559,\"headers\":\"HTTP/1.1 200 OK\\nContent-Length: 2443\\nContent-Type: text/html\\nServer: bfe\\nDate: Thu, 18 Jan 2024 09:36:29 GMT\\n\",\"body\":\"<!DOCTYPE html>\\r\\n<!--STATUS OK--><html> <head><meta http-equiv=content-type content=text/html;charset=utf-8><meta http-equiv=X-UA-Compatible content=IE=Edge><meta content=always name=referrer><link rel=stylesheet type=text/css href=https://ss1.bdstatic.com/5eN1bjq8AAUYm2zgoY3K/r/www/cache/bdorz/baidu.min.css><title>百度一下，你就知道</title></head> <body link=#0000cc> <div id=wrapper> <div id=head> <div class=head_wrapper> <div class=s_form> <div class=s_form_wrapper> <div id=lg> <img hidefocus=true src=//www.baidu.com/img/bd_logo1.png width=270 height=129> </div> <form id=form name=f action=//www.baidu.com/s class=fm> <input type=hidden name=bdorz_come value=1> <input type=hidden name=ie value=utf-8> <input type=hidden name=f value=8> <input type=hidden name=rsv_bp value=1> <input type=hidden name=rsv_idx value=1> <input type=hidden name=tn value=baidu><span class=\\\"bg s_ipt_wr\\\"><input id=kw name=wd class=s_ipt value maxlength=255 autocomplete=off autofocus=autofocus></span><span class=\\\"bg s_btn_wr\\\"><input type=submit id=su value=百度一下 class=\\\"bg s_btn\\\" autofocus></span> </form> </div> </div> <div id=u1> <a href=http://news.baidu.com name=tj_trnews class=mnav>新闻</a> <a href=https://www.hao123.com name=tj_trhao123 class=mnav>hao123</a> <a href=http://map.baidu.com name=tj_trmap class=mnav>地图</a> <a href=http://v.baidu.com name=tj_trvideo class=mnav>视频</a> <a href=http://tieba.baidu.com name=tj_trtieba class=mnav>贴吧</a> <noscript> <a href=http://www.baidu.com/bdorz/login.gif?login&tpl=mn&u=http%3A%2F%2Fwww.baidu.com%2f%3fbdorz_come%3d1 name=tj_login class=lb>登录</a> </noscript> <script>document.write('<a href=\\\"http://www.baidu.com/bdorz/login.gif?login&tpl=mn&u='+ encodeURIComponent(window.location.href+ (window.location.search === \\\"\\\" ? \\\"?\\\" : \\\"&\\\")+ \\\"bdorz_come=1\\\")+ '\\\" name=\\\"tj_login\\\" class=\\\"lb\\\">登录</a>');\\r\\n </script> <a href=//www.baidu.com/more/ name=tj_briicon class=bri style=\\\"display: block;\\\">更多产品</a> </div> </div> </div> <div id=ftCon> <div id=ftConw> <p id=lh> <a href=http://home.baidu.com>关于百度</a> <a href=http://ir.baidu.com>About Baidu</a> </p> <p id=cp>©2017 Baidu <a href=http://www.baidu.com/duty/>使用百度前必读</a> <a href=http://jianyi.baidu.com/ class=cp-feedback>意见反馈</a> 京ICP证030173号 <img src=//www.baidu.com/img/gs.gif> </p> </div> </div> </div> </body> </html>\\r\\n\",\"contentType\":\"text/html\",\"vars\":null,\"imageUrl\":null,\"socketInitTime\":14,\"dnsLookupTime\":0,\"tcpHandshakeTime\":0,\"sslHandshakeTime\":0,\"transferStartTime\":166,\"downloadTime\":5,\"bodySize\":2443,\"headerSize\":116,\"assertions\":[{\"name\":\"JSON Assertion\",\"content\":null,\"script\":null,\"message\":\"Expected to find an object with property ['test'] in path $ but found 'java.lang.String'. This is not a json object according to the JsonProvider: 'com.jayway.jsonpath.spi.json.JsonSmartJsonProvider'.\",\"pass\":false}]},\"isSuccessful\":false,\"fakeErrorMessage\":\"\",\"fakeErrorCode\":null}\n".getBytes());
|
||||
|
||||
}});
|
||||
}
|
||||
apiScenarioReportDetailMapper.batchInsert(reportsDetails);
|
||||
apiScenarioReportDetailBlobMapper.batchInsert(reportBlogs);
|
||||
|
||||
this.requestGetWithOk("/report/get/detail/plan-test-scenario-report-id/plan-test-scenario-report-step-id1")
|
||||
.andReturn();
|
||||
requestGetPermissionTest(PermissionConstants.TEST_PLAN_READ, "/report/get/detail/plan-test-scenario-report-id/plan-test-scenario-report-step-id1");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue