Output fixes

Bruce Eckel · Bruce Eckel · commit 5f1059da6fd4 · 2015-12-16T13:50:01.000-08:00
diff --git a/Ant-Clean.xml b/Ant-Clean.xml
@@ -17,6 +17,7 @@
         <include name="**/*.err" />
         <include name="**/*.dat" />
         <include name="**/*.log" />
+        <include name="**/*.serialized" />
         <include name="**/failures" />
         <include name="**/test.gz" />
         <include name="**/test.zip" />
diff --git a/Ant-Common.xml b/Ant-Common.xml
@@ -176,7 +176,9 @@
       <fileset dir="${basedir}" casesensitive="yes">
         <include name="**/update_output.bat" />
         <include name="**/validate_failures.txt" />
+        <include name="**/validate_successes.txt" />
         <include name="**/strategies.txt" />
+        <include name="**/edit_errors.bat" />
       </fileset>
     </delete>
     <echo message="verifyclean successful"/>
diff --git a/annotations/AtUnitComposition.java b/annotations/AtUnitComposition.java
@@ -17,8 +17,8 @@ public class AtUnitComposition {
     return testObject.methodTwo() == 2;
   }
   public static void main(String[] args) throws Exception {
-    OSExecute.command(
-     "java -cp .. onjava.atunit.AtUnit AtUnitComposition.class");
+    OSExecute.command("java -cp .. " +
+      "onjava.atunit.AtUnit AtUnitComposition.class");
   }
 }
 /* Output:
diff --git a/annotations/AtUnitExample1.java b/annotations/AtUnitExample1.java
@@ -23,8 +23,8 @@ public int methodTwo() {
   @Test boolean failureTest() { return false; }
   @Test boolean anotherDisappointment() { return false; }
   public static void main(String[] args) throws Exception {
-    OSExecute.command(
-      "java -cp .. onjava.atunit.AtUnit AtUnitExample1.class");
+    OSExecute.command("java -cp .. " +
+      "onjava.atunit.AtUnit AtUnitExample1.class");
   }
 }
 /* Output:
diff --git a/annotations/AtUnitExample2.java b/annotations/AtUnitExample2.java
@@ -31,8 +31,8 @@ public int methodTwo() {
     return methodOne().equals("This is methodOne");
   }
   public static void main(String[] args) throws Exception {
-    OSExecute.command(
-      "java -cp .. onjava.atunit.AtUnit AtUnitExample2.class");
+    OSExecute.command("java -cp .. " +
+      "onjava.atunit.AtUnit AtUnitExample2.class");
   }
 }
 /* Output:
diff --git a/annotations/AtUnitExample3.java b/annotations/AtUnitExample3.java
@@ -26,8 +26,8 @@ public int methodTwo() {
   }
   @Test boolean m2() { return methodTwo() == 2; }
   public static void main(String[] args) throws Exception {
-    OSExecute.command(
-      "java -cp .. onjava.atunit.AtUnit AtUnitExample3.class");
+    OSExecute.command("java -cp .. " +
+      "onjava.atunit.AtUnit AtUnitExample3.class");
   }
 }
 /* Output:
diff --git a/annotations/AtUnitExample4.java b/annotations/AtUnitExample4.java
@@ -57,8 +57,8 @@ public String scrambleWord() {
   }
   public static void main(String[] args) throws Exception {
     System.out.println("starting");
-    OSExecute.command(
-      "java -cp .. onjava.atunit.AtUnit AtUnitExample4.class");
+    OSExecute.command("java -cp .. " +
+      "onjava.atunit.AtUnit AtUnitExample4.class");
   }
 }
 /* Output:
diff --git a/annotations/AtUnitExample5.java b/annotations/AtUnitExample5.java
@@ -41,8 +41,8 @@ public class AtUnitExample5 {
     return true;
   }
   public static void main(String[] args) throws Exception {
-    OSExecute.command(
-      "java -cp .. onjava.atunit.AtUnit AtUnitExample5.class");
+    OSExecute.command("java -cp .. " +
+      "onjava.atunit.AtUnit AtUnitExample5.class");
   }
 }
 /* Output:
diff --git a/annotations/AtUnitExternalTest.java b/annotations/AtUnitExternalTest.java
@@ -13,8 +13,8 @@ public class AtUnitExternalTest extends AtUnitExample1 {
   }
   @Test boolean _methodTwo() { return methodTwo() == 2; }
   public static void main(String[] args) throws Exception{
-    OSExecute.command(
-    "java -cp .. onjava.atunit.AtUnit AtUnitExternalTest.class");
+    OSExecute.command("java -cp .. " +
+      "onjava.atunit.AtUnit AtUnitExternalTest.class");
   }
 }
 /* Output:
diff --git a/annotations/HashSetTest.java b/annotations/HashSetTest.java
@@ -22,8 +22,8 @@ public class HashSetTest {
     assert testObject.isEmpty();
   }
   public static void main(String[] args) throws Exception {
-    OSExecute.command(
-      "java -cp .. onjava.atunit.AtUnit HashSetTest.class");
+    OSExecute.command("java -cp .. " +
+      "onjava.atunit.AtUnit HashSetTest.class");
   }
 }
 /* Output:
diff --git a/annotations/StackLStringTest.java b/annotations/StackLStringTest.java
@@ -27,8 +27,8 @@ public class StackLStringTest extends StackL<String> {
     assert top().equals("B");
   }
   public static void main(String[] args) throws Exception {
-    OSExecute.command(
-      "java -cp .. onjava.atunit.AtUnit StackLStringTest.class");
+    OSExecute.command("java -cp .. " +
+      "onjava.atunit.AtUnit StackLStringTest.class");
   }
 }
 /* Output:
diff --git a/build.xml b/build.xml
@@ -111,7 +111,7 @@
     <antcall target="finish"/>
   </target>
 
-  <target name="testable" description="Compiles and runs all examples">
+  <target name="testable" description="Compiles and runs testable examples">
     <delete file="errors.txt"/>
     <subant>
       <filelist refid="testablefiles"/>
@@ -140,7 +140,9 @@
       <fileset dir="${basedir}" casesensitive="yes">
         <include name="update_output.bat" />
         <include name="validate_failures.txt" />
+        <include name="validate_successes.txt" />
         <include name="strategies.txt" />
+        <include name="edit_errors.bat" />
       </fileset>
     </delete>
     <echo message="verifyclean successful"/>
diff --git a/collections/ApplesAndOrangesWithoutGenerics.java b/collections/ApplesAndOrangesWithoutGenerics.java
@@ -32,7 +32,7 @@ public static void main(String[] args) {
 ___[ Error Output ]___
 Exception in thread "main" java.lang.ClassCastException:
 Orange cannot be cast to Apple
-        at ApplesAndOrangesWithoutGenerics.main(ApplesAndOr
-angesWithoutGenerics.java:23)
+        at ApplesAndOrangesWithoutGenerics.main(Unknown
+Source)
 ___[ Exception is Expected ]___
 */
diff --git a/concurrency/ExplicitCriticalSection.java b/concurrency/ExplicitCriticalSection.java
@@ -52,6 +52,32 @@ public class ExplicitCriticalSection {
   }
 }
 /* Output:
-pm1: Pair: x: 10, y: 10 checkCounter = 2115789
-pm2: Pair: x: 10, y: 10 checkCounter = 2124465
+pm1: Pair: x: 10, y: 10 checkCounter = 2193118
+pm2: Pair: x: 10, y: 10 checkCounter = 2184256
+___[ Error Output ]___
+Exception in thread "pool-1-thread-4" Exception in thread
+"pool-1-thread-3"
+concurrency.Pair$PairValuesNotEqualException: Pair values
+not equal: x: 2, y: 1
+        at
+concurrency.Pair.checkState(CriticalSection.java:36)
+        at
+concurrency.PairChecker.run(CriticalSection.java:110)
+        at java.util.concurrent.ThreadPoolExecutor.runWorke
+r(ThreadPoolExecutor.java:1142)
+        at java.util.concurrent.ThreadPoolExecutor$Worker.r
+un(ThreadPoolExecutor.java:617)
+        at java.lang.Thread.run(Thread.java:745)
+concurrency.Pair$PairValuesNotEqualException: Pair values
+not equal: x: 2, y: 1
+        at
+concurrency.Pair.checkState(CriticalSection.java:36)
+        at
+concurrency.PairChecker.run(CriticalSection.java:110)
+        at java.util.concurrent.ThreadPoolExecutor.runWorke
+r(ThreadPoolExecutor.java:1142)
+        at java.util.concurrent.ThreadPoolExecutor$Worker.r
+un(ThreadPoolExecutor.java:617)
+        at java.lang.Thread.run(Thread.java:745)
+___[ Exception is Expected ]___
 */
diff --git a/concurrency/build.xml b/concurrency/build.xml
@@ -26,7 +26,7 @@
     <jrun cls="DaemonsDoRunFinally" />
     <jrun cls="DeadlockingDiningPhilosophers" arguments="0 5 timeout" />
     <jrun cls="DelayQueueDemo" />
-    <jrun cls="EvenSupplier" />
+    <jrun cls="EvenSupplier" failOnError='false' timeOut='4000' msg='* Timeout for Testing *' />
     <jrun cls="ExchangerDemo" />
     <jrun cls="concurrency.ExplicitCriticalSection" dirpath="../concurrency" failOnError='false' msg='* Exception was Expected *' />
     <jrun cls="FastSimulation" />
diff --git a/exceptions/LoggingExceptions.java b/exceptions/LoggingExceptions.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // An exception that reports through a Logger.
+// {ErrorOutputExpected}
 import java.util.logging.*;
 import java.io.*;
 
@@ -32,14 +33,17 @@ public static void main(String[] args) {
 }
 /* Output:
 ___[ Error Output ]___
-Jun 15, 2015 3:47:40 PM LoggingException <init>
+Dec 15, 2015 10:34:24 PM LoggingException <init>
 SEVERE: LoggingException
         at
-LoggingExceptions.main(LoggingExceptions.java:19)
+LoggingExceptions.main(LoggingExceptions.java:20)
+
 Caught LoggingException
-Jun 15, 2015 3:47:40 PM LoggingException <init>
+Dec 15, 2015 10:34:24 PM LoggingException <init>
 SEVERE: LoggingException
         at
-LoggingExceptions.main(LoggingExceptions.java:24)
+LoggingExceptions.main(LoggingExceptions.java:25)
+
 Caught LoggingException
+___[ Error Output is Expected ]___
 */
diff --git a/exceptions/LoggingExceptions2.java b/exceptions/LoggingExceptions2.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Logging caught exceptions.
+// {ErrorOutputExpected}
 import java.util.logging.*;
 import java.io.*;
 
@@ -24,8 +25,9 @@ public static void main(String[] args) {
 }
 /* Output:
 ___[ Error Output ]___
-Jun 15, 2015 3:47:40 PM LoggingExceptions2 logException
+Dec 15, 2015 10:34:25 PM LoggingExceptions2 logException
 SEVERE: java.lang.NullPointerException
         at
-LoggingExceptions2.main(LoggingExceptions2.java:16)
+LoggingExceptions2.main(LoggingExceptions2.java:17)
+___[ Error Output is Expected ]___
 */
diff --git a/logging/ConfigureLogging.java b/logging/ConfigureLogging.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // {JVMArgs: -Djava.util.logging.config.file=log.prop}
+// {ErrorOutputExpected}
 import java.util.logging.*;
 
 public class ConfigureLogging {
@@ -43,46 +44,41 @@ public static void main(String[] args) {
   }
 }
 /* Output:
-Logger Name : net Level: SEVERE
-Logger Name : com.mindviewinc Level: FINEST
-Logger Name : onjava Level: INFO
-Logger Name : com.mindviewinc.test Level: FINER
-Logger Name : random Level: SEVERE
+Logger Name : com Level: null
+ Logger Name : com.mindviewinc Level: null
+ Logger Name : onjava Level: null
+ Logger Name : com.mindviewinc.test Level: null
+ Logger Name : random Level: null
 ___[ Error Output ]___
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
+INFO: Info
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
+WARNING: Warning
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 SEVERE: Severe
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
-FINEST: Finest
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
-FINER: Finer
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
-FINE: Fine
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
-CONFIG: Config
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 INFO: Info
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 WARNING: Warning
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 SEVERE: Severe
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 INFO: Info
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 WARNING: Warning
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 SEVERE: Severe
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
-FINER: Finer
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
-FINE: Fine
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
-CONFIG: Config
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 INFO: Info
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 WARNING: Warning
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 SEVERE: Severe
-Jun 15, 2015 3:47:52 PM ConfigureLogging sendLogMessages
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
+INFO: Info
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
+WARNING: Warning
+Dec 15, 2015 9:58:42 PM ConfigureLogging sendLogMessages
 SEVERE: Severe
+___[ Error Output is Expected ]___
 */
diff --git a/logging/CustomHandler.java b/logging/CustomHandler.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // How to write custom handler
+// {ErrorOutputExpected}
 import java.util.logging.*;
 import java.util.*;
 
@@ -39,8 +40,9 @@ public void close() {}
 , INFO:, CustomHandler:, main:, <Logging Info>,
 ]
 ___[ Error Output ]___
-Jun 15, 2015 3:47:52 PM CustomHandler main
+Dec 15, 2015 9:58:42 PM CustomHandler main
 WARNING: Logging Warning
-Jun 15, 2015 3:47:52 PM CustomHandler main
+Dec 15, 2015 9:58:42 PM CustomHandler main
 INFO: Logging Info
+___[ Error Output is Expected ]___
 */
diff --git a/logging/InfoLogging.java b/logging/InfoLogging.java
@@ -2,6 +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.
+// {ErrorOutputExpected}
 import java.util.logging.*;
 
 public class InfoLogging {
@@ -13,6 +14,7 @@ public static void main(String[] args) {
 }
 /* Output:
 ___[ Error Output ]___
-Jun 15, 2015 3:47:52 PM InfoLogging main
+Dec 15, 2015 9:58:43 PM InfoLogging main
 INFO: Logging: INFO-level message
+___[ Error Output is Expected ]___
 */
diff --git a/logging/InfoLogging2.java b/logging/InfoLogging2.java
@@ -3,6 +3,7 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 // Guaranteeing proper class and method names
+// {ErrorOutputExpected}
 import java.util.logging.*;
 
 public class InfoLogging2 {
@@ -15,6 +16,7 @@ public static void main(String[] args) {
 }
 /* Output:
 ___[ Error Output ]___
-Jun 15, 2015 3:47:52 PM InfoLogging2 main
+Dec 15, 2015 9:58:43 PM InfoLogging2 main
 INFO: Logging an INFO-level message
+___[ Error Output is Expected ]___
 */
diff --git a/logging/LogToFile.java b/logging/LogToFile.java
@@ -2,6 +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.
+// {ErrorOutputExpected}
 import java.util.logging.*;
 
 public class LogToFile {
@@ -16,6 +17,7 @@ public class LogToFile {
 }
 /* Output:
 ___[ Error Output ]___
-Jun 15, 2015 3:47:52 PM LogToFile main
+Dec 15, 2015 9:58:43 PM LogToFile main
 INFO: A message logged to the file
+___[ Error Output is Expected ]___
 */
diff --git a/logging/LogToFile2.java b/logging/LogToFile2.java
diff --git a/logging/LoggingLevelManipulation.java b/logging/LoggingLevelManipulation.java
diff --git a/logging/LoggingLevels.java b/logging/LoggingLevels.java
diff --git a/logging/MultipleHandlers.java b/logging/MultipleHandlers.java
diff --git a/logging/MultipleHandlers2.java b/logging/MultipleHandlers2.java
diff --git a/logging/SimpleFilter.java b/logging/SimpleFilter.java
diff --git a/logging/SimpleFormatterExample.java b/logging/SimpleFormatterExample.java
diff --git a/output_duet.py b/output_duet.py
diff --git a/verify_output.py b/verify_output.py

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public class AtUnitComposition {`
`17`	`17`	`return testObject.methodTwo() == 2;`
`18`	`18`	`}`
`19`	`19`	`public static void main(String[] args) throws Exception {`
`20`		`- OSExecute.command(`
`21`		`- "java -cp .. onjava.atunit.AtUnit AtUnitComposition.class");`
	`20`	`+ OSExecute.command("java -cp .. " +`
	`21`	`+ "onjava.atunit.AtUnit AtUnitComposition.class");`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`/* Output:`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ public int methodTwo() {`
`23`	`23`	`@Test boolean failureTest() { return false; }`
`24`	`24`	`@Test boolean anotherDisappointment() { return false; }`
`25`	`25`	`public static void main(String[] args) throws Exception {`
`26`		`- OSExecute.command(`
`27`		`- "java -cp .. onjava.atunit.AtUnit AtUnitExample1.class");`
	`26`	`+ OSExecute.command("java -cp .. " +`
	`27`	`+ "onjava.atunit.AtUnit AtUnitExample1.class");`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`/* Output:`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public int methodTwo() {`
`31`	`31`	`return methodOne().equals("This is methodOne");`
`32`	`32`	`}`
`33`	`33`	`public static void main(String[] args) throws Exception {`
`34`		`- OSExecute.command(`
`35`		`- "java -cp .. onjava.atunit.AtUnit AtUnitExample2.class");`
	`34`	`+ OSExecute.command("java -cp .. " +`
	`35`	`+ "onjava.atunit.AtUnit AtUnitExample2.class");`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`/* Output:`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public int methodTwo() {`
`26`	`26`	`}`
`27`	`27`	`@Test boolean m2() { return methodTwo() == 2; }`
`28`	`28`	`public static void main(String[] args) throws Exception {`
`29`		`- OSExecute.command(`
`30`		`- "java -cp .. onjava.atunit.AtUnit AtUnitExample3.class");`
	`29`	`+ OSExecute.command("java -cp .. " +`
	`30`	`+ "onjava.atunit.AtUnit AtUnitExample3.class");`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`/* Output:`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ public String scrambleWord() {`
`57`	`57`	`}`
`58`	`58`	`public static void main(String[] args) throws Exception {`
`59`	`59`	`System.out.println("starting");`
`60`		`- OSExecute.command(`
`61`		`- "java -cp .. onjava.atunit.AtUnit AtUnitExample4.class");`
	`60`	`+ OSExecute.command("java -cp .. " +`
	`61`	`+ "onjava.atunit.AtUnit AtUnitExample4.class");`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`/* Output:`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ public class AtUnitExample5 {`
`41`	`41`	`return true;`
`42`	`42`	`}`
`43`	`43`	`public static void main(String[] args) throws Exception {`
`44`		`- OSExecute.command(`
`45`		`- "java -cp .. onjava.atunit.AtUnit AtUnitExample5.class");`
	`44`	`+ OSExecute.command("java -cp .. " +`
	`45`	`+ "onjava.atunit.AtUnit AtUnitExample5.class");`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`/* Output:`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public class AtUnitExternalTest extends AtUnitExample1 {`
`13`	`13`	`}`
`14`	`14`	`@Test boolean _methodTwo() { return methodTwo() == 2; }`
`15`	`15`	`public static void main(String[] args) throws Exception{`
`16`		`- OSExecute.command(`
`17`		`- "java -cp .. onjava.atunit.AtUnit AtUnitExternalTest.class");`
	`16`	`+ OSExecute.command("java -cp .. " +`
	`17`	`+ "onjava.atunit.AtUnit AtUnitExternalTest.class");`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`/* Output:`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ public class HashSetTest {`
`22`	`22`	`assert testObject.isEmpty();`
`23`	`23`	`}`
`24`	`24`	`public static void main(String[] args) throws Exception {`
`25`		`- OSExecute.command(`
`26`		`- "java -cp .. onjava.atunit.AtUnit HashSetTest.class");`
	`25`	`+ OSExecute.command("java -cp .. " +`
	`26`	`+ "onjava.atunit.AtUnit HashSetTest.class");`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`/* Output:`