Renumbered Chapter 18 and added missing listing

src/Chapter18.Tests/Listing18.17.RetrievingASpecificAttributeAndCheckingItsInitialization.Tests.cs → src/Chapter18.Tests/Listing18.16.RetrievingASpecificAttributeAndCheckingItsInitialization.Tests.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_17.Tests;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_16.Tests;
 
 [TestClass]
 public class ProgramTests

src/Chapter18.Tests/Listing18.25.UsingConditionalAttributeToEliminateACall.Tests.cs → src/Chapter18.Tests/Listing18.24.UsingConditionalAttributeToEliminateACall.Tests.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_25.Tests;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_24.Tests;
 
 [TestClass]
 public class ProgramTests

src/Chapter18.Tests/Listing18.27.GenericException.Tests.cs → src/Chapter18.Tests/Listing18.26.GenericException.Tests.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_27.Tests;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_26.Tests;
 
 #if NET7_0_OR_GREATER
 [TestClass]

src/Chapter18.Tests/Listing18.28.CallerArgumentExpression.Tests.cs → src/Chapter18.Tests/Listing18.27.CallerArgumentExpression.Tests.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_28.Tests;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_27.Tests;
 
 #if NET7_0_OR_GREATER
 [TestClass]
@@ -27,29 +27,6 @@ public void VerifyExpectedExceptionMessage()
         }
     }
 
-    [TestMethod]
-    public void Method()
-    {
-        try
-        {
-            SampleTests.Method();
-        }
-        catch (InvalidOperationException exception)
-        {
-            Assert.IsTrue(
-                exception.Message.Contains("'() => { }'") &&
-                exception.Message.Contains("'Method'") &&
-                exception.Message.Contains("'./FileName.cs'"));
-            // The expected exception, System.DivideByZeroException,
-            // was not thrown by the expression, 'Method' in the method, './FileName.cs', and file 'C:\Git\EssentialCSharp\src\Chapter18\Listing18.25b.CallerArgumentExpression.cs'.
-        }
-    }
-
-    private object PassingMethodNameAndFileName()
-    {
-        throw new NotImplementedException();
-    }
-
     [TestMethod]
     [ExpectedException(typeof(InvalidOperationException))]
     public void ExpectedExceptionIsNotThrown()

src/Chapter18.Tests/Listing18.28a.Tests.cs

@@ -0,0 +1,27 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_28.Tests;
+
+#if NET7_0_OR_GREATER
+[TestClass]
+public class GenericExceptionTests
+{
+    [TestMethod]
+    public void Method()
+    {
+        try
+        {
+            Program.Main();
+        }
+        catch (InvalidOperationException exception)
+        {
+            Assert.IsTrue(
+                exception.Message.Contains("'() => { }'") &&
+                exception.Message.Contains("'Method'") &&
+                exception.Message.Contains("'./FileName.cs'"));
+            // The expected exception, System.DivideByZeroException,
+            // was not thrown by the expression, 'Method' in the method, './FileName.cs', and file 'C:\Git\EssentialCSharp\src\Chapter18\Listing18.25b.CallerArgumentExpression.cs'.
+        }
+    }
+}
+#endif // NET7_0_OR_GREATER

src/Chapter18/Listing18.14.DefiningACustomAttribute.cs → src/Chapter18/Listing18.13.DefiningACustomAttribute.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_14;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_13;
 
 #region INCLUDE
 public class CommandLineSwitchRequiredAttribute : Attribute

src/Chapter18/Listing18.15.RetrievingACustomAttribute.cs → src/Chapter18/Listing18.14.RetrievingACustomAttribute.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_15;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_14;
 
 #region INCLUDE
 using System.Reflection;

src/Chapter18/Listing18.16.ProvidingAnAttributeConstructor.cs → src/Chapter18/Listing18.15.ProvidingAnAttributeConstructor.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_16;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_15;
 
 #region INCLUDE
 public class CommandLineSwitchAliasAttribute : Attribute

src/Chapter18/Listing18.17.RetrievingASpecificAttributeAndCheckingItsInitialization.cs → src/Chapter18/Listing18.16.RetrievingASpecificAttributeAndCheckingItsInitialization.cs

@@ -1,6 +1,6 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_17;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_16;
 
-using AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_16;
+using AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_15;
 using System.Reflection;
 
 public class Program

src/Chapter18/Listing18.18.RetrievingCustomAttributeInstances.cs → src/Chapter18/Listing18.17.RetrievingCustomAttributeInstances.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_18;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_17;
 
 #region INCLUDE
 using System.Reflection;

src/Chapter18/Listing18.19.UpdatingCommandLineHandler.TryParseToHandleAliases.cs → src/Chapter18/Listing18.18.UpdatingCommandLineHandler.TryParseToHandleAliases.cs

@@ -1,6 +1,6 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_19;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_18;
 
-using Listing18_18;
+using Listing18_17;
 #region INCLUDE
 using System.Reflection;
 using System.Collections.Generic;

src/Chapter18/Listing18.20.RestrictingTheConstructsAnAttributeCanDecorate.cs → src/Chapter18/Listing18.19.RestrictingTheConstructsAnAttributeCanDecorate.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_20;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_19;
 
 #region INCLUDE
 [AttributeUsage(AttributeTargets.Property)]

src/Chapter18/Listing18.21.AttributeUsageAttributeRestrictingWhereToApplyAnAttribute.cs → src/Chapter18/Listing18.20.AttributeUsageAttributeRestrictingWhereToApplyAnAttribute.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_21;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_20;
 
 // Will not compile if uncommented
 /*

src/Chapter18/Listing18.22.LimitingAnAttributesUsageWithAttributeUsageAttribute.cs → src/Chapter18/Listing18.21.LimitingAnAttributesUsageWithAttributeUsageAttribute.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_22;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_21;
 
 #region INCLUDE
 // Restrict the attribute to properties and methods

src/Chapter18/Listing18.23.UsingANamedParameter.cs → src/Chapter18/Listing18.22.UsingANamedParameter.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_23;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_22;
 
 #region INCLUDE
 [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]

src/Chapter18/Listing18.24.UsingFlagsAttribute.cs → src/Chapter18/Listing18.23.UsingFlagsAttribute.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_24;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_23;
 
 #region INCLUDE
 /*

src/Chapter18/Listing18.25.UsingConditionalAttributeToEliminateACall.cs → src/Chapter18/Listing18.24.UsingConditionalAttributeToEliminateACall.cs

@@ -1,7 +1,7 @@
 #region INCLUDE
 #define CONDITION_A
 #region EXCLUDE
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_25;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_24;
 
 #endregion EXCLUDE
 using System.Diagnostics;

src/Chapter18/Listing18.26.UsingObsoleteAttribute.cs → src/Chapter18/Listing18.25.UsingObsoleteAttribute.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_26;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_25;
 
 #region INCLUDE
 public class Program

src/Chapter18/Listing18.27.GenericException.cs → src/Chapter18/Listing18.26.GenericException.cs

@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_27;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_26;
 
 #if NET7_0_OR_GREATER
 #region INCLUDE

src/Chapter18/Listing18.28.CallerArgumentExpression.cs → src/Chapter18/Listing18.27.CallerArgumentExpression.cs

@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_28;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_27;
 
 #if NET7_0_OR_GREATER
 #region INCLUDE
@@ -13,12 +13,6 @@ public static void ThrowArgumentNullExceptionTest()
     {
         var result = 1/"".Length;
     }
-
-public static void Method()
-{
-    ExpectedException<DivideByZeroException>.AssertExceptionThrown(
-        () => throw new DivideByZeroException());
-}
 }
 
 [AttributeUsage(AttributeTargets.Method)]

src/Chapter18/Listing18.28.InvokingCallerAttributesMethod.cs

@@ -0,0 +1,16 @@
+using AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_27;
+
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_28;
+
+#if NET7_0_OR_GREATER
+public class Program
+{
+    public static void Main()
+    {
+        #region INCLUDE
+        ExpectedException<DivideByZeroException>.AssertExceptionThrown(
+            () => throw new DivideByZeroException());
+        #endregion INCLUDE
+    }
+}
+#endif // NET7_0_OR_GREATER