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

refactor(接口测试): 导入jmx文件优化，支持多线程组 

--story=1011083 --user=赵勇 【Bug转需求】接口自动化支持导入多线程的jmx文件 https://www.tapd.cn/55049933/s/1329318
This commit is contained in:
fit2-zhao 2023-01-31 15:10:25 +08:00 committed by fit2-zhao
parent 273d8113b6
commit a2a2bd0571
2 changed files with 121 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import io.metersphere.api.dto.definition.request.sampler.dubbo.MsConsumerAndServ
import io.metersphere.api.dto.definition.request.sampler.dubbo.MsRegistryCenter;
import io.metersphere.api.dto.definition.request.timer.MsConstantTimer;
import io.metersphere.api.dto.definition.request.unknown.MsJmeterElement;
import io.metersphere.api.dto.definition.request.variable.ScenarioVariable;
import io.metersphere.api.dto.scenario.Body;
import io.metersphere.api.dto.scenario.DatabaseConfig;
import io.metersphere.api.dto.scenario.KeyValue;
@ -37,10 +38,7 @@ import io.metersphere.api.parse.ApiImportAbstractParser;
import io.metersphere.base.domain.ApiScenarioWithBLOBs;
import io.metersphere.base.domain.ApiTestEnvironmentExample;
import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
import io.metersphere.commons.constants.ElementConstants;
import io.metersphere.commons.constants.LoopConstants;
import io.metersphere.commons.constants.PropertyConstant;
import io.metersphere.commons.constants.RequestTypeConstants;
import io.metersphere.commons.constants.*;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.*;
import io.metersphere.environment.service.BaseEnvironmentService;
@ -48,8 +46,10 @@ import io.metersphere.plugin.core.MsTestElement;
import io.metersphere.request.BodyFile;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.assertions.*;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.control.ForeachController;
import org.apache.jmeter.control.LoopController;
@ -75,6 +75,7 @@ import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.threads.ThreadGroup;
import org.apache.jmeter.timers.ConstantTimer;
import org.apache.jorphan.collections.HashTree;
@ -105,7 +106,27 @@ public class JMeterParser extends ApiImportAbstractParser<ScenarioImport> {
MsScenario scenario = new MsScenario();
scenario.setReferenced("IMPORT");
formatHashTree(testPlan, scenario);
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);
this.projectId = request.getProjectId();
ScenarioImport scenarioImport = new ScenarioImport();
scenarioImport.setData(parseObj(scenario, request));
@ -697,11 +718,7 @@ public class JMeterParser extends ApiImportAbstractParser<ScenarioImport> {
}
// 测试计划
if (key instanceof TestPlan) {
scenario.setName(((TestPlan) key).getName());
elementNode = new MsJmeterElement();
elementNode.setName(((TestPlan) key).getName());
((MsJmeterElement) elementNode).setJmeterElement(objToXml(key));
((MsJmeterElement) elementNode).setElementType(key.getClass().getSimpleName());
continue;
}
// 线程组
else if (key instanceof ThreadGroup) {

15
api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
View File

@ -582,7 +582,6 @@ import {getEnvironmentByProjectId} from 'metersphere-frontend/src/api/environmen
import { useApiStore } from '@/store';
import { getDefaultVersion, setLatestVersionById } from 'metersphere-frontend/src/api/version';
const store = useApiStore();
let jsonPath = require('jsonpath');
@ -790,7 +789,7 @@ export default {
debugReportId: '',
isPreventReClick: false,
latestVersionId: '',
hasLatest: false
hasLatest: false,
};
},
created() {
@ -923,6 +922,9 @@ export default {
if (!array) {
array = this.scenarioDefinition;
}
if (!array) {
return;
}
let isLeaf = true;
let nodeType = '';
if (node) {
@ -2489,8 +2491,7 @@ export default {
if (!hasLicense()) {
return;
}
getDefaultVersion(this.projectId)
.then(response => {
getDefaultVersion(this.projectId).then((response) => {
this.latestVersionId = response.data;
this.getVersionHistory();
});
@ -2507,7 +2508,7 @@ export default {
}
let latestVersionData = response.data.filter((v) => v.versionId === this.latestVersionId);
if (latestVersionData.length > 0) {
this.hasLatest = false
this.hasLatest = false;
} else {
this.hasLatest = true;
}
@ -2567,8 +2568,8 @@ export default {
projectId: this.projectId,
type: 'SCENARIO',
versionId: row.id,
resourceId: this.currentScenario.id
}
resourceId: this.currentScenario.id,
};
setLatestVersionById(param).then(() => {
this.$success(this.$t('commons.modify_success'));
this.checkout(row);