refactor: de-duplicated normalize/fix path logic moving method to path verifier

Author: HarrisonTCodes

src/TestableIO.System.IO.Abstractions.TestingHelpers/MockFileStream.cs

@@ -55,7 +55,7 @@ public MockFileStream(
         ThrowIfInvalidModeAccess(mode, access);
 
         this.mockFileDataAccessor = mockFileDataAccessor ?? throw new ArgumentNullException(nameof(mockFileDataAccessor));
-        path = NormalizePath(path);
+        path = mockFileDataAccessor.PathVerifier.FixPath(path);
         this.path = path;
         this.options = options;
 
@@ -360,15 +360,4 @@ private TimeAdjustments GetTimeAdjustmentsForFileStreamWhenFileExists(FileMode m
                 return TimeAdjustments.None;
         }
     }
-
-    private string NormalizePath(string path)
-    {
-        var normalizedPath = path
-            .Replace(
-                mockFileDataAccessor.Path.AltDirectorySeparatorChar,
-                mockFileDataAccessor.Path.DirectorySeparatorChar)
-            .TrimSlashes();
-        normalizedPath = mockFileDataAccessor.Path.GetFullPath(normalizedPath);
-        return normalizedPath;
-    }
 }

src/TestableIO.System.IO.Abstractions.TestingHelpers/MockFileSystem.cs

@@ -128,19 +128,6 @@ public MockFileSystem MockTime(Func<DateTime> dateTimeProvider)
         return this;
     }
 
-    private string FixPath(string path, bool checkCaps = false)
-    {
-        if (path == null)
-        {
-            throw new ArgumentNullException(nameof(path), StringResources.Manager.GetString("VALUE_CANNOT_BE_NULL"));
-        }
-
-        var pathSeparatorFixed = path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-        var fullPath = Path.GetFullPath(pathSeparatorFixed);
-
-        return checkCaps ? GetPathWithCorrectDirectoryCapitalization(fullPath) : fullPath;
-    }
-
     //If C:\foo exists, ensures that trying to save a file to "C:\FOO\file.txt" instead saves it to "C:\foo\file.txt".
     private string GetPathWithCorrectDirectoryCapitalization(string fullPath)
     {
@@ -194,7 +181,7 @@ public MockFileData AdjustTimes(MockFileData fileData, TimeAdjustments timeAdjus
     /// <inheritdoc />
     public MockFileData GetFile(string path)
     {
-        path = FixPath(path).TrimSlashes();
+        path = pathVerifier.FixPath(path).TrimSlashes();
         return GetFileWithoutFixingPath(path);
     }
 
@@ -210,7 +197,9 @@ public MockDriveData GetDrive(string name)
 
     private void SetEntry(string path, MockFileData mockFile)
     {
-        path = FixPath(path, true).TrimSlashes();
+        path = GetPathWithCorrectDirectoryCapitalization(
+            pathVerifier.FixPath(path)
+        ).TrimSlashes();
 
         lock (files)
         {
@@ -232,7 +221,9 @@ private void SetEntry(string path, MockFileData mockFile)
     /// <inheritdoc />
     public void AddFile(string path, MockFileData mockFile, bool verifyAccess = true)
     {
-        var fixedPath = FixPath(path, true);
+        var fixedPath = GetPathWithCorrectDirectoryCapitalization(
+            pathVerifier.FixPath(path)
+        );
 
         mockFile ??= new MockFileData(string.Empty);
         var file = GetFile(fixedPath);
@@ -319,7 +310,9 @@ public MockFileData GetFile(IFileInfo path)
     /// <inheritdoc />
     public void AddDirectory(string path)
     {
-        var fixedPath = FixPath(path, true);
+        var fixedPath = GetPathWithCorrectDirectoryCapitalization(
+            pathVerifier.FixPath(path)
+        );
         var separator = Path.DirectorySeparatorChar.ToString();
 
         if (FileExists(fixedPath) && FileIsReadOnly(fixedPath))
@@ -408,8 +401,8 @@ public void AddDrive(string name, MockDriveData mockDrive)
     /// <inheritdoc />
     public void MoveDirectory(string sourcePath, string destPath)
     {
-        sourcePath = FixPath(sourcePath);
-        destPath = FixPath(destPath);
+        sourcePath = pathVerifier.FixPath(sourcePath);
+        destPath = pathVerifier.FixPath(destPath);
 
         var sourcePathSequence = sourcePath.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries);
 
@@ -452,7 +445,7 @@ bool PathStartsWith(string path, string[] minMatch)
     /// <inheritdoc />
     public void RemoveFile(string path, bool verifyAccess = true)
     {
-        path = FixPath(path);
+        path = pathVerifier.FixPath(path);
 
         lock (files)
         {
@@ -473,7 +466,7 @@ public bool FileExists(string path)
             return false;
         }
 
-        path = FixPath(path).TrimSlashes();
+        path = pathVerifier.FixPath(path).TrimSlashes();
 
         lock (files)
         {

src/TestableIO.System.IO.Abstractions.TestingHelpers/PathVerifier.cs

@@ -183,4 +183,23 @@ public bool TryNormalizeDriveName(string name, out string result)
         result = name;
         return true;
     }
+
+    /// <summary>
+    /// Resolves and normalizes a path.
+    /// </summary>
+    public string FixPath(string path)
+    {
+        if (path == null)
+        {
+            throw new ArgumentNullException(nameof(path), StringResources.Manager.GetString("VALUE_CANNOT_BE_NULL"));
+        }
+
+        var pathSeparatorFixed = path.Replace(
+            _mockFileDataAccessor.Path.AltDirectorySeparatorChar,
+            _mockFileDataAccessor.Path.DirectorySeparatorChar
+        );
+        var fullPath = _mockFileDataAccessor.Path.GetFullPath(pathSeparatorFixed);
+
+        return fullPath;
+    }
 }