cleanup

VerifyTests · Apr 4, 2024 · 2334ecc · 2334ecc
1 parent 0c99d8e
commit 2334ecc
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 37 deletions.
diff --git a/src/Verify/Counter_Date.cs b/src/Verify/Counter_Date.cs
@@ -31,17 +31,19 @@ internal static void AddNamed(Date value, string name)
 
         return dateCache.GetOrAdd(
             input,
-            _ =>
-            {
-                var value = Interlocked.Increment(ref currentDate);
+            _ => BuildDateValue());
+    }
+
+    (int intValue, string stringValue) BuildDateValue()
+    {
+        var value = Interlocked.Increment(ref currentDate);
 
-                if (dateCounting)
-                {
-                    return (value, $"Date_{value}");
-                }
+        if (dateCounting)
+        {
+            return (value, $"Date_{value}");
+        }
 
-                return (value, "{Scrubbed}");
-            });
+        return (value, "{Scrubbed}");
     }
 }
 #endif
diff --git a/src/Verify/Counter_DateTime.cs b/src/Verify/Counter_DateTime.cs
@@ -40,16 +40,18 @@ internal static void AddNamed(DateTime value, string name)
 
         return dateTimeCache.GetOrAdd(
             input,
-            _ =>
-            {
-                var value = Interlocked.Increment(ref currentDateTime);
+            _ => BuildDateTimeValue());
+    }
+
+    (int intValue, string stringValue) BuildDateTimeValue()
+    {
+        var value = Interlocked.Increment(ref currentDateTime);
 
-                if (dateCounting)
-                {
-                    return (value, $"DateTime_{value}");
-                }
+        if (dateCounting)
+        {
+            return (value, $"DateTime_{value}");
+        }
 
-                return (value, "{Scrubbed}");
-            });
+        return (value, "{Scrubbed}");
     }
 }
diff --git a/src/Verify/Counter_DateTimeOffset.cs b/src/Verify/Counter_DateTimeOffset.cs
@@ -41,16 +41,18 @@ internal static void AddNamed(DateTimeOffset value, string name)
 
         return dateTimeOffsetCache.GetOrAdd(
             input,
-            _ =>
-            {
-                var value = Interlocked.Increment(ref currentDateTimeOffset);
+            _ => BuildDateTimeOffsetValue());
+    }
+
+    (int intValue, string stringValue) BuildDateTimeOffsetValue()
+    {
+        var value = Interlocked.Increment(ref currentDateTimeOffset);
 
-                if (dateCounting)
-                {
-                    return (value, $"DateTimeOffset_{value}");
-                }
+        if (dateCounting)
+        {
+            return (value, $"DateTimeOffset_{value}");
+        }
 
-                return (value, "{Scrubbed}");
-            });
+        return (value, "{Scrubbed}");
     }
 }
diff --git a/src/Verify/Counter_Guid.cs b/src/Verify/Counter_Guid.cs
@@ -30,10 +30,12 @@ internal static void AddNamed(Guid value, string name)
 
         return guidCache.GetOrAdd(
             input,
-            _ =>
-            {
-                var value = Interlocked.Increment(ref currentGuid);
-                return (value, $"Guid_{value}");
-            });
+            _ => BuildGuidValue());
+    }
+
+    (int intValue, string stringValue) BuildGuidValue()
+    {
+        var value = Interlocked.Increment(ref currentGuid);
+        return (value, $"Guid_{value}");
     }
 }
diff --git a/src/Verify/Counter_Time.cs b/src/Verify/Counter_Time.cs
@@ -31,11 +31,13 @@ internal static void AddNamed(Time time, string name)
 
         return timeCache.GetOrAdd(
             input,
-            _ =>
-            {
-                var value = Interlocked.Increment(ref currentTime);
-                return (value, $"Time_{value}");
-            });
+            _ => BuildTimeValue());
+    }
+
+    (int intValue, string stringValue) BuildTimeValue()
+    {
+        var value = Interlocked.Increment(ref currentTime);
+        return (value, $"Time_{value}");
     }
 }
 #endif