From 8da5aab2ac94afa2e99700e14f285d99bbfbf338 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 1 Mar 2022 20:09:09 +0100
Subject: [PATCH] curly braces are special in Java Regex

Oro seems to get along with the escaped braces, so use them for testing
both implementations
---
 .../org/apache/jmeter/assertions/ResponseAssertionTest.java | 2 +-
 .../org/apache/jmeter/assertions/TestJSONPathAssertion.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java b/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java
index 5c3bfd319ab..a556c407b3a 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java
@@ -258,7 +258,7 @@ public void testResponseAssertionContainsDollar() throws Exception {
         assertion.unsetNotType();
         assertion.setToContainsType();
         assertion.setTestFieldResponseData();
-        assertion.addTestString("value=\"\\${ID}\" Group\\$ctl00\\$drpEmails");
+        assertion.addTestString("value=\"\\$\\{ID\\}\" Group\\$ctl00\\$drpEmails");
 
         result = assertion.getResult(sample);
         assertPassed();
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 8447977d687..125662f7909 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
@@ -82,7 +82,7 @@ void testIsJsonValidationBool() {
         "{\"myval\": 123}; $.myval; 123",
         "{\"myval\": [{\"test\":1},{\"test\":2},{\"test\":3}]}; $.myval[*].test; 2",
         "{\"myval\": []}; $.myval; []",
-        "{\"myval\": {\"key\": \"val\"}}; $.myval; {\"key\":\"val\"}"
+        "{\"myval\": {\"key\": \"val\"}}; $.myval; \\{\"key\":\"val\"\\}"
     }, delimiterString=";")
     void testGetResult_pathsWithOneResult(String data, String jsonPath, String expectedResult) {
         SampleResult samplerResult = new SampleResult();
@@ -311,14 +311,14 @@ void testGetResult_match_msg_problem() {
         instance.setJsonPath("$.execution[0].scenario.requests[0].headers");
         instance.setJsonValidationBool(true);
         instance.setExpectNull(false);
-        instance.setExpectedValue("{headerkey=header value}");
+        instance.setExpectedValue("\\{headerkey=header value\\}");
         instance.setInvert(false);
         AssertionResult expResult = new AssertionResult("");
         AssertionResult result = instance.getResult(samplerResult);
         assertEquals(expResult.getName(), result.getName());
         assertTrue(result.isFailure());
         assertEquals(
-                "Value expected to match regexp '{headerkey=header value}', but it did not match: '{\"headerkey\":\"header value\"}'",
+                "Value expected to match regexp '\\{headerkey=header value\\}', but it did not match: '{\"headerkey\":\"header value\"}'",
                 result.getFailureMessage());
     }