Simplify TrimTrailingDirectorySeparator

vbreuss · vbreuss · commit e6313c4debf9 · 2025-09-09T16:06:26.000+02:00
diff --git a/Source/Testably.Abstractions.Testing/Helpers/PathHelper.cs b/Source/Testably.Abstractions.Testing/Helpers/PathHelper.cs
@@ -178,13 +178,12 @@ internal static string TrimOnWindows(this string path, MockFileSystem fileSystem
 	internal static string TrimTrailingDirectorySeparator(this string path,
 		MockFileSystem fileSystem)
 	{
-		path = path.TrimEnd(fileSystem.Path.DirectorySeparatorChar);
-		if (string.IsNullOrEmpty(path))
+		if (path.Length == 1 && path[0] == fileSystem.Path.DirectorySeparatorChar)
 		{
-			return $"{fileSystem.Path.DirectorySeparatorChar}";
+			return path;
 		}
 
-		return path;
+		return path.TrimEnd(fileSystem.Path.DirectorySeparatorChar);
 	}
 
 	private static void CheckPathArgument(Execute execute, [NotNull] string? path, string paramName,

Original file line number	Diff line number	Diff line change
`@@ -178,13 +178,12 @@ internal static string TrimOnWindows(this string path, MockFileSystem fileSystem`
`178`	`178`	`internal static string TrimTrailingDirectorySeparator(this string path,`
`179`	`179`	`MockFileSystem fileSystem)`
`180`	`180`	`{`
`181`		`- path = path.TrimEnd(fileSystem.Path.DirectorySeparatorChar);`
`182`		`- if (string.IsNullOrEmpty(path))`
	`181`	`+ if (path.Length == 1 && path[0] == fileSystem.Path.DirectorySeparatorChar)`
`183`	`182`	`{`
`184`		`- return $"{fileSystem.Path.DirectorySeparatorChar}";`
	`183`	`+ return path;`
`185`	`184`	`}`
`186`	`185`
`187`		`- return path;`
	`186`	`+ return path.TrimEnd(fileSystem.Path.DirectorySeparatorChar);`
`188`	`187`	`}`
`189`	`188`
`190`	`189`	`private static void CheckPathArgument(Execute execute, [NotNull] string? path, string paramName,`