Make combination tests support recording when an exception is thrown (#1340)

SimonCropp · web-flow · commit 527eedfe341d · 2024-11-03T06:46:08.000+11:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;xUnit1026;xUnit1013;CS1573;VerifyTestsProjectDir;VerifySetParameters;PolyFillTargetsForNuget</NoWarn>
-    <Version>28.1.2</Version>
+    <Version>28.1.3</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>preview</LangVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>
diff --git a/src/Verify.Tests/CombinationTests.RecordingWithExceptionPausedTest.verified.txt b/src/Verify.Tests/CombinationTests.RecordingWithExceptionPausedTest.verified.txt
@@ -0,0 +1,24 @@
+﻿{
+   1, Smith St  : {
+    target: {
+      Type: Exception,
+      Message: boom
+    },
+    key: recorded 1 Smith St
+  },
+   1, Wallace St: {
+    target: {
+      Type: Exception,
+      Message: boom
+    },
+    key: recorded 1 Wallace St
+  },
+  10, Smith St  : {
+    target: 10 Smith St,
+    key: recorded 10 Smith St
+  },
+  10, Wallace St: {
+    target: 10 Wallace St,
+    key: recorded 10 Wallace St
+  }
+}
diff --git a/src/Verify.Tests/CombinationTests.RecordingWithExceptionTest.verified.txt b/src/Verify.Tests/CombinationTests.RecordingWithExceptionTest.verified.txt
@@ -0,0 +1,24 @@
+﻿{
+   1, Smith St  : {
+    target: {
+      Type: Exception,
+      Message: boom
+    },
+    key: recorded 1 Smith St
+  },
+   1, Wallace St: {
+    target: {
+      Type: Exception,
+      Message: boom
+    },
+    key: recorded 1 Wallace St
+  },
+  10, Smith St  : {
+    target: 10 Smith St,
+    key: recorded 10 Smith St
+  },
+  10, Wallace St: {
+    target: 10 Wallace St,
+    key: recorded 10 Wallace St
+  }
+}
diff --git a/src/Verify.Tests/CombinationTests.cs b/src/Verify.Tests/CombinationTests.cs
@@ -107,6 +107,49 @@ public Task RecordingTest()
                 params2);
     }
 
+    [Fact]
+    public Task RecordingWithExceptionTest()
+    {
+        Recording.Start();
+        return Combination(captureExceptions: true)
+            .Verify(
+                (param1, param2) =>
+                {
+                    Recording.Add("key", $"recorded {param1} {param2}");
+                    if (param1 == 1)
+                    {
+                        throw new("boom");
+                    }
+
+                    return $"{param1} {param2}";
+                },
+                params1,
+                params2)
+            .IgnoreStackTrace();
+    }
+
+    [Fact]
+    public Task RecordingWithExceptionPausedTest()
+    {
+        Recording.Start();
+        return Combination(captureExceptions: true)
+            .Verify(
+                (param1, param2) =>
+                {
+                    Recording.Add("key", $"recorded {param1} {param2}");
+                    Recording.Pause();
+                    if (param1 == 1)
+                    {
+                        throw new("boom");
+                    }
+
+                    return $"{param1} {param2}";
+                },
+                params1,
+                params2)
+            .IgnoreStackTrace();
+    }
+
     [Fact]
     public Task RecordingPausedTest()
     {
diff --git a/src/Verify/Combinations/CombinationRunner.cs b/src/Verify/Combinations/CombinationRunner.cs
@@ -37,11 +37,16 @@ Task<CombinationResults> RunWithVoid(Func<object?[], Task> method) =>
         InnerRun(async keys =>
         {
             await method(keys);
-            if (Recording.IsRecording())
+            var paused = Recording.IsPaused();
+            if (Recording.IsRecording() || paused)
             {
                 var appends = Recording.Values().ToList();
                 var value = new InfoBuilder("void", appends);
                 Recording.Clear();
+                if (paused)
+                {
+                    Recording.Resume();
+                }
                 return (CombinationResult.ForValue(keys, value), null);
             }
             return (CombinationResult.ForVoid(keys), null);
@@ -64,7 +69,23 @@ async Task<CombinationResults> InnerRun(Func<object?[], Task<(CombinationResult
                 when (captureExceptions)
             {
                 await CombinationSettings.RunExceptionCallbacks(keys, exception);
-                items.Add(CombinationResult.ForException(keys, exception));
+
+                var paused = Recording.IsPaused();
+                if (Recording.IsRecording() || paused)
+                {
+                    var appends = Recording.Values().ToList();
+                    var value = new InfoBuilder(exception, appends);
+                    items.Add(CombinationResult.ForValue(keys, value));
+                    Recording.Clear();
+                    if (paused)
+                    {
+                        Recording.Resume();
+                    }
+                }
+                else
+                {
+                    items.Add(CombinationResult.ForException(keys, exception));
+                }
             }
 
             if (Increment())
