.

Author: SimonCropp

docs/serializer-settings.md

@@ -174,7 +174,7 @@ var settings = new JsonSerializerSettings
     DefaultValueHandling = DefaultValueHandling.Ignore
 };
 ```
-<sup><a href='/src/Verify/Serialization/SerializationSettings.cs#L82-L91' title='Snippet source file'>snippet source</a> | <a href='#snippet-defaultSerialization' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify/Serialization/SerializationSettings.cs#L83-L92' title='Snippet source file'>snippet source</a> | <a href='#snippet-defaultSerialization' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

src/Verify.Xunit.Tests/VerifyCombinationsSample.WithDontScrub.verified.txt

@@ -0,0 +1,10 @@
+{
+  2020, 2, 12: 2020-02-12,
+  2020, 2, 15: 2020-02-15,
+  2020, 3, 12: 2020-03-12,
+  2020, 3, 15: 2020-03-15,
+  2022, 2, 12: 2022-02-12,
+  2022, 2, 15: 2022-02-15,
+  2022, 3, 12: 2022-03-12,
+  2022, 3, 15: 2022-03-15
+}

src/Verify.Xunit.Tests/VerifyCombinationsSample.WithScrubbed.verified.txt

@@ -0,0 +1,10 @@
+{
+  2020, 2, 12: DateTime_1,
+  2020, 2, 15: DateTime_2,
+  2020, 3, 12: DateTime_3,
+  2020, 3, 15: DateTime_4,
+  2022, 2, 12: DateTime_5,
+  2022, 2, 15: DateTime_6,
+  2022, 3, 12: DateTime_7,
+  2022, 3, 15: DateTime_8
+}

src/Verify.Xunit.Tests/VerifyCombinationsSample.cs

@@ -19,6 +19,29 @@ public Task Two()
             a, b);
     }
 
+    [Fact]
+    public Task WithScrubbed()
+    {
+        List<int> years = [2020, 2022];
+        List<int> months = [2, 3];
+        List<int> dates = [12, 15];
+        return VerifyCombinations(
+            (year, month, date) => new DateTime(year, month, date),
+            years, months, dates);
+    }
+
+    [Fact]
+    public Task WithDontScrub()
+    {
+        List<int> years = [2020, 2022];
+        List<int> months = [2, 3];
+        List<int> dates = [12, 15];
+        return VerifyCombinations(
+            (year, month, date) => new DateTime(year, month, date),
+            years, months, dates)
+            .DontScrubDateTimes();
+    }
+
     [Fact]
     public Task Three()
     {

src/Verify/Combinations/CombinationResult.cs

@@ -0,0 +1,20 @@
+namespace VerifyTests;
+
+public class CombinationResult
+{
+    public CombinationResult(object?[] keys, Exception exception)
+    {
+        Keys = keys;
+        Exception = exception;
+    }
+
+    public CombinationResult(object?[] keys, object? value)
+    {
+        Keys = keys;
+        Value = value;
+    }
+
+    public object?[] Keys { get; }
+    public object? Value { get; }
+    public Exception? Exception { get; }
+}

src/Verify/Combinations/CombinationResultsConverter.cs

@@ -0,0 +1,40 @@
+namespace VerifyTests;
+
+public class CombinationResultsConverter :
+    WriteOnlyJsonConverter<List<CombinationResult>>
+{
+    public override void Write(VerifyJsonWriter writer, List<CombinationResult> items)
+    {
+        writer.WriteStartObject();
+        foreach (var item in items)
+        {
+            writer.WritePropertyName(BuildKeys(item.Keys).ToString());
+            var exception = item.Exception;
+            if (exception == null)
+            {
+                writer.WriteValue(item.Value);
+            }
+            else
+            {
+                writer.WriteValue($"{exception.GetType().Name}: {exception.Message}");
+            }
+        }
+        writer.WriteEndObject();
+    }
+
+    static StringBuilder BuildKeys(object?[] combo)
+    {
+        var builder = new StringBuilder();
+        for (var index = 0; index < combo.Length; index++)
+        {
+            var item = combo[index];
+            VerifierSettings.AppendParameter(item, builder, true);
+            if (index + 1 != combo.Length)
+            {
+                builder.Append(", ");
+            }
+        }
+
+        return builder;
+    }
+}

src/Verify/Combinations/InnerVerifier_Combinations.cs

@@ -161,58 +161,36 @@ public Task<VerifyResult> VerifyCombinations(
         return Verify(target);
     }
 
-    static Dictionary<StringBuilder, object?> GetCombinationString(
+    static List<CombinationResult> GetCombinationString(
         Func<object?[], object?> processCall,
         List<IEnumerable<object?>> lists)
     {
-        var items = new Dictionary<StringBuilder,object?>();
+        var items = new List<CombinationResult>();
         var listCopy = lists.Select(_ => _.ToList()).ToList();
         var combinationGenerator = new CombinationGenerator(
             listCopy,
             combo =>
             {
+                var keys = combo.ToArray();
                 object? value;
                 try
                 {
                     value = processCall(combo);
                 }
                 catch (TargetInvocationException exception)
                 {
-                    value = ExceptionToString(exception.InnerException!);
+                    items.Add(new(keys, exception.InnerException!));
+                    return;
                 }
                 catch (Exception exception)
                 {
-                    value = ExceptionToString(exception);
+                    items.Add(new(keys, exception));
+                    return;
                 }
-                items.Add(BuildKeys(combo), value);
+
+                items.Add(new(keys, value));
             });
         combinationGenerator.Run();
         return items;
     }
-
-    static string ExceptionToString(Exception exception) =>
-        $"{exception.GetType().Name}: {exception.Message}";
-
-    static StringBuilder BuildKeys(object?[] combo)
-    {
-        var builder = new StringBuilder();
-        for (var index = 0; index < combo.Length; index++)
-        {
-            var item = combo[index];
-            VerifierSettings.AppendParameter(item, builder, true);
-            if (index + 1 != combo.Length)
-            {
-                builder.Append(", ");
-            }
-        }
-
-        return builder;
-    }
-
-    public class Item(StringBuilder keys, object? value)
-    {
-        public StringBuilder Keys { get; } = keys;
-        public object? Value { get; } = value;
-    }
-}
-
+}

src/Verify/Serialization/SerializationSettings.cs

@@ -32,6 +32,7 @@ partial class SerializationSettings
     static StringDictionaryConverter stringDictionaryConverter = new();
     static TaskConverter taskConverter = new();
     static ValueTaskConverter valueTaskConverter = new();
+    static CombinationResultsConverter combinationResultsConverter = new();
 
     JsonSerializerSettings jsonSettings;
 
@@ -122,6 +123,7 @@ JsonSerializerSettings BuildSettings()
         converters.Add(nameValueCollectionConverter);
         converters.Add(stringDictionaryConverter);
         converters.Add(keyValuePairConverter);
+        converters.Add(combinationResultsConverter);
         foreach (var extraSetting in extraSettings)
         {
             extraSetting(settings);