Added IDirectoryInfo, IDriveInfo, IFileInfo, IFileSystemInfo and IPath and changed source accordingly

Author: Weiermann

System.IO.Abstractions.TestingHelpers/IMockFileDataAccessor.cs

@@ -59,7 +59,7 @@ public interface IMockFileDataAccessor
         IFile File { get; }
         IDirectory Directory { get; }
         IFileInfoFactory FileInfo {get; }
-        PathBase Path { get; }
+        IPath Path { get; }
         IDirectoryInfoFactory DirectoryInfo { get; }
         IDriveInfoFactory DriveInfo { get; }
 

System.IO.Abstractions.TestingHelpers/MockDirectory.cs

@@ -25,19 +25,19 @@ public MockDirectory(IMockFileDataAccessor mockFileDataAccessor, string currentD
             this.mockFileDataAccessor = mockFileDataAccessor ?? throw new ArgumentNullException(nameof(mockFileDataAccessor));
         }
 
-        public override DirectoryInfoBase CreateDirectory(string path)
+        public override IDirectoryInfo CreateDirectory(string path)
         {
             return CreateDirectoryInternal(path, null);
         }
 
 #if NET40
-        public override DirectoryInfoBase CreateDirectory(string path, DirectorySecurity directorySecurity)
+        public override IDirectoryInfo CreateDirectory(string path, DirectorySecurity directorySecurity)
         {
             return CreateDirectoryInternal(path, directorySecurity);
         }
 #endif
 
-        private DirectoryInfoBase CreateDirectoryInternal(string path, DirectorySecurity directorySecurity)
+        private IDirectoryInfo CreateDirectoryInternal(string path, DirectorySecurity directorySecurity)
         {
             if (path == null)
             {
@@ -312,7 +312,7 @@ public override string[] GetLogicalDrives()
         }
 #endif
 
-        public override DirectoryInfoBase GetParent(string path)
+        public override IDirectoryInfo GetParent(string path)
         {
             if (path == null)
             {

System.IO.Abstractions.TestingHelpers/MockDirectoryInfo.cs

@@ -127,13 +127,13 @@ public override void Create(DirectorySecurity directorySecurity)
         }
 #endif
 
-        public override DirectoryInfoBase CreateSubdirectory(string path)
+        public override IDirectoryInfo CreateSubdirectory(string path)
         {
             return mockFileDataAccessor.Directory.CreateDirectory(Path.Combine(FullName, path));
         }
 
 #if NET40
-        public override DirectoryInfoBase CreateSubdirectory(string path, DirectorySecurity directorySecurity)
+        public override IDirectoryInfo CreateSubdirectory(string path, DirectorySecurity directorySecurity)
         {
             return mockFileDataAccessor.Directory.CreateDirectory(Path.Combine(FullName, path), directorySecurity);
         }
@@ -144,47 +144,47 @@ public override void Delete(bool recursive)
             mockFileDataAccessor.Directory.Delete(directoryPath, recursive);
         }
 
-        public override IEnumerable<DirectoryInfoBase> EnumerateDirectories()
+        public override IEnumerable<IDirectoryInfo> EnumerateDirectories()
         {
             return GetDirectories();
         }
 
-        public override IEnumerable<DirectoryInfoBase> EnumerateDirectories(string searchPattern)
+        public override IEnumerable<IDirectoryInfo> EnumerateDirectories(string searchPattern)
         {
             return GetDirectories(searchPattern);
         }
 
-        public override IEnumerable<DirectoryInfoBase> EnumerateDirectories(string searchPattern, SearchOption searchOption)
+        public override IEnumerable<IDirectoryInfo> EnumerateDirectories(string searchPattern, SearchOption searchOption)
         {
             return GetDirectories(searchPattern, searchOption);
         }
 
-        public override IEnumerable<FileInfoBase> EnumerateFiles()
+        public override IEnumerable<IFileInfo> EnumerateFiles()
         {
             return GetFiles();
         }
 
-        public override IEnumerable<FileInfoBase> EnumerateFiles(string searchPattern)
+        public override IEnumerable<IFileInfo> EnumerateFiles(string searchPattern)
         {
             return GetFiles(searchPattern);
         }
 
-        public override IEnumerable<FileInfoBase> EnumerateFiles(string searchPattern, SearchOption searchOption)
+        public override IEnumerable<IFileInfo> EnumerateFiles(string searchPattern, SearchOption searchOption)
         {
             return GetFiles(searchPattern, searchOption);
         }
 
-        public override IEnumerable<FileSystemInfoBase> EnumerateFileSystemInfos()
+        public override IEnumerable<IFileSystemInfo> EnumerateFileSystemInfos()
         {
             return GetFileSystemInfos();
         }
 
-        public override IEnumerable<FileSystemInfoBase> EnumerateFileSystemInfos(string searchPattern)
+        public override IEnumerable<IFileSystemInfo> EnumerateFileSystemInfos(string searchPattern)
         {
             return GetFileSystemInfos(searchPattern);
         }
 
-        public override IEnumerable<FileSystemInfoBase> EnumerateFileSystemInfos(string searchPattern, SearchOption searchOption)
+        public override IEnumerable<IFileSystemInfo> EnumerateFileSystemInfos(string searchPattern, SearchOption searchOption)
         {
             return GetFileSystemInfos(searchPattern, searchOption);
         }
@@ -199,17 +199,17 @@ public override DirectorySecurity GetAccessControl(AccessControlSections include
             return mockFileDataAccessor.Directory.GetAccessControl(directoryPath, includeSections);
         }
 
-        public override DirectoryInfoBase[] GetDirectories()
+        public override IDirectoryInfo[] GetDirectories()
         {
             return ConvertStringsToDirectories(mockFileDataAccessor.Directory.GetDirectories(directoryPath));
         }
 
-        public override DirectoryInfoBase[] GetDirectories(string searchPattern)
+        public override IDirectoryInfo[] GetDirectories(string searchPattern)
         {
             return ConvertStringsToDirectories(mockFileDataAccessor.Directory.GetDirectories(directoryPath, searchPattern));
         }
 
-        public override DirectoryInfoBase[] GetDirectories(string searchPattern, SearchOption searchOption)
+        public override IDirectoryInfo[] GetDirectories(string searchPattern, SearchOption searchOption)
         {
             return ConvertStringsToDirectories(mockFileDataAccessor.Directory.GetDirectories(directoryPath, searchPattern, searchOption));
         }
@@ -222,41 +222,41 @@ private DirectoryInfoBase[] ConvertStringsToDirectories(IEnumerable<string> path
                 .ToArray();
         }
 
-        public override FileInfoBase[] GetFiles()
+        public override IFileInfo[] GetFiles()
         {
             return ConvertStringsToFiles(mockFileDataAccessor.Directory.GetFiles(FullName));
         }
 
-        public override FileInfoBase[] GetFiles(string searchPattern)
+        public override IFileInfo[] GetFiles(string searchPattern)
         {
             return ConvertStringsToFiles(mockFileDataAccessor.Directory.GetFiles(FullName, searchPattern));
         }
 
-        public override FileInfoBase[] GetFiles(string searchPattern, SearchOption searchOption)
+        public override IFileInfo[] GetFiles(string searchPattern, SearchOption searchOption)
         {
             return ConvertStringsToFiles(mockFileDataAccessor.Directory.GetFiles(FullName, searchPattern, searchOption));
         }
 
-        FileInfoBase[] ConvertStringsToFiles(IEnumerable<string> paths)
+        IFileInfo[] ConvertStringsToFiles(IEnumerable<string> paths)
         {
             return paths
                   .Select(mockFileDataAccessor.FileInfo.FromFileName)
                   .ToArray();
         }
 
-        public override FileSystemInfoBase[] GetFileSystemInfos()
+        public override IFileSystemInfo[] GetFileSystemInfos()
         {
             return GetFileSystemInfos("*");
         }
 
-        public override FileSystemInfoBase[] GetFileSystemInfos(string searchPattern)
+        public override IFileSystemInfo[] GetFileSystemInfos(string searchPattern)
         {
             return GetFileSystemInfos(searchPattern, SearchOption.TopDirectoryOnly);
         }
 
-        public override FileSystemInfoBase[] GetFileSystemInfos(string searchPattern, SearchOption searchOption)
+        public override IFileSystemInfo[] GetFileSystemInfos(string searchPattern, SearchOption searchOption)
         {
-            return GetDirectories(searchPattern, searchOption).OfType<FileSystemInfoBase>().Concat(GetFiles(searchPattern, searchOption)).ToArray();
+            return GetDirectories(searchPattern, searchOption).OfType<IFileSystemInfo>().Concat(GetFiles(searchPattern, searchOption)).ToArray();
         }
 
         public override void MoveTo(string destDirName)
@@ -269,15 +269,15 @@ public override void SetAccessControl(DirectorySecurity directorySecurity)
             mockFileDataAccessor.Directory.SetAccessControl(directoryPath, directorySecurity);
         }
 
-        public override DirectoryInfoBase Parent
+        public override IDirectoryInfo Parent
         {
             get
             {
                 return mockFileDataAccessor.Directory.GetParent(directoryPath);
             }
         }
 
-        public override DirectoryInfoBase Root
+        public override IDirectoryInfo Root
         {
             get
             {

System.IO.Abstractions.TestingHelpers/MockDirectoryInfoFactory.cs

@@ -10,7 +10,7 @@ public MockDirectoryInfoFactory(IMockFileDataAccessor mockFileSystem)
             this.mockFileSystem = mockFileSystem;
         }
 
-        public DirectoryInfoBase FromDirectoryName(string directoryName)
+        public IDirectoryInfo FromDirectoryName(string directoryName)
         {
             return new MockDirectoryInfo(mockFileSystem, directoryName);
         }

System.IO.Abstractions.TestingHelpers/MockDriveInfo.cs

@@ -44,7 +44,7 @@ public MockDriveInfo(IMockFileDataAccessor mockFileDataAccessor, string name) :
         public new bool IsReady { get; protected set; }
         public override string Name { get; protected set; }
 
-        public override DirectoryInfoBase RootDirectory
+        public override IDirectoryInfo RootDirectory
         {
             get
             {

System.IO.Abstractions.TestingHelpers/MockDriveInfoFactory.cs

@@ -12,7 +12,7 @@ public MockDriveInfoFactory(IMockFileDataAccessor mockFileSystem)
             this.mockFileSystem = mockFileSystem ?? throw new ArgumentNullException(nameof(mockFileSystem));
         }
 
-        public DriveInfoBase[] GetDrives()
+        public IDriveInfo[] GetDrives()
         {
             var driveLetters = new HashSet<string>(new DriveEqualityComparer(mockFileSystem));
             foreach (var path in mockFileSystem.AllPaths)
@@ -38,7 +38,7 @@ public DriveInfoBase[] GetDrives()
             return result.ToArray();
         }
 
-        public DriveInfoBase FromDriveName(string driveName)
+        public IDriveInfo FromDriveName(string driveName)
         {
             var drive = mockFileSystem.Path.GetPathRoot(driveName);
 

System.IO.Abstractions.TestingHelpers/MockFileInfo.cs

@@ -153,12 +153,12 @@ public override StreamWriter AppendText()
             return new StreamWriter(new MockFileStream(mockFileSystem, FullName, MockFileStream.StreamType.APPEND));
         }
 
-        public override FileInfoBase CopyTo(string destFileName)
+        public override IFileInfo CopyTo(string destFileName)
         {
             return CopyTo(destFileName, false);
         }
 
-        public override FileInfoBase CopyTo(string destFileName, bool overwrite)
+        public override IFileInfo CopyTo(string destFileName, bool overwrite)
         {
             if (!Exists)
             {
@@ -210,7 +210,7 @@ public override FileSecurity GetAccessControl(AccessControlSections includeSecti
 
         public override void MoveTo(string destFileName)
         {
-            var movedFileInfo = CopyTo(destFileName);
+            var movedFileInfo = CopyTo(destFileName) as MockFileInfo;
             if (destFileName == FullName)
             {
                 return;
@@ -251,12 +251,12 @@ public override Stream OpenWrite()
         }
 
 #if NET40
-        public override FileInfoBase Replace(string destinationFileName, string destinationBackupFileName)
+        public override IFileInfo Replace(string destinationFileName, string destinationBackupFileName)
         {
             return Replace(destinationFileName, destinationBackupFileName, false);
         }
 
-        public override FileInfoBase Replace(string destinationFileName, string destinationBackupFileName, bool ignoreMetadataErrors)
+        public override IFileInfo Replace(string destinationFileName, string destinationBackupFileName, bool ignoreMetadataErrors)
         {
             mockFileSystem.File.Replace(path, destinationFileName, destinationBackupFileName, ignoreMetadataErrors);
             return mockFileSystem.FileInfo.FromFileName(destinationFileName);
@@ -268,7 +268,7 @@ public override void SetAccessControl(FileSecurity fileSecurity)
             mockFileSystem.File.SetAccessControl(this.path, fileSecurity);
         }
 
-        public override DirectoryInfoBase Directory
+        public override IDirectoryInfo Directory
         {
             get
             {

System.IO.Abstractions.TestingHelpers/MockFileInfoFactory.cs

@@ -10,7 +10,7 @@ public MockFileInfoFactory(IMockFileDataAccessor mockFileSystem)
             this.mockFileSystem = mockFileSystem ?? throw new ArgumentNullException(nameof(mockFileSystem));
         }
 
-        public FileInfoBase FromFileName(string fileName)
+        public IFileInfo FromFileName(string fileName)
         {
             return new MockFileInfo(mockFileSystem, fileName);
         }

System.IO.Abstractions.TestingHelpers/MockFileSystem.cs

@@ -57,7 +57,7 @@ public MockFileSystem(IDictionary<string, MockFileData> files, string currentDir
         public IDirectory Directory { get; }
         public IFileInfoFactory FileInfo { get; }
         public IFileStreamFactory FileStream { get; }
-        public PathBase Path { get; }
+        public IPath Path { get; }
         public IDirectoryInfoFactory DirectoryInfo { get; }
         public IDriveInfoFactory DriveInfo { get; }
         public IFileSystemWatcherFactory FileSystemWatcher { get; set; }

System.IO.Abstractions/DirectoryBase.cs

@@ -21,11 +21,11 @@ internal DirectoryBase() { }
         public IFileSystem FileSystem { get; }
 
         /// <inheritdoc cref="Directory.CreateDirectory(string)"/>
-        public abstract DirectoryInfoBase CreateDirectory(string path);
+        public abstract IDirectoryInfo CreateDirectory(string path);
 
 #if NET40
         /// <inheritdoc cref="Directory.CreateDirectory(string,DirectorySecurity)"/>
-        public abstract DirectoryInfoBase CreateDirectory(string path, DirectorySecurity directorySecurity);
+        public abstract IDirectoryInfo CreateDirectory(string path, DirectorySecurity directorySecurity);
 #endif
 
         /// <inheritdoc cref="Directory.Delete(string)"/>
@@ -97,7 +97,7 @@ internal DirectoryBase() { }
 #endif
 
         /// <inheritdoc cref="Directory.GetParent"/>
-        public abstract DirectoryInfoBase GetParent(string path);
+        public abstract IDirectoryInfo GetParent(string path);
 
         /// <inheritdoc cref="Directory.Move"/>
         public abstract void Move(string sourceDirName, string destDirName);
@@ -127,13 +127,13 @@ internal DirectoryBase() { }
         public abstract void SetLastWriteTimeUtc(string path, DateTime lastWriteTimeUtc);
 
         /// <inheritdoc cref="Directory.EnumerateDirectories(string)"/>
-        public abstract IEnumerable<String> EnumerateDirectories(String path);
+        public abstract IEnumerable<string> EnumerateDirectories(string path);
 
         /// <inheritdoc cref="Directory.EnumerateDirectories(string,string)"/>
-        public abstract IEnumerable<String> EnumerateDirectories(String path, String searchPattern);
+        public abstract IEnumerable<string> EnumerateDirectories(string path, string searchPattern);
 
         /// <inheritdoc cref="Directory.EnumerateDirectories(string,string,SearchOption)"/>
-        public abstract IEnumerable<String> EnumerateDirectories(String path, String searchPattern, SearchOption searchOption);
+        public abstract IEnumerable<string> EnumerateDirectories(string path, string searchPattern, SearchOption searchOption);
 
         /// <inheritdoc cref="Directory.EnumerateFiles(string)"/>
         public abstract IEnumerable<string> EnumerateFiles(string path);