cli: background command output extract by regexp

Author: MykolaGolubyev

webtau-cli-groovy/src/test/groovy/org/testingisdocumenting/webtau/cli/CliBackgroundCommandOutputTest.groovy

@@ -22,6 +22,7 @@ import org.testingisdocumenting.webtau.console.ConsoleOutput
 import org.testingisdocumenting.webtau.console.ConsoleOutputs
 import org.testingisdocumenting.webtau.console.ansi.IgnoreAnsiString
 
+import static org.testingisdocumenting.webtau.Matchers.contain
 import static org.testingisdocumenting.webtau.cli.Cli.cli
 import static org.testingisdocumenting.webtau.cli.CliTestUtils.supportedPlatformOnly
 
@@ -67,6 +68,19 @@ class CliBackgroundCommandOutputTest implements ConsoleOutput {
         }
     }
 
+    @Test
+    void "extract text by regexp should be part of steps"() {
+        supportedPlatformOnly {
+            def backgroundCmd = cli.runInBackground("scripts/hello")
+            backgroundCmd.output.waitTo contain("more text")
+
+            def text = backgroundCmd.output.extractByRegexp("more (.*xt)")
+            text.should == "text"
+
+            output.should contain("extracted text by regexp more (.*xt) from scripts/hello process output : text")
+        }
+    }
+
     private static String normalizeOutput(String output) {
         return output.replaceAll(/\(\d+ms\)/, "(time)")
             .replace('. background cli command : scripts/long-sleep finished with exit code 143 (time)\n', '')

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

@@ -51,8 +51,8 @@ public CliBackgroundProcess(Process process,
         this.errorGobbler = errorGobbler;
         this.consumeErrorThread = consumeErrorThread;
         this.consumeOutThread = consumeOutThread;
-        this.output = new CliOutput("process output", outputGobbler);
-        this.error = new CliOutput("process error output", errorGobbler);
+        this.output = new CliOutput(command, "process output", outputGobbler);
+        this.error = new CliOutput(command, "process error output", errorGobbler);
         this.isActive = new AtomicBoolean(true);
     }
 

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

@@ -19,20 +19,30 @@
 
 import org.testingisdocumenting.webtau.cli.expectation.CliResultExpectations;
 import org.testingisdocumenting.webtau.expectation.ActualPath;
+import org.testingisdocumenting.webtau.reporter.StepReportOptions;
+import org.testingisdocumenting.webtau.reporter.WebTauStep;
+import org.testingisdocumenting.webtau.utils.RegexpUtils;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static org.testingisdocumenting.webtau.reporter.IntegrationTestsMessageBuilder.*;
+import static org.testingisdocumenting.webtau.reporter.IntegrationTestsMessageBuilder.stringValue;
+import static org.testingisdocumenting.webtau.reporter.TokenizedMessage.tokenizedMessage;
+
 public class CliOutput implements CliResultExpectations {
     private final String id;
     private final StreamGobbler streamGobbler;
 
     private final Set<Integer> matchedLinesIdx;
+    private final String command;
 
     private int lastClearNextLineIdxMarker;
 
-    public CliOutput(String id, StreamGobbler streamGobbler) {
+    public CliOutput(String command, String id, StreamGobbler streamGobbler) {
+        this.command = command;
         this.id = id;
         this.streamGobbler = streamGobbler;
 
@@ -44,6 +54,21 @@ public ActualPath actualPath() {
         return new ActualPath(id);
     }
 
+    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(command), classifier(id)),
+                (r) -> tokenizedMessage(action("extracted text"), classifier("by regexp"), stringValue(regexp),
+                        FROM, urlValue(command), classifier(id), COLON, stringValue(r)),
+                    () -> RegexpUtils.extractByRegexp(get(), regexp));
+
+            return step.execute(StepReportOptions.SKIP_START);
+    }
+
     public String get() {
         return streamGobbler.joinLinesStartingAt(lastClearNextLineIdxMarker);
     }