Align tests with moved InputSanitizer.cs and StringFormatWithExtension.cs

Author: 9swampy

src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs

@@ -1,5 +1,5 @@
 using GitVersion.Core.Tests.Helpers;
-using GitVersion.Helpers;
+using GitVersion.Formatting;
 
 namespace GitVersion.Core.Tests;
 

src/GitVersion.Core.Tests/Helpers/EdgeCaseTests.cs renamed to src/GitVersion.Core.Tests/Formatting/EdgeCaseTests.cs

@@ -1,5 +1,5 @@
 using GitVersion.Core.Tests.Extensions;
-using GitVersion.Helpers;
+using GitVersion.Formatting;
 
 namespace GitVersion.Tests.Helpers;
 

src/GitVersion.Core.Tests/Helpers/InputSanitizerTests.cs renamed to src/GitVersion.Core.Tests/Formatting/InputSanitizerTests.cs

@@ -1,5 +1,5 @@
 using GitVersion.Core.Tests.Extensions;
-using GitVersion.Helpers;
+using GitVersion.Formatting;
 
 namespace GitVersion.Tests.Helpers;
 

src/GitVersion.Core.Tests/Helpers/SanitizeEnvVarNameTests.cs renamed to src/GitVersion.Core.Tests/Formatting/SanitizeEnvVarNameTests.cs

@@ -1,5 +1,5 @@
 using GitVersion.Core.Tests.Extensions;
-using GitVersion.Helpers;
+using GitVersion.Formatting;
 
 namespace GitVersion.Tests.Helpers;
 

src/GitVersion.Core.Tests/Helpers/SanitizeMemberNameTests.cs renamed to src/GitVersion.Core.Tests/Formatting/SanitizeMemberNameTests.cs

@@ -1,5 +1,5 @@
 using GitVersion.Core.Tests.Extensions;
-using GitVersion.Helpers;
+using GitVersion.Formatting;
 
 namespace GitVersion.Tests.Helpers;
 

src/GitVersion.Core/Helpers/IInputSanitizer.cs renamed to src/GitVersion.Core/Formatting/IInputSanitizer.cs

@@ -1,4 +1,4 @@
-namespace GitVersion.Helpers
+namespace GitVersion.Formatting
 {
     internal interface IInputSanitizer
     {

src/GitVersion.Core/Helpers/InputSanitizer.cs renamed to src/GitVersion.Core/Formatting/InputSanitizer.cs

@@ -1,65 +1,47 @@
 using GitVersion.Core;
 
-namespace GitVersion.Helpers;
+namespace GitVersion.Formatting;
 
 internal class InputSanitizer : IInputSanitizer
 {
     public string SanitizeFormat(string format)
     {
         if (string.IsNullOrWhiteSpace(format))
-        {
             throw new FormatException("Format string cannot be empty.");
-        }
 
         if (format.Length > 50)
-        {
             throw new FormatException($"Format string too long: '{format[..20]}...'");
-        }
 
         if (format.Any(c => char.IsControl(c) && c != '\t'))
-        {
             throw new FormatException("Format string contains invalid control characters");
-        }
 
         return format;
     }
 
     public string SanitizeEnvVarName(string name)
     {
         if (string.IsNullOrWhiteSpace(name))
-        {
             throw new ArgumentException("Environment variable name cannot be null or empty.");
-        }
 
         if (name.Length > 200)
-        {
             throw new ArgumentException($"Environment variable name too long: '{name[..20]}...'");
-        }
 
         if (!RegexPatterns.Cache.GetOrAdd(RegexPatterns.Common.SanitizeEnvVarNameRegexPattern).IsMatch(name))
-        {
             throw new ArgumentException($"Environment variable name contains disallowed characters: '{name}'");
-        }
 
         return name;
     }
 
     public string SanitizeMemberName(string memberName)
     {
         if (string.IsNullOrWhiteSpace(memberName))
-        {
             throw new ArgumentException("Member name cannot be empty.");
-        }
 
         if (memberName.Length > 100)
-        {
             throw new ArgumentException($"Member name too long: '{memberName[..20]}...'");
-        }
 
         if (!RegexPatterns.Cache.GetOrAdd(RegexPatterns.Common.SanitizeMemberNameRegexPattern).IsMatch(memberName))
-        {
             throw new ArgumentException($"Member name contains disallowed characters: '{memberName}'");
-        }
 
         return memberName;
     }

src/GitVersion.Core/Helpers/StringFormatWith.cs renamed to src/GitVersion.Core/Formatting/StringFormatWithExtension.cs

@@ -1,8 +1,7 @@
 using System.Text.RegularExpressions;
 using GitVersion.Core;
-using GitVersion.Formatting;
 
-namespace GitVersion.Helpers;
+namespace GitVersion.Formatting;
 
 internal static class StringFormatWithExtension
 {
@@ -59,9 +58,7 @@ private static string EvaluateMatch<T>(Match match, T source, IEnvironment envir
         var fallback = match.Groups["fallback"].Success ? match.Groups["fallback"].Value : null;
 
         if (match.Groups["envvar"].Success)
-        {
             return EvaluateEnvVar(match.Groups["envvar"].Value, fallback, environment);
-        }
 
         if (match.Groups["member"].Success)
         {
@@ -88,9 +85,7 @@ private static string EvaluateMember<T>(T source, string member, string? format,
         var value = getter(source);
 
         if (value is null)
-        {
             return fallback ?? string.Empty;
-        }
 
         if (format is not null && ValueFormatter.Default.TryFormat(
             value,

src/GitVersion.Core/VersionCalculation/VariableProvider.cs

@@ -1,7 +1,7 @@
 using GitVersion.Configuration;
 using GitVersion.Core;
 using GitVersion.Extensions;
-using GitVersion.Helpers;
+using GitVersion.Formatting;
 using GitVersion.OutputVariables;
 
 namespace GitVersion.VersionCalculation;

src/GitVersion.Output/OutputGenerator/OutputGenerator.cs

@@ -1,6 +1,7 @@
 using System.IO.Abstractions;
 using GitVersion.Agents;
 using GitVersion.Extensions;
+using GitVersion.Formatting;
 using GitVersion.Helpers;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;