MaybeCaughtException.cs (#1341)

TUnit.Assertions.Tests/AssertMultipleTests.cs

@@ -24,5 +24,35 @@ await Assert.That(async () =>
                 await Assert.That(3).IsEqualTo(6);
             }
         }).Throws<Exception>().And.HasMessageContaining("Hello World");
-}
+    }
+
+    [Test]
+    public async Task Caught_Exception_In_Scope_Is_Not_Captured()
+    {
+        var exception = await Assert.That(async () =>
+        {
+            using (Assert.Multiple())
+            {
+                await Assert.That(1).IsEqualTo(2);
+                await Assert.That(2).IsEqualTo(4);
+
+                if (1.ToString() == "1")
+                {
+                    try
+                    {
+                        throw new Exception("Hello World");
+                    }
+                    catch
+                    {
+                        // Ignored
+                    }
+                }
+
+                await Assert.That(3).IsEqualTo(6);
+            }
+        }).Throws<Exception>();
+
+        await Assert.That(exception!.Message)
+            .Contains("(This exception may or may not have been caught) System.Exception: Hello World");
+    }
 }

TUnit.Assertions/AssertionScope.cs

@@ -24,7 +24,7 @@ private static void InterceptException(object? sender, FirstChanceExceptionEvent
     {
         if (GetCurrentAssertionScope() is { } validScope)
         {
-            validScope._exceptions.Add(firstChanceExceptionEventArgs.Exception);
+            validScope._exceptions.Add(new MaybeCaughtException(firstChanceExceptionEventArgs.Exception));
         }
     }
 
@@ -42,7 +42,9 @@ public void Dispose()
             return;
         }
 
-        if (_exceptions.Count == 1)
+        // It could be an intercepted exception,
+        // In which case it should just throw itself, so we don't need to do that
+        if (_exceptions is [AssertionException])
         {
             ExceptionDispatchInfo.Throw(_exceptions[0]);
         }

TUnit.Assertions/Exceptions/MaybeCaughtException.cs

@@ -0,0 +1,4 @@
+namespace TUnit.Assertions.Exceptions;
+
+public class MaybeCaughtException(Exception exception)
+    : Exception($"(This exception may or may not have been caught) {exception.GetType().Namespace}.{exception.GetType().Name}: Hello World", exception);