core: extract by regexp overload (#810)

Author: MykolaGolubyev

webtau-cli/src/main/java/org/testingisdocumenting/webtau/cli/CliRunResult.java

@@ -20,6 +20,8 @@
 import org.testingisdocumenting.webtau.reporter.WebTauStep;
 import org.testingisdocumenting.webtau.utils.RegexpUtils;
 
+import java.util.regex.Pattern;
+
 import static org.testingisdocumenting.webtau.reporter.IntegrationTestsMessageBuilder.*;
 import static org.testingisdocumenting.webtau.reporter.IntegrationTestsMessageBuilder.stringValue;
 import static org.testingisdocumenting.webtau.reporter.TokenizedMessage.tokenizedMessage;
@@ -50,14 +52,22 @@ public String getError() {
     }
 
     public String extractFromOutputByRegexp(String regexp) {
+        return extractFromOutputByRegexp(Pattern.compile(regexp));
+    }
+
+    public String extractFromOutputByRegexp(Pattern regexp) {
         return extractFromSourceByRegexp("stdout", output, regexp);
     }
 
     public String extractFromErrorByRegexp(String regexp) {
+        return extractFromErrorByRegexp(Pattern.compile(regexp));
+    }
+
+    public String extractFromErrorByRegexp(Pattern regexp) {
         return extractFromSourceByRegexp("stderr", error, regexp);
     }
 
-    private String extractFromSourceByRegexp(String sourceLabel, String source, String regexp) {
+    private String extractFromSourceByRegexp(String sourceLabel, String source, Pattern regexp) {
         WebTauStep step = WebTauStep.createStep(null,
                 tokenizedMessage(action("extracting text"), classifier("by regexp"), stringValue(regexp),
                         FROM, urlValue(command), classifier(sourceLabel)),
@@ -68,7 +78,7 @@ FROM, urlValue(command), classifier(sourceLabel), COLON, stringValue(r)),
         return step.execute(StepReportOptions.SKIP_START);
     }
 
-    private String extractByRegexpStepImpl(String sourceLabel, String source, String regexp) {
+    private String extractByRegexpStepImpl(String sourceLabel, String source, Pattern regexp) {
         String extracted = RegexpUtils.extractByRegexp(source, regexp);
         if (extracted == null) {
             throw new RuntimeException("can't find content to extract using regexp <" + regexp + "> from " +

webtau-filesystem/src/main/java/org/testingisdocumenting/webtau/fs/FileTextContent.java

@@ -29,6 +29,7 @@
 import org.testingisdocumenting.webtau.utils.RegexpUtils;
 
 import java.nio.file.Path;
+import java.util.regex.Pattern;
 
 import static org.testingisdocumenting.webtau.reporter.IntegrationTestsMessageBuilder.*;
 import static org.testingisdocumenting.webtau.reporter.TokenizedMessage.tokenizedMessage;
@@ -56,6 +57,10 @@ public ActualPath actualPath() {
     }
 
     public String extractByRegexp(String regexp) {
+        return extractByRegexp(Pattern.compile(regexp));
+    }
+
+    public String extractByRegexp(Pattern regexp) {
         WebTauStep step = WebTauStep.createStep(null,
                 tokenizedMessage(action("extracting text"), classifier("by regexp"), stringValue(regexp),
                         FROM, urlValue(path)),
@@ -97,7 +102,7 @@ public String toString() {
         return getData();
     }
 
-    private String extractByRegexpStepImpl(String regexp) {
+    private String extractByRegexpStepImpl(Pattern regexp) {
         String extracted = RegexpUtils.extractByRegexp(getData(), regexp);
         if (extracted == null) {
             throw new RuntimeException("can't find content to extract using regexp <" + regexp + "> from: " + path);

webtau-utils/src/main/java/org/testingisdocumenting/webtau/utils/RegexpUtils.java

@@ -40,6 +40,10 @@ public static String replaceAll(String source, Pattern regexp, Function<Matcher,
 
     public static String extractByRegexp(String source, String regexp) {
         Pattern pattern = Pattern.compile(regexp);
+        return extractByRegexp(source, pattern);
+    }
+
+    public static String extractByRegexp(String source, Pattern pattern) {
         Matcher matcher = pattern.matcher(source);
         boolean found = matcher.find();
         if (!found) {

webtau-utils/src/test/groovy/org/testingisdocumenting/webtau/utils/RegexpUtilsTest.groovy

@@ -32,6 +32,9 @@ class RegexpUtilsTest {
         Assert.assertEquals("123",
                 RegexpUtils.extractByRegexp("line 1\nline 2\nhello id=123 ere\n", "id=(\\d+)"))
 
+        Assert.assertEquals("123",
+                RegexpUtils.extractByRegexp("line 1\nline 2\nhello id=123 ere\n", ~/id=(\d+)/))
+
         Assert.assertEquals(null,
                 RegexpUtils.extractByRegexp("line 1\nline 2\nhello id=123 ere\n", "bid=(\\d+)"))
     }