simplify path separator normalization

It no longer tries to clean up the path (e.g. "path/to///file/" => "path/to/file"), which means it can more intuitively handle cases like this:
     asset.AssetName.StartsWith(PathUtilities.NormalizePathSeparators("Characters/Dialogue/"))

1 files changed, 52 insertions, 3 deletions

diff --git a/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs b/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
index 1d6c371d..ea69a9ea 100644
--- a/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
+++ b/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
@@ -24,6 +24,18 @@ namespace SMAPI.Tests.Utilities
                 NormalizedOnUnix = @"C:/Program Files (x86)/Steam/steamapps/common/Stardew Valley"
             },
 
+            // Windows absolute path (with trailing slash)
+            new SamplePath
+            {
+                OriginalPath = @"C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley\",
+
+                Segments = new[] { "C:", "Program Files (x86)", "Steam", "steamapps", "common", "Stardew Valley" },
+                SegmentsLimit3 = new [] { "C:", "Program Files (x86)", @"Steam\steamapps\common\Stardew Valley\" },
+
+                NormalizedOnWindows = @"C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley\",
+                NormalizedOnUnix = @"C:/Program Files (x86)/Steam/steamapps/common/Stardew Valley/"
+            },
+
             // Windows relative path
             new SamplePath
             {
@@ -68,10 +80,22 @@ namespace SMAPI.Tests.Utilities
                 Segments = new [] { "home", ".steam", "steam", "steamapps", "common", "Stardew Valley" },
                 SegmentsLimit3 = new [] { "home", ".steam", "steam/steamapps/common/Stardew Valley" },
 
-                NormalizedOnWindows = @"home\.steam\steam\steamapps\common\Stardew Valley",
+                NormalizedOnWindows = @"\home\.steam\steam\steamapps\common\Stardew Valley",
                 NormalizedOnUnix = @"/home/.steam/steam/steamapps/common/Stardew Valley"
             },
 
+            // Linux absolute path (with trailing slash)
+            new SamplePath
+            {
+                OriginalPath = @"/home/.steam/steam/steamapps/common/Stardew Valley/",
+
+                Segments = new [] { "home", ".steam", "steam", "steamapps", "common", "Stardew Valley" },
+                SegmentsLimit3 = new [] { "home", ".steam", "steam/steamapps/common/Stardew Valley/" },
+
+                NormalizedOnWindows = @"\home\.steam\steam\steamapps\common\Stardew Valley\",
+                NormalizedOnUnix = @"/home/.steam/steam/steamapps/common/Stardew Valley/"
+            },
+
             // Linux absolute path (with ~)
             new SamplePath
             {
@@ -199,15 +223,40 @@ namespace SMAPI.Tests.Utilities
             ExpectedResult = @"\\adjacent\unc"
         )]
         [TestCase(
+            @"C:\same\path",
+            @"C:\same\path",
+            ExpectedResult = @"."
+        )]
+        [TestCase(
             @"C:\parent",
             @"C:\PARENT\child",
-            ExpectedResult = @"child" // note: incorrect on Linux and sometimes MacOS, but not worth the complexity of detecting whether the filesystem is case-sensitive for SMAPI's purposes
+            ExpectedResult = @"child"
         )]
 #else
         [TestCase(
             @"~/.steam/steam/steamapps/common/Stardew Valley",
             @"~/.steam/steam/steamapps/common/Stardew Valley/Mods/Automate",
-            ExpectedResult = @"Mods\Automate"
+            ExpectedResult = @"Mods/Automate"
+        )]
+        [TestCase(
+            @"~/.steam/steam/steamapps/common/Stardew Valley/Mods/Automate",
+            @"~/.steam/steam/steamapps/common/Stardew Valley/Content",
+            ExpectedResult = @"../../Content"
+        )]
+        [TestCase(
+            @"~/.steam/steam/steamapps/common/Stardew Valley/Mods/Automate",
+            @"/mnt/another-drive",
+            ExpectedResult = @"/mnt/another-drive"
+        )]
+        [TestCase(
+            @"~/same/path",
+            @"~/same/path",
+            ExpectedResult = @"."
+        )]
+        [TestCase(
+            @"~/parent",
+            @"~/PARENT/child",
+            ExpectedResult = @"child" // note: incorrect on Linux and sometimes MacOS, but not worth the complexity of detecting whether the filesystem is case-sensitive for SMAPI's purposes
         )]
 #endif
         public string GetRelativePath(string sourceDir, string targetPath)