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

fix: jsonpath断言顺序问题

This commit is contained in:
chenjianxing 2021-05-11 14:04:29 +08:00 committed by jianxing
parent 5383786026
commit a9262201bc
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
View File

@ -5,16 +5,10 @@
package org.apache.jmeter.assertions; package org.apache.jmeter.assertions;
import com.google.gson.Gson;
import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.Predicate; import com.jayway.jsonpath.Predicate;
import java.io.Serializable;
import java.text.DecimalFormat;
import java.util.Map;
import java.util.function.Supplier;
import net.minidev.json.JSONArray; import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.samplers.SampleResult; import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractTestElement; import org.apache.jmeter.testelement.AbstractTestElement;
@ -24,6 +18,10 @@ import org.apache.oro.text.regex.Pattern;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.text.DecimalFormat;
import java.util.Map;
public class JSONPathAssertion extends AbstractTestElement implements Serializable, Assertion, ThreadListener { public class JSONPathAssertion extends AbstractTestElement implements Serializable, Assertion, ThreadListener {
private static final Logger log = LoggerFactory.getLogger(JSONPathAssertion.class); private static final Logger log = LoggerFactory.getLogger(JSONPathAssertion.class);
private static final long serialVersionUID = 2L; private static final long serialVersionUID = 2L;
@ -212,7 +210,7 @@ public class JSONPathAssertion extends AbstractTestElement implements Serializab
if (subj == null) { if (subj == null) {
str = "null"; str = "null";
} else if (subj instanceof Map) { } else if (subj instanceof Map) {
str = (new JSONObject((Map) subj)).toJSONString(); str = new Gson().toJson(subj);
} else if (!(subj instanceof Double) && !(subj instanceof Float)) { } else if (!(subj instanceof Double) && !(subj instanceof Float)) {
str = subj.toString(); str = subj.toString();
} else { } else {