Merge pull request #258 from tathamoddie/issue-169

Fix relative directory path issue

Author: tathamoddie

TestHelpers.Tests/MockDirectoryTests.cs

@@ -877,6 +877,70 @@ public void MockDirectory_GetDirectories_WithTopDirectories_ShouldOnlyReturnTopD
             Assert.That(actualResult, Is.EquivalentTo(new []{XFS.Path(@"C:\Folder\.foo\"), XFS.Path(@"C:\Folder\foo.foo\")}));
         }
 
+        [Test]
+        public void MockDirectory_GetDirectories_RelativeWithNoSubDirectories_ShouldReturnDirectories()
+        {
+            // Arrange
+            var fileSystem = new MockFileSystem();
+            fileSystem.Directory.CreateDirectory("Folder");
+
+            // Act
+            var actualResult = fileSystem.Directory.GetDirectories("Folder");
+
+            // Assert
+            Assert.That(actualResult, Is.Empty);
+        }
+
+        [TestCase(@"Folder\SubFolder")]
+        [TestCase(@"Folder")]
+        public void MockDirectory_GetDirectories_RelativeDirectory_WithoutChildren_ShouldReturnNoChildDirectories(string relativeDirPath)
+        {
+            // Arrange
+            var fileSystem = new MockFileSystem();
+            fileSystem.Directory.CreateDirectory(relativeDirPath);
+
+            // Act
+            var actualResult = fileSystem.Directory.GetDirectories(relativeDirPath);
+
+            // Assert
+            Assert.That(actualResult, Is.Empty);
+        }
+
+        [TestCase(@"Folder\SubFolder")]
+        [TestCase(@"Folder")]
+        public void MockDirectory_GetDirectories_RelativeDirectory_WithChildren_ShouldReturnChildDirectories(string relativeDirPath)
+        {
+            // Arrange
+            const string currentDirectory = @"T:\foo";
+            var fileSystem = new MockFileSystem(null, currentDirectory: currentDirectory);
+            fileSystem.Directory.CreateDirectory(relativeDirPath);
+            fileSystem.Directory.CreateDirectory(relativeDirPath + @"\child");
+
+            // Act
+            var actualResult = fileSystem.Directory.GetDirectories(relativeDirPath);
+
+            // Assert
+            CollectionAssert.AreEqual(
+                new[] { currentDirectory + @"\" + relativeDirPath + @"\child\" },
+                actualResult
+            );
+        }
+
+        [Test]
+        public void MockDirectory_GetDirectories_AbsoluteWithNoSubDirectories_ShouldReturnDirectories()
+        {
+            // Arrange
+            var fileSystem = new MockFileSystem();
+            fileSystem.Directory.CreateDirectory("Folder");
+
+            // Act
+            var fullPath = fileSystem.Path.GetFullPath("Folder");
+            var actualResult = fileSystem.Directory.GetDirectories(fullPath);
+
+            // Assert
+            Assert.That(actualResult, Is.Empty);
+        }
+
         [Test]
         public void MockDirectory_GetDirectories_WithAllDirectories_ShouldReturnsAllMatchingSubFolders()
         {

TestingHelpers/MockDirectory.cs

@@ -184,7 +184,6 @@ private string[] GetFilesInternal(IEnumerable<string> files, string path, string
         {
             CheckSearchPattern(searchPattern);
             path = EnsurePathEndsWithDirectorySeparator(path);
-            path = mockFileDataAccessor.Path.GetFullPath(path);
 
             bool isUnix = XFS.IsUnixPlatform();
 
@@ -434,6 +433,7 @@ public override IEnumerable<string> EnumerateDirectories(string path, string sea
             mockFileDataAccessor.PathVerifier.IsLegalAbsoluteOrRelative(path, "path");
 
             path = EnsurePathEndsWithDirectorySeparator(path);
+            path = mockFileDataAccessor.Path.GetFullPath(path);
 
             if (!Exists(path))
             {