feat: moved open file handles state to mock file system and ran API acceptance tests

HarrisonTCodes · HarrisonTCodes · commit cd2a151e283f · 2025-11-14T16:56:53.000Z
diff --git a/src/TestableIO.System.IO.Abstractions.TestingHelpers/IMockFileDataAccessor.cs b/src/TestableIO.System.IO.Abstractions.TestingHelpers/IMockFileDataAccessor.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Reflection;
 
 namespace System.IO.Abstractions.TestingHelpers;
@@ -110,4 +111,9 @@ public interface IMockFileDataAccessor : IFileSystem
     /// Gets a reference to the underlying file system. 
     /// </summary>
     IFileSystem FileSystem { get; }
+
+    /// <summary>
+    /// Gets a reference to the open file handles.
+    /// </summary>
+    ConcurrentDictionary<string, ConcurrentDictionary<Guid, (FileAccess, FileShare)>> FileHandles { get; }
 }
diff --git a/src/TestableIO.System.IO.Abstractions.TestingHelpers/MockFileStream.cs b/src/TestableIO.System.IO.Abstractions.TestingHelpers/MockFileStream.cs
@@ -38,7 +38,6 @@ public NullFileSystemStream() : base(Null, ".", true)
     private readonly FileOptions options;
     private readonly MockFileData fileData;
     private bool disposed;
-    private static ConcurrentDictionary<string, ConcurrentDictionary<Guid, (FileAccess access, FileShare share)>> _fileHandles = new();
 
     /// <inheritdoc />
     public MockFileStream(
@@ -103,7 +102,7 @@ public MockFileStream(
             mockFileDataAccessor.AddFile(path, fileData);
         }
 
-        var fileHandlesEntry = _fileHandles.GetOrAdd(path, _ => new ConcurrentDictionary<Guid, (FileAccess access, FileShare share)>());
+        var fileHandlesEntry = mockFileDataAccessor.FileHandles.GetOrAdd(path, _ => new ConcurrentDictionary<Guid, (FileAccess access, FileShare share)>());
         fileHandlesEntry[guid] = (access, share);
         this.access = access;
         this.share = share;
@@ -153,12 +152,12 @@ protected override void Dispose(bool disposing)
         {
             return;
         }
-        if (_fileHandles.TryGetValue(path, out var fileHandlesEntry))
+        if (mockFileDataAccessor.FileHandles.TryGetValue(path, out var fileHandlesEntry))
         {
             fileHandlesEntry.TryRemove(guid, out _);
             if (fileHandlesEntry.IsEmpty)
             {
-                _fileHandles.TryRemove(path, out _);
+                mockFileDataAccessor.FileHandles.TryRemove(path, out _);
             }
         }
         InternalFlush();
diff --git a/src/TestableIO.System.IO.Abstractions.TestingHelpers/MockFileSystem.cs b/src/TestableIO.System.IO.Abstractions.TestingHelpers/MockFileSystem.cs
@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -21,6 +22,10 @@ public class MockFileSystem : FileSystemBase, IMockFileDataAccessor
     private readonly PathVerifier pathVerifier;
 #if FEATURE_SERIALIZABLE
     [NonSerialized]
+#endif
+    private readonly ConcurrentDictionary<string, ConcurrentDictionary<Guid, (FileAccess access, FileShare share)>> fileHandles = new();
+#if FEATURE_SERIALIZABLE
+    [NonSerialized]
 #endif
     private Func<DateTime> dateTimeProvider = defaultDateTimeProvider;
     private static Func<DateTime> defaultDateTimeProvider = () => DateTime.UtcNow;
@@ -114,6 +119,9 @@ public MockFileSystem(IDictionary<string, MockFileData> files, MockFileSystemOpt
     public IFileSystem FileSystem => this;
     /// <inheritdoc />
     public PathVerifier PathVerifier => pathVerifier;
+    /// <inheritdoc />
+    public ConcurrentDictionary<string, ConcurrentDictionary<Guid, (FileAccess, FileShare)>> FileHandles
+    => fileHandles;
 
     /// <summary>
     /// Replaces the time provider with a mocked instance. This allows to influence the used time in tests.
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net472.txt b/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net472.txt
@@ -8,6 +8,7 @@ namespace System.IO.Abstractions.TestingHelpers
         System.Collections.Generic.IEnumerable<string> AllDrives { get; }
         System.Collections.Generic.IEnumerable<string> AllFiles { get; }
         System.Collections.Generic.IEnumerable<string> AllPaths { get; }
+        System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         System.IO.Abstractions.IFileSystem FileSystem { get; }
         System.IO.Abstractions.TestingHelpers.PathVerifier PathVerifier { get; }
         System.IO.Abstractions.TestingHelpers.StringOperations StringOperations { get; }
@@ -347,6 +348,7 @@ namespace System.IO.Abstractions.TestingHelpers
         public override System.IO.Abstractions.IDirectoryInfoFactory DirectoryInfo { get; }
         public override System.IO.Abstractions.IDriveInfoFactory DriveInfo { get; }
         public override System.IO.Abstractions.IFile File { get; }
+        public System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         public override System.IO.Abstractions.IFileInfoFactory FileInfo { get; }
         public override System.IO.Abstractions.IFileStreamFactory FileStream { get; }
         public System.IO.Abstractions.IFileSystem FileSystem { get; }
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net6.0.txt b/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net6.0.txt
@@ -8,6 +8,7 @@ namespace System.IO.Abstractions.TestingHelpers
         System.Collections.Generic.IEnumerable<string> AllDrives { get; }
         System.Collections.Generic.IEnumerable<string> AllFiles { get; }
         System.Collections.Generic.IEnumerable<string> AllPaths { get; }
+        System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         System.IO.Abstractions.IFileSystem FileSystem { get; }
         System.IO.Abstractions.TestingHelpers.PathVerifier PathVerifier { get; }
         System.IO.Abstractions.TestingHelpers.StringOperations StringOperations { get; }
@@ -402,6 +403,7 @@ namespace System.IO.Abstractions.TestingHelpers
         public override System.IO.Abstractions.IDirectoryInfoFactory DirectoryInfo { get; }
         public override System.IO.Abstractions.IDriveInfoFactory DriveInfo { get; }
         public override System.IO.Abstractions.IFile File { get; }
+        public System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         public override System.IO.Abstractions.IFileInfoFactory FileInfo { get; }
         public override System.IO.Abstractions.IFileStreamFactory FileStream { get; }
         public System.IO.Abstractions.IFileSystem FileSystem { get; }
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net8.0.txt b/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net8.0.txt
@@ -8,6 +8,7 @@ namespace System.IO.Abstractions.TestingHelpers
         System.Collections.Generic.IEnumerable<string> AllDrives { get; }
         System.Collections.Generic.IEnumerable<string> AllFiles { get; }
         System.Collections.Generic.IEnumerable<string> AllPaths { get; }
+        System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         System.IO.Abstractions.IFileSystem FileSystem { get; }
         System.IO.Abstractions.TestingHelpers.PathVerifier PathVerifier { get; }
         System.IO.Abstractions.TestingHelpers.StringOperations StringOperations { get; }
@@ -426,6 +427,7 @@ namespace System.IO.Abstractions.TestingHelpers
         public override System.IO.Abstractions.IDirectoryInfoFactory DirectoryInfo { get; }
         public override System.IO.Abstractions.IDriveInfoFactory DriveInfo { get; }
         public override System.IO.Abstractions.IFile File { get; }
+        public System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         public override System.IO.Abstractions.IFileInfoFactory FileInfo { get; }
         public override System.IO.Abstractions.IFileStreamFactory FileStream { get; }
         public System.IO.Abstractions.IFileSystem FileSystem { get; }
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net9.0.txt b/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_net9.0.txt
@@ -8,6 +8,7 @@ namespace System.IO.Abstractions.TestingHelpers
         System.Collections.Generic.IEnumerable<string> AllDrives { get; }
         System.Collections.Generic.IEnumerable<string> AllFiles { get; }
         System.Collections.Generic.IEnumerable<string> AllPaths { get; }
+        System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         System.IO.Abstractions.IFileSystem FileSystem { get; }
         System.IO.Abstractions.TestingHelpers.PathVerifier PathVerifier { get; }
         System.IO.Abstractions.TestingHelpers.StringOperations StringOperations { get; }
@@ -440,6 +441,7 @@ namespace System.IO.Abstractions.TestingHelpers
         public override System.IO.Abstractions.IDirectoryInfoFactory DirectoryInfo { get; }
         public override System.IO.Abstractions.IDriveInfoFactory DriveInfo { get; }
         public override System.IO.Abstractions.IFile File { get; }
+        public System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         public override System.IO.Abstractions.IFileInfoFactory FileInfo { get; }
         public override System.IO.Abstractions.IFileStreamFactory FileStream { get; }
         public System.IO.Abstractions.IFileSystem FileSystem { get; }
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_netstandard2.0.txt b/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_netstandard2.0.txt
@@ -8,6 +8,7 @@ namespace System.IO.Abstractions.TestingHelpers
         System.Collections.Generic.IEnumerable<string> AllDrives { get; }
         System.Collections.Generic.IEnumerable<string> AllFiles { get; }
         System.Collections.Generic.IEnumerable<string> AllPaths { get; }
+        System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         System.IO.Abstractions.IFileSystem FileSystem { get; }
         System.IO.Abstractions.TestingHelpers.PathVerifier PathVerifier { get; }
         System.IO.Abstractions.TestingHelpers.StringOperations StringOperations { get; }
@@ -347,6 +348,7 @@ namespace System.IO.Abstractions.TestingHelpers
         public override System.IO.Abstractions.IDirectoryInfoFactory DirectoryInfo { get; }
         public override System.IO.Abstractions.IDriveInfoFactory DriveInfo { get; }
         public override System.IO.Abstractions.IFile File { get; }
+        public System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         public override System.IO.Abstractions.IFileInfoFactory FileInfo { get; }
         public override System.IO.Abstractions.IFileStreamFactory FileStream { get; }
         public System.IO.Abstractions.IFileSystem FileSystem { get; }
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_netstandard2.1.txt b/tests/TestableIO.System.IO.Abstractions.Api.Tests/Expected/TestableIO.System.IO.Abstractions.TestingHelpers_netstandard2.1.txt
@@ -8,6 +8,7 @@ namespace System.IO.Abstractions.TestingHelpers
         System.Collections.Generic.IEnumerable<string> AllDrives { get; }
         System.Collections.Generic.IEnumerable<string> AllFiles { get; }
         System.Collections.Generic.IEnumerable<string> AllPaths { get; }
+        System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         System.IO.Abstractions.IFileSystem FileSystem { get; }
         System.IO.Abstractions.TestingHelpers.PathVerifier PathVerifier { get; }
         System.IO.Abstractions.TestingHelpers.StringOperations StringOperations { get; }
@@ -375,6 +376,7 @@ namespace System.IO.Abstractions.TestingHelpers
         public override System.IO.Abstractions.IDirectoryInfoFactory DirectoryInfo { get; }
         public override System.IO.Abstractions.IDriveInfoFactory DriveInfo { get; }
         public override System.IO.Abstractions.IFile File { get; }
+        public System.Collections.Concurrent.ConcurrentDictionary<string, System.Collections.Concurrent.ConcurrentDictionary<System.Guid, System.ValueTuple<System.IO.FileAccess, System.IO.FileShare>>> FileHandles { get; }
         public override System.IO.Abstractions.IFileInfoFactory FileInfo { get; }
         public override System.IO.Abstractions.IFileStreamFactory FileStream { get; }
         public System.IO.Abstractions.IFileSystem FileSystem { get; }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ public NullFileSystemStream() : base(Null, ".", true)`
`38`	`38`	`private readonly FileOptions options;`
`39`	`39`	`private readonly MockFileData fileData;`
`40`	`40`	`private bool disposed;`
`41`		`- private static ConcurrentDictionary<string, ConcurrentDictionary<Guid, (FileAccess access, FileShare share)>> _fileHandles = new();`
`42`	`41`
`43`	`42`	`/// <inheritdoc />`
`44`	`43`	`public MockFileStream(`
`@@ -103,7 +102,7 @@ public MockFileStream(`
`103`	`102`	`mockFileDataAccessor.AddFile(path, fileData);`
`104`	`103`	`}`
`105`	`104`
`106`		`- var fileHandlesEntry = _fileHandles.GetOrAdd(path, _ => new ConcurrentDictionary<Guid, (FileAccess access, FileShare share)>());`
	`105`	`+ var fileHandlesEntry = mockFileDataAccessor.FileHandles.GetOrAdd(path, _ => new ConcurrentDictionary<Guid, (FileAccess access, FileShare share)>());`
`107`	`106`	`fileHandlesEntry[guid] = (access, share);`
`108`	`107`	`this.access = access;`
`109`	`108`	`this.share = share;`
`@@ -153,12 +152,12 @@ protected override void Dispose(bool disposing)`
`153`	`152`	`{`
`154`	`153`	`return;`
`155`	`154`	`}`
`156`		`- if (_fileHandles.TryGetValue(path, out var fileHandlesEntry))`
	`155`	`+ if (mockFileDataAccessor.FileHandles.TryGetValue(path, out var fileHandlesEntry))`
`157`	`156`	`{`
`158`	`157`	`fileHandlesEntry.TryRemove(guid, out _);`
`159`	`158`	`if (fileHandlesEntry.IsEmpty)`
`160`	`159`	`{`
`161`		`- _fileHandles.TryRemove(path, out _);`
	`160`	`+ mockFileDataAccessor.FileHandles.TryRemove(path, out _);`
`162`	`161`	`}`
`163`	`162`	`}`
`164`	`163`	`InternalFlush();`