.

VerifyTests · Jan 22, 2025 · a0f0a31 · a0f0a31
1 parent 12762d6
commit a0f0a31
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 25 deletions.
diff --git a/src/Verify.Tests/Naming/NameForParameterTests.cs b/src/Verify.Tests/Naming/NameForParameterTests.cs
@@ -2,62 +2,83 @@
 {
     [Fact]
     public Task Null() =>
-        Verify(VerifierSettings.GetNameForParameter(null));
+        Verify(VerifierSettings.GetNameForParameter(null, counter: Counter()));
 
     [Fact]
     public Task StringEmpty() =>
-        Verify(VerifierSettings.GetNameForParameter(""));
+        Verify(VerifierSettings.GetNameForParameter("", counter: Counter()));
 
     [Fact]
     public Task StringInvalidPathChar() =>
-        Verify(VerifierSettings.GetNameForParameter("a/a"));
+        Verify(VerifierSettings.GetNameForParameter("a/a", counter: Counter()));
 
     [Fact]
     public Task Int() =>
-        Verify(VerifierSettings.GetNameForParameter(10));
+        Verify(VerifierSettings.GetNameForParameter(10, counter: Counter()));
 
 #if NET6_0_OR_GREATER
     [Fact]
     public Task Half() =>
-        Verify(VerifierSettings.GetNameForParameter((Half) 10));
+        Verify(
+            VerifierSettings.GetNameForParameter(
+                (Half) 10,
+                counter: Counter()));
 #endif
 
 #if NET6_0_OR_GREATER
     [Fact]
     public Task Date() =>
-        Verify(VerifierSettings.GetNameForParameter(new Date(2000, 10, 1)));
+        Verify(
+            VerifierSettings.GetNameForParameter(
+                new Date(2000, 10, 1),
+                counter: Counter()));
 
     [Fact]
     public Task Time() =>
-        Verify(VerifierSettings.GetNameForParameter(new Date(2000, 10, 1)));
+        Verify(
+            VerifierSettings.GetNameForParameter(
+                new Date(2000, 10, 1),
+                counter: Counter()));
 #endif
 
     [Fact]
     public Task DateTimeLocal()
     {
         var date = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Local);
-        return Verify(VerifierSettings.GetNameForParameter(date));
+        return Verify(
+            VerifierSettings.GetNameForParameter(
+                date,
+                counter: Counter()));
     }
 
     [Fact]
     public Task DateTimeUnspecified()
     {
         var date = new DateTime(2000, 10, 1, 0, 0, 0);
-        return Verify(VerifierSettings.GetNameForParameter(date));
+        return Verify(
+            VerifierSettings.GetNameForParameter(
+                date,
+                counter: Counter()));
     }
 
     [Fact]
     public Task DateTimeUtc()
     {
         var date = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Utc);
-        return Verify(VerifierSettings.GetNameForParameter(date));
+        return Verify(
+            VerifierSettings.GetNameForParameter(
+                date,
+                counter: Counter()));
     }
 
     [Fact]
     public Task DateTimeOffsetUtc()
     {
         var date = new DateTimeOffset(2000, 10, 1, 0, 0, 0, TimeSpan.Zero);
-        return Verify(VerifierSettings.GetNameForParameter(date));
+        return Verify(
+            VerifierSettings.GetNameForParameter(
+                date,
+                counter: Counter()));
     }
 
     [Fact]
@@ -66,16 +87,19 @@ public Task List() =>
             new List<string>
             {
                 "value"
-            }));
+            },
+            counter: Counter()));
 
     [Fact]
     public Task ListMultiple() =>
-        Verify(VerifierSettings.GetNameForParameter(
+        Verify(
+            VerifierSettings.GetNameForParameter(
             new List<string>
             {
                 "value1",
                 "value2"
-            }));
+            },
+            counter: Counter()));
 
     [Fact]
     public Task Nested() =>
@@ -93,11 +117,15 @@ public Task Nested() =>
                     }
                 },
                 "value4"
-            }));
+            },
+            counter: Counter()));
 
     [Fact]
     public Task EmptyList() =>
-        Verify(VerifierSettings.GetNameForParameter(new List<string>()));
+        Verify(
+            VerifierSettings.GetNameForParameter(
+                new List<string>(),
+                counter: Counter()));
 
     [Fact]
     public Task Dictionary() =>
@@ -107,7 +135,8 @@ public Task Dictionary() =>
                 {
                     "value", 10
                 }
-            }));
+            },
+            counter: Counter()));
 
     [Fact]
     public Task DictionaryMultiple() =>
@@ -120,23 +149,43 @@ public Task DictionaryMultiple() =>
                 {
                     "value2", 11
                 }
-            }));
+            },
+            counter: Counter()));
 
     [Fact]
     public Task EmptyDictionary() =>
-        Verify(VerifierSettings.GetNameForParameter(new Dictionary<string, int>()));
+        Verify(
+            VerifierSettings.GetNameForParameter(
+                new Dictionary<string, int>(),
+                counter: Counter()));
 
     [Fact]
     public Task EnumerableStaticEmpty() =>
-        Verify(VerifierSettings.GetNameForParameter(Enumerable.Empty<string>()));
+        Verify(
+            VerifierSettings.GetNameForParameter(
+                Enumerable.Empty<string>(),
+                counter: Counter()));
 
     [Fact]
     public Task Array() =>
-        Verify(VerifierSettings.GetNameForParameter(
+        Verify(
+            VerifierSettings.GetNameForParameter(
             new[]
             {
                 "value"
-            }));
+            },
+            counter: Counter()));
+
+    private static Counter Counter() =>
+        new(
+            true,
+#if NET6_0_OR_GREATER
+            [],
+            [],
+#endif
+            [],
+            [],
+            []);
 
     [Fact]
     public Task ArrayMultiple() =>
@@ -145,9 +194,13 @@ public Task ArrayMultiple() =>
             {
                 "value1",
                 "value2"
-            }));
+            },
+            counter: Counter()));
 
     [Fact]
     public Task ArrayEmpty() =>
-        Verify(VerifierSettings.GetNameForParameter(System.Array.Empty<string>()));
+        Verify(
+            VerifierSettings.GetNameForParameter(
+                System.Array.Empty<string>(),
+                counter: Counter()));
 }
diff --git a/src/Verify.Tests/Naming/NamerTests.NamedGuid_guid=guidOne.verified.txt b/src/Verify.Tests/Naming/NamerTests.NamedGuid_guid=guidOne.verified.txt
@@ -0,0 +1 @@
+Content
diff --git a/src/Verify.Tests/Naming/NamerTests.NamedGuid_guid=guidTwo.verified.txt b/src/Verify.Tests/Naming/NamerTests.NamedGuid_guid=guidTwo.verified.txt
@@ -0,0 +1 @@
+Content
diff --git a/src/Verify/Counter.cs b/src/Verify/Counter.cs
@@ -12,6 +12,76 @@ public partial class Counter
     bool dateCounting;
     static AsyncLocal<Counter?> local = new();
 
+    internal bool TryGetNamed(object value, [NotNullWhen(true)] out string? result)
+    {
+#if NET6_0_OR_GREATER
+
+        if (value is Date date)
+        {
+            if (namedDates.TryGetValue(date, out result) ||
+                globalNamedDates.TryGetValue(date, out result))
+            {
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
+        if (value is Time time)
+        {
+            if (namedTimes.TryGetValue(time, out result) ||
+                globalNamedTimes.TryGetValue(time, out result))
+            {
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
+#endif
+
+        if (value is Guid guid)
+        {
+            if (namedGuids.TryGetValue(guid, out result) ||
+                globalNamedGuids.TryGetValue(guid, out result))
+            {
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
+        if (value is DateTime dateTime)
+        {
+            if (namedDateTimes.TryGetValue(dateTime, out result) ||
+                globalNamedDateTimes.TryGetValue(dateTime, out result))
+            {
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
+        if (value is DateTimeOffset dateTimeOffset)
+        {
+            if (namedDateTimeOffsets.TryGetValue(dateTimeOffset, out result) ||
+                globalNamedDateTimeOffsets.TryGetValue(dateTimeOffset, out result))
+            {
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
+        result = null;
+        return false;
+    }
+
     public static Counter Current
     {
         get
@@ -26,7 +96,7 @@ public static Counter Current
         }
     }
 
-    Counter(
+    public Counter(
         bool dateCounting,
 #if NET6_0_OR_GREATER
         Dictionary<Date, string> namedDates,

diff --git a/src/Verify/Naming/VerifierSettings.cs b/src/Verify/Naming/VerifierSettings.cs
@@ -93,6 +93,12 @@ internal static void AppendParameter(object? parameter, StringBuilder builder, b
                 return;
             }
 
+            if (counter.TryGetNamed(parameter, out var result))
+            {
+                builder.Append(result);
+                return;
+            }
+
             if (parameter is string stringParameter)
             {
                 if (pathFriendly)