repl: PageElement, PageUrl prettyPrint (#812)

Author: MykolaGolubyev

webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/page/PageElement.java

@@ -18,18 +18,21 @@
 package org.testingisdocumenting.webtau.browser.page;
 
 import org.testingisdocumenting.webtau.browser.page.path.ElementsFinder;
+import org.testingisdocumenting.webtau.console.ansi.Color;
+import org.testingisdocumenting.webtau.data.render.PrettyPrintable;
 import org.testingisdocumenting.webtau.expectation.ActualValueExpectations;
 import org.testingisdocumenting.webtau.expectation.ValueMatcher;
 import org.testingisdocumenting.webtau.expectation.timer.ExpectationTimer;
-import org.testingisdocumenting.webtau.reporter.StepReportOptions;
-import org.testingisdocumenting.webtau.reporter.TokenizedMessage;
-import org.testingisdocumenting.webtau.reporter.ValueMatcherExpectationSteps;
+import org.testingisdocumenting.webtau.reporter.*;
 import org.openqa.selenium.WebElement;
 
 import java.util.List;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
-public interface PageElement extends ActualValueExpectations, WithTokenizedDescription {
+import static org.testingisdocumenting.webtau.console.ConsoleOutputs.out;
+
+public interface PageElement extends ActualValueExpectations, WithTokenizedDescription, PrettyPrintable {
     PageElementValue<Integer> getCount();
 
     WebElement findElement();
@@ -105,4 +108,27 @@ default void waitToNot(ValueMatcher valueMatcher, ExpectationTimer expectationTi
                 this.describe(), valueMatcher,
                 expectationTimer, tickMillis, timeOutMillis);
     }
+
+    @Override
+    default void prettyPrint() {
+        TokenizedMessageToAnsiConverter toAnsiConverter = IntegrationTestsMessageBuilder.getConverter();
+
+        if (!isPresent()) {
+            out(Stream.concat(
+                    Stream.of(Color.RED, "element is not present: "),
+                    toAnsiConverter.convert(locationDescription()).stream()).toArray());
+            return;
+        }
+
+        out(Stream.concat(
+                Stream.of(Color.GREEN, "element is found: "),
+                toAnsiConverter.convert(locationDescription()).stream()).toArray());
+
+        out(Color.YELLOW, "           getText(): ", Color.GREEN, getText());
+        out(Color.YELLOW, "getUnderlyingValue(): ", Color.GREEN, getUnderlyingValue());
+        Integer count = getCount().get();
+        if (count > 1) {
+            out(Color.YELLOW, "               count: ", Color.GREEN, count);
+        }
+    }
 }

webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/page/PageUrl.java

@@ -17,11 +17,16 @@
 
 package org.testingisdocumenting.webtau.browser.page;
 
+import org.testingisdocumenting.webtau.console.ansi.Color;
+import org.testingisdocumenting.webtau.data.render.PrettyPrintable;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.function.Supplier;
 
-public class PageUrl {
+import static org.testingisdocumenting.webtau.console.ConsoleOutputs.out;
+
+public class PageUrl implements PrettyPrintable {
     private static final BrowserContext browserContext = new BrowserContext();
     private final Supplier<String> currentUrlSupplier;
 
@@ -80,4 +85,12 @@ public String toString() {
                 ", query: " + query +
                 ", ref: " + ref;
     }
+
+    @Override
+    public void prettyPrint() {
+        out(Color.YELLOW, " full: ", Color.GREEN, full.get());
+        out(Color.YELLOW, " path: ", Color.GREEN, path.get());
+        out(Color.YELLOW, "query: ", Color.GREEN, query.get());
+        out(Color.YELLOW, "  ref: ", Color.GREEN, ref.get());
+    }
 }

webtau-groovy/src/main/groovy/org/testingisdocumenting/webtau/cli/repl/ReplResultRenderer.groovy

@@ -18,41 +18,31 @@ package org.testingisdocumenting.webtau.cli.repl
 
 import org.apache.groovy.groovysh.Groovysh
 import org.testingisdocumenting.webtau.browser.page.PageElement
-import org.testingisdocumenting.webtau.browser.page.PageUrl
 import org.testingisdocumenting.webtau.cli.repl.tabledata.ReplTableRenderer
 import org.testingisdocumenting.webtau.console.ConsoleOutputs
-import org.testingisdocumenting.webtau.console.ansi.Color
 import org.testingisdocumenting.webtau.data.render.PrettyPrintable
 import org.testingisdocumenting.webtau.db.DbQuery
 import org.testingisdocumenting.webtau.fs.FileTextContent
-import org.testingisdocumenting.webtau.reporter.IntegrationTestsMessageBuilder
-import org.testingisdocumenting.webtau.reporter.TokenizedMessageToAnsiConverter
-
-import java.util.stream.Stream
 
 import static org.testingisdocumenting.webtau.cfg.WebTauConfig.cfg
 import static org.testingisdocumenting.webtau.console.ConsoleOutputs.out
 
 class ReplResultRenderer {
     private final Groovysh groovysh
-    private final TokenizedMessageToAnsiConverter toAnsiConverter
 
     ReplResultRenderer(Groovysh groovysh) {
         this.groovysh = groovysh
-        toAnsiConverter = IntegrationTestsMessageBuilder.getConverter()
     }
 
     void renderResult(Object result) {
-        if (result instanceof PrettyPrintable) {
-            result.prettyPrint()
-        } else if (result instanceof PageElement) {
-            renderPageElementResult(result)
+        if (result instanceof PageElement) {
+            renderPageElementAndHighlight(result)
         } else if (result instanceof DbQuery) {
             renderDbQueryResult(result)
-        } else if (result instanceof PageUrl) {
-            renderPageUrl(result)
         } else if (result instanceof FileTextContent) {
             renderTextLimitingSize(result.data)
+        } else if (result instanceof PrettyPrintable) {
+            result.prettyPrint()
         } else {
             groovysh.defaultResultHook(result)
         }
@@ -68,32 +58,8 @@ class ReplResultRenderer {
         out(ReplTableRenderer.render(queryResult.tableData))
     }
 
-    private static void renderPageUrl(PageUrl pageUrl) {
-        out(Color.YELLOW, " full: ", Color.GREEN, pageUrl.full.get())
-        out(Color.YELLOW, " path: ", Color.GREEN, pageUrl.path.get())
-        out(Color.YELLOW, "query: ", Color.GREEN, pageUrl.query.get())
-        out(Color.YELLOW, "  ref: ", Color.GREEN, pageUrl.ref.get())
-    }
-
-    private void renderPageElementResult(PageElement pageElement) {
-        if (!pageElement.isPresent()) {
-            out(Stream.concat(
-                    Stream.of(Color.RED, "element is not present: "),
-                    toAnsiConverter.convert(pageElement.locationDescription()).stream()).toArray())
-            return
-        }
-
-        out(Stream.concat(
-                Stream.of(Color.GREEN, "element is found: "),
-                toAnsiConverter.convert(pageElement.locationDescription()).stream()).toArray())
-
-        out(Color.YELLOW, "           getText(): ", Color.GREEN, pageElement.getText())
-        out(Color.YELLOW, "getUnderlyingValue(): ", Color.GREEN, pageElement.getUnderlyingValue())
-        def count = pageElement.count.get()
-        if (count > 1) {
-            out(Color.YELLOW, "               count: ", Color.GREEN, count)
-        }
-
+    private static void renderPageElementAndHighlight(PageElement pageElement) {
+        pageElement.prettyPrint()
         pageElement.highlight()
     }
 }