Chapter name and order change

BruceEckel · BruceEckel · commit 33a529c41765 · 2016-08-29T07:27:53.000-06:00
diff --git a/build.gradle b/build.gradle
@@ -277,9 +277,9 @@ subprojects {
     task run(dependsOn: createdTasks)
 }
 
-project(':verifying') {
+project(':validating') {
     jmh {
-        include = 'verifying.jmh.*'
+        include = 'validating.jmh.*'
     }
 }
 
diff --git a/network/SimpleClient.java b/network/SimpleClient.java
@@ -11,9 +11,8 @@
 public class SimpleClient {
   public static void
   main(String[] args) throws IOException {
-    // Passing null to getByName() produces the
-    // special "Local Loopback" IP address, for
-    // testing on one machine w/o a network:
+    // Produce the "Local Loopback" IP address
+    // for testing on one machine w/o a network:
     InetAddress addr =
       InetAddress.getLoopbackAddress();
     System.out.println("addr = " + addr);
@@ -35,7 +34,7 @@ public class SimpleClient {
             new OutputStreamWriter(
               socket.getOutputStream())),true);
       for(int i = 0; i < 10; i ++) {
-        out.println("howdy " + i);
+        out.println("hello " + i);
         String str = in.readLine();
         System.out.println(str);
       }
diff --git a/network/SimpleServer.java b/network/SimpleServer.java
@@ -2,7 +2,7 @@
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-// Just echoes whatever the client sends
+// Echoes what the client sends
 // {ValidateByHand}
 import java.io.*;
 import java.net.*;
@@ -30,7 +30,7 @@ public class SimpleServer {
           new PrintWriter(
             new BufferedWriter(
               new OutputStreamWriter(
-                socket.getOutputStream())),true);
+                socket.getOutputStream())), true);
         while (true) {
           String str = in.readLine();
           if(str.equals("END")) break;
diff --git a/validating/Assert1.java b/validating/Assert1.java
@@ -1,4 +1,4 @@
-// verifying/Assert1.java
+// validating/Assert1.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/Assert2.java b/validating/Assert2.java
@@ -1,4 +1,4 @@
-// verifying/Assert2.java
+// validating/Assert2.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/BadMicroBenchmark.java b/validating/BadMicroBenchmark.java
@@ -1,4 +1,4 @@
-// verifying/BadMicroBenchmark.java
+// validating/BadMicroBenchmark.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/BadMicroBenchmark2.java b/validating/BadMicroBenchmark2.java
@@ -1,4 +1,4 @@
-// verifying/BadMicroBenchmark2.java
+// validating/BadMicroBenchmark2.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/BadMicroBenchmark3.java b/validating/BadMicroBenchmark3.java
@@ -1,4 +1,4 @@
-// verifying/BadMicroBenchmark3.java
+// validating/BadMicroBenchmark3.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/CountedList.java b/validating/CountedList.java
@@ -1,10 +1,10 @@
-// verifying/CountedList.java
+// validating/CountedList.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // A List that keeps track of how many
 // of itself are created.
-package verifying;
+package validating;
 import java.util.*;
 
 public class CountedList extends ArrayList<String> {
diff --git a/validating/CountedListTest.java b/validating/CountedListTest.java
@@ -1,9 +1,9 @@
-// verifying/CountedListTest.java
+// validating/CountedListTest.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Simple use of JUnit to test CountedList.
-package verifying;
+package validating;
 import java.util.*;
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/validating/DynamicStringInverterTests.java b/validating/DynamicStringInverterTests.java
@@ -0,0 +1,121 @@
+// validating/DynamicStringInverterTests.java
+// (c)2016 MindView LLC: see Copyright.txt
+// We make no guarantees that this code is fit for any purpose.
+// Visit http://mindviewinc.com/Books/OnJava/ for more book information.
+package validating;
+import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
+import org.junit.jupiter.api.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.DynamicTest.*;
+
+class DynamicStringInverterTests {
+  // Combine operations to prevent code duplication:
+  Stream<DynamicTest> testVersions(String id,
+    Function<StringInverter, String> test) {
+    List<StringInverter> versions = Arrays.asList(
+      new Inverter1(), new Inverter2(),
+      new Inverter3(), new Inverter4());
+    return DynamicTest.stream(
+      versions.iterator(),
+      inverter -> inverter.getClass().getSimpleName(),
+      inverter -> {
+        System.out.println(
+          inverter.getClass().getSimpleName() + ": " + id
+        );
+        try {
+          if(test.apply(inverter) != "fail")
+            System.out.println("Success");
+        } catch(Exception | Error e) {
+          System.out.println("Exception: " + e.getMessage());
+        }
+      }
+    );
+  }
+  String isEqual(String lval, String rval) {
+    if(lval.equals(rval))
+      return "success";
+    System.out.println("FAIL: " + lval + " != " + rval);
+    return "fail";
+  }
+  @BeforeAll
+  static void startMsg() {
+    System.out.println(
+      ">>> Starting DynamicStringInverterTests <<<");
+  }
+  @AfterAll
+  static void endMsg() {
+    System.out.println(
+      ">>> Finished DynamicStringInverterTests <<<");
+  }
+  @TestFactory
+  Stream<DynamicTest> basicInversion1() {
+    String in =  "Exit, Pursued by a Bear.";
+    String out = "eXIT, pURSUED BY A bEAR.";
+    return testVersions(
+      "Basic inversion (should succeed)",
+      inverter -> isEqual(inverter.invert(in), out)
+    );
+  }
+  @TestFactory
+  Stream<DynamicTest> basicInversion2() {
+    return testVersions(
+      "Basic inversion (should fail)",
+      inverter -> isEqual(inverter.invert("X"), "X"));
+  }
+  @TestFactory
+  Stream<DynamicTest> disallowedCharacters() {
+    String disallowed = ";-_()*&^%$#@!~`0123456789";
+    return testVersions(
+      "Disallowed characters",
+      inverter -> {
+        String result = disallowed.chars()
+          .mapToObj(c -> {
+            String cc = Character.toString((char)c);
+            try {
+              inverter.invert(cc);
+              return "";
+            } catch(RuntimeException e) {
+              return cc;
+            }
+          }).collect(Collectors.joining(""));
+        if(result.length() == 0)
+          return "success";
+        System.out.println("Bad characters: " + result);
+        return "fail";
+      }
+    );
+  }
+  @TestFactory
+  Stream<DynamicTest> allowedCharacters() {
+    String lowcase = "abcdefghijklmnopqrstuvwxyz ,.";
+    String upcase =  "ABCDEFGHIJKLMNOPQRSTUVWXYZ ,.";
+    return testVersions(
+      "Allowed characters (should succeed)",
+      inverter -> {
+        assertEquals(inverter.invert(lowcase), upcase);
+        assertEquals(inverter.invert(upcase), lowcase);
+        return "success";
+      }
+    );
+  }
+  @TestFactory
+  Stream<DynamicTest> lengthNoGreaterThan30() {
+    String str = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+    assertTrue(str.length() > 30);
+    return testVersions(
+      "Length must be less than 31 (throws exception)",
+      inverter -> inverter.invert(str)
+    );
+  }
+  @TestFactory
+  Stream<DynamicTest> lengthLessThan31() {
+    String str = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+    assertTrue(str.length() < 31);
+    return testVersions(
+      "Length must be less than 31 (should succeed)",
+      inverter -> inverter.invert(str)
+    );
+  }
+}
diff --git a/validating/FirstJUnit5Tests.java b/validating/FirstJUnit5Tests.java
@@ -1,8 +1,8 @@
-// verifying/FirstJUnit5Tests.java
+// validating/FirstJUnit5Tests.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package verifying;
+package validating;
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/validating/GuavaPreconditions.java b/validating/GuavaPreconditions.java
@@ -1,4 +1,4 @@
-// verifying/GuavaPreconditions.java
+// validating/GuavaPreconditions.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/Inverter1.java b/validating/Inverter1.java
@@ -1,9 +1,9 @@
-// verifying/StringInverter1.java
+// validating/Inverter1.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package verifying;
+package validating;
 
-public class StringInverter1 implements StringInverter {
-  public String invert(String str) { return ""; }
+public class Inverter1 implements StringInverter {
+  public String invert(String str) { return str; }
 }
diff --git a/validating/Inverter2.java b/validating/Inverter2.java
@@ -1,11 +1,11 @@
-// verifying/StringInverter2.java
+// validating/Inverter2.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package verifying;
+package validating;
 import static java.lang.Character.*;
 
-public class StringInverter2 implements StringInverter {
+public class Inverter2 implements StringInverter {
   public String invert(String str) {
     String result = "";
     for(int i = 0; i < str.length(); i++) {
diff --git a/validating/Inverter3.java b/validating/Inverter3.java
@@ -1,11 +1,11 @@
-// verifying/StringInverter3.java
+// validating/Inverter3.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package verifying;
+package validating;
 import static java.lang.Character.*;
 
-public class StringInverter3 implements StringInverter {
+public class Inverter3 implements StringInverter {
   public String invert(String str) {
     if(str.length() > 30)
       throw new RuntimeException("argument too long!");
diff --git a/validating/Inverter4.java b/validating/Inverter4.java
@@ -1,11 +1,11 @@
-// verifying/StringInverter4.java
+// validating/Inverter4.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package verifying;
+package validating;
 import static java.lang.Character.*;
 
-public class StringInverter4 implements StringInverter {
+public class Inverter4 implements StringInverter {
   static final String allowed =
     "abcdefghijklmnopqrstuvwxyz ,." +
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
diff --git a/validating/LoaderAssertions.java b/validating/LoaderAssertions.java
@@ -1,4 +1,4 @@
-// verifying/LoaderAssertions.java
+// validating/LoaderAssertions.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/Queue.java b/validating/Queue.java
@@ -1,9 +1,9 @@
-// verifying/Queue.java
+// validating/Queue.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Demonstration of Design by Contract (DbC)
-package verifying;
+package validating;
 import java.util.*;
 
 public class Queue {
diff --git a/validating/QueueException.java b/validating/QueueException.java
@@ -1,8 +1,8 @@
-// verifying/QueueException.java
+// validating/QueueException.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package verifying;
+package validating;
 
 public class QueueException extends RuntimeException {
   public QueueException(String why) { super(why); }
diff --git a/validating/QueueTest.java b/validating/QueueTest.java
@@ -1,9 +1,9 @@
-// verifying/QueueTest.java
+// validating/QueueTest.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package verifying;
-import verifying.Queue;
+package validating;
+//import validating.Queue;
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/validating/SLF4JLevels.java b/validating/SLF4JLevels.java
@@ -1,4 +1,4 @@
-// verifying/SLF4JLevels.java
+// validating/SLF4JLevels.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/SLF4JLogging.java b/validating/SLF4JLogging.java
@@ -1,4 +1,4 @@
-// verifying/SLF4JLogging.java
+// validating/SLF4JLogging.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/SimpleDebugging.java b/validating/SimpleDebugging.java
@@ -1,4 +1,4 @@
-// verifying/SimpleDebugging.java
+// validating/SimpleDebugging.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/StringInverter.java b/validating/StringInverter.java
@@ -1,8 +1,8 @@
-// verifying/StringInverter.java
+// validating/StringInverter.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
-package verifying;
+package validating;
 
 interface StringInverter {
   public String invert(String str);
diff --git a/validating/StringInverterTests.java b/validating/StringInverterTests.java
diff --git a/validating/Time.java b/validating/Time.java
diff --git a/validating/jmh/ParallelSetAll.java b/validating/jmh/ParallelSetAll.java
diff --git a/validating/logback.xml b/validating/logback.xml
diff --git a/verifying/DynamicStringInverterTests.java b/verifying/DynamicStringInverterTests.java

Original file line number	Diff line number	Diff line change
`@@ -277,9 +277,9 @@ subprojects {`
`277`	`277`	`task run(dependsOn: createdTasks)`
`278`	`278`	`}`
`279`	`279`
`280`		`-project(':verifying') {`
	`280`	`+project(':validating') {`
`281`	`281`	`jmh {`
`282`		`- include = 'verifying.jmh.*'`
	`282`	`+ include = 'validating.jmh.*'`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// verifying/Assert1.java`
	`1`	`+// validating/Assert1.java`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// verifying/Assert2.java`
	`1`	`+// validating/Assert2.java`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// verifying/BadMicroBenchmark.java`
	`1`	`+// validating/BadMicroBenchmark.java`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// verifying/BadMicroBenchmark2.java`
	`1`	`+// validating/BadMicroBenchmark2.java`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// verifying/BadMicroBenchmark3.java`
	`1`	`+// validating/BadMicroBenchmark3.java`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`