switched from Assert.Throws<Exception>() to Assert.That(..., Throws.TypeOf<Exception>())

Author: FreeAndNil

src/log4net.Tests/Core/DefaultRepositorySelectorTest.cs

@@ -46,7 +46,7 @@ public void CreateRepository_ExplicitType()
     ILoggerRepository[] allRepositories = selector.GetAllRepositories();
     Assert.That(allRepositories, Is.Empty);
     Assert.That(numCreatedCallbacks, Is.EqualTo(0));
-    Assert.Throws<LogException>(() => selector.GetRepository(RepositoryName));
+    Assert.That(() => selector.GetRepository(RepositoryName), Throws.TypeOf<LogException>());
 
     ILoggerRepository logRep = selector.CreateRepository(RepositoryName, typeof(MockLoggerRepository));
     Assert.That(selector.ExistsRepository(RepositoryName));
@@ -58,10 +58,9 @@ public void CreateRepository_ExplicitType()
     ILoggerRepository rep2 = selector.GetRepository(RepositoryName);
     Assert.That(rep2, Is.SameAs(logRep));
 
-    LogException exception = Assert.Throws<LogException>(
-      () => selector.CreateRepository(RepositoryName, typeof(MockLoggerRepository)),
+    Assert.That(() => selector.CreateRepository(RepositoryName, typeof(MockLoggerRepository)),
+      Throws.TypeOf<LogException>().With.Message.Contains("already defined"),
       "Should have thrown exception on redefinition.");
-    Assert.That(exception.Message, Does.Contain("already defined"));
   }
 
   [Test]
@@ -113,8 +112,8 @@ public void CreateRepositoryAndAlias()
     selector.AliasRepository("alias1", logRep);
 
     MockLoggerRepository2 otherTypeLogRep = new();
-    Assert.Throws<InvalidOperationException>(() => selector.AliasRepository("alias1", otherTypeLogRep));
-    Assert.Throws<InvalidOperationException>(() => selector.AliasRepository(RepositoryName, otherTypeLogRep));
+    Assert.That(() => selector.AliasRepository("alias1", otherTypeLogRep), Throws.InvalidOperationException);
+    Assert.That(() => selector.AliasRepository(RepositoryName, otherTypeLogRep), Throws.InvalidOperationException);
 
     Assert.That(selector.ExistsRepository(RepositoryName));
     Assert.That(selector.ExistsRepository("alias1"), Is.False);

src/log4net.Tests/Core/LevelTest.cs

@@ -65,7 +65,7 @@ private static void Compare(int? leftInt, int? rightInt, Level? left, Level? rig
       }
       else
       {
-        Assert.Throws<ArgumentNullException>(() => left!.CompareTo(right!));
+        Assert.That(() => left!.CompareTo(right!), Throws.ArgumentNullException);
       }
     }
   }

src/log4net.Tests/Util/CyclicBufferTest.cs

@@ -27,14 +27,14 @@
 namespace log4net.Tests.Util;
 
 /// <summary>
-/// Used for internal unit testing the <see cref="PropertiesDictionary"/> class.
+/// Used for internal unit testing the <see cref="CyclicBuffer"/> class.
 /// </summary>
 [TestFixture]
 public class CyclicBufferTest
 {
   [Test]
-  public void TestConstructorSize0() 
-    => Assert.Throws<ArgumentOutOfRangeException>(() => new CyclicBuffer(0));
+  public void TestConstructorSize0()
+    => Assert.That(() => new CyclicBuffer(0), Throws.TypeOf<ArgumentOutOfRangeException>());
 
   [Test]
   public void TestSize1()

src/log4net.Tests/Util/SystemInfoTest.cs

@@ -62,7 +62,7 @@ private static Func<string> GetAssemblyLocationInfoMethodCall()
 
   [System.Diagnostics.CodeAnalysis.SuppressMessage("Structure", "NUnit1028:The non-test method is public",
     Justification = "Reflection")]
-  public static string TestAssemblyLocationInfoMethod() 
+  public static string TestAssemblyLocationInfoMethod()
     => SystemInfo.AssemblyLocationInfo(Assembly.GetCallingAssembly());
 
   [Test]
@@ -133,8 +133,8 @@ public void TestGetTypeFromStringFails1()
     t = GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST,LOG4NET.TESTS", false, false);
     Assert.That(t, Is.Null, "Test explicit case sensitive fails type load");
 
-    Assert.Throws<TypeLoadException>(
-      () => GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST,LOG4NET.TESTS", true, false));
+    Assert.That(() => GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST,LOG4NET.TESTS", true, false),
+      Throws.TypeOf<TypeLoadException>());
   }
 
   [Test]
@@ -145,36 +145,37 @@ public void TestGetTypeFromStringFails2()
     t = GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST", false, false);
     Assert.That(t, Is.Null, "Test explicit case sensitive fails type load");
 
-    Assert.Throws<TypeLoadException>(() => GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST", true, false));
+    Assert.That(() => GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST", true, false),
+      Throws.TypeOf<TypeLoadException>());
   }
 
   // Wraps SystemInfo.GetTypeFromString because the method relies on GetCallingAssembly, which is
   // unavailable in CoreFX. As a workaround, only overloads which explicitly take a Type or Assembly
   // are exposed for NETSTANDARD1_3.
-  private static Type? GetTypeFromString(string typeName, bool throwOnError, bool ignoreCase) 
+  private static Type? GetTypeFromString(string typeName, bool throwOnError, bool ignoreCase)
     => SystemInfo.GetTypeFromString(typeName, throwOnError, ignoreCase);
 
   [Test]
-  public void EqualsIgnoringCase_BothNull_true() 
+  public void EqualsIgnoringCase_BothNull_true()
     => Assert.That(SystemInfo.EqualsIgnoringCase(null, null), Is.True);
 
   [Test]
-  public void EqualsIgnoringCase_LeftNull_false() 
+  public void EqualsIgnoringCase_LeftNull_false()
     => Assert.That(SystemInfo.EqualsIgnoringCase(null, "foo"), Is.False);
 
   [Test]
-  public void EqualsIgnoringCase_RightNull_false() 
+  public void EqualsIgnoringCase_RightNull_false()
     => Assert.That(SystemInfo.EqualsIgnoringCase("foo", null), Is.False);
 
   [Test]
-  public void EqualsIgnoringCase_SameStringsSameCase_true() 
+  public void EqualsIgnoringCase_SameStringsSameCase_true()
     => Assert.That(SystemInfo.EqualsIgnoringCase("foo", "foo"), Is.True);
 
   [Test]
-  public void EqualsIgnoringCase_SameStringsDifferentCase_true() 
+  public void EqualsIgnoringCase_SameStringsDifferentCase_true()
     => Assert.That(SystemInfo.EqualsIgnoringCase("foo", "FOO"), Is.True);
 
   [Test]
-  public void EqualsIgnoringCase_DifferentStrings_false() 
+  public void EqualsIgnoringCase_DifferentStrings_false()
     => Assert.That(SystemInfo.EqualsIgnoringCase("foo", "foobar"), Is.False);
 }