*** Midway in converting Grid

Author: ScottBob

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

@@ -42,7 +42,7 @@ void gameOfLifeWithDescription()
     Approvals.verify(storyboard);
   }
   @Test
-  @UseReporter(QuietReporter.class)
+//  @UseReporter(QuietReporter.class)
   void gameOfLifeInMarkdown()
   {
     GameOfLife gameOfLife = new GameOfLife((x, y) -> y == 2 && 1 <= x && x <= 3);

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

@@ -1,6 +1,6 @@
 package org.approvaltests;
 
-import org.approvaltests.legacycode.Range;
+import org.lambda.utils.Range;
 import org.approvaltests.utils.VerifiableMarkdownTable;
 import org.junit.jupiter.api.Test;
 

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

@@ -6,7 +6,7 @@
 import org.approvaltests.combinations.pairwise.OptionsForAParameter;
 import org.approvaltests.combinations.pairwise.Pairwise;
 import org.approvaltests.core.Options;
-import org.approvaltests.legacycode.Range;
+import org.lambda.utils.Range;
 import org.approvaltests.reporters.UseReporter;
 import org.approvaltests.reporters.macosx.DiffMergeReporter;
 import org.approvaltests.scrubbers.RegExScrubber;

approvaltests-util-tests/src/test/java/org/lambda/functions/F1Test.java

@@ -1,7 +1,7 @@
 package org.lambda.functions;
 
 import org.approvaltests.Approvals;
-import org.approvaltests.legacycode.Range;
+import org.lambda.utils.Range;
 import org.approvaltests.reporters.UseReporter;
 import org.approvaltests.reporters.windows.TortoiseTextDiffReporter;
 import org.junit.jupiter.api.Test;

approvaltests-util-tests/src/test/java/org/lambda/query/QueryTest.java

@@ -1,6 +1,6 @@
 package org.lambda.query;
 
-import org.approvaltests.legacycode.Range;
+import org.lambda.utils.Range;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

approvaltests-util/src/main/java/org/lambda/utils/Grid.java

@@ -1,6 +1,8 @@
 package org.lambda.utils;
 
+import com.spun.util.MarkdownTable;
 import org.lambda.functions.Function2;
+import org.lambda.query.Queryable;
 
 public class Grid
 {
@@ -25,20 +27,31 @@ public static String print(int width, int height, final String cell)
   }
   public static String printMarkdown(int width, int height, Function2<Integer, Integer, String> f2)
   {
-    StringBuffer b = new StringBuffer();
-    b.append(printHeader(width));
-    for (int y = 0; y < height; y++)
-    {
-      b.append("|**" + y + "**|");
-      for (int x = 0; x < width; x++)
-      {
-        String c = f2.call(x, y);
-        c = c == null ? " " : c;
-        b.append(" " + c + " |");
-      }
-      b.append("\n");
+    Queryable<Integer> numbers = Range.getAsQueryable(0, width - 1);
+    Queryable<String> asQueryable = numbers.select(i -> "" + i);
+    asQueryable.add(0, "   ");
+    MarkdownTable table = MarkdownTable.withHeaders(asQueryable.asArray());
+    for (int y = 0; y < height; y++) {
+      int y2 = y;
+      Queryable<String> row = numbers.select(x -> f2.call(x, y2)).select(c -> c == null ? "" : c);
+      row.add(0, "**" + y + "**");
+      table.addRow(row.toArray());
     }
-    return b.toString();
+    return table.toMarkdown();
+//    StringBuffer b = new StringBuffer();
+//    b.append(printHeader(width));
+//    for (int y = 0; y < height; y++)
+//    {
+//      b.append("|**" + y + "**|");
+//      for (int x = 0; x < width; x++)
+//      {
+//        String c = f2.call(x, y);
+//        c = c == null ? " " : c;
+//        b.append(" " + c + " |");
+//      }
+//      b.append("\n");
+//    }
+//    return b.toString();
   }
   private static String printHeader(int width)
   {

approvaltests/src/main/java/org/approvaltests/legacycode/Range.java renamed to approvaltests-util/src/main/java/org/lambda/utils/Range.java

@@ -1,4 +1,6 @@
-package org.approvaltests.legacycode;
+package org.lambda.utils;
+
+import org.lambda.query.Queryable;
 
 import java.util.ArrayList;
 
@@ -13,4 +15,8 @@ public static Integer[] get(int start, int stop)
     }
     return (Integer[]) a.toArray(new Integer[a.size()]);
   }
+
+  public static Queryable<Integer> getAsQueryable(int start, int stop) {
+    return Queryable.as(get(start, stop));
+  }
 }