Merge pull request #617 from EDbarvinsky/dotall_custom_matcher_regexp

Make custom matcher regexp DOTALL
lukas-krecan · Mar 23, 2023 · 9f02156 · 9f02156
2 parents 21b4a18 + b83fd47
commit 9f02156
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/json-unit-core/src/main/java/net/javacrumbs/jsonunit/core/internal/Diff.java b/json-unit-core/src/main/java/net/javacrumbs/jsonunit/core/internal/Diff.java
@@ -69,7 +69,7 @@ public class Diff {
     private static final Pattern ANY_STRING_PLACEHOLDER = Pattern.compile("[$#]\\{json-unit.any-string\\}");
 
     private static final Pattern REGEX_PLACEHOLDER = Pattern.compile("[$#]\\{json-unit.regex\\}(.*)");
-    private static final Pattern MATCHER_PLACEHOLDER_PATTERN = Pattern.compile("[$#]\\{json-unit.matches:(.+?)\\}(.*)");
+    private static final Pattern MATCHER_PLACEHOLDER_PATTERN = Pattern.compile("[$#]\\{json-unit.matches:(.+?)\\}(.*)", Pattern.DOTALL);
 
     private static final JsonUnitLogger DEFAULT_DIFF_LOGGER = createLogger("net.javacrumbs.jsonunit.difference.diff");
     private static final JsonUnitLogger DEFAULT_VALUE_LOGGER = createLogger("net.javacrumbs.jsonunit.difference.values");

diff --git a/json-unit-core/src/test/java/net/javacrumbs/jsonunit/core/internal/DifferenceTest.java b/json-unit-core/src/test/java/net/javacrumbs/jsonunit/core/internal/DifferenceTest.java
@@ -17,9 +17,12 @@
 
 import net.javacrumbs.jsonunit.core.Configuration;
 import net.javacrumbs.jsonunit.core.Option;
+import net.javacrumbs.jsonunit.core.ParametrizedMatcher;
 import net.javacrumbs.jsonunit.core.listener.Difference;
 import net.javacrumbs.jsonunit.core.listener.DifferenceContext;
 import net.javacrumbs.jsonunit.core.listener.DifferenceListener;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
@@ -32,6 +35,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class DifferenceTest {
     private final RecordingDifferenceListener listener = new RecordingDifferenceListener();
@@ -216,6 +220,13 @@ void shouldSeeExpectedSource() {
         assertThat(listener.getExpectedSource(), equalTo(singletonMap("test", "1")));
     }
 
+    @Test
+    void shouldMatchWithLineSeparatorCustomMatcher() {
+        Configuration cfg = commonConfig().withMatcher("equalTo",  new EqualsMatcher());
+        Diff diff = Diff.create("{\"key\": \"${json-unit.matches:equalTo}separated \\n line\"}", "{\"key\": \"separated \\n line\"}", "", "", cfg);
+        assertTrue(diff.similar());
+        assertThat(listener.getDifferenceList(), hasSize(0));
+    }
 
     private Configuration commonConfig() {
         return Configuration.empty().withDifferenceListener(listener);
@@ -245,4 +256,23 @@ Object getExpectedSource() {
             return expectedSource;
         }
     }
+
+    private static class EqualsMatcher extends BaseMatcher<Object> implements ParametrizedMatcher {
+        private String parameter;
+
+        @Override
+        public void setParameter(String parameter) {
+            this.parameter = parameter;
+        }
+
+        @Override
+        public boolean matches(Object o) {
+            return o.toString().equals(parameter);
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendText("the same ").appendText(parameter);
+        }
+    }
 }