F!! fluent syntax and factory method

Author: actions-user

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

@@ -10,11 +10,15 @@ public class StoryBoardTest
   @Test
   void gameOfLife()
   {
-    final GameOfLife gameOfLife = new GameOfLife((x, y) -> y == 2 && 1 <= x && x <= 3);
-    final Storyboard storyboard = new Storyboard();
+    GameOfLife gameOfLife = new GameOfLife((x, y) -> y == 2 && 1 <= x && x <= 3);
+    StoryBoard storyboard = new StoryBoard();
     storyboard.add(gameOfLife);
     storyboard.addFrames(3, gameOfLife::advance);
     Approvals.verify(storyboard);
+    gameOfLife = new GameOfLife((x, y) -> y == 2 && 1 <= x && x <= 3);
+    Approvals.verify(StoryBoard.createSequence(gameOfLife, 3, gameOfLife::advance));
+    gameOfLife = new GameOfLife((x, y) -> y == 2 && 1 <= x && x <= 3);
+    Approvals.verify(new StoryBoard().add(gameOfLife).addFrames(3, gameOfLife::advance));
   }
   private class GameOfLife
   {
@@ -27,18 +31,11 @@ public GameOfLife advance()
     {
       final Function2<Integer, Integer, Boolean> old = this.board;
       this.board = (x, y) -> {
-        final int aliveNeighbours = Queryable.as(
-            old.call(x - 1, y - 1),
-            old.call(x - 0, y - 1),
-            old.call(x + 1, y - 1),
-            old.call(x - 1, y - 0),
-//            old.call(x - 0, y - 0),
-            old.call(x + 1, y - 0),
-            old.call(x - 1, y + 1),
-            old.call(x - 0, y + 1),
-            old.call(x + 1, y + 1)
-        ).where(a -> a)
-            .size();
+        final int aliveNeighbours = Queryable
+            .as(old.call(x - 1, y - 1), old.call(x - 0, y - 1), old.call(x + 1, y - 1), old.call(x - 1, y - 0),
+                //            old.call(x - 0, y - 0),
+                old.call(x + 1, y - 0), old.call(x - 1, y + 1), old.call(x - 0, y + 1), old.call(x + 1, y + 1))
+            .where(a -> a).size();
         return aliveNeighbours == 3 || (aliveNeighbours == 2 && old.call(x, y));
       };
       return this;

approvaltests/src/main/java/org/approvaltests/StoryBoard.java

@@ -0,0 +1,33 @@
+package org.approvaltests;
+
+import org.lambda.functions.Function0;
+
+public class StoryBoard
+{
+  private StringBuffer stringBuffer = new StringBuffer();
+  int                  index        = 0;
+  public static <T> StoryBoard createSequence(T initial, int additionalFrames, Function0<T> getNextFrame)
+  {
+    return new StoryBoard().add(initial).addFrames(additionalFrames, getNextFrame);
+  }
+  public <T> StoryBoard add(T object)
+  {
+    String title = index == 0 ? "Initial:" : "\n\nFrame #" + index + ":";
+    stringBuffer.append(String.format("%s\n%s", title, object));
+    index++;
+    return this;
+  }
+  public <T> StoryBoard addFrames(int howMany, Function0<T> getNextFrame)
+  {
+    for (int i = 0; i < howMany; i++)
+    {
+      add(getNextFrame.call());
+    }
+    return this;
+  }
+  @Override
+  public String toString()
+  {
+    return stringBuffer.toString();
+  }
+}