breaking: remove DataRenderers (#1492)

Author: MykolaGolubyev

webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/expectation/PageElementValueCompareToHandler.java

@@ -22,8 +22,6 @@
 import org.testingisdocumenting.webtau.expectation.equality.CompareToComparator;
 import org.testingisdocumenting.webtau.expectation.equality.CompareToHandler;
 
-import static org.testingisdocumenting.webtau.WebTauCore.createActualPath;
-
 public class PageElementValueCompareToHandler implements CompareToHandler {
     @Override
     public boolean handleEquality(Object actual, Object expected) {
@@ -35,29 +33,24 @@ public boolean handleGreaterLessEqual(Object actual, Object expected) {
         return handles(actual);
     }
 
+    @Override
+    public Object convertedActual(Object actual, Object expected) {
+        return ((PageElementValue<?>)actual).get();
+    }
+
     @Override
     public boolean handleNulls() {
         return true;
     }
 
     @Override
     public void compareEqualOnly(CompareToComparator comparator, ValuePath actualPath, Object actual, Object expected) {
-        PageElementValue<?> actualElementValue = (PageElementValue<?>) actual;
-        comparator.compareUsingEqualOnly(creataPath(actualElementValue), extractActualValue(actualElementValue), expected);
+        comparator.compareUsingEqualOnly(actualPath, actual, expected);
     }
 
     @Override
     public void compareGreaterLessEqual(CompareToComparator comparator, ValuePath actualPath, Object actual, Object expected) {
-        PageElementValue<?> actualElementValue = (PageElementValue<?>) actual;
-        comparator.compareUsingCompareTo(creataPath(actualElementValue), extractActualValue(actualElementValue), expected);
-    }
-
-    private Object extractActualValue(PageElementValue<?> actualElementValue) {
-        return actualElementValue.get();
-    }
-
-    private ValuePath creataPath(PageElementValue<?> elementValue) {
-        return createActualPath(elementValue.getName());
+        comparator.compareUsingCompareTo(actualPath, actual, expected);
     }
 
     private boolean handles(Object actual) {

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

@@ -17,10 +17,8 @@
 
 package org.testingisdocumenting.webtau.browser.page;
 
-import org.testingisdocumenting.webtau.console.ansi.Color;
 import org.testingisdocumenting.webtau.data.ValuePath;
 import org.testingisdocumenting.webtau.data.converters.ValueConverter;
-import org.testingisdocumenting.webtau.data.render.DataRenderers;
 import org.testingisdocumenting.webtau.data.render.PrettyPrintable;
 import org.testingisdocumenting.webtau.data.render.PrettyPrinter;
 import org.testingisdocumenting.webtau.expectation.ActualPathAndDescriptionAware;
@@ -29,7 +27,7 @@
 import org.testingisdocumenting.webtau.reporter.TokenizedMessage;
 import org.testingisdocumenting.webtau.reporter.TokenizedMessageToAnsiConverter;
 
-import java.util.stream.Stream;
+import java.util.List;
 
 import static org.testingisdocumenting.webtau.WebTauCore.*;
 
@@ -80,16 +78,13 @@ public StepReportOptions shouldReportOption() {
 
     @Override
     public void prettyPrint(PrettyPrinter printer) {
-        printer.printLine(
-                Stream.concat(parentPrettyPrint(),
-                        Stream.of(Color.PURPLE, name, ":", Color.GREEN, " ", DataRenderers.render(get()))).toArray());
+        TokenizedMessage message = tokenizedMessage().add(describe()).colon().value(get());
+        List<Object> valuesAndColors = TokenizedMessageToAnsiConverter.DEFAULT.convert(ValueConverter.EMPTY, message, 0);
+        printer.printLine(valuesAndColors.toArray());
     }
 
-    private Stream<Object> parentPrettyPrint() {
-        if (parent == null) {
-            return Stream.empty();
-        }
-
-        return Stream.concat(TokenizedMessageToAnsiConverter.DEFAULT.convert(ValueConverter.EMPTY, parent.describe(), 0).stream(), Stream.of(" "));
+    @Override
+    public String toString() {
+        return PrettyPrinter.renderAsTextWithoutColors(this);
     }
 }

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

@@ -87,10 +87,7 @@ private URL fetchAsUrl() {
 
     @Override
     public String toString() {
-        return "full: " + full +
-                ", path: " + path +
-                ", query: " + query +
-                ", ref: " + ref;
+        return PrettyPrinter.renderAsTextWithoutColors(this);
     }
 
     @Override

webtau-browser/src/test/groovy/org/testingisdocumenting/webtau/browser/page/PageUrlTest.groovy

@@ -71,13 +71,11 @@ class PageUrlTest {
 
     @Test
     void "should provide context of the failure in case of failed should statement"() {
-        runExpectExceptionAndValidateOutput(AssertionError, "> expecting page url query of browser to equal \"wrong-value\"\n" +
-                "X failed expecting page url query of browser to equal \"wrong-value\":\n" +
-                "    page url query:  actual: \"type=full&debug=true\" <java.lang.String>\n" +
-                "                   expected: \"wrong-value\" <java.lang.String>\n" +
-                "                              ^ (Xms)\n" +
-                "  \n" +
-                "  browser page url query: \"type=full&debug=true\"") {
+        runExpectExceptionAndValidateOutput(AssertionError, """> expecting page url query of browser to equal "wrong-value"
+X failed expecting page url query of browser to equal "wrong-value":
+      actual: "type=full&debug=true" <java.lang.String>
+    expected: "wrong-value" <java.lang.String>
+               ^ (Xms)""") {
             browser.url.query.should == 'wrong-value'
         }
     }

webtau-core-groovy/src/test/groovy/org/testingisdocumenting/webtau/data/render/TableDataRenderTest.groovy

@@ -88,6 +88,11 @@ public void prettyPrint(PrettyPrinter printer, ValuePath rootPath) {
         prettyPrint(printer, rootPath, PrettyPrinterDecorationToken.EMPTY);
     }
 
+    @Override
+    public String toString() {
+        return PrettyPrinter.renderAsTextWithoutColors(this);
+    }
+
     @Override
     public boolean handlesDecoration() {
         return true;
@@ -160,12 +165,7 @@ private String createLongestLineUnderscore() {
             maxLength = Math.max(maxLength, line.length());
         }
 
-        StringBuilder result = new StringBuilder();
-        for (int idx = 0; idx < maxLength; idx++) {
-            result.append('_');
-        }
-
-        return result.toString();
+        return "_".repeat(maxLength);
     }
 
     private String quoteString(Object text) {

webtau-core/src/main/java/org/testingisdocumenting/webtau/data/MultilineString.java

@@ -1,6 +1,23 @@
+/*
+ * Copyright 2023 webtau maintainers
+ * Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.testingisdocumenting.webtau.data.math;
 
-import org.testingisdocumenting.webtau.data.render.DataRenderers;
+import org.testingisdocumenting.webtau.data.render.PrettyPrinter;
 import org.testingisdocumenting.webtau.utils.ServiceLoaderUtils;
 import org.testingisdocumenting.webtau.utils.TraceUtils;
 
@@ -33,7 +50,7 @@ private static List<SimpleMathHandler> discoverSimpleMathHandlers() {
     private static RuntimeException noAddSubtractHandlerFound(Object left, Object right) {
         return new RuntimeException(
                 "no add/subtract handler found for" +
-                        "\nleft: " + DataRenderers.render(left) + " " + TraceUtils.renderType(left) +
-                        "\nright: " + DataRenderers.render(right) + " " + TraceUtils.renderType(right));
+                        "\nleft: " + PrettyPrinter.renderAsTextWithoutColors(left) + " " + TraceUtils.renderType(left) +
+                        "\nright: " + PrettyPrinter.renderAsTextWithoutColors(right) + " " + TraceUtils.renderType(right));
     }
 }