R Split MarkdownTable to encapsulate Verifiable part

Author: ScottBob

approvaltests-tests/src/test/java/org/approvaltests/TableTest.java

@@ -2,6 +2,7 @@
 
 import org.approvaltests.legacycode.Range;
 import org.approvaltests.utils.MarkdownTable;
+import org.approvaltests.utils.MarkdownTableBasic;
 import org.junit.jupiter.api.Test;
 
 public class TableTest
@@ -18,9 +19,9 @@ void differentCases()
   {
     // begin-snippet: markdown_table_example
     String[] inputs = {"verify json", "verify all", "verify parameters", "verify as json"};
-    MarkdownTable table = MarkdownTable.withHeaders("Input", "Camel Case", "Snake Case", "Kebab Case");
+    MarkdownTableBasic table = MarkdownTableBasic.withHeaders("Input", "Camel Case", "Snake Case", "Kebab Case");
     table.addRowsForInputs(inputs, this::toCamelCase, this::toSnakeCase, this::toKebabCase);
-    Approvals.verify(table);
+    Approvals.verify(new MarkdownTable(table));
     // end-snippet
   }
   private String toKebabCase(String input)

approvaltests/src/main/java/org/approvaltests/utils/MarkdownTable.java

@@ -8,71 +8,19 @@
 import org.lambda.functions.Function1;
 import org.lambda.query.Queryable;
 
-public class MarkdownTable implements Verifiable, MarkdownCompatible
+public class MarkdownTable extends MarkdownTableBasic implements Verifiable
 {
-  private String markdown;
-  public static <I, O> MarkdownTable create(I[] inputs, Function1<I, O> o, String column1, String column2)
-  {
-    MarkdownTable table = new MarkdownTable().withColumnHeaders(column1, column2);
-    for (I input : inputs)
-    {
-      table.addRow(input, o.call(input));
-    }
-    return table;
-  }
-  public static MarkdownTable withHeaders(String... columnNames)
-  {
-    MarkdownTable table = new MarkdownTable();
-    return table.withColumnHeaders(columnNames);
-  }
-  public <I> MarkdownTable addRowsForInputs(I[] inputs, Function1<I, Object>... transfers)
-  {
-    for (I input : inputs)
-    {
-      Queryable<Object> row = Queryable.as(transfers).select(f -> f.call(input));
-      row.add(0, input);
-      addRow(row.toArray());
-    }
-    return this;
-  }
-  public MarkdownTable addRow(Object... columns)
-  {
-    markdown += printRow(columns);
-    return this;
+  public MarkdownTable(MarkdownTableBasic markdownTableBasic) {
+    this.markdown = markdownTableBasic.toMarkdown();
   }
-  public MarkdownTable withColumnHeaders(String... headers)
+
+  public static <I, O> MarkdownTable create(I[] inputs, Function1<I, O> o, String column1, String column2)
   {
-    markdown = printColumnHeaders(headers);
-    return this;
+    return new MarkdownTable(MarkdownTableBasic.create(inputs, o, column1, column2));
   }
   @Override
   public VerifyParameters getVerifyParameters(Options options)
   {
     return new VerifyParameters(options.forFile().withExtension(".md"));
   }
-  @Override
-  public String toString()
-  {
-    return toMarkdown();
-  }
-  @Override
-  public String toMarkdown()
-  {
-    return markdown;
-  }
-  public static String printColumnHeaders(String... headers)
-  {
-    return printRow(headers) + printRow(ArrayUtils.of("---", headers.length));
-  }
-  public static String printRow(Object... columns)
-  {
-    StringBuffer b = new StringBuffer();
-    b.append("|");
-    for (int x = 0; x < columns.length; ++x)
-    {
-      b.append(String.format(" %s |", columns[x]));
-    }
-    b.append("\n");
-    return b.toString();
-  }
 }

approvaltests/src/main/java/org/approvaltests/utils/MarkdownTableBasic.java

@@ -0,0 +1,73 @@
+package org.approvaltests.utils;
+
+import com.spun.util.ArrayUtils;
+import org.approvaltests.core.Options;
+import org.approvaltests.core.Verifiable;
+import org.approvaltests.core.VerifyParameters;
+import org.approvaltests.strings.MarkdownCompatible;
+import org.lambda.functions.Function1;
+import org.lambda.query.Queryable;
+
+public class MarkdownTableBasic implements MarkdownCompatible
+{
+  protected String markdown;
+  public static <I, O> MarkdownTableBasic create(I[] inputs, Function1<I, O> o, String column1, String column2)
+  {
+    MarkdownTableBasic table = new MarkdownTableBasic().withColumnHeaders(column1, column2);
+    for (I input : inputs)
+    {
+      table.addRow(input, o.call(input));
+    }
+    return table;
+  }
+  public static MarkdownTableBasic withHeaders(String... columnNames)
+  {
+    MarkdownTableBasic table = new MarkdownTableBasic();
+    return table.withColumnHeaders(columnNames);
+  }
+  public <I> MarkdownTableBasic addRowsForInputs(I[] inputs, Function1<I, Object>... transfers)
+  {
+    for (I input : inputs)
+    {
+      Queryable<Object> row = Queryable.as(transfers).select(f -> f.call(input));
+      row.add(0, input);
+      addRow(row.toArray());
+    }
+    return this;
+  }
+  public MarkdownTableBasic addRow(Object... columns)
+  {
+    markdown += printRow(columns);
+    return this;
+  }
+  public MarkdownTableBasic withColumnHeaders(String... headers)
+  {
+    markdown = printColumnHeaders(headers);
+    return this;
+  }
+  @Override
+  public String toString()
+  {
+    return toMarkdown();
+  }
+  @Override
+  public String toMarkdown()
+  {
+    return markdown;
+  }
+  public static String printColumnHeaders(String... headers)
+  {
+    return printRow(headers) + printRow(ArrayUtils.of("---", headers.length));
+  }
+  public static String printRow(Object... columns)
+  {
+    StringBuffer b = new StringBuffer();
+    b.append("|");
+    for (int x = 0; x < columns.length; ++x)
+    {
+      b.append(String.format(" %s |", columns[x]));
+    }
+    b.append("\n");
+    return b.toString();
+  }
+}