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-06 10:08:19 +08:00 committed by jianxing
parent e1e1a36d9b
commit 5ecbefb884
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/services/api-test/src/main/java/io/metersphere/api/controller/definition/ApiTestCaseController.java
View File

@ -319,11 +319,11 @@ public class ApiTestCaseController {
} }
@GetMapping("/api-change/ignore/{id}") @GetMapping("/api-change/ignore/{id}")
@Operation(summary = "清除接口参数变更标识") @Operation(summary = "忽略接口变更提示")
@RequiresPermissions(logical = Logical.OR, value = {PermissionConstants.PROJECT_API_DEFINITION_CASE_ADD, PermissionConstants.PROJECT_API_DEFINITION_CASE_UPDATE}) @RequiresPermissions(logical = Logical.OR, value = {PermissionConstants.PROJECT_API_DEFINITION_CASE_ADD, PermissionConstants.PROJECT_API_DEFINITION_CASE_UPDATE})
@CheckOwner(resourceId = "#id", resourceType = "api_test_case") @CheckOwner(resourceId = "#id", resourceType = "api_test_case")
public void ignoreApiChange(@PathVariable String id) { public void ignoreApiChange(@PathVariable String id, @RequestParam(name = "ignore") boolean ignore) {
apiTestCaseService.ignoreApiChange(id); apiTestCaseService.ignoreApiChange(id, ignore);
} }
@GetMapping("/api/compare/{id}") @GetMapping("/api/compare/{id}")

3
backend/services/api-test/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseDTO.java
View File

@ -101,6 +101,9 @@ public class ApiTestCaseDTO {
@Schema(description = "与接口定义不一致") @Schema(description = "与接口定义不一致")
private Boolean inconsistentWithApi; private Boolean inconsistentWithApi;
@Schema(description = "忽略接口与用例参数不一致")
private Boolean ignoreApiDiff;
@Schema(description = "忽略接口定义参数变更") @Schema(description = "忽略接口定义参数变更")
private Boolean ignoreApiChange; private Boolean ignoreApiChange;
} }

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

@ -980,13 +980,17 @@ public class ApiTestCaseService extends MoveNodeService {
return ApiDataUtils.parseObject(new String(apiTestCaseBlob.getRequest()), AbstractMsTestElement.class); return ApiDataUtils.parseObject(new String(apiTestCaseBlob.getRequest()), AbstractMsTestElement.class);
} }
public void ignoreApiChange(String id) { public void ignoreApiChange(String id, boolean ignore) {
checkResourceExist(id); checkResourceExist(id);
ApiTestCase apiTestCase = new ApiTestCase(); ApiTestCase apiTestCase = new ApiTestCase();
apiTestCase.setId(id); apiTestCase.setId(id);
apiTestCase.setApiChange(false); if (ignore) {
apiTestCase.setIgnoreApiDiff(true); apiTestCase.setApiChange(false);
apiTestCase.setIgnoreApiChange(true); apiTestCase.setIgnoreApiDiff(true);
apiTestCase.setIgnoreApiChange(true);
} else {
apiTestCase.setIgnoreApiChange(false);
}
apiTestCaseMapper.updateByPrimaryKeySelective(apiTestCase); apiTestCaseMapper.updateByPrimaryKeySelective(apiTestCase);
} }

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

@ -111,7 +111,7 @@ public class ApiTestCaseControllerTests extends BaseTest {
private static final String RUN_POST = "run"; private static final String RUN_POST = "run";
private static final String BATCH_RUN = "batch/run"; private static final String BATCH_RUN = "batch/run";
private static final String API_CHANGE_CLEAR = "api-change/clear/{0}"; private static final String API_CHANGE_CLEAR = "api-change/clear/{0}";
private static final String API_CHANGE_IGNORE = "api-change/ignore/{0}"; private static final String API_CHANGE_IGNORE = "api-change/ignore/{0}?ignore={1}";
private static final String API_CHANGE_SYNC = "batch/api-change/sync"; private static final String API_CHANGE_SYNC = "batch/api-change/sync";
private static final String API_COMPARE = "api/compare/{0}"; private static final String API_COMPARE = "api/compare/{0}";
@ -478,14 +478,18 @@ public class ApiTestCaseControllerTests extends BaseTest {
updateCase.setApiChange(true); updateCase.setApiChange(true);
updateCase.setId(apiTestCase.getId()); updateCase.setId(apiTestCase.getId());
apiTestCaseMapper.updateByPrimaryKeySelective(updateCase); apiTestCaseMapper.updateByPrimaryKeySelective(updateCase);
this.requestGetWithOk(API_CHANGE_IGNORE, apiTestCase.getId()); this.requestGetWithOk(API_CHANGE_IGNORE, apiTestCase.getId(), true);
Assertions.assertFalse(apiTestCaseMapper.selectByPrimaryKey(apiTestCase.getId()).getApiChange()); Assertions.assertFalse(apiTestCaseMapper.selectByPrimaryKey(apiTestCase.getId()).getApiChange());
Assertions.assertTrue(apiTestCaseMapper.selectByPrimaryKey(apiTestCase.getId()).getIgnoreApiDiff()); Assertions.assertTrue(apiTestCaseMapper.selectByPrimaryKey(apiTestCase.getId()).getIgnoreApiDiff());
Assertions.assertTrue(apiTestCaseMapper.selectByPrimaryKey(apiTestCase.getId()).getIgnoreApiChange()); Assertions.assertTrue(apiTestCaseMapper.selectByPrimaryKey(apiTestCase.getId()).getIgnoreApiChange());
this.requestGetWithOk(API_CHANGE_IGNORE, apiTestCase.getId(), false);
Assertions.assertFalse(apiTestCaseMapper.selectByPrimaryKey(apiTestCase.getId()).getApiChange());
Assertions.assertTrue(apiTestCaseMapper.selectByPrimaryKey(apiTestCase.getId()).getIgnoreApiDiff());
Assertions.assertFalse(apiTestCaseMapper.selectByPrimaryKey(apiTestCase.getId()).getIgnoreApiChange());
// @@校验权限 // @@校验权限
requestGetPermissionTest(PermissionConstants.PROJECT_API_DEFINITION_CASE_ADD, API_CHANGE_IGNORE, apiTestCase.getId()); requestGetPermissionTest(PermissionConstants.PROJECT_API_DEFINITION_CASE_ADD, API_CHANGE_IGNORE, apiTestCase.getId(), true);
requestGetPermissionTest(PermissionConstants.PROJECT_API_DEFINITION_CASE_UPDATE, API_CHANGE_IGNORE, apiTestCase.getId()); requestGetPermissionTest(PermissionConstants.PROJECT_API_DEFINITION_CASE_UPDATE, API_CHANGE_IGNORE, apiTestCase.getId(), false);
} }
@Test @Test