cleanup

VerifyTests · Sep 18, 2024 · 2422117 · 2422117
1 parent 9380ced
commit 2422117
Showing 1 changed file with 28 additions and 25 deletions.
diff --git a/src/Verify/Naming/FileNameBuilder.cs b/src/Verify/Naming/FileNameBuilder.cs
@@ -37,12 +37,6 @@ public static (string receivedParameters, string verifiedParameters) GetParamete
 
         var numberOfMethodParameters = methodParameters.Count;
 
-        var ignoredParameters = settings.ignoredParameters;
-        if (ignoredParameters?.All(methodParameters.Contains) == false)
-        {
-            throw new($"Some of the ignored parameter names ({string.Join(", ", ignoredParameters)}) do not exist in the test method parameters ({string.Join(", ", methodParameters)}).");
-        }
-
         if (settingsParameters.Length > numberOfMethodParameters)
         {
             throw new($"The number of passed in parameters ({settingsParameters.Length}) must not exceed the number of parameters for the method ({methodParameters.Count}).");
@@ -52,32 +46,41 @@ public static (string receivedParameters, string verifiedParameters) GetParamete
             .Zip(settingsParameters, (name, value) => new KeyValuePair<string, object?>(name, value))
             .ToArray();
 
+        var ignoredParameters = settings.ignoredParameters;
+        if (ignoredParameters?.All(methodParameters.Contains) == false)
+        {
+            throw new($"Some of the ignored parameter names ({string.Join(", ", ignoredParameters)}) do not exist in the test method parameters ({string.Join(", ", methodParameters)}).");
+        }
+
         var verifiedValues = ignoredParameters is null
             ? allValues
             : ignoredParameters.Count == 0 ? [] : allValues.Where(x => !ignoredParameters.Contains(x.Key)).ToArray();
 
-        return (BuildParameterString(allValues), BuildParameterString(verifiedValues));
+        var hashParameters = settings.hashParameters || VerifierSettings.hashParameters;
+        return (
+            BuildParameterString(allValues, hashParameters),
+            BuildParameterString(verifiedValues, hashParameters));
+    }
 
-        string BuildParameterString(KeyValuePair<string, object?>[] values)
+    static string BuildParameterString(KeyValuePair<string, object?>[] values, bool hashParameters)
+    {
+        var builder = values.Aggregate(new StringBuilder(), (acc, seed) =>
         {
-            var builder = values.Aggregate(new StringBuilder(), (acc, seed) =>
-            {
-                acc.Append('_');
-                acc.Append(seed.Key);
-                acc.Append('=');
-                VerifierSettings.AppendParameter(seed.Value, acc, true);
-                return acc;
-            });
-
-            var parameterText = builder.ToString();
-
-            if (settings.hashParameters || VerifierSettings.hashParameters)
-            {
-                return HashString(parameterText);
-            }
-
-            return parameterText;
+            acc.Append('_');
+            acc.Append(seed.Key);
+            acc.Append('=');
+            VerifierSettings.AppendParameter(seed.Value, acc, true);
+            return acc;
+        });
+
+        var parameterText = builder.ToString();
+
+        if (hashParameters)
+        {
+            return HashString(parameterText);
         }
+
+        return parameterText;
     }
 
     static string HashString(string value)