fix(接口自动化): 修复IF条件下${value} value 包含引号问题 #1005122
--bug=1005127 --user=赵勇 【github#4631】测试跟... https://www.tapd.cn/55049933/s/1025395
This commit is contained in:
parent
068348764b
commit
accfb22cbb
|
@ -13,6 +13,8 @@ import org.apache.jmeter.testelement.TestElement;
|
||||||
import org.apache.jorphan.collections.HashTree;
|
import org.apache.jorphan.collections.HashTree;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ -74,8 +76,26 @@ public class MsIfController extends MsTestElement {
|
||||||
return "IfController";
|
return "IfController";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getContentValue() {
|
||||||
|
String content = this.variable;
|
||||||
|
Pattern regex = Pattern.compile("\\$\\{([^}]*)\\}");
|
||||||
|
Matcher matcher = regex.matcher(content);
|
||||||
|
StringBuilder stringBuilder = new StringBuilder();
|
||||||
|
while (matcher.find()) {
|
||||||
|
stringBuilder.append(matcher.group(1) + ",");
|
||||||
|
}
|
||||||
|
if (stringBuilder.length() > 0) {
|
||||||
|
stringBuilder.deleteCharAt(stringBuilder.length() - 1);
|
||||||
|
}
|
||||||
|
if (StringUtils.isEmpty(stringBuilder.toString())) {
|
||||||
|
return this.variable;
|
||||||
|
}
|
||||||
|
return stringBuilder.toString();
|
||||||
|
}
|
||||||
|
|
||||||
public String getCondition() {
|
public String getCondition() {
|
||||||
String variable = "\"" + this.variable + "\"";
|
String key = getContentValue();
|
||||||
|
String variable = key.equals(this.variable) ? "\"" + this.variable + "\"" : "vars.get('" + key + "')";
|
||||||
String operator = this.operator;
|
String operator = this.operator;
|
||||||
String value;
|
String value;
|
||||||
if (StringUtils.equals(operator, "<") || StringUtils.equals(operator, ">")) {
|
if (StringUtils.equals(operator, "<") || StringUtils.equals(operator, ">")) {
|
||||||
|
|
Loading…
Reference in New Issue