Fix chapter19 listings

src/Chapter19.Tests/Listing19.05.Test.cs → src/Chapter19.Tests/Listing19.03.Test.cs

@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Text.RegularExpressions;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_05.Tests
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_03.Tests
 {
     [TestClass]
     public class ProgramTests
@@ -11,15 +12,19 @@ public void ObservingUnhandledExceptionsWithContinueWith()
             string expected = @"Before
 Starting...
 Continuing A...
-Continuing B...
-Continuing C...
+Continuing {0}...
+Continuing {1}...
 Finished!";
-
-            IntelliTect.TestTools.Console.ConsoleAssert.Expect(expected,
+            string actual = IntelliTect.TestTools.Console.ConsoleAssert.Execute(expected,
             () =>
             {
                 Program.Main();
             });
+
+            Assert.IsTrue( 
+                (string.Format(expected, 'B', 'C') == actual.TrimEnd()) || 
+                (string.Format(expected, 'C', 'B') == actual.TrimEnd())
+                );
         }
     }
 }

src/Chapter19.Tests/Listing19.06.Test.cs → src/Chapter19.Tests/Listing19.04.Test.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_06.Tests
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_04.Tests
 {
     [TestClass]
     public class ProgramTests

src/Chapter19.Tests/Listing19.08.Tests.cs → src/Chapter19.Tests/Listing19.05.Tests.cs

@@ -1,5 +1,5 @@
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_08.Tests
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_05.Tests
 {
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 

src/Chapter19.Tests/Listing19.09.Tests.cs → src/Chapter19.Tests/Listing19.07.Tests.cs

@@ -1,5 +1,5 @@
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_09.Tests
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_07.Tests
 {
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -9,7 +9,15 @@ public class ProgramTests
         [TestMethod][Ignore]
         public void ValueTaskAsyncReturnTest()
         {
-            string expected = "";
+            string expected = @"3:0047:Throwing exception.
+3:0052:Unhandled exception handler starting.
+3:0055:Sleeping for 4000 ms
+1:0058:Sleeping for 2000 ms
+1:2059:Awake
+1:2060:Finally block running.
+3:4059:Awake
+Unhandled Exception: System.Exception: Exception of type 'System.Exception' was thrown.
+";
 
             IntelliTect.TestTools.Console.ConsoleAssert.Expect(expected,
             () =>

src/Chapter19/Listing19.03.InvokingAnAsynchronousTask.cs → src/Chapter19/Listing19.01.InvokingAnAsynchronousTask.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_03
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_01
 {
     using System;
     using System.Threading.Tasks;

src/Chapter19/Listing19.04.PollingATask.cs → src/Chapter19/Listing19.02.PollingATask.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_04
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_02
 {
     using System;
     using System.Threading.Tasks;

src/Chapter19/Listing19.05.CallingTaskContinueWith.cs → src/Chapter19/Listing19.03.CallingTaskContinueWith.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_05
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_03
 {
     using System;
     using System.Threading.Tasks;
@@ -17,9 +17,9 @@ public static void Main()
                      Console.WriteLine("Continuing A..."));
             Task taskB = taskA.ContinueWith(antecedent =>
                 Console.WriteLine("Continuing B..."));
-            Task taskC = taskB.ContinueWith(antecedent =>
+            Task taskC = taskA.ContinueWith(antecedent =>
                 Console.WriteLine("Continuing C..."));
-            Task.WaitAll(taskC);
+            Task.WaitAll(taskB, taskC);
             Console.WriteLine("Finished!");
         }
     }

src/Chapter19/Listing19.06.RegisteringForNotificationsWithContinueWith.cs → src/Chapter19/Listing19.04.RegisteringForNotificationsWithContinueWith.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_06
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_04
 {
     using System;
     using System.Threading.Tasks;
@@ -50,9 +50,7 @@ public static void Main()
                         OnlyOnRanToCompletion);
 
             completedTask.Wait();
-
         }
-
     }
 }
 

src/Chapter19/Listing19.07.HandlingATasksUnhandledException.cs → src/Chapter19/Listing19.05.HandlingATasksUnhandledException.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_07
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_05
 {
     using System;
     using System.Threading.Tasks;

src/Chapter19/Listing19.08.ObservingUnhandledExceptionsWithContinueWith.cs → src/Chapter19/Listing19.06.ObservingUnhandledExceptionsWithContinueWith.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_08
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_06
 {
     using System;
     using System.Threading.Tasks;

src/Chapter19/Listing19.09.RegisteringForUnhandledExceptions.cs → src/Chapter19/Listing19.07.RegisteringForUnhandledExceptions.cs

@@ -1,19 +1,18 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_09
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_07
 {
     using System;
     using System.Diagnostics;
     using System.Threading;
 
     public class Program
     {
-        public static Stopwatch clock = new Stopwatch();
+        public static Stopwatch _Clock = new Stopwatch();
         public static void Main()
         {
-            ManualResetEventSlim resetEvent = new ManualResetEventSlim();
             try
             {
-                clock.Start();
-
+                ManualResetEventSlim resetEvent = new ManualResetEventSlim();
+                _Clock.Start();
                 // Register a callback to receive notifications
                 // of any unhandled exception
 #if NETCOREAPP1_1
@@ -38,13 +37,12 @@ void Work()
                 GC.WaitForPendingFinalizers();
                 GC.Collect();
 
-
-#else
                 Action<object, EventArgs> unhandledExcpetionHandler = (s, e) =>
                 {
                     Message("Event handler starting");
                     Delay(4000);
                 };
+#else
                 AppDomain.CurrentDomain.UnhandledException +=
                   (s, e) =>
                   {
@@ -57,18 +55,16 @@ void Work()
                     throw new Exception();
                 });
                 thread.Start();
-
 #endif
 #if DEBUG1   
                 resetEvent.Wait();
                 {
-#else
                 if (!resetEvent.Wait(5000))
                 {
                     throw new Exception("Timed out waiting for unhandled exception.");
-#endif // DEBUG
                 }
-                //Delay(2000)
+#endif // DEBUG
+                Delay(2000);
             }
             finally
             {
@@ -85,8 +81,7 @@ static void Delay(int i)
 
         static void Message(string text)
         {
-            Console.WriteLine(
-                $"{Thread.CurrentThread.ManagedThreadId}:{text}");
+            Console.WriteLine("{0}:{1:0000}:{2}",Thread.CurrentThread.ManagedThreadId,_Clock.ElapsedMilliseconds, text);
         }
     }
 }

src/Chapter19/Listing19.10.CancelingTaskUsingCancellationToken.cs → src/Chapter19/Listing19.08.CancelingTaskUsingCancellationToken.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_10
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_08
 {
     using System;
     using System.Threading;
@@ -15,7 +15,6 @@ public static void Main()
 
             CancellationTokenSource cancellationTokenSource =
                 new CancellationTokenSource();
-
             // Use Task.Factory.StartNew<string>() for
             // TPL prior to .NET 4.5
             Task task = Task.Run(

src/Chapter19/Listing19.11.UsingTaskRun.cs → src/Chapter19/Listing19.09.UsingTaskRun.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_11
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_09
 {
     using System.Threading.Tasks;
 

src/Chapter19/Listing19.12.CooperativeLongRunningTasks.cs → src/Chapter19/Listing19.10.CooperativeLongRunningTasks.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_12
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter19.Listing19_10
 {
     using System;
     using System.Threading;