Fix NormalizePath and add tests

clowd · Jan 1, 2022 · b328456 · b328456
1 parent 377fac4
commit b328456
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/src/Squirrel/Internal/Utility.cs b/src/Squirrel/Internal/Utility.cs
@@ -72,8 +72,9 @@ public static string RemoveByteOrderMarkerIfPresent(byte[] content)
 
         public static string NormalizePath(string path)
         {
-            return Path.GetFullPath(new Uri(path).LocalPath)
-                       .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+            var fullPath = Path.GetFullPath(path);
+            var normalized = new Uri(fullPath, UriKind.Absolute).LocalPath;
+            return normalized.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
         }
 
         public static bool IsFileInDirectory(string file, string directory)

diff --git a/test/UtilityTests.cs b/test/UtilityTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -14,6 +14,36 @@ namespace Squirrel.Tests.Core
 {
     public class UtilityTests : IEnableLogger
     {
+        [Theory]
+        [InlineData("file.txt", "file.txt")]
+        [InlineData("file", "file")]
+        [InlineData("/file", "\\file")]
+        [InlineData("/file/", "\\file")]
+        [InlineData("one\\two\\..\\file", "one\\file")]
+        [InlineData("C:/AnApp/file/", "C:\\AnApp\\file")]
+        public void PathIsNormalized(string input, string expected)
+        {
+            var exp = Path.GetFullPath(expected);
+            var normal = Utility.NormalizePath(input);
+            Assert.Equal(exp, normal);
+        }
+
+        [Theory]
+        [InlineData("C:\\AnApp", "C:\\AnApp\\file.exe", true)]
+        [InlineData("C:\\AnApp\\", "C:\\AnApp\\file.exe", true)]
+        [InlineData("C:\\AnApp", "C:\\AnApp\\sub\\dir\\file.exe", true)]
+        [InlineData("C:\\AnApp\\", "C:\\AnApp\\sub\\dir\\file.exe", true)]
+        [InlineData("C:\\AnAppTwo", "C:\\AnApp\\file.exe", false)]
+        [InlineData("C:\\AnAppTwo\\", "C:\\AnApp\\file.exe", false)]
+        [InlineData("C:\\AnAppTwo", "C:\\AnApp\\sub\\dir\\file.exe", false)]
+        [InlineData("C:\\AnAppTwo\\", "C:\\AnApp\\sub\\dir\\file.exe", false)]
+        [InlineData("AnAppThree", "AnAppThree\\file.exe", true)]
+        public void FileIsInDirectory(string directory, string file, bool isIn)
+        {
+            var fileInDir = Utility.IsFileInDirectory(file, directory);
+            Assert.Equal(isIn, fileInDir);
+        }
+
         [Fact]
         public void SetAppIdOnShortcutTest()
         {