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

fix(接口测试): 修复场景导入非标准JMX文件失败问题 

--bug=1027337 --user=王孝刚 【接口测试】接口自动化中导入jmeter文件失败
https://www.tapd.cn/55049933/s/1386032
This commit is contained in:
wxg0103 2023-06-26 10:52:17 +08:00 committed by 刘瑞斌
parent d8549c278e
commit bbc8641165
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
api-test/backend/src/main/java/io/metersphere/api/parse/scenario/JMeterParser.java
View File

@ -106,27 +106,30 @@ public class JMeterParser extends ApiImportAbstractParser<ScenarioImport> {
MsScenario scenario = new MsScenario();
scenario.setReferenced("IMPORT");
TestPlan plan = (TestPlan) testPlan.getArray()[0];
if (plan.getArguments() != null) {
List<ScenarioVariable> variables = new LinkedList<>();
plan.getArguments().forEach(item -> {
ScenarioVariable scenarioVariable = new ScenarioVariable();
scenarioVariable.setId(UUID.randomUUID().toString());
scenarioVariable.setName(item.getName());
if (ObjectUtils.isNotEmpty(item.getObjectValue())) {
Argument arg = (Argument) item.getObjectValue();
scenarioVariable.setValue(arg.getValue());
}
scenarioVariable.setType(VariableTypeConstants.CONSTANT.name());
variables.add(scenarioVariable);
});
scenario.setVariables(variables);
if (testPlan.getArray()[0] instanceof TestPlan) {
TestPlan plan = (TestPlan) testPlan.getArray()[0];
if (plan.getArguments() != null) {
List<ScenarioVariable> variables = new LinkedList<>();
plan.getArguments().forEach(item -> {
ScenarioVariable scenarioVariable = new ScenarioVariable();
scenarioVariable.setId(UUID.randomUUID().toString());
scenarioVariable.setName(item.getName());
if (ObjectUtils.isNotEmpty(item.getObjectValue())) {
Argument arg = (Argument) item.getObjectValue();
scenarioVariable.setValue(arg.getValue());
}
scenarioVariable.setType(VariableTypeConstants.CONSTANT.name());
variables.add(scenarioVariable);
});
scenario.setVariables(variables);
}
if (CollectionUtils.isEmpty(scenario.getHashTree())) {
scenario.setHashTree(new LinkedList<>());
}
formatHashTree(testPlan.getTree(plan), scenario);
} else {
formatHashTree(testPlan, scenario);
}
if (CollectionUtils.isEmpty(scenario.getHashTree())) {
scenario.setHashTree(new LinkedList<>());
}
formatHashTree(testPlan.getTree(plan), scenario);
this.projectId = request.getProjectId();
ScenarioImport scenarioImport = new ScenarioImport();
scenarioImport.setData(parseObj(scenario, request));