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:
fit2-zhao 2021-07-09 12:22:20 +08:00 committed by fit2-zhao
parent c4f553d3a2
commit 0cf2d0a69e
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
View File

@ -8,8 +8,12 @@ import io.metersphere.api.dto.ApiTestImportRequest;
import io.metersphere.api.dto.definition.request.MsScenario;
import io.metersphere.api.dto.definition.request.MsTestElement;
import io.metersphere.api.parse.MsAbstractParser;
import io.metersphere.api.service.ApiAutomationService;
import io.metersphere.api.service.ApiTestCaseService;
import io.metersphere.base.domain.ApiScenarioModule;
import io.metersphere.base.domain.ApiScenarioWithBLOBs;
import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
import io.metersphere.commons.utils.CommonBeanFactory;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@ -35,7 +39,7 @@ public class MsScenarioParser extends MsAbstractParser<ScenarioImport> {
}
}
if (testObject.get("projectName") != null || testObject.get("projectId") != null ) {
if (testObject.get("projectName") != null || testObject.get("projectId") != null) {
return parseMsFormat(testStr, request);
} else {
ScenarioImport apiImport = new ScenarioImport();
@ -95,7 +99,27 @@ public class MsScenarioParser extends MsAbstractParser<ScenarioImport> {
JSONObject object = (JSONObject) hashTree.get(i);
String referenced = object.getString("referenced");
if (StringUtils.isNotBlank(referenced) && StringUtils.equals(referenced, "REF")) {
object.put("referenced", "Copy");
// 检测引用对象是否存在，若果不存在则改成复制对象
String refType = object.getString("refType");
boolean isCopy = true;
if (StringUtils.isNotEmpty(refType)) {
if (refType.equals("CASE")) {
ApiTestCaseService testCaseService = CommonBeanFactory.getBean(ApiTestCaseService.class);
ApiTestCaseWithBLOBs bloBs = testCaseService.get(object.getString("id"));
if (bloBs != null) {
isCopy = false;
}
} else {
ApiAutomationService apiAutomationService = CommonBeanFactory.getBean(ApiAutomationService.class);
ApiScenarioWithBLOBs bloBs = apiAutomationService.getDto(object.getString("id"));
if (bloBs != null) {
isCopy = false;
}
}
}
if (isCopy) {
object.put("referenced", "Copy");
}
}
object.put("projectId", "");
JSONObject environmentMap = object.getJSONObject("environmentMap");