#351: Add IFileSystem property to base classes (#352)

* Add IFileSystem property to base classes

This allows people to get at the underlying IFileSystem implementation when developing extension methods.

For example, it may make sense to put your extension method on DirectoryBase, but you may require FileBase to actually implement it. This makes that possible.

In addition it fixes a bug in MockFileInfo.Replace where the returned FileInfo was for the concrete FileSystem not the mock one (bug caused by implicit casting).

I think this commit actually removes the need for supporting implicit casting at all.

* Remove laziness from FileSystem

I really can't see the point of any of this - none of these constructors do any real work.

* Rest of PR comments

* Fix for serialization test

Author: herebebeasties

.gitignore

@@ -149,6 +149,9 @@ $RECYCLE.BIN/
 # Mac crap
 .DS_Store
 
+# JetBrains Rider IDE files
+.idea/
+
 #System.IO.Abstractions specific ignores
 Releases
 System.IO.Abstractions.*.nupkg

System.IO.Abstractions.TestingHelpers.Tests/ConvertersTests.cs

@@ -32,23 +32,23 @@ public void WrapFileSystemInfos_with_IEnumerable_is_lazy()
         {
             var crashingFileSystemInfos = new CrashingEnumerable<FileSystemInfo>();
 
-            Assert.DoesNotThrow(() => Converters.WrapFileSystemInfos(crashingFileSystemInfos));
+            Assert.DoesNotThrow(() => crashingFileSystemInfos.WrapFileSystemInfos(new MockFileSystem()));
         }
 
         [Test]
         public void WrapFiles_with_IEnumerable_is_lazy()
         {
             var crashingFileInfos = new CrashingEnumerable<FileInfo>();
 
-            Assert.DoesNotThrow(() => Converters.WrapFiles(crashingFileInfos));
+            Assert.DoesNotThrow(() => crashingFileInfos.WrapFiles(new MockFileSystem()));
         }
         [Test]
         public void WrapDirectories_with_IEnumerable_is_lazy()
         {
             var crashingDirectoryInfos = new CrashingEnumerable<DirectoryInfo>();
 
-            Assert.DoesNotThrow(() => Converters.WrapDirectories(crashingDirectoryInfos));
+            Assert.DoesNotThrow(() => crashingDirectoryInfos.WrapDirectories(new MockFileSystem()));
         }
 
     }
-}
+}

System.IO.Abstractions.TestingHelpers/IMockFileDataAccessor.cs

@@ -62,5 +62,7 @@ public interface IMockFileDataAccessor
         IDriveInfoFactory DriveInfo { get; }
 
         PathVerifier PathVerifier { get; }
+
+        IFileSystem FileSystem { get; }
     }
-}
+}

System.IO.Abstractions.TestingHelpers/MockDirectory.cs

@@ -18,7 +18,7 @@ public class MockDirectory : DirectoryBase
 
         private string currentDirectory;
 
-        public MockDirectory(IMockFileDataAccessor mockFileDataAccessor, FileBase fileBase, string currentDirectory)
+        public MockDirectory(IMockFileDataAccessor mockFileDataAccessor, FileBase fileBase, string currentDirectory) : base(mockFileDataAccessor?.FileSystem)
         {
             this.currentDirectory = currentDirectory;
             this.mockFileDataAccessor = mockFileDataAccessor ?? throw new ArgumentNullException(nameof(mockFileDataAccessor));
@@ -529,4 +529,4 @@ static void CheckSearchPattern(string searchPattern)
             }
         }
     }
-}
+}

System.IO.Abstractions.TestingHelpers/MockDirectoryInfo.cs

@@ -17,7 +17,7 @@ public class MockDirectoryInfo : DirectoryInfoBase
         /// <param name="mockFileDataAccessor">The mock file data accessor.</param>
         /// <param name="directoryPath">The directory path.</param>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="mockFileDataAccessor"/> or <paramref name="directoryPath"/> is <see langref="null"/>.</exception>
-        public MockDirectoryInfo(IMockFileDataAccessor mockFileDataAccessor, string directoryPath)
+        public MockDirectoryInfo(IMockFileDataAccessor mockFileDataAccessor, string directoryPath) : base(mockFileDataAccessor?.FileSystem)
         {
             this.mockFileDataAccessor = mockFileDataAccessor ?? throw new ArgumentNullException(nameof(mockFileDataAccessor));
 

System.IO.Abstractions.TestingHelpers/MockDriveInfo.cs

@@ -5,7 +5,7 @@ public class MockDriveInfo : DriveInfoBase
     {
         private readonly IMockFileDataAccessor mockFileDataAccessor;
 
-        public MockDriveInfo(IMockFileDataAccessor mockFileDataAccessor, string name)
+        public MockDriveInfo(IMockFileDataAccessor mockFileDataAccessor, string name) : base(mockFileDataAccessor?.FileSystem)
         {
             if (mockFileDataAccessor == null)
             {

System.IO.Abstractions.TestingHelpers/MockFile.cs

@@ -12,7 +12,7 @@ public class MockFile : FileBase
         private readonly IMockFileDataAccessor mockFileDataAccessor;
         private readonly MockPath mockPath;
 
-        public MockFile(IMockFileDataAccessor mockFileDataAccessor)
+        public MockFile(IMockFileDataAccessor mockFileDataAccessor) : base(mockFileDataAccessor?.FileSystem)
         {
             this.mockFileDataAccessor = mockFileDataAccessor ?? throw new ArgumentNullException(nameof(mockFileDataAccessor));
             mockPath = new MockPath(mockFileDataAccessor);
@@ -350,7 +350,7 @@ public override void Move(string sourceFileName, string destFileName)
                     throw new IOException("A file can not be created if it already exists.");
                 }
             }
-                
+
 
             var sourceFile = mockFileDataAccessor.GetFile(sourceFileName);
 
@@ -399,7 +399,7 @@ public override Stream Open(string path, FileMode mode, FileAccess access, FileS
             }
 
             var length = mockFileDataAccessor.GetFile(path).Contents.Length;
-            
+
             MockFileStream.StreamType streamType = MockFileStream.StreamType.WRITE;
             if (access == FileAccess.Read)
                 streamType = MockFileStream.StreamType.READ;
@@ -938,7 +938,7 @@ public override void WriteAllText(string path, string contents, Encoding encodin
             }
 
             VerifyDirectoryExists(path);
-     
+
             MockFileData data = contents == null ? new MockFileData(new byte[0]) : new MockFileData(contents, encoding);
             mockFileDataAccessor.AddFile(path, data);
         }
@@ -975,4 +975,4 @@ private void VerifyDirectoryExists(string path)
             }
         }
     }
-}
+}

System.IO.Abstractions.TestingHelpers/MockFileInfo.cs

@@ -8,7 +8,7 @@ public class MockFileInfo : FileInfoBase
         private readonly IMockFileDataAccessor mockFileSystem;
         private string path;
 
-        public MockFileInfo(IMockFileDataAccessor mockFileSystem, string path)
+        public MockFileInfo(IMockFileDataAccessor mockFileSystem, string path) : base(mockFileSystem?.FileSystem)
         {
             this.mockFileSystem = mockFileSystem ?? throw new ArgumentNullException(nameof(mockFileSystem));
             this.path = path ?? throw new ArgumentNullException(nameof(path));
@@ -259,7 +259,7 @@ public override FileInfoBase Replace(string destinationFileName, string destinat
         public override FileInfoBase Replace(string destinationFileName, string destinationBackupFileName, bool ignoreMetadataErrors)
         {
             mockFileSystem.File.Replace(path, destinationFileName, destinationBackupFileName, ignoreMetadataErrors);
-            return new FileInfo(destinationFileName);
+            return mockFileSystem.FileInfo.FromFileName(destinationFileName);
         }
 #endif
 
@@ -312,4 +312,4 @@ public override long Length
             }
         }
     }
-}
+}

System.IO.Abstractions.TestingHelpers/MockFileSystem.cs

@@ -60,6 +60,8 @@ public MockFileSystem(IDictionary<string, MockFileData> files, string currentDir
 
         public IFileSystemWatcherFactory FileSystemWatcher { get; }
 
+        public IFileSystem FileSystem => this;
+
         public PathVerifier PathVerifier => pathVerifier;
 
         private string FixPath(string path, bool checkCaps = false)

System.IO.Abstractions.TestingHelpers/MockPath.cs

@@ -14,14 +14,9 @@ public class MockPath : PathWrapper
 
         private static readonly char[] InvalidAdditionalPathChars = { '*', '?' };
 
-        public MockPath(IMockFileDataAccessor mockFileDataAccessor)
+        public MockPath(IMockFileDataAccessor mockFileDataAccessor) : base(mockFileDataAccessor?.FileSystem)
         {
-            if (mockFileDataAccessor == null)
-            {
-                throw new ArgumentNullException(nameof(mockFileDataAccessor));
-            }
-
-            this.mockFileDataAccessor = mockFileDataAccessor;
+            this.mockFileDataAccessor = mockFileDataAccessor ?? throw new ArgumentNullException(nameof(mockFileDataAccessor));
         }
 
         public override string GetFullPath(string path)