Refactor implementation (2)

Testably · Apr 20, 2024 · ebe88ad · ebe88ad
1 parent c7c20f7
commit ebe88ad
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 17 deletions.
diff --git a/Source/Testably.Abstractions.Testing/Helpers/Execute.LinuxPath.cs b/Source/Testably.Abstractions.Testing/Helpers/Execute.LinuxPath.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using System.Text;
+using System.Text;
 
 namespace Testably.Abstractions.Testing.Helpers;
 
@@ -69,18 +68,23 @@ protected override bool IsEffectivelyEmpty(string path)
 		/// <summary>
 		///     https://github.com/dotnet/runtime/blob/v8.0.4/src/libraries/Common/src/System/IO/PathInternal.Unix.cs#L39
 		/// </summary>
-		protected override string? NormalizeDirectorySeparators(string? path)
+		protected override string NormalizeDirectorySeparators(string path)
 		{
-			if (string.IsNullOrEmpty(path))
+			bool IsAlreadyNormalized()
 			{
-				return path;
+				for (int i = 0; i < path.Length - 1; i++)
+				{
+					if (IsDirectorySeparator(path[i]) &&
+					    IsDirectorySeparator(path[i + 1]))
+					{
+						return false;
+					}
+				}
+
+				return true;
 			}
 
-			bool isAlreadyNormalized = Enumerable
-				.Range(0, path.Length - 1)
-				.All(i => !IsDirectorySeparator(path[i]) ||
-				          !IsDirectorySeparator(path[i + 1]));
-			if (isAlreadyNormalized)
+			if (IsAlreadyNormalized())
 			{
 				return path;
 			}
@@ -100,6 +104,7 @@ protected override bool IsEffectivelyEmpty(string path)
 				builder.Append(current);
 			}
 
+			builder.Append(path[path.Length - 1]);
 			return builder.ToString();
 		}
 	}

diff --git a/Source/Testably.Abstractions.Testing/Helpers/Execute.SimulatedPath.cs b/Source/Testably.Abstractions.Testing/Helpers/Execute.SimulatedPath.cs
@@ -515,8 +515,7 @@ private string JoinInternal(string?[] paths)
 		}
 #endif
 
-		[return: NotNullIfNotNull(nameof(path))]
-		protected abstract string? NormalizeDirectorySeparators(string? path);
+		protected abstract string NormalizeDirectorySeparators(string path);
 
 		protected string RandomString(int length)
 		{

diff --git a/Source/Testably.Abstractions.Testing/Helpers/Execute.WindowsPath.cs b/Source/Testably.Abstractions.Testing/Helpers/Execute.WindowsPath.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 
@@ -201,8 +200,7 @@ private static bool IsValidDriveChar(char value)
 		/// <summary>
 		///     https://github.com/dotnet/runtime/blob/v8.0.4/src/libraries/Common/src/System/IO/PathInternal.Windows.cs#L318
 		/// </summary>
-		[return: NotNullIfNotNull(nameof(path))]
-		protected override string? NormalizeDirectorySeparators(string? path)
+		protected override string NormalizeDirectorySeparators(string path)
 		{
 			bool IsAlreadyNormalized()
 			{
@@ -220,7 +218,7 @@ bool IsAlreadyNormalized()
 				return true;
 			}
 
-			if (string.IsNullOrEmpty(path) || IsAlreadyNormalized())
+			if (IsAlreadyNormalized())
 			{
 				return path;
 			}

diff --git a/Tests/Testably.Abstractions.Tests/FileSystem/Path/GetDirectoryNameTests.cs b/Tests/Testably.Abstractions.Tests/FileSystem/Path/GetDirectoryNameTests.cs
@@ -58,6 +58,8 @@ public void GetDirectoryName_Spaces_ShouldReturnNullOnWindowsOtherwiseEmpty(stri
 	[SkippableTheory]
 	[InlineData("\t")]
 	[InlineData("\n")]
+	[InlineData(" \t")]
+	[InlineData("\n  ")]
 	public void GetDirectoryName_TabOrNewline_ShouldReturnEmptyString(string? path)
 	{
 		string? result = FileSystem.Path.GetDirectoryName(path);
@@ -81,7 +83,7 @@ public void GetDirectoryName_ShouldReturnDirectory(
 
 	[SkippableTheory]
 	[AutoData]
-	public void GetDirectoryName_ShouldNormalizeDirectorySeparators(
+	public void GetDirectoryName_ShouldReplaceAltDirectorySeparator(
 		string parentDirectory, string directory, string filename)
 	{
 		string path = parentDirectory + FileSystem.Path.AltDirectorySeparatorChar + directory +
@@ -93,6 +95,23 @@ public void GetDirectoryName_ShouldNormalizeDirectorySeparators(
 		result.Should().Be(expected);
 	}
 
+	[SkippableTheory]
+	[InlineData("foo//bar/file", "foo/bar", TestOS.All)]
+	[InlineData("foo///bar/file", "foo/bar", TestOS.All)]
+	[InlineData(@"foo\\bar/file", "foo/bar", TestOS.Windows)]
+	[InlineData(@"foo\\\bar/file", "foo/bar", TestOS.Windows)]
+	public void GetDirectoryName_ShouldNormalizeDirectorySeparators(
+		string path, string expected, TestOS operatingSystem)
+	{
+		Skip.IfNot(Test.RunsOn(operatingSystem));
+
+		expected = expected.Replace('/', FileSystem.Path.DirectorySeparatorChar);
+
+		string? result = FileSystem.Path.GetDirectoryName(path);
+
+		result.Should().Be(expected);
+	}
+
 #if FEATURE_SPAN
 	[SkippableTheory]
 	[AutoData]