Get makefiles and fuzzer testing uniform across chapters

2 files changed, 37 insertions, 6 deletions

diff --git a/chapter18/src/test/java/com/seaofnodes/simple/FuzzerWrap.java b/chapter18/src/test/java/com/seaofnodes/simple/FuzzerWrap.java
index d67b2065..1427c99d 100644
--- a/chapter18/src/test/java/com/seaofnodes/simple/FuzzerWrap.java
+++ b/chapter18/src/test/java/com/seaofnodes/simple/FuzzerWrap.java
@@ -7,15 +7,32 @@ import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 
 /**
- * To use the fuzzer run the <code>fuzzPeeps</code> methods.
- * This can be done from IntelliJ Gui or remove the `@Ignore` annotation and start the test case from the command line
- * via <code>mvn clean test -Dtest=com.seaofnodes.simple.Fuzzer08Test#fuzzPeeps</code>
+ * Normal tests run only this chapter's fixed regression seeds. Open failures
+ * and exploratory fuzzing are opt-in: run their methods directly in the IDE,
+ * or temporarily remove the relevant Ignore annotation when investigating.
+ * Seeds belong to this chapter's generator; do not copy them between chapters.
  */
 public class FuzzerWrap {
 
+    private static final long[] REGRESSION_SEEDS = {
+    };
+
+    private static final long[] OPEN_FAILING_SEEDS = {
+        973358943756616234L, // Parser failure on nullable field access after dead code
+    };
+
+    @Test         public void fuzzPeepsRegression  () { fuzzPeepsSeeds(REGRESSION_SEEDS); }
+    @Test @Ignore public void fuzzPeepsOpenFailures() { fuzzPeepsSeeds(OPEN_FAILING_SEEDS); }
+
+    private static void fuzzPeepsSeeds(long... seeds) {
+        var fuzzer = new Fuzzer();
+        for (long seed : seeds)
+            fuzzer.fuzzPeepsRegression(seed);
+    }
+
     @Ignore
     @Test
-    public void fuzzPeeps() {
+    public void fuzzPeepsLarge() {
         var fuzzer = new Fuzzer();
         for (int i=0; i<1000000; i++)
             fuzzer.fuzzPeeps(i);
@@ -23,8 +40,8 @@ public class FuzzerWrap {
     }
 
 
-    @Test
-    public void fuzzPeepsSmall() {
+    @Test @Ignore
+    public void fuzzPeepsRandom() {
         Random R = new Random(System.currentTimeMillis());
         var fuzzer = new Fuzzer();
         for (int i=0; i<100; i++)
diff --git a/chapter18/src/test/java/com/seaofnodes/simple/fuzzer/Fuzzer.java b/chapter18/src/test/java/com/seaofnodes/simple/fuzzer/Fuzzer.java
index f57a0031..9f2ffa4d 100644
--- a/chapter18/src/test/java/com/seaofnodes/simple/fuzzer/Fuzzer.java
+++ b/chapter18/src/test/java/com/seaofnodes/simple/fuzzer/Fuzzer.java
@@ -172,4 +172,18 @@ public class Fuzzer {
     public boolean noExceptions() {
         return exceptions.isEmpty();
     }
+
+    /** Run a fixed seed without reducing or swallowing failures. */
+    public void fuzzPeepsRegression(long seed) {
+        var rand = new Random(seed);
+        var sb = new StringBuilder();
+        var valid = new ScriptGenerator(rand, sb, true).genProgram();
+        try {
+            runCheck(sb.toString(), valid);
+        } catch (Throwable e) {
+            AssertionError ae = new AssertionError("Fuzzer regression seed failed: " + seed);
+            ae.initCause(e);
+            throw ae;
+        }
+    }
 }