From 8ee07e2661cefa88fab41d676a04fdeb1260bfea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20Breu=C3=9F?= Date: Thu, 9 Apr 2026 21:02:24 +0200 Subject: [PATCH 1/3] refactor: improve mocking tests in `FileSystemTests` --- Directory.Packages.props | 3 ++- tests/Directory.Build.props | 1 + .../FileSystemTests.cs | 12 +++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 5a7ae39f4..2c16b7990 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -22,13 +22,14 @@ - + + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 65e9192f2..498d0b28a 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -27,6 +27,7 @@ + diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs index d64616dea..fdebc82b5 100644 --- a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs +++ b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs @@ -26,12 +26,14 @@ await That(memoryStream).HasLength().GreaterThan(0) [Test] public async Task Mock_File_Succeeds() { - var fileSystemMock = IFileSystem.CreateMock(fs => + var fileSystem = IFileSystem.CreateMock(fs => fs.File.InitializeWith(IFile.CreateMock())); - - await That(() => - fileSystemMock.File.Mock.Setup.ReadAllText(It.IsAny()).Returns("") - ).DoesNotThrow(); + fileSystem.File.Mock.Setup.ReadAllText(It.IsAny()).Returns("foo"); + + var result = fileSystem.File.ReadAllText("any path"); + + await That(result).IsEqualTo("foo"); + await That(fileSystem.File.Mock.Verify.ReadAllText(It.Is("any path"))).Once(); } [Test] From c15c47647cf62dcdf77fbb82ca14364ccfdbceb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20Breu=C3=9F?= Date: Thu, 9 Apr 2026 21:05:59 +0200 Subject: [PATCH 2/3] Fix review issues --- .../FileSystemTests.cs | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs index fdebc82b5..b79171af4 100644 --- a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs +++ b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs @@ -39,77 +39,77 @@ public async Task Mock_File_Succeeds() [Test] public async Task Mock_Directory_Succeeds() { - var fileSystemMock = IFileSystem.CreateMock(fs => + var fileSystem = IFileSystem.CreateMock(fs => fs.Directory.InitializeWith(IDirectory.CreateMock())); await That(() => - fileSystemMock.Directory.Mock.Setup.CreateDirectory(It.IsAny()) + fileSystem.Directory.Mock.Setup.CreateDirectory(It.IsAny()) ).DoesNotThrow(); } [Test] public async Task Mock_FileInfo_Succeeds() { - var fileSystemMock = IFileSystem.CreateMock(fs => + var fileSystem = IFileSystem.CreateMock(fs => fs.FileInfo.InitializeWith(IFileInfoFactory.CreateMock())); await That(() => - fileSystemMock.FileInfo.Mock.Setup.New(It.IsAny()) + fileSystem.FileInfo.Mock.Setup.New(It.IsAny()) ).DoesNotThrow(); } [Test] public async Task Mock_FileStream_Succeeds() { - var fileSystemMock = IFileSystem.CreateMock(fs => + var fileSystem = IFileSystem.CreateMock(fs => fs.FileStream.InitializeWith(IFileStreamFactory.CreateMock())); await That(() => - fileSystemMock.FileStream.Mock.Setup.New(It.IsAny(), It.IsAny()) + fileSystem.FileStream.Mock.Setup.New(It.IsAny(), It.IsAny()) ).DoesNotThrow(); } [Test] public async Task Mock_Path_Succeeds() { - var fileSystemMock = IFileSystem.CreateMock(fs => + var fileSystem = IFileSystem.CreateMock(fs => fs.Path.InitializeWith(IPath.CreateMock())); await That(() => - fileSystemMock.Path.Mock.Setup.Combine(It.IsAny(), It.IsAny()) + fileSystem.Path.Mock.Setup.Combine(It.IsAny(), It.IsAny()) ).DoesNotThrow(); } [Test] public async Task Mock_DirectoryInfo_Succeeds() { - var fileSystemMock = IFileSystem.CreateMock(fs => + var fileSystem = IFileSystem.CreateMock(fs => fs.DirectoryInfo.InitializeWith(IDirectoryInfoFactory.CreateMock())); await That(() => - fileSystemMock.DirectoryInfo.Mock.Setup.New(It.IsAny()) + fileSystem.DirectoryInfo.Mock.Setup.New(It.IsAny()) ).DoesNotThrow(); } [Test] public async Task Mock_DriveInfo_Succeeds() { - var fileSystemMock = IFileSystem.CreateMock(fs => + var fileSystem = IFileSystem.CreateMock(fs => fs.DriveInfo.InitializeWith(IDriveInfoFactory.CreateMock())); await That(() => - fileSystemMock.DriveInfo.Mock.Setup.New(It.IsAny()) + fileSystem.DriveInfo.Mock.Setup.New(It.IsAny()) ).DoesNotThrow(); } [Test] public async Task Mock_FileSystemWatcher_Succeeds() { - var fileSystemMock = IFileSystem.CreateMock(fs => + var fileSystem = IFileSystem.CreateMock(fs => fs.FileSystemWatcher.InitializeWith(IFileSystemWatcherFactory.CreateMock())); await That(() => - fileSystemMock.FileSystemWatcher.Mock.Setup.New(It.IsAny()) + fileSystem.FileSystemWatcher.Mock.Setup.New(It.IsAny()) ).DoesNotThrow(); } } \ No newline at end of file From 37292955f25e384785f970dd90914201ec79cd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20Breu=C3=9F?= Date: Thu, 9 Apr 2026 21:07:58 +0200 Subject: [PATCH 3/3] Fix review issue --- .../FileSystemTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs index b79171af4..c9dd6df6b 100644 --- a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs +++ b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs @@ -29,7 +29,7 @@ public async Task Mock_File_Succeeds() var fileSystem = IFileSystem.CreateMock(fs => fs.File.InitializeWith(IFile.CreateMock())); fileSystem.File.Mock.Setup.ReadAllText(It.IsAny()).Returns("foo"); - + var result = fileSystem.File.ReadAllText("any path"); await That(result).IsEqualTo("foo");