fix: When payloads are not valid jsons compare them as strings

Author: en-milie

src/main/java/com/endava/cats/io/ServiceCaller.java

@@ -702,7 +702,6 @@ String replacePayloadWithRefData(ServiceData data) {
                     if (CATS_REMOVE_FIELD.equalsIgnoreCase(String.valueOf(refDataValue))) {
                         payload = JsonUtils.deleteNode(payload, entry.getKey());
                     } else {
-
                         FuzzingStrategy fuzzingStrategy = FuzzingStrategy.replace().withData(refDataValue);
                         boolean mergeFuzzing = data.getFuzzedFields().contains(entry.getKey());
                         payload = FuzzingStrategy.replaceField(payload, entry.getKey(), fuzzingStrategy, mergeFuzzing).json();

src/main/java/com/endava/cats/util/JsonUtils.java

@@ -136,6 +136,9 @@ public static String sanitizeToJsonPath(String input) {
      * @return true if the 2 inputs are the same as JSON elements, false otherwise
      */
     public static boolean equalAsJson(String json1, String json2) {
+        if (!isValidJson(json1) || !isValidJson(json2)) {
+            return json1.equalsIgnoreCase(json2);
+        }
         return JsonPath.parse(json1).jsonString().contentEquals(JsonPath.parse(json2).jsonString());
     }
 

src/test/java/com/endava/cats/util/JsonUtilsTest.java

@@ -218,4 +218,17 @@ void shouldReturnAllFieldsFromJson() {
                 "anArray[0].arrKey1",
                 "anArray[1].arrKey2");
     }
+
+    @Test
+    void shouldBeEqualAsStrings() {
+        String s1 = "test";
+        String s2 = "test";
+        Assertions.assertThat(JsonUtils.equalAsJson(s1, s2)).isTrue();
+    }
+
+    @ParameterizedTest
+    @CsvSource({"test, {'test':true}", "{'test':false}, test2", "test, 1"})
+    void shouldNotBeEqualAsStrings(String s1, String s2) {
+        Assertions.assertThat(JsonUtils.equalAsJson(s1, s2)).isFalse();
+    }
 }