V6.0

EssentialCSharp/.gitignore

@@ -1,6 +1,7 @@
 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
 [Bb]in/
 [Oo]bj/
+.vs/
 
 # user files
 *.csproj.user

EssentialCSharp/Chapter01.Tests/Chapter01.Tests.csproj

@@ -61,8 +61,9 @@
     <Compile Include="Listing01.11.Tests.cs" />
     <Compile Include="Listing01.13.Tests.cs" />
     <Compile Include="Listing01.14.Tests.cs" />
-    <Compile Include="Listing01.15.Tests.cs" />
     <Compile Include="Listing01.16.Tests.cs" />
+    <Compile Include="Listing01.15.Tests.cs" />
+    <Compile Include="Listing01.17.Tests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

EssentialCSharp/Chapter01.Tests/Listing01.01.Tests.cs

@@ -8,13 +8,11 @@ public class HelloWorldTests
         [TestMethod]
         public void Main_InigoHello()
         {
-            string view = @"Hello. My name is Inigo Montoya.";
+            const string expected = 
+                @"Hello. My name is Inigo Montoya.";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                HelloWorld.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, HelloWorld.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.03.Tests.cs

@@ -8,13 +8,10 @@ public class ProgramTests
         [TestMethod]
         public void Main_InigoHello()
         {
-            string view = @"Hello, My name is Inigo Montoya";
+            const string expected = @"Hello, My name is Inigo Montoya";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                Program.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, Program.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.05.Tests.cs

@@ -8,15 +8,12 @@ public class HelloWorldTests
         [TestMethod]
         public void Main_UpDown()
         {
-            string view =
-            @"Up
+            const string expected =
+@"Up
 Down";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                HelloWorld.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, HelloWorld.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.06.Tests.cs

@@ -8,13 +8,11 @@ public class HelloWorldTests
         [TestMethod]
         public void Main_InigoHello()
         {
-            string view = @"Hello. My name is Inigo Montoya.";
+            const string expected = 
+                @"Hello. My name is Inigo Montoya.";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                HelloWorld.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, HelloWorld.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.07.Tests.cs

@@ -8,13 +8,10 @@ public class HelloWorldTests
         [TestMethod]
         public void Main_HelloToInigo()
         {
-            string view = @"Hello Inigo Montoya";
+            const string expected = @"Hello Inigo Montoya";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                HelloWorld.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, HelloWorld.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.08.Tests.cs

@@ -8,13 +8,10 @@ public class ProgramTests
         [TestMethod]
         public void Main_HelloToInigo()
         {
-            string view = @"Hello Inigo Montoya";
+            const string expected = @"Hello Inigo Montoya";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                Program.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, Program.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.09.Tests.cs

@@ -8,13 +8,10 @@ public class MiracleMaxTests
         [TestMethod]
         public void Main_StormCastleShort()
         {
-            string view = @"Have fun storming the castle!";
+            const string expected = @"Have fun storming the castle!";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                MiracleMax.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, MiracleMax.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.11.Tests.cs

@@ -8,16 +8,13 @@ public class MiracleMaxTests
         [TestMethod]
         public void Main_StormCastleLong()
         {
-            string view =
+            const string expected =
 @"Have fun storming the castle!
 Think it will work?
 It would take a miracle.";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                MiracleMax.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, MiracleMax.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.13.Tests.cs

@@ -8,17 +8,14 @@ public class HeyYouTests
         [TestMethod]
         public void Main_InputInigoMontoya_WriteNothing()
         {
-            string view =
+            const string expected =
 @"Hey you!
 Enter your first name: <<Inigo
 >>Enter your last name: <<Montoya
 >>";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                HeyYou.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, HeyYou.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.14.Tests.cs

@@ -8,13 +8,10 @@ public class ProgramTests
         [TestMethod]
         public void Main_InputOne_WriteOne()
         {
-            string view = @"1<<1>>";
+            const string expected = @"1<<1>>";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                Program.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, Program.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.15.Tests.cs

@@ -8,17 +8,14 @@ public class ProgramTests
         [TestMethod]
         public void Main_InputInigoMontoya_WriteFirstLast()
         {
-            string view =
+            const string expected =
 @"Hey you!
 Enter your first name: <<Inigo
 >>Enter your last name: <<Montoya
 >>Your full name is Inigo Montoya.";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                Program.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, Program.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.16.Tests.cs

@@ -6,19 +6,16 @@ namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_16.Tests
     public class ProgramTests
     {
         [TestMethod]
-        public void Main_InputInigoMontoya_WriteLastFirst()
+        public void Main_InputInigoMontoya_WriteFirstLast()
         {
-            string view =
+            const string expected =
 @"Hey you!
 Enter your first name: <<Inigo
 >>Enter your last name: <<Montoya
->>Your full name is Montoya, Inigo.";
+>>Your full name is Inigo Montoya.";
 
-            IntelliTect.ConsoleView.Tester.Test(view,
-            () =>
-            {
-                Listing01_16.Program.Main();
-            });
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, Program.Main);
         }
     }
 }

EssentialCSharp/Chapter01.Tests/Listing01.17.Tests.cs

@@ -0,0 +1,21 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_17.Tests
+{
+    [TestClass]
+    public class ProgramTests
+    {
+        [TestMethod]
+        public void Main_InputInigoMontoya_WriteLastFirst()
+        {
+            const string expected =
+@"Hey you!
+Enter your first name: <<Inigo
+>>Enter your last name: <<Montoya
+>>Your full name is Montoya, Inigo.";
+
+            IntelliTect.ConsoleView.Tester.Test(
+                expected, Program.Main);
+        }
+    }
+}

EssentialCSharp/Chapter01.Tests/Properties/AssemblyInfo.cs

@@ -7,9 +7,9 @@
 [assembly: AssemblyTitle("Chapter01.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Hewlett-Packard")]
+[assembly: AssemblyCompany("Addison Wesley")]
 [assembly: AssemblyProduct("Chapter01.Tests")]
-[assembly: AssemblyCopyright("Copyright © Hewlett-Packard 2012")]
+[assembly: AssemblyCopyright("Copyright © Addison Wesley 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 // Setting ComVisible to false makes the types in this assembly not visible

EssentialCSharp/Chapter01/Chapter01.csproj

@@ -85,8 +85,9 @@
     <Compile Include="Listing01.12.AssignmentReturningAValueThatCanBeassignedAgain.cs" />
     <Compile Include="Listing01.13.UsingSystemConsoleReadLine.cs" />
     <Compile Include="Listing01.14.UsingSystemConsoleRead.cs" />
-    <Compile Include="Listing01.15.FormattingUsingSystemConsoleWriteLine.cs" />
-    <Compile Include="Listing01.16.SwappingTheIndexedPlaceholdersAndCorrespondingVariables.cs" />
+    <Compile Include="Listing01.16.FormattingUsingCompositeFormatting.cs" />
+    <Compile Include="Listing01.15.FormattingUsingStringInterpolation.cs" />
+    <Compile Include="Listing01.17.SwappingTheIndexedPlaceholdersAndCorrespondingVariables.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

EssentialCSharp/Chapter01/Listing01.11.ChangingTheValueOfAVariable.cs

@@ -5,15 +5,15 @@ public class MiracleMax
         public static void Main()
         {
             string valerie;
-            string max = "Have fun storming the castle!";
+            string miracleMax = "Have fun storming the castle!";
 
             valerie = "Think it will work?";
 
-            System.Console.WriteLine(max);
+            System.Console.WriteLine(miracleMax);
             System.Console.WriteLine(valerie);
 
-            max = "It would take a miracle.";
-            System.Console.WriteLine(max);
+            miracleMax = "It would take a miracle.";
+            System.Console.WriteLine(miracleMax);
         }
     }
 }

EssentialCSharp/Chapter01/Listing01.12.AssignmentReturningAValueThatCanBeassignedAgain.cs

@@ -5,8 +5,8 @@ public class MiracleMax
         public static void Main()
         {
             // ...
-            string requirements, max;
-            requirements = max = "It would take a miracle.";
+            string requirements, miracleMax;
+            requirements = miracleMax = "It would take a miracle.";
             // ... 
         }
     }

EssentialCSharp/Chapter01/Listing01.15.FormattingUsingStringInterpolation.cs

@@ -0,0 +1,22 @@
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_15
+{
+    public class Program
+    {
+        public static void Main()
+        {
+            string firstName;
+            string lastName;
+
+            System.Console.WriteLine("Hey you!");
+
+            System.Console.Write("Enter your first name: ");
+            firstName = System.Console.ReadLine();
+
+            System.Console.Write("Enter your last name: ");
+            lastName = System.Console.ReadLine();
+
+            System.Console.WriteLine(
+                $"Your full name is { firstName } { lastName }.");
+        }
+    }
+}

EssentialCSharp/Chapter01/Listing01.15.FormattingUsingSystemConsoleWriteLine.cs → EssentialCSharp/Chapter01/Listing01.16.FormattingUsingCompositeFormatting.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_15
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_16
 {
     public class Program
     {

EssentialCSharp/Chapter01/Listing01.16.SwappingTheIndexedPlaceholdersAndCorrespondingVariables.cs → EssentialCSharp/Chapter01/Listing01.17.SwappingTheIndexedPlaceholdersAndCorrespondingVariables.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_16
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_17
 {
     public class Program
     {

EssentialCSharp/Chapter01/Properties/AssemblyInfo.cs

@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("Chapter01")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Addison Wesley")]
 [assembly: AssemblyProduct("Chapter01")]
-[assembly: AssemblyCopyright("Copyright ©  2010")]
+[assembly: AssemblyCopyright("Copyright © Addison Wesley 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

EssentialCSharp/Chapter02.Tests/Chapter02.Tests.csproj

@@ -59,6 +59,7 @@
     <Compile Include="Listing02.14.Tests.cs" />
     <Compile Include="Listing02.17.Tests.cs" />
     <Compile Include="Listing02.18.Tests.cs" />
+    <Compile Include="Listing02.50.AdditionalArrayMethods.Tests.cs" />
     <Compile Include="Listing02.21.Tests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>