Testably · vbreuss · Aug 21, 2023 · Aug 21, 2023 · Aug 21, 2023 · Aug 21, 2023
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -36,6 +36,7 @@
 	<ItemGroup>
 		<PackageVersion Include="Testably.Abstractions" Version="2.3.4" />
 		<PackageVersion Include="Testably.Abstractions.Testing" Version="2.3.4" />
+		<PackageVersion Include="Testably.Abstractions.FluentAssertions" Version="0.5.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/Tests/Testably.Abstractions.Testing.Tests/FileSystem/ChangeHandlerTests.cs b/Tests/Testably.Abstractions.Testing.Tests/FileSystem/ChangeHandlerTests.cs
@@ -22,15 +22,15 @@ public void CreateDirectory_CustomException_ShouldNotCreateDirectory(
 	{
 		FileSystem.Intercept.Event(_ =>
 		{
-			FileSystem.Directory.Exists(path).Should().BeFalse();
+			FileSystem.Should().NotHaveDirectory(path);
 			throw exceptionToThrow;
 		});
 		Exception? exception = Record.Exception(() =>
 		{
 			FileSystem.Directory.CreateDirectory(path);
 		});
 
-		FileSystem.Directory.Exists(path).Should().BeFalse();
+		FileSystem.Should().NotHaveDirectory(path);
 		exception.Should().Be(exceptionToThrow);
 	}
 

diff --git a/Tests/Testably.Abstractions.Testing.Tests/FileSystem/FileSystemExtensibilityTests.cs b/Tests/Testably.Abstractions.Testing.Tests/FileSystem/FileSystemExtensibilityTests.cs
@@ -13,7 +13,7 @@ public void Directory_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -24,7 +24,7 @@ public void DirectoryInfo_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -35,7 +35,7 @@ public void DirectoryInfoFactory_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -46,7 +46,7 @@ public void DriveInfo_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -57,7 +57,7 @@ public void DriveInfoFactory_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -68,7 +68,7 @@ public void File_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -79,7 +79,7 @@ public void FileInfo_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -90,7 +90,7 @@ public void FileInfoFactory_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -101,7 +101,7 @@ public void FileStreamFactory_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -112,7 +112,7 @@ public void FileSystemInfo_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -123,7 +123,7 @@ public void FileSystemWatcher_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -134,7 +134,7 @@ public void FileSystemWatcherFactory_ShouldSetExtensionPoint(IFileSystem fileSys
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	[SkippableTheory]
@@ -145,7 +145,7 @@ public void Path_ShouldSetExtensionPoint(IFileSystem fileSystem)
 
 		IFileSystem result = sut.FileSystem;
 
-		result.Should().Be(fileSystem);
+		result.Should().BeSameAs(fileSystem);
 	}
 
 	public static IEnumerable<object[]> GetFileSystems =>

diff --git a/Tests/Testably.Abstractions.Testing.Tests/FileSystem/FileSystemWatcherMockTests.cs b/Tests/Testably.Abstractions.Testing.Tests/FileSystem/FileSystemWatcherMockTests.cs
@@ -165,8 +165,10 @@ public void InternalBufferSize_ShouldResetQueue(string path1, string path2)
 			{
 				break;
 			}
+
 			FileSystem.Directory.CreateDirectory($"{i}_{path1}");
 		}
+
 		fileSystemWatcher.InternalBufferSize = 4196;
 		FileSystem.Directory.CreateDirectory(path2);
 		for (int i = 0; i < 4196 / 128; i++)
@@ -175,6 +177,7 @@ public void InternalBufferSize_ShouldResetQueue(string path1, string path2)
 			{
 				break;
 			}
+
 			FileSystem.Directory.CreateDirectory($"{i}_{path2}");
 		}
 

diff --git a/...s/Testably.Abstractions.Testing.Tests/FileSystemInitializer/FileSystemInitializerTests.cs b/...s/Testably.Abstractions.Testing.Tests/FileSystemInitializer/FileSystemInitializerTests.cs
@@ -17,7 +17,7 @@ public void With_DirectoryDescriptions_ShouldCreateDirectories(
 
 		foreach (DirectoryDescription directory in directories)
 		{
-			fileSystem.Directory.Exists(directory.Name).Should().BeTrue();
+			fileSystem.Should().HaveDirectory(directory.Name);
 		}
 	}
 
@@ -31,7 +31,7 @@ public void With_FileDescriptions_ShouldCreateFileContent(string name, string co
 
 		sut.With(description);
 
-		fileSystem.File.Exists(name).Should().BeTrue();
+		fileSystem.Should().HaveFile(name);
 		fileSystem.File.ReadAllText(name).Should().Be(content);
 	}
 
@@ -46,7 +46,7 @@ public void With_FileDescriptions_ShouldCreateFiles(FileDescription[] files)
 
 		foreach (FileDescription file in files)
 		{
-			fileSystem.File.Exists(file.Name).Should().BeTrue();
+			fileSystem.Should().HaveFile(file.Name);
 		}
 	}
 
@@ -64,7 +64,7 @@ public void With_FileDescriptions_ShouldSetIsReadOnlyFlag(bool isReadOnly, strin
 
 		sut.With(description);
 
-		fileSystem.File.Exists(name).Should().BeTrue();
+		fileSystem.Should().HaveFile(name);
 		fileSystem.FileInfo.New(name).IsReadOnly.Should().Be(isReadOnly);
 	}
 
@@ -79,8 +79,8 @@ public void With_FilesAndDirectories_ShouldBothBeCreated(string fileName, string
 
 		sut.With(fileDescription, directoryDescription);
 
-		fileSystem.File.Exists(fileName).Should().BeTrue();
-		fileSystem.Directory.Exists(directoryName).Should().BeTrue();
+		fileSystem.Should().HaveFile(fileName);
+		fileSystem.Should().HaveDirectory(directoryName);
 	}
 
 	[Theory]
@@ -120,7 +120,7 @@ public void WithFile_HasStringContent_ShouldWriteFileContent(string path)
 
 		sut.WithFile(path).Which(f => f.HasStringContent("foo"));
 
-		fileSystem.File.Exists(path).Should().BeTrue();
+		fileSystem.Should().HaveFile(path);
 		fileSystem.File.ReadAllText(path).Should().Be("foo");
 	}
 
@@ -135,8 +135,8 @@ public void WithFile_MissingDirectory_ShouldCreateDirectory(string directoryPath
 
 		sut.WithFile(path);
 
-		fileSystem.File.Exists(path).Should().BeTrue();
-		fileSystem.Directory.Exists(directoryPath).Should().BeTrue();
+		fileSystem.Should().HaveFile(path);
+		fileSystem.Should().HaveDirectory(directoryPath);
 	}
 
 	[Theory]
@@ -151,7 +151,7 @@ public void WithSubdirectories_ShouldCreateAllDirectories(string[] paths)
 
 		foreach (string path in paths)
 		{
-			fileSystem.Directory.Exists(path).Should().BeTrue();
+			fileSystem.Should().HaveDirectory(path);
 		}
 
 		result.Should().Be(sut);
@@ -196,7 +196,7 @@ public void WithSubdirectory_MultipleDirectoryLevels(string level1, string level
 		IFileSystemDirectoryInitializer<MockFileSystem> result = sut
 			.WithSubdirectory(path);
 
-		fileSystem.Directory.Exists(path).Should().BeTrue();
-		result.FileSystem.Should().Be(fileSystem);
+		fileSystem.Should().HaveDirectory(path);
+		result.FileSystem.Should().BeSameAs(fileSystem);
 	}
 }
diff --git a/Tests/Testably.Abstractions.Testing.Tests/FileSystemInitializerExtensionsTests.cs b/Tests/Testably.Abstractions.Testing.Tests/FileSystemInitializerExtensionsTests.cs
@@ -207,7 +207,7 @@ public void
 		result.Length.Should().Be(2);
 		result.Should().Contain(x => x.EndsWith("TestFile1.txt"));
 		result.Should().Contain(x => x.EndsWith("TestFile2.txt"));
-		fileSystem.Directory.Exists(Path.Combine(path, "SubResource")).Should().BeFalse();
+		fileSystem.Should().NotHaveDirectory(Path.Combine(path, "SubResource"));
 	}
 
 	[Theory]

diff --git a/Tests/Testably.Abstractions.Testing.Tests/Storage/InMemoryContainerTests.cs b/Tests/Testably.Abstractions.Testing.Tests/Storage/InMemoryContainerTests.cs
@@ -221,8 +221,8 @@ public void Container_ShouldProvideCorrectTimeAndFileSystem(string path)
 		IStorageLocation location = InMemoryLocation.New(null, path);
 		IStorageContainer sut = InMemoryContainer.NewFile(location, fileSystem);
 
-		sut.FileSystem.Should().Be(fileSystem);
-		sut.TimeSystem.Should().Be(fileSystem.TimeSystem);
+		sut.FileSystem.Should().BeSameAs(fileSystem);
+		sut.TimeSystem.Should().BeSameAs(fileSystem.TimeSystem);
 	}
 
 	[Theory]

diff --git a/Tests/Testably.Abstractions.Testing.Tests/Storage/NullContainerTests.cs b/Tests/Testably.Abstractions.Testing.Tests/Storage/NullContainerTests.cs
@@ -35,8 +35,8 @@ public void Constructor_ShouldSetFileAndTimeSystem()
 
 		IStorageContainer sut = NullContainer.New(fileSystem);
 
-		sut.FileSystem.Should().Be(fileSystem);
-		sut.TimeSystem.Should().Be(fileSystem.TimeSystem);
+		sut.FileSystem.Should().BeSameAs(fileSystem);
+		sut.TimeSystem.Should().BeSameAs(fileSystem.TimeSystem);
 	}
 
 	[Fact]

diff --git a/Tests/Testably.Abstractions.Testing.Tests/TestHelpers/Usings.cs b/Tests/Testably.Abstractions.Testing.Tests/TestHelpers/Usings.cs
@@ -2,4 +2,5 @@
 global using FluentAssertions;
 global using System;
 global using System.IO.Abstractions;
+global using Testably.Abstractions.FluentAssertions;
 global using Xunit;
diff --git a/Tests/Testably.Abstractions.Testing.Tests/Testably.Abstractions.Testing.Tests.csproj b/Tests/Testably.Abstractions.Testing.Tests/Testably.Abstractions.Testing.Tests.csproj
@@ -21,6 +21,10 @@
 		<ProjectReference Include="..\..\Source\Testably.Abstractions\Testably.Abstractions.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="Testably.Abstractions.FluentAssertions" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <Compile Update="Properties\Resources.Designer.cs">
 	    <DesignTime>True</DesignTime>

diff --git a/Tests/Testably.Abstractions.Tests/FileSystem/Directory/CreateDirectoryTests.cs b/Tests/Testably.Abstractions.Tests/FileSystem/Directory/CreateDirectoryTests.cs
@@ -19,7 +19,7 @@ public void CreateDirectory_AlreadyExisting_ShouldDoNothing(string path)
 		});
 
 		exception.Should().BeNull();
-		FileSystem.Directory.Exists(path).Should().BeTrue();
+		FileSystem.Should().HaveDirectory(path);
 	}
 
 	[SkippableTheory]
@@ -39,14 +39,14 @@ public void CreateDirectory_ReadOnlyParent_ShouldStillCreateDirectory(string par
 		if (Test.RunsOnWindows)
 		{
 			exception.Should().BeNull();
-			FileSystem.Directory.Exists(subdirectoryPath).Should().BeTrue();
+			FileSystem.Should().HaveDirectory(subdirectoryPath);
 			FileSystem.DirectoryInfo.New(parent).Attributes
 				.Should().HaveFlag(FileAttributes.ReadOnly);
 		}
 		else
 		{
 			exception.Should().BeException<UnauthorizedAccessException>(hResult: -2147024891);
-			FileSystem.Directory.Exists(subdirectoryPath).Should().BeFalse();
+			FileSystem.Should().NotHaveDirectory(subdirectoryPath);
 		}
 	}
 
@@ -63,7 +63,7 @@ public void CreateDirectory_FileWithSameNameAlreadyExists_ShouldThrowIOException
 
 		exception.Should().BeException<IOException>(
 			hResult: Test.RunsOnWindows ? -2147024713 : 17);
-		FileSystem.Directory.Exists(name).Should().BeFalse();
+		FileSystem.Should().NotHaveDirectory(name);
 	}
 
 	[SkippableFact]
@@ -78,7 +78,7 @@ public void CreateDirectory_Root_ShouldNotThrowException()
 		});
 
 		exception.Should().BeNull();
-		FileSystem.Directory.Exists(path).Should().BeTrue();
+		FileSystem.Should().HaveDirectory(path);
 	}
 
 	[SkippableTheory]
@@ -218,9 +218,8 @@ public void CreateDirectory_NullCharacter_ShouldThrowArgumentException()
 	public void CreateDirectory_ShouldCreateDirectoryInBasePath()
 	{
 		IDirectoryInfo result = FileSystem.Directory.CreateDirectory("foo");
-		bool exists = FileSystem.Directory.Exists("foo");
 
-		exists.Should().BeTrue();
+		FileSystem.Should().HaveDirectory("foo");
 		result.FullName.Should().StartWith(BasePath);
 	}
 
@@ -263,7 +262,7 @@ public void CreateDirectory_TrailingDirectorySeparator_ShouldNotBeTrimmed(
 		result.FullName.Should().Be(System.IO.Path.Combine(BasePath, expectedName
 			.Replace(FileSystem.Path.AltDirectorySeparatorChar,
 				FileSystem.Path.DirectorySeparatorChar)));
-		FileSystem.Directory.Exists(nameWithSuffix).Should().BeTrue();
+		FileSystem.Should().HaveDirectory(nameWithSuffix);
 	}
 
 	[SkippableTheory]
@@ -285,7 +284,7 @@ public void CreateDirectory_EmptyOrWhitespace_ShouldReturnEmptyString(
 		result.FullName.Should().Be(System.IO.Path.Combine(BasePath, expectedName
 			.Replace(FileSystem.Path.AltDirectorySeparatorChar,
 				FileSystem.Path.DirectorySeparatorChar)));
-		FileSystem.Directory.Exists(nameWithSuffix).Should().BeTrue();
+		FileSystem.Should().HaveDirectory(nameWithSuffix);
 	}
 #else
 	[SkippableTheory]
@@ -317,7 +316,7 @@ public void CreateDirectory_TrailingDirectorySeparator_ShouldNotBeTrimmed(
 		result.FullName.Should().Be(System.IO.Path.Combine(BasePath, expectedName
 			.Replace(FileSystem.Path.AltDirectorySeparatorChar,
 				FileSystem.Path.DirectorySeparatorChar)));
-		FileSystem.Directory.Exists(nameWithSuffix).Should().BeTrue();
+		FileSystem.Should().HaveDirectory(nameWithSuffix);
 	}
 #endif
 }