fix: fixed mock file system exception when using root path as a param…

…eter (#1132) * fixed mock file system exception when using root path as a parameter * test: added a test to cover new drive creation with nested directories * fix: fixed code structure PR comment * test: added one more test to make sure there is no duplicate drives created * docs: added information about conventional commits repo convention * docs: revert back CONTRIBUTING.md changes * fix: fixed duplicate call to SetEntry method * docs: revert back CONTRIBUTING.md * test: mark Drives tests as windows only --------- Co-authored-by: Your Name <[email protected]>
TestableIO · Jul 13, 2024 · f2bcaa9 · f2bcaa9
1 parent c708b42
commit f2bcaa9
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 2 deletions.
diff --git a/src/TestableIO.System.IO.Abstractions.TestingHelpers/MockFileSystem.cs b/src/TestableIO.System.IO.Abstractions.TestingHelpers/MockFileSystem.cs
@@ -243,8 +243,11 @@ public void AddFile(string path, MockFileData mockFile)
             }
 
             var directoryPath = Path.GetDirectoryName(fixedPath);
-
-            if (!DirectoryExistsWithoutFixingPath(directoryPath))
+            if (directoryPath == null)
+            {
+                AddDrive(fixedPath, new MockDriveData());
+            }
+            else if (!DirectoryExistsWithoutFixingPath(directoryPath))
             {
                 AddDirectory(directoryPath);
             }

diff --git a/tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockFileSystemTests.cs b/tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockFileSystemTests.cs
@@ -435,6 +435,60 @@ public void MockFileSystem_Constructor_ThrowsForNonRootedCurrentDirectory()
             );
             Assert.That(ae.ParamName, Is.EqualTo("currentDirectory"));
         }
+
+        [Test]
+        [WindowsOnly(WindowsSpecifics.Drives)]
+        public void MockFileSystem_Constructor_ShouldSupportDifferentRootDrives()
+        {
+            var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
+            {
+                [@"c:\"] = new MockDirectoryData(),
+                [@"z:\"] = new MockDirectoryData(),
+                [@"d:\"] = new MockDirectoryData(),
+            });
+
+            var cExists = fileSystem.Directory.Exists(@"c:\");
+            var zExists = fileSystem.Directory.Exists(@"z:\");
+            var dExists = fileSystem.Directory.Exists(@"d:\");
+
+            Assert.That(fileSystem, Is.Not.Null);
+            Assert.That(cExists, Is.True);
+            Assert.That(zExists, Is.True);
+            Assert.That(dExists, Is.True);
+        }
+
+        [Test]
+        [WindowsOnly(WindowsSpecifics.Drives)]
+        public void MockFileSystem_Constructor_ShouldAddDifferentDrivesIfNotExist()
+        {
+            var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
+            {
+                [@"d:\foo\bar\"] = new MockDirectoryData(),
+            });
+
+            var drivesInfo = fileSystem.DriveInfo.GetDrives();
+            var fooExists = fileSystem.Directory.Exists(@"d:\foo\");
+            var barExists = fileSystem.Directory.Exists(@"d:\foo\bar\");
+
+            Assert.That(drivesInfo.Any(d => string.Equals(d.Name, @"D:\", StringComparison.InvariantCultureIgnoreCase)), Is.True);
+            Assert.That(fooExists, Is.True);
+            Assert.That(barExists, Is.True);
+        }
+
+        [Test]
+        [WindowsOnly(WindowsSpecifics.Drives)]
+        public void MockFileSystem_Constructor_ShouldNotDuplicateDrives()
+        {
+            var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
+            {
+                [@"d:\foo\bar\"] = new MockDirectoryData(),
+                [@"d:\"] = new MockDirectoryData()
+            });
+
+            var drivesInfo = fileSystem.DriveInfo.GetDrives();
+
+            Assert.That(drivesInfo.Where(d => string.Equals(d.Name, @"D:\", StringComparison.InvariantCultureIgnoreCase)), Has.Exactly(1).Items);
+        }
 
         [Test]
         public void MockFileSystem_DefaultState_DefaultTempDirectoryExists()