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

fix(接口测试): 场景转性能测试时如果选择的是默认执行器则不会再将执行器的className写入jmx中

This commit is contained in:
song-tianyang 2023-10-17 16:43:30 +08:00 committed by 建国
parent 21fe7cd0f9
commit ec64af6323
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
View File

@ -142,7 +142,7 @@ public class MsTCPSampler extends MsTestElement {
//添加csv
ElementUtil.addApiVariables(config, tree, this.getProjectId());
final HashTree samplerHashTree = new ListedHashTree();
samplerHashTree.add(tcpConfig());
samplerHashTree.add(tcpConfig(config));
TCPSampler tcpSampler = tcpSampler(config);
// 失败重试
if (config.getRetryNum() > 0 && !ElementUtil.isLoop(this.getParent())) {
@ -257,19 +257,18 @@ public class MsTCPSampler extends MsTestElement {
ElementUtil.setBaseParams(tcpSampler, this.getParent(), config, this.getId(), this.getIndex());
tcpSampler.setProperty(TestElement.TEST_CLASS, TCPSampler.class.getName());
tcpSampler.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TCPSamplerGui"));
if (StringUtils.isEmpty(this.getClassname())) {
tcpSampler.setClassname("TCPClientImpl");
} else {
tcpSampler.setClassname(this.getClassname());
}
if (StringUtils.equals("TCPClientImpl", this.getClassname())) {
if (config.isOperating()) {
//导出时className不转换MsTCPClientImpl。 这个类在性能测试时tps会变得很低
tcpSampler.setClassname(TCPSampler.class.getName());
if (!config.isOperating() || !StringUtils.equals("TCPClientImpl", this.getClassname())) {
if (StringUtils.isEmpty(this.getClassname())) {
tcpSampler.setClassname("TCPClientImpl");
} else {
tcpSampler.setClassname(this.getClassname());
}
if (StringUtils.equals("TCPClientImpl", this.getClassname())) {
tcpSampler.setClassname(MsTCPClientImpl.class.getCanonicalName());
}
}
tcpSampler.setCharset(this.getConnectEncoding());
tcpSampler.setServer(this.getServer());
tcpSampler.setPort(this.getPort());
@ -345,13 +344,15 @@ public class MsTCPSampler extends MsTestElement {
return value;
}
private ConfigTestElement tcpConfig() {
private ConfigTestElement tcpConfig(ParameterConfig config) {
ConfigTestElement configTestElement = new ConfigTestElement();
configTestElement.setEnabled(true);
configTestElement.setName(this.getName());
configTestElement.setProperty(TestElement.TEST_CLASS, ConfigTestElement.class.getName());
configTestElement.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TCPConfigGui"));
configTestElement.setProperty(TCPSampler.CLASSNAME, this.getClassname());
if (!config.isOperating() || !StringUtils.equals("TCPClientImpl", this.getClassname())) {
configTestElement.setProperty(TCPSampler.CLASSNAME, this.getClassname());
}
configTestElement.setProperty(TCPSampler.SERVER, this.getServer());
configTestElement.setProperty(TCPSampler.PORT, this.getPort());
configTestElement.setProperty(TCPSampler.TIMEOUT_CONNECT, this.getCtimeout());