Made sure MockDirectoryInfo.cs always stores its path with a trailing \

Made MockDirectory.cs CreateDirectory not throw an exception if trying to create a folder which already exists Signed-off-by: Martin Evans <martindevans@gmail.com>
TestableIO · Mar 22, 2013 · dff19c0 · dff19c0
1 parent 1207720
commit dff19c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/TestingHelpers/MockDirectory.cs b/TestingHelpers/MockDirectory.cs
@@ -25,11 +25,12 @@ public override DirectoryInfoBase CreateDirectory(string path)
         public override DirectoryInfoBase CreateDirectory(string path, DirectorySecurity directorySecurity)
         {
             path = EnsurePathEndsWithDirectorySeparator(path);
-            mockFileDataAccessor.AddFile(path, new MockDirectoryData());
+            if (!Exists(path))
+                mockFileDataAccessor.AddFile(path, new MockDirectoryData());
             var created = new MockDirectoryInfo(mockFileDataAccessor, path);
 
             var parent = GetParent(path);
-            if (parent != null && !parent.Exists)
+            if (parent != null)
                 CreateDirectory(GetParent(path).FullName, directorySecurity);
 
             return created;

diff --git a/TestingHelpers/MockDirectoryInfo.cs b/TestingHelpers/MockDirectoryInfo.cs
@@ -12,6 +12,9 @@ public class MockDirectoryInfo : DirectoryInfoBase
 
         public MockDirectoryInfo(IMockFileDataAccessor mockFileDataAccessor, string directoryPath)
         {
+            if (!directoryPath.EndsWith(Path.DirectorySeparatorChar.ToString()))
+                directoryPath += Path.DirectorySeparatorChar;
+
             this.mockFileDataAccessor = mockFileDataAccessor;
             this.directoryPath = directoryPath;
         }