F!! MarkdownTable allows right justification

    Move Markdown classes into their own package

Author: ScottBob

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

@@ -1,8 +1,6 @@
 package org.approvaltests;
 
-import com.spun.util.MarkdownCompatible;
-import org.approvaltests.reporters.QuietReporter;
-import org.approvaltests.reporters.UseReporter;
+import com.spun.util.markdown.MarkdownCompatible;
 import org.junit.jupiter.api.Test;
 import org.lambda.functions.Function2;
 import org.lambda.query.Queryable;

approvaltests-tests/src/test/java/org/approvaltests/combinations/PairWiseTest.forTable.approved.include.md

@@ -1,12 +1,12 @@
 
 
 | Number of Parameters | Variations per Parameter | Total Combinations | Pairwise Combinations |
-| --------------------: | -----------------------: | ------------------: | ---------------------: |
-|2|5|25|25|
-|3|3|27|11|
-|3|4|64|16|
-|4|5|625|33|
-|5|6|7,776|49|
-|9|9|387,420,489|134|
+|---------------------:|-------------------------:|-------------------:|----------------------:|
+|                    2 |                        5 |                 25 |                    25 |
+|                    3 |                        3 |                 27 |                    11 |
+|                    3 |                        4 |                 64 |                    16 |
+|                    4 |                        5 |                625 |                    33 |
+|                    5 |                        6 |              7,776 |                    49 |
+|                    9 |                        9 |        387,420,489 |                   134 |
 
 

approvaltests-tests/src/test/java/org/approvaltests/combinations/PairWiseTest.java

@@ -1,5 +1,7 @@
 package org.approvaltests.combinations;
 
+import com.spun.util.markdown.table.MarkdownColumn;
+import com.spun.util.markdown.table.MarkdownTable;
 import org.approvaltests.Approvals;
 import org.approvaltests.combinations.pairwise.Case;
 import org.approvaltests.combinations.pairwise.InParameterOrderStrategy;
@@ -22,25 +24,37 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-@UseReporter(DiffMergeReporter.class)
+//@UseReporter(DiffMergeReporter.class)
 public class PairWiseTest
 {
   @Test
   void forTable()
   {
-    StringBuffer output = new StringBuffer();
-    output.append("\n\n"); // added blank lines at beginning due to markdown snippets bug
-    output.append(
-        "| Number of Parameters | Variations per Parameter | Total Combinations | Pairwise Combinations |\n"
-            + "| --------------------: | -----------------------: | ------------------: | ---------------------: |\n");
-    output.append(getPairwiseTableRow(2, 5));
-    output.append(getPairwiseTableRow(3, 3));
-    output.append(getPairwiseTableRow(3, 4));
-    output.append(getPairwiseTableRow(4, 5));
-    output.append(getPairwiseTableRow(5, 6));
-    output.append(getPairwiseTableRow(9, 9));
-    output.append("\n\n"); // added blank lines at beginning due to markdown snippets bug
-    Approvals.verify(output, new Options().forFile().withExtension("include.md"));
+    String [] headers = {"Number of Parameters", "Variations per Parameter", "Total Combinations", "Pairwise Combinations"};
+    MarkdownTable table = MarkdownTable.withHeaders(headers);
+    table.setColumnProperties(MarkdownColumn.RIGHT_JUSTIFIED);
+//            + "| --------------------: | -----------------------: | ------------------: | ---------------------: |\n");
+    addPairwiseTableRow(2, 5, table);
+    addPairwiseTableRow(3, 3, table);
+    addPairwiseTableRow(3, 4, table);
+    addPairwiseTableRow(4, 5, table);
+    addPairwiseTableRow(5, 6, table);
+    addPairwiseTableRow(9, 9, table);
+    // added blank lines at beginning due to markdown snippets bug
+    Approvals.verify(String.format("\n\n%s\n\n", table.toMarkdown()), new Options().forFile().withExtension("include.md"));
+  }
+  private String addPairwiseTableRow(int pCount, int variations, MarkdownTable table)
+  {
+    Object[] p = Range.get(1, variations);
+    Pairwise pairwise = Pairwise.toPairWise(p, p, 3 <= pCount ? p : CombinationApprovals.EMPTY,
+            4 <= pCount ? p : CombinationApprovals.EMPTY, 5 <= pCount ? p : CombinationApprovals.EMPTY,
+            6 <= pCount ? p : CombinationApprovals.EMPTY, 7 <= pCount ? p : CombinationApprovals.EMPTY,
+            8 <= pCount ? p : CombinationApprovals.EMPTY, 9 <= pCount ? p : CombinationApprovals.EMPTY);
+    final List<Case> cases = pairwise.getCases();
+    int totalPossibleSize = pairwise.getTotalPossibleCombinations();
+    DecimalFormat df = new DecimalFormat("###,###,###");
+    table.addRow(pCount, p.length, df.format(totalPossibleSize), cases.size());
+    return null;
   }
   private String getPairwiseTableRow(int pCount, int variations)
   {

approvaltests-util/src/main/java/com/spun/util/MarkdownTableContents.java

@@ -615,4 +615,11 @@ public static String pad(String contents, int targetLength)
     }
     return contents;
   }
+
+    public static String padLeft(String contents, int targetLength) {
+      while(contents.length() < targetLength) {
+        contents = " " + contents;
+      }
+      return contents;
+    }
 }

approvaltests-util/src/main/java/com/spun/util/MarkdownTableHeader.java

@@ -1,4 +1,4 @@
-package com.spun.util;
+package com.spun.util.markdown;
 
 public interface MarkdownCompatible
 {

approvaltests-util/src/main/java/com/spun/util/Resizable.java

@@ -0,0 +1,6 @@
+package com.spun.util.markdown.table;
+
+public enum MarkdownColumn {
+    DEFAULT,
+    RIGHT_JUSTIFIED
+}

approvaltests-util/src/main/java/com/spun/util/StringUtils.java

@@ -1,15 +1,16 @@
-package com.spun.util;
+package com.spun.util.markdown.table;
 
+import com.spun.util.markdown.MarkdownCompatible;
 import org.lambda.functions.Function1;
 import org.lambda.query.Queryable;
 
 public class MarkdownTable implements MarkdownCompatible
 {
-  public Queryable<MarkdownTableElement> markdown   = new Queryable<MarkdownTableElement>(
-      MarkdownTableElement.class);
-  private boolean                        fixedWidth = true;
-  public void setColumnsConsistentWidth(boolean setting)
-  {
+  public Queryable<MarkdownTableElement> markdown = new Queryable<MarkdownTableElement>(MarkdownTableElement.class);
+  private boolean fixedWidth = true;
+  private MarkdownColumn columnProperties = MarkdownColumn.DEFAULT;
+
+  public void setColumnsConsistentWidth(boolean setting) {
     fixedWidth = setting;
   }
   public static <I, O> MarkdownTable create(I[] inputs, Function1<I, O> o, String column1, String column2)
@@ -57,32 +58,32 @@ public String toMarkdown()
     handleFixedWidth();
     return render(markdown);
   }
-  private void handleFixedWidth()
-  {
-    if (!fixedWidth)
-    { return; }
+
+  private void handleFixedWidth() {
+    if (!fixedWidth) { return; }
     Queryable<Queryable<MarkdownTableElement>> rows = markdown.split(e -> e == MarkdownTableElement.NEWLINE);
-    for (int column = 0; column < rows.get(0).size(); column++)
-    {
+    for (int column = 0; column < rows.get(0).size(); column++) {
       int col = column;
-      if (rows.get(0).get(column) instanceof MarkdownTableContents)
-      {
-        Queryable<Resizable> select = rows.select(e -> e.get(col)).where(e -> e instanceof Resizable)
-            .select(e -> (Resizable) e);
-        int length = select.max(e -> e.getLength()).getLength();
-        select.forEach(e -> e.setPadding(length));
+      if (rows.get(0).get(column) instanceof MarkdownTableContents) {
+          Queryable<Resizable> select = rows
+                  .select(e -> e.get(col))
+                  .where(e -> e instanceof Resizable)
+                  .select(e -> (Resizable) e);
+          select.forEach(e -> e.setJustification(columnProperties));
+          int length = select.max(e -> e.getLength()).getLength();
+          select.forEach(e -> e.setPadding(length));
       }
     }
   }
+
   public static String printColumnHeaders(String... headers)
   {
     return render(constructColumnHeaders(headers));
   }
   public static Queryable<MarkdownTableElement> constructColumnHeaders(String... headers)
   {
     Queryable<MarkdownTableElement> row = constructRow(headers);
-    for (int i = 0; i < headers.length; i++)
-    {
+    for (int i = 0; i < headers.length; i++) {
       row.add(MarkdownTableElement.DELIMITER);
       row.add(new MarkdownTableHeader());
     }
@@ -94,10 +95,11 @@ public static String printRow(Object... columns)
   {
     return render(constructRow(columns));
   }
-  private static String render(Queryable<MarkdownTableElement> table)
-  {
+
+  private static String render(Queryable<MarkdownTableElement> table) {
     return table.join("");
   }
+
   public static Queryable<MarkdownTableElement> constructRow(Object... columns)
   {
     Queryable row = new Queryable(MarkdownTableElement.class);
@@ -110,4 +112,8 @@ public static Queryable<MarkdownTableElement> constructRow(Object... columns)
     row.add(MarkdownTableElement.NEWLINE);
     return row;
   }
+
+  public void setColumnProperties(MarkdownColumn columnProperties) {
+    this.columnProperties = columnProperties;
+  }
 }