feat(用例管理): 增加功能用例清空标签功能
This commit is contained in:
parent
06be04d2f7
commit
3d85e8a48c
|
@ -22,6 +22,9 @@ public class FunctionalCaseBatchEditRequest extends BaseFunctionalCaseBatchDTO {
|
||||||
@Schema(description = "是否追加")
|
@Schema(description = "是否追加")
|
||||||
private boolean append;
|
private boolean append;
|
||||||
|
|
||||||
|
@Schema(description = "是否清空")
|
||||||
|
private boolean clear;
|
||||||
|
|
||||||
@Schema(description = "标签")
|
@Schema(description = "标签")
|
||||||
private List<String> tags;
|
private List<String> tags;
|
||||||
|
|
||||||
|
|
|
@ -1026,7 +1026,15 @@ public class FunctionalCaseService {
|
||||||
});
|
});
|
||||||
sqlSession.flushStatements();
|
sqlSession.flushStatements();
|
||||||
SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
|
SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
|
||||||
} else {
|
} else if (request.isClear()) {
|
||||||
|
//清空标签
|
||||||
|
FunctionalCase functionalCase = new FunctionalCase();
|
||||||
|
functionalCase.setTags(new ArrayList<>());
|
||||||
|
functionalCase.setProjectId(request.getProjectId());
|
||||||
|
functionalCase.setUpdateTime(System.currentTimeMillis());
|
||||||
|
functionalCase.setUpdateUser(userId);
|
||||||
|
extFunctionalCaseMapper.batchUpdate(functionalCase, ids);
|
||||||
|
}else {
|
||||||
//替换标签
|
//替换标签
|
||||||
FunctionalCase functionalCase = new FunctionalCase();
|
FunctionalCase functionalCase = new FunctionalCase();
|
||||||
functionalCase.setTags(request.getTags());
|
functionalCase.setTags(request.getTags());
|
||||||
|
|
|
@ -663,16 +663,19 @@ public class FunctionalCaseControllerTests extends BaseTest {
|
||||||
FunctionalCaseBatchEditRequest request = new FunctionalCaseBatchEditRequest();
|
FunctionalCaseBatchEditRequest request = new FunctionalCaseBatchEditRequest();
|
||||||
request.setProjectId(DEFAULT_PROJECT_ID);
|
request.setProjectId(DEFAULT_PROJECT_ID);
|
||||||
request.setAppend(false);
|
request.setAppend(false);
|
||||||
|
request.setClear(false);
|
||||||
request.setSelectAll(false);
|
request.setSelectAll(false);
|
||||||
this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
||||||
request.setSelectIds(Arrays.asList("TEST_FUNCTIONAL_CASE_ID_1", "TEST_FUNCTIONAL_CASE_ID_2"));
|
request.setSelectIds(Arrays.asList("TEST_FUNCTIONAL_CASE_ID_1", "TEST_FUNCTIONAL_CASE_ID_2"));
|
||||||
this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
||||||
request.setAppend(true);
|
request.setAppend(true);
|
||||||
|
request.setClear(false);
|
||||||
request.setTags(Arrays.asList("追加标签_1", "追加标签_2"));
|
request.setTags(Arrays.asList("追加标签_1", "追加标签_2"));
|
||||||
this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
||||||
request.setTags(Arrays.asList("追加标签_1", "追加标签_2", "追加标签_3", "追加标签_4", "追加标签_5", "追加标签_6", "追加标签_7", "追加标签_8", "追加标签_9", "追加标签_10", "追加标签_11"));
|
request.setTags(Arrays.asList("追加标签_1", "追加标签_2", "追加标签_3", "追加标签_4", "追加标签_5", "追加标签_6", "追加标签_7", "追加标签_8", "追加标签_9", "追加标签_10", "追加标签_11"));
|
||||||
this.requestPost(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
this.requestPost(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
||||||
request.setAppend(false);
|
request.setAppend(false);
|
||||||
|
request.setClear(false);
|
||||||
request.setTags(Arrays.asList("覆盖标签1", "覆盖标签2"));
|
request.setTags(Arrays.asList("覆盖标签1", "覆盖标签2"));
|
||||||
request.setSelectAll(true);
|
request.setSelectAll(true);
|
||||||
CaseCustomFieldDTO caseCustomFieldDTO = new CaseCustomFieldDTO();
|
CaseCustomFieldDTO caseCustomFieldDTO = new CaseCustomFieldDTO();
|
||||||
|
@ -680,6 +683,14 @@ public class FunctionalCaseControllerTests extends BaseTest {
|
||||||
caseCustomFieldDTO.setValue("批量编辑自定义字段");
|
caseCustomFieldDTO.setValue("批量编辑自定义字段");
|
||||||
request.setCustomField(caseCustomFieldDTO);
|
request.setCustomField(caseCustomFieldDTO);
|
||||||
this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
||||||
|
FunctionalCase functionalCase = functionalCaseMapper.selectByPrimaryKey("TEST_FUNCTIONAL_CASE_ID_1");
|
||||||
|
Assertions.assertTrue(CollectionUtils.isNotEmpty(functionalCase.getTags()));
|
||||||
|
request.setAppend(false);
|
||||||
|
request.setClear(true);
|
||||||
|
request.setSelectAll(true);
|
||||||
|
this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_BATCH_EDIT_URL, request);
|
||||||
|
functionalCase = functionalCaseMapper.selectByPrimaryKey("TEST_FUNCTIONAL_CASE_ID_1");
|
||||||
|
Assertions.assertTrue(CollectionUtils.isEmpty(functionalCase.getTags()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue