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

fix(测试用例): 用例步骤处理

This commit is contained in:
WangXu10 2024-08-19 14:16:27 +08:00 committed by 刘瑞斌
parent 7d505ff384
commit 8fe7d869e8
1 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
backend/services/case-management/src/main/java/io/metersphere/functional/xmind/utils/XmindExportUtil.java
View File

@ -464,6 +464,45 @@ public class XmindExportUtil {
} }
}); });
buildStep(dto, systemColumns, itemTopic, workbook, style);
//自定义字段
Map<String, String> customColumnsMap = request.getCustomFields().stream().collect(Collectors.toMap(FunctionalCaseHeader::getId, FunctionalCaseHeader::getName));
HashMap<String, AbstractCustomFieldValidator> customFieldValidatorMap = CustomFieldValidatorFactory.getValidatorMap(request.getProjectId());
customColumnsMap.forEach((k, v) -> {
if (customFieldMap.containsKey(k) && temCustomFieldsMap.containsKey(k)) {
AbstractCustomFieldValidator customFieldValidator = customFieldValidatorMap.get(temCustomFieldsMap.get(k).getType());
String value = "";
if (customFieldValidator.isKVOption) {
if (!temCustomFieldsMap.get(k).getInternal()) {
// 这里如果填的是选项值，替换成选项ID，保存
value = customFieldValidator.parse2Value(customFieldMap.get(k), temCustomFieldsMap.get(k)).toString();
} else {
value = customFieldMap.get(k);
}
}
ITopic preTopic = workbook.createTopic();
preTopic.setTitleText(v.concat(": ").concat(value));
if (style != null) {
preTopic.setStyleId(style.getId());
}
itemTopic.add(preTopic, ITopic.ATTACHED);
}
});
topic.add(itemTopic);
}
private static void buildStep(FunctionalCaseXmindDTO dto, List<String> systemColumns, ITopic itemTopic, IWorkbook workbook, IStyle style) {
List<String> textDescription = systemColumns.stream().filter(item -> StringUtils.equalsIgnoreCase(item, "text_description")).toList();
List<String> expectedResult = systemColumns.stream().filter(item -> StringUtils.equalsIgnoreCase(item, "expected_result")).toList();
if (CollectionUtils.isEmpty(textDescription) && CollectionUtils.isEmpty(expectedResult)) {
return;
}
if (StringUtils.equalsIgnoreCase(dto.getCaseEditType(), FunctionalCaseTypeConstants.CaseEditType.TEXT.name())) { if (StringUtils.equalsIgnoreCase(dto.getCaseEditType(), FunctionalCaseTypeConstants.CaseEditType.TEXT.name())) {
//文本描述 //文本描述
ITopic textDesTopic = workbook.createTopic(); ITopic textDesTopic = workbook.createTopic();
@ -527,39 +566,13 @@ public class XmindExportUtil {
} catch (Exception e) { } catch (Exception e) {
} }
} }
//自定义字段
Map<String, String> customColumnsMap = request.getCustomFields().stream().collect(Collectors.toMap(FunctionalCaseHeader::getId, FunctionalCaseHeader::getName));
HashMap<String, AbstractCustomFieldValidator> customFieldValidatorMap = CustomFieldValidatorFactory.getValidatorMap(request.getProjectId());
customColumnsMap.forEach((k, v) -> {
if (customFieldMap.containsKey(k) && temCustomFieldsMap.containsKey(k)) {
AbstractCustomFieldValidator customFieldValidator = customFieldValidatorMap.get(temCustomFieldsMap.get(k).getType());
String value = "";
if (customFieldValidator.isKVOption) {
if (!temCustomFieldsMap.get(k).getInternal()) {
// 这里如果填的是选项值，替换成选项ID，保存
value = customFieldValidator.parse2Value(customFieldMap.get(k), temCustomFieldsMap.get(k)).toString();
} else {
value = customFieldMap.get(k);
}
}
ITopic preTopic = workbook.createTopic();
preTopic.setTitleText(v.concat(": ").concat(value));
if (style != null) {
preTopic.setStyleId(style.getId());
}
itemTopic.add(preTopic, ITopic.ATTACHED);
}
});
topic.add(itemTopic);
} }
private static String parseTag(String tags) { private static String parseTag(String tags) {
List list = JSON.parseArray(tags); List list = JSON.parseArray(tags);
if (CollectionUtils.isEmpty(list) || list.size() == 0) {
return StringUtils.EMPTY;
}
AtomicReference<String> tag = new AtomicReference<>(""); AtomicReference<String> tag = new AtomicReference<>("");
list.forEach(item -> { list.forEach(item -> {
tag.set(tag.get() + item.toString().concat("|")); tag.set(tag.get() + item.toString().concat("|"));