[patch] Compare JSON objects and not their string representations.

0001-JSONPathAssertion-attributes-are-out-of-order.patch (text/plain), 14.02 KB, created by Felix Schumacher on 2021-05-11 18:30:26 UTC

(hide)

Description: Compare JSON objects and not their string representations.

Filename:

MIME Type:

Creator: Felix Schumacher

Created: 2021-05-11 18:30:26 UTC

Size: 14.02 KB

patch

obsolete

>From 9b27cb632cccafbe11c7b0babb65ed2bcb5fe0db Mon Sep 17 00:00:00 2001 >From: Felix Schumacher <felix.schumacher@internetallee.de> >Date: Tue, 11 May 2021 18:20:13 +0200 >Subject: [PATCH] JSONPathAssertion attributes are out of order > >Compare JSON objects and not their string representations. > >When using our stringifier, the order of the entries in maps >is not guaranteed and can lead to wrong results. > >In the old days we made no difference between a string or int >when asserting a result. Jackson JSON Parser differentiates >between 'foo' and '"foo"' (former is invalid) and '1' and '"1"' >(former is an int, latter a string). > >To enable both (complex, simple and edge cases), we now have to do >more work. > >Bugzilla Id: 65299 >--- > .../jmeter/assertions/JSONPathAssertion.java | 7 +- > .../jmespath/JMESPathAssertion.java | 11 ++- > .../assertions/TestJSONPathAssertion.java | 73 +++++++++++-------- > .../jmespath/TestJMESPathAssertion.java | 6 +- > 4 files changed, 64 insertions(+), 33 deletions(-) > >diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java >index 67e528e102..2e135b46b2 100644 >--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java >+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java >@@ -20,6 +20,7 @@ package org.apache.jmeter.assertions; > import java.io.Serializable; > import java.text.DecimalFormat; > import java.util.Map; >+import java.util.Objects; > > import org.apache.jmeter.samplers.SampleResult; > import org.apache.jmeter.testelement.AbstractTestElement; >@@ -31,6 +32,7 @@ import org.slf4j.LoggerFactory; > > import net.minidev.json.JSONArray; > import net.minidev.json.JSONObject; >+import net.minidev.json.JSONValue; > > import com.jayway.jsonpath.JsonPath; > >@@ -153,12 +155,13 @@ public class JSONPathAssertion extends AbstractTestElement implements Serializab > } > > private boolean isEquals(Object subj) { >- String str = objectToString(subj); > if (isUseRegex()) { >+ String str = objectToString(subj); > Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue()); > return JMeterUtils.getMatcher().matches(str, pattern); > } else { >- return str.equals(getExpectedValue()); >+ Object expected = JSONValue.parse(getExpectedValue()); >+ return Objects.equals(expected, subj); > } > } > >diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java >index 97edda7c87..0cf46bdab9 100644 >--- a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java >+++ b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/JMESPathAssertion.java >@@ -18,6 +18,7 @@ > package org.apache.jmeter.assertions.jmespath; > > import java.io.Serializable; >+import java.util.Objects; > > import org.apache.jmeter.assertions.Assertion; > import org.apache.jmeter.assertions.AssertionResult; >@@ -179,7 +180,15 @@ public class JMESPathAssertion extends AbstractTestElement implements Serializab > Pattern pattern = JMeterUtils.getPatternCache().getPattern(getExpectedValue()); > return JMeterUtils.getMatcher().matches(str, pattern); > } else { >- return str.equals(getExpectedValue()); >+ String expectedValueString = getExpectedValue(); >+ // first try to match as a string value, as >+ // we did in the old days >+ if (str.equals(expectedValueString)) { >+ return true; >+ } >+ // now try harder and compare it as an JSON object >+ JsonNode expected = OBJECT_MAPPER.readValue(expectedValueString, JsonNode.class); >+ return Objects.equals(expected, jsonNode); > } > } > >diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java >index d87990349d..636a139323 100644 >--- a/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java >+++ b/src/components/src/test/java/org/apache/jmeter/assertions/TestJSONPathAssertion.java >@@ -17,19 +17,20 @@ > > package org.apache.jmeter.assertions; > >-import static org.junit.Assert.assertEquals; >-import static org.junit.Assert.assertFalse; >-import static org.junit.Assert.assertTrue; >+ >+import static org.junit.jupiter.api.Assertions.assertEquals; >+import static org.junit.jupiter.api.Assertions.assertFalse; >+import static org.junit.jupiter.api.Assertions.assertTrue; > > import java.util.Locale; > > import org.apache.jmeter.samplers.SampleResult; > import org.junit.jupiter.api.Test; > >-public class TestJSONPathAssertion { >+class TestJSONPathAssertion { > > @Test >- public void testGetJsonPath() { >+ void testGetJsonPath() { > JSONPathAssertion instance = new JSONPathAssertion(); > String expResult = ""; > String result = instance.getJsonPath(); >@@ -37,14 +38,14 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testSetJsonPath() { >+ void testSetJsonPath() { > String jsonPath = ""; > JSONPathAssertion instance = new JSONPathAssertion(); > instance.setJsonPath(jsonPath); > } > > @Test >- public void testGetExpectedValue() { >+ void testGetExpectedValue() { > JSONPathAssertion instance = new JSONPathAssertion(); > String expResult = ""; > String result = instance.getExpectedValue(); >@@ -52,27 +53,27 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testSetExpectedValue() { >+ void testSetExpectedValue() { > String expectedValue = ""; > JSONPathAssertion instance = new JSONPathAssertion(); > instance.setExpectedValue(expectedValue); > } > > @Test >- public void testSetJsonValidationBool() { >+ void testSetJsonValidationBool() { > JSONPathAssertion instance = new JSONPathAssertion(); > instance.setJsonValidationBool(false); > } > > @Test >- public void testIsJsonValidationBool() { >+ void testIsJsonValidationBool() { > JSONPathAssertion instance = new JSONPathAssertion(); > boolean result = instance.isJsonValidationBool(); > assertFalse(result); > } > > @Test >- public void testGetResult_positive() { >+ void testGetResult_positive() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": 123}".getBytes()); > >@@ -87,7 +88,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_positive_regexp() { >+ void testGetResult_positive_regexp() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": 123}".getBytes()); > >@@ -106,7 +107,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_positive_invert() { >+ void testGetResult_positive_invert() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": 123}".getBytes()); > >@@ -122,7 +123,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_not_regexp() { >+ void testGetResult_not_regexp() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": \"some complicated value\"}".getBytes()); > >@@ -139,7 +140,21 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_negative() { >+ void testGetResult_complex_map() { >+ SampleResult samplerResult = new SampleResult(); >+ samplerResult.setResponseData("{\"myval\": { \"a\": 23, \"b\": 42, \"c\": \"something\" } }".getBytes()); >+ >+ JSONPathAssertion instance = new JSONPathAssertion(); >+ instance.setJsonPath("$.myval"); >+ instance.setJsonValidationBool(true); >+ instance.setIsRegex(false); >+ instance.setExpectedValue("{\n\t\"a\": 23,\n\"b\": 42,\n\t\"c\": \"something\"\n}"); >+ AssertionResult result = instance.getResult(samplerResult); >+ assertFalse(result.isFailure()); >+ } >+ >+ @Test >+ void testGetResult_negative() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": 123}".getBytes()); > >@@ -154,7 +169,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_negative_invert() { >+ void testGetResult_negative_invert() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": 123}".getBytes()); > >@@ -170,7 +185,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_null() { >+ void testGetResult_null() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": null}".getBytes()); > >@@ -185,7 +200,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_null_not_found() { >+ void testGetResult_null_not_found() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": 123}".getBytes()); > >@@ -200,7 +215,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_null_novalidate() { >+ void testGetResult_null_novalidate() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": null}".getBytes()); > >@@ -214,7 +229,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_no_such_path() { >+ void testGetResult_no_such_path() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": null}".getBytes()); > >@@ -228,7 +243,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_list_val() { >+ void testGetResult_list_val() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": [{\"test\":1},{\"test\":2},{\"test\":3}]}".getBytes()); > >@@ -243,7 +258,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_list_negative() { >+ void testGetResult_list_negative() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": [{\"test\":1},{\"test\":2},{\"test\":3}]}".getBytes()); > >@@ -258,7 +273,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_list_empty_novalidate() { >+ void testGetResult_list_empty_novalidate() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": []}".getBytes()); > >@@ -272,7 +287,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_list_empty_validate() { >+ void testGetResult_list_empty_validate() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": []}".getBytes()); > >@@ -287,7 +302,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_dict() { >+ void testGetResult_dict() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": {\"key\": \"val\"}}".getBytes()); > >@@ -302,7 +317,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_inverted_null() { >+ void testGetResult_inverted_null() { > SampleResult samplerResult = new SampleResult(); > samplerResult.setResponseData("{\"myval\": [{\"key\": null}]}".getBytes()); > >@@ -318,7 +333,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_match_msg_problem() { >+ void testGetResult_match_msg_problem() { > SampleResult samplerResult = new SampleResult(); > String str = "{\"execution\":[{\"scenario\":{\"requests\":[{\"headers\":{\"headerkey\":\"header value\"}}]}}]}"; > samplerResult.setResponseData(str.getBytes()); >@@ -339,7 +354,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResult_match_msg_problem2() { >+ void testGetResult_match_msg_problem2() { > SampleResult samplerResult = new SampleResult(); > String str = "{\n" + > " \"code\":200,\n" + >@@ -370,7 +385,7 @@ public class TestJSONPathAssertion { > } > > @Test >- public void testGetResultFloat() { >+ void testGetResultFloat() { > Locale prevLocale = Locale.getDefault(); > try { > // 0.0000123456789 is locale-dependent >diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java >index 679737784a..4f8ce722eb 100644 >--- a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java >+++ b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java >@@ -143,7 +143,11 @@ public class TestJMESPathAssertion { > + " ]\n" + " }\n" + " ]\n" + "}", > "reservations[*].instances[*].state", ValidationType.USE_VALIDATION, > ComparisonType.USE_NO_REXEG, ResultNullity.EXPECT_NOT_NULL, >- "[[\"running\",\"stopped\"],[\"terminated\",\"running\"]]", ResultType.SUCCESS, "" } }); >+ "[[\"running\",\"stopped\"],[\"terminated\",\"running\"]]", ResultType.SUCCESS, "" }, >+ { InvertType.USE_NO_INVERT, "{\"x\": {\"a\": 23, \"b\": 42, \"c\": \"something\"}}", "x", >+ ValidationType.USE_VALIDATION, ComparisonType.USE_NO_REXEG, ResultNullity.EXPECT_NOT_NULL, >+ "{\n\t\"a\": 23,\n\t\"b\": 42,\n\t\"c\": \"something\"\n}", ResultType.SUCCESS, >+ "" } }); > } > > >-- >2.25.1 > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]