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

fix(接口测试): 接口定义变更没有添加变更标识 

--task=1015861 --user=陈建星 【接口测试】接口用例支持同步更新接口变更-是否与定义不一致查询接口 https://www.tapd.cn/55049933/s/1557706
This commit is contained in:
AgAngle 2024-08-02 13:59:14 +08:00 committed by Craftsman
parent bc1d906ae6
commit 317d88a18b
3 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionService.java
View File

@ -298,7 +298,9 @@ public class ApiDefinitionService extends MoveNodeService {
AbstractMsTestElement originRequest = ApiDataUtils.parseObject(new String(originApiDefinitionBlob.getRequest()), AbstractMsTestElement.class); AbstractMsTestElement originRequest = ApiDataUtils.parseObject(new String(originApiDefinitionBlob.getRequest()), AbstractMsTestElement.class);
// 处理接口定义参数变更 // 处理接口定义参数变更
apiTestCaseService.handleApiParamChange(apiDefinition.getId(), request.getRequest(), originRequest); String requestStr = JSON.toJSONString(request.getRequest());
AbstractMsTestElement msTestElement = ApiDataUtils.parseObject(requestStr, AbstractMsTestElement.class);
apiTestCaseService.handleApiParamChange(apiDefinition.getId(), msTestElement, originRequest);
return apiDefinition; return apiDefinition;
} }

11
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionControllerTests.java
View File

@ -13,6 +13,7 @@ import io.metersphere.api.dto.request.ApiEditPosRequest;
import io.metersphere.api.dto.request.ApiTransferRequest; import io.metersphere.api.dto.request.ApiTransferRequest;
import io.metersphere.api.dto.request.ImportRequest; import io.metersphere.api.dto.request.ImportRequest;
import io.metersphere.api.dto.request.http.MsHTTPElement; import io.metersphere.api.dto.request.http.MsHTTPElement;
import io.metersphere.api.dto.request.http.MsHeader;
import io.metersphere.api.dto.schema.JsonSchemaItem; import io.metersphere.api.dto.schema.JsonSchemaItem;
import io.metersphere.api.mapper.*; import io.metersphere.api.mapper.*;
import io.metersphere.api.model.CheckLogModel; import io.metersphere.api.model.CheckLogModel;
@ -595,7 +596,17 @@ public class ApiDefinitionControllerTests extends BaseTest {
apiTestCaseService.addCase(testCaseAddRequest, "admin"); apiTestCaseService.addCase(testCaseAddRequest, "admin");
} }
updateRequest.setPath("/api/test/path/method/case"); updateRequest.setPath("/api/test/path/method/case");
MsHeader msHeader = new MsHeader();
msHeader.setKey("111");
// 添加差异
msHttpElement.setHeaders(List.of(msHeader));
updateRequest.setRequest(getMsElementParam(msHttpElement));
this.requestPostWithOk(UPDATE, updateRequest); this.requestPostWithOk(UPDATE, updateRequest);
ApiTestCaseExample example = new ApiTestCaseExample();
example.createCriteria().andApiDefinitionIdEqualTo(apiDefinition.getId());
List<ApiTestCase> apiTestCases = apiTestCaseMapper.selectByExample(example);
// 校验差异后的变更通知
apiTestCases.forEach(apiTestCase -> Assertions.assertTrue(apiTestCase.getApiChange()));
// @@校验权限 // @@校验权限
request.setId(apiDefinition.getId()); request.setId(apiDefinition.getId());

61
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestCaseControllerTests.java
View File

@ -75,10 +75,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@ -117,6 +114,8 @@ public class ApiTestCaseControllerTests extends BaseTest {
private static final ResultMatcher ERROR_REQUEST_MATCHER = status().is5xxServerError(); private static final ResultMatcher ERROR_REQUEST_MATCHER = status().is5xxServerError();
private static ApiTestCase apiTestCase; private static ApiTestCase apiTestCase;
private static String apiDefinitionId = UUID.randomUUID().toString();
private static String anotherApiDefinitionId = UUID.randomUUID().toString();
private static ApiTestCase anotherApiTestCase; private static ApiTestCase anotherApiTestCase;
@Resource @Resource
@ -181,7 +180,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
public void initApiData() { public void initApiData() {
ApiDefinition apiDefinition = new ApiDefinition(); ApiDefinition apiDefinition = new ApiDefinition();
apiDefinition.setId("apiDefinitionId"); apiDefinition.setId(apiDefinitionId);
apiDefinition.setProjectId(DEFAULT_PROJECT_ID); apiDefinition.setProjectId(DEFAULT_PROJECT_ID);
apiDefinition.setName(StringUtils.join("接口定义", apiDefinition.getId())); apiDefinition.setName(StringUtils.join("接口定义", apiDefinition.getId()));
apiDefinition.setModuleId("case-moduleId"); apiDefinition.setModuleId("case-moduleId");
@ -204,7 +203,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
MsHTTPElement msHttpElement = MsHTTPElementTest.getMsHttpElement(); MsHTTPElement msHttpElement = MsHTTPElementTest.getMsHttpElement();
apiDefinitionBlob.setRequest(JSON.toJSONBytes(msHttpElement)); apiDefinitionBlob.setRequest(JSON.toJSONBytes(msHttpElement));
apiDefinitionBlobMapper.insertSelective(apiDefinitionBlob); apiDefinitionBlobMapper.insertSelective(apiDefinitionBlob);
apiDefinition.setId("apiDefinitionId1"); apiDefinition.setId(anotherApiDefinitionId);
apiDefinition.setModuleId("moduleId1"); apiDefinition.setModuleId("moduleId1");
apiDefinitionMapper.insertSelective(apiDefinition); apiDefinitionMapper.insertSelective(apiDefinition);
} }
@ -218,7 +217,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
for (int i = 0; i < 2100; i++) { for (int i = 0; i < 2100; i++) {
ApiTestCase apiTestCase = new ApiTestCase(); ApiTestCase apiTestCase = new ApiTestCase();
apiTestCase.setId("apiTestCaseId" + i); apiTestCase.setId("apiTestCaseId" + i);
apiTestCase.setApiDefinitionId("apiDefinitionId"); apiTestCase.setApiDefinitionId(apiDefinitionId);
apiTestCase.setProjectId(DEFAULT_PROJECT_ID); apiTestCase.setProjectId(DEFAULT_PROJECT_ID);
apiTestCase.setName(StringUtils.join("接口用例", apiTestCase.getId())); apiTestCase.setName(StringUtils.join("接口用例", apiTestCase.getId()));
apiTestCase.setPriority("P0"); apiTestCase.setPriority("P0");
@ -344,7 +343,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
List<Environment> environments = environmentMapper.selectByExample(environmentExample); List<Environment> environments = environmentMapper.selectByExample(environmentExample);
// @@请求成功 // @@请求成功
ApiTestCaseAddRequest request = new ApiTestCaseAddRequest(); ApiTestCaseAddRequest request = new ApiTestCaseAddRequest();
request.setApiDefinitionId("apiDefinitionId"); request.setApiDefinitionId(apiDefinitionId);
request.setName("test"); request.setName("test");
request.setProjectId(DEFAULT_PROJECT_ID); request.setProjectId(DEFAULT_PROJECT_ID);
request.setPriority("P0"); request.setPriority("P0");
@ -389,7 +388,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
// 校验项目是否存在 // 校验项目是否存在
request.setProjectId("111"); request.setProjectId("111");
request.setApiDefinitionId("apiDefinitionId"); request.setApiDefinitionId(apiDefinitionId);
request.setName("test123"); request.setName("test123");
this.requestPost(ADD, request).andExpect(ERROR_REQUEST_MATCHER); this.requestPost(ADD, request).andExpect(ERROR_REQUEST_MATCHER);
// @@校验日志 // @@校验日志
@ -405,13 +404,19 @@ public class ApiTestCaseControllerTests extends BaseTest {
@Test @Test
@Order(3) @Order(3)
public void handleApiParamChange() { public void handleApiParamChange() {
apiTestCaseService.handleApiParamChange(apiTestCase.getApiDefinitionId(), new MsHTTPElement(), new MsHTTPElement()); ApiTestCase updateCase = new ApiTestCase();
updateCase.setApiChange(false);
ApiTestCaseExample example = new ApiTestCaseExample(); ApiTestCaseExample example = new ApiTestCaseExample();
example.createCriteria().andApiChangeEqualTo(true); example.createCriteria().andApiDefinitionIdEqualTo(apiTestCase.getApiDefinitionId());
apiTestCaseMapper.updateByExampleSelective(updateCase, example);
apiTestCaseService.handleApiParamChange(apiTestCase.getApiDefinitionId(), new MsHTTPElement(), new MsHTTPElement());
example = new ApiTestCaseExample();
example.createCriteria().andApiDefinitionIdEqualTo(apiTestCase.getApiDefinitionId())
.andApiChangeEqualTo(true);
Assertions.assertEquals(apiTestCaseMapper.selectByExample(example), List.of()); Assertions.assertEquals(apiTestCaseMapper.selectByExample(example), List.of());
// 设置忽略变更通知 // 设置忽略变更通知
ApiTestCase updateCase = new ApiTestCase(); updateCase = new ApiTestCase();
updateCase.setId(apiTestCase.getId()); updateCase.setId(apiTestCase.getId());
updateCase.setIgnoreApiChange(true); updateCase.setIgnoreApiChange(true);
apiTestCaseMapper.updateByPrimaryKeySelective(updateCase); apiTestCaseMapper.updateByPrimaryKeySelective(updateCase);
@ -896,7 +901,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
public void page() throws Exception { public void page() throws Exception {
// @@请求成功 // @@请求成功
ApiTestCaseAddRequest request = new ApiTestCaseAddRequest(); ApiTestCaseAddRequest request = new ApiTestCaseAddRequest();
request.setApiDefinitionId("apiDefinitionId1"); request.setApiDefinitionId(anotherApiDefinitionId);
request.setName("testApiDefinitionId1"); request.setName("testApiDefinitionId1");
request.setProjectId(DEFAULT_PROJECT_ID); request.setProjectId(DEFAULT_PROJECT_ID);
request.setPriority("P0"); request.setPriority("P0");
@ -921,7 +926,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
Assertions.assertTrue(((List<ApiTestCaseDTO>) returnPager.getList()).size() <= pageRequest.getPageSize()); Assertions.assertTrue(((List<ApiTestCaseDTO>) returnPager.getList()).size() <= pageRequest.getPageSize());
//查询apiDefinitionId1的数据 //查询apiDefinitionId1的数据
pageRequest.setApiDefinitionId("apiDefinitionId1"); pageRequest.setApiDefinitionId(anotherApiDefinitionId);
mvcResult = requestPostWithOkAndReturn(PAGE, pageRequest); mvcResult = requestPostWithOkAndReturn(PAGE, pageRequest);
returnPager = parseObjectFromMvcResult(mvcResult, Pager.class); returnPager = parseObjectFromMvcResult(mvcResult, Pager.class);
//返回值不为空 //返回值不为空
@ -930,7 +935,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
Assertions.assertEquals(returnPager.getCurrent(), pageRequest.getCurrent()); Assertions.assertEquals(returnPager.getCurrent(), pageRequest.getCurrent());
List<ApiTestCaseDTO> caseDTOS = JSON.parseArray(JSON.toJSONString(returnPager.getList()), ApiTestCaseDTO.class); List<ApiTestCaseDTO> caseDTOS = JSON.parseArray(JSON.toJSONString(returnPager.getList()), ApiTestCaseDTO.class);
caseDTOS.forEach(caseDTO -> Assertions.assertEquals(caseDTO.getApiDefinitionId(), "apiDefinitionId1")); caseDTOS.forEach(caseDTO -> Assertions.assertEquals(caseDTO.getApiDefinitionId(), anotherApiDefinitionId));
//查询模块为moduleId1的数据 //查询模块为moduleId1的数据
pageRequest.setApiDefinitionId(null); pageRequest.setApiDefinitionId(null);
@ -1036,7 +1041,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
requestPostWithOkAndReturn(BATCH_EDIT, request); requestPostWithOkAndReturn(BATCH_EDIT, request);
//判断数据的优先级是不是P3 //判断数据的优先级是不是P3
example.clear(); example.clear();
example.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo("apiDefinitionId").andDeletedEqualTo(false); example.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo(apiDefinitionId).andDeletedEqualTo(false);
List<ApiTestCase> caseList = apiTestCaseMapper.selectByExample(example); List<ApiTestCase> caseList = apiTestCaseMapper.selectByExample(example);
caseList.forEach(apiTestCase -> Assertions.assertEquals(apiTestCase.getPriority(), "P3")); caseList.forEach(apiTestCase -> Assertions.assertEquals(apiTestCase.getPriority(), "P3"));
@ -1142,11 +1147,11 @@ public class ApiTestCaseControllerTests extends BaseTest {
request.setSelectAll(true); request.setSelectAll(true);
request.setExcludeIds(new ArrayList<>()); request.setExcludeIds(new ArrayList<>());
request.setApiDefinitionId("apiDefinitionId"); request.setApiDefinitionId(apiDefinitionId);
request.setModuleIds(List.of("case-moduleId")); request.setModuleIds(List.of("case-moduleId"));
requestPostWithOkAndReturn(BATCH_DELETE_TO_GC, request); requestPostWithOkAndReturn(BATCH_DELETE_TO_GC, request);
ApiTestCaseExample example = new ApiTestCaseExample(); ApiTestCaseExample example = new ApiTestCaseExample();
example.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo("apiDefinitionId").andDeletedEqualTo(true); example.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo(apiDefinitionId).andDeletedEqualTo(true);
List<ApiTestCase> caseList = apiTestCaseMapper.selectByExample(example); List<ApiTestCase> caseList = apiTestCaseMapper.selectByExample(example);
caseList.forEach(apiTestCase -> Assertions.assertTrue(apiTestCase.getDeleted())); caseList.forEach(apiTestCase -> Assertions.assertTrue(apiTestCase.getDeleted()));
@ -1180,7 +1185,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
Assertions.assertTrue(((List<ApiTestCaseDTO>) returnPager.getList()).size() <= pageRequest.getPageSize()); Assertions.assertTrue(((List<ApiTestCaseDTO>) returnPager.getList()).size() <= pageRequest.getPageSize());
//查询apiDefinitionId1的数据 //查询apiDefinitionId1的数据
pageRequest.setApiDefinitionId("apiDefinitionId1"); pageRequest.setApiDefinitionId(anotherApiDefinitionId);
mvcResult = requestPostWithOkAndReturn(TRASH_PAGE, pageRequest); mvcResult = requestPostWithOkAndReturn(TRASH_PAGE, pageRequest);
returnPager = parseObjectFromMvcResult(mvcResult, Pager.class); returnPager = parseObjectFromMvcResult(mvcResult, Pager.class);
//返回值不为空 //返回值不为空
@ -1189,7 +1194,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
Assertions.assertEquals(returnPager.getCurrent(), pageRequest.getCurrent()); Assertions.assertEquals(returnPager.getCurrent(), pageRequest.getCurrent());
List<ApiTestCaseDTO> caseDTOS = JSON.parseArray(JSON.toJSONString(returnPager.getList()), ApiTestCaseDTO.class); List<ApiTestCaseDTO> caseDTOS = JSON.parseArray(JSON.toJSONString(returnPager.getList()), ApiTestCaseDTO.class);
caseDTOS.forEach(caseDTO -> Assertions.assertEquals(caseDTO.getApiDefinitionId(), "apiDefinitionId1")); caseDTOS.forEach(caseDTO -> Assertions.assertEquals(caseDTO.getApiDefinitionId(), anotherApiDefinitionId));
//查询模块为moduleId1的数据 //查询模块为moduleId1的数据
pageRequest.setApiDefinitionId(null); pageRequest.setApiDefinitionId(null);
@ -1226,17 +1231,17 @@ public class ApiTestCaseControllerTests extends BaseTest {
requestPostWithOkAndReturn(BATCH_RECOVER, request); requestPostWithOkAndReturn(BATCH_RECOVER, request);
ApiDefinition apiDefinition = new ApiDefinition(); ApiDefinition apiDefinition = new ApiDefinition();
apiDefinition.setId("apiDefinitionId"); apiDefinition.setId(apiDefinitionId);
apiDefinition.setDeleted(true); apiDefinition.setDeleted(true);
apiDefinitionMapper.updateByPrimaryKeySelective(apiDefinition); apiDefinitionMapper.updateByPrimaryKeySelective(apiDefinition);
request.setSelectAll(true); request.setSelectAll(true);
request.setSelectIds(List.of(apiTestCase.getId())); request.setSelectIds(List.of(apiTestCase.getId()));
request.setExcludeIds(List.of(apiTestCase.getId())); request.setExcludeIds(List.of(apiTestCase.getId()));
request.setApiDefinitionId("apiDefinitionId"); request.setApiDefinitionId(apiDefinitionId);
request.setModuleIds(List.of("case-moduleId")); request.setModuleIds(List.of("case-moduleId"));
requestPostWithOkAndReturn(BATCH_RECOVER, request); requestPostWithOkAndReturn(BATCH_RECOVER, request);
ApiTestCaseExample example = new ApiTestCaseExample(); ApiTestCaseExample example = new ApiTestCaseExample();
example.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo("apiDefinitionId").andDeletedEqualTo(false); example.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo(apiDefinitionId).andDeletedEqualTo(false);
List<ApiTestCase> caseList = apiTestCaseMapper.selectByExample(example); List<ApiTestCase> caseList = apiTestCaseMapper.selectByExample(example);
caseList.forEach(apiTestCase -> Assertions.assertFalse(apiTestCase.getDeleted())); caseList.forEach(apiTestCase -> Assertions.assertFalse(apiTestCase.getDeleted()));
@ -1252,10 +1257,10 @@ public class ApiTestCaseControllerTests extends BaseTest {
gcRequest.setProjectId(DEFAULT_PROJECT_ID); gcRequest.setProjectId(DEFAULT_PROJECT_ID);
gcRequest.setSelectAll(true); gcRequest.setSelectAll(true);
gcRequest.setExcludeIds(new ArrayList<>()); gcRequest.setExcludeIds(new ArrayList<>());
gcRequest.setApiDefinitionId("apiDefinitionId"); gcRequest.setApiDefinitionId(apiDefinitionId);
requestPostWithOkAndReturn(BATCH_DELETE_TO_GC, gcRequest); requestPostWithOkAndReturn(BATCH_DELETE_TO_GC, gcRequest);
ApiTestCaseExample example1 = new ApiTestCaseExample(); ApiTestCaseExample example1 = new ApiTestCaseExample();
example1.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo("apiDefinitionId").andDeletedEqualTo(true); example1.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo(apiDefinitionId).andDeletedEqualTo(true);
List<ApiTestCase> caseList1 = apiTestCaseMapper.selectByExample(example1); List<ApiTestCase> caseList1 = apiTestCaseMapper.selectByExample(example1);
caseList1.forEach(apiTestCase -> Assertions.assertTrue(apiTestCase.getDeleted())); caseList1.forEach(apiTestCase -> Assertions.assertTrue(apiTestCase.getDeleted()));
} }
@ -1302,14 +1307,14 @@ public class ApiTestCaseControllerTests extends BaseTest {
requestPostWithOkAndReturn(BATCH_DELETE, request); requestPostWithOkAndReturn(BATCH_DELETE, request);
request.setSelectAll(true); request.setSelectAll(true);
request.setExcludeIds(new ArrayList<>()); request.setExcludeIds(new ArrayList<>());
request.setApiDefinitionId("apiDefinitionId"); request.setApiDefinitionId(apiDefinitionId);
requestPostWithOkAndReturn(BATCH_DELETE_TO_GC, request); requestPostWithOkAndReturn(BATCH_DELETE_TO_GC, request);
request.setProjectId(DEFAULT_PROJECT_ID); request.setProjectId(DEFAULT_PROJECT_ID);
request.setSelectAll(true); request.setSelectAll(true);
request.setApiDefinitionId("apiDefinitionId"); request.setApiDefinitionId(apiDefinitionId);
requestPostWithOkAndReturn(BATCH_DELETE, request); requestPostWithOkAndReturn(BATCH_DELETE, request);
ApiTestCaseExample example = new ApiTestCaseExample(); ApiTestCaseExample example = new ApiTestCaseExample();
example.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo("apiDefinitionId"); example.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID).andApiDefinitionIdEqualTo(apiDefinitionId);
//数据为空 //数据为空
Assertions.assertEquals(0, apiTestCaseMapper.selectByExample(example).size()); Assertions.assertEquals(0, apiTestCaseMapper.selectByExample(example).size());