refactor: error message when no file or directory was found (#48)

When no matching file or directory was found in a directory, improve the error message to specify that "none" was found instead of the simple count (0).
Testably · Sep 5, 2023 · 5364317 · 5364317
1 parent 2474d0c
commit 5364317
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/Source/Testably.Abstractions.FluentAssertions/DirectoryAssertions.cs b/Source/Testably.Abstractions.FluentAssertions/DirectoryAssertions.cs
@@ -62,6 +62,7 @@ public AndConstraint<DirectoryAssertions> HasDirectories(
 	public AndWhichConstraint<FileSystemAssertions, DirectoryAssertions> HasDirectory(
 		string searchPattern = "*", string because = "", params object[] becauseArgs)
 	{
+		var subdirectory = Subject?.GetDirectories(searchPattern).FirstOrDefault();
 		Execute.Assertion
 			.WithDefaultIdentifier(Identifier)
 			.BecauseOf(because, becauseArgs)
@@ -75,16 +76,22 @@ public AndWhichConstraint<FileSystemAssertions, DirectoryAssertions> HasDirector
 			.Then
 			.Given(() => Subject!)
 			.ForCondition(directoryInfo
-				=> directoryInfo.GetDirectories(searchPattern).Length == 1)
+				=> directoryInfo.GetDirectories(searchPattern).Length <= 1)
 			.FailWith(
 				"Expected {context} {1} to contain exactly one directory matching {0}{reason}, but found {2}.",
 				_ => searchPattern,
 				directoryInfo => directoryInfo.Name,
-				directoryInfo => directoryInfo.GetDirectories(searchPattern).Length);
+				directoryInfo => directoryInfo.GetDirectories(searchPattern).Length)
+			.Then
+			.ForCondition(_ => subdirectory != null)
+			.FailWith(
+				"Expected {context} {1} to contain exactly one directory matching {0}{reason}, but found none.",
+				_ => searchPattern,
+				directoryInfo => directoryInfo.Name);
 
 		return new AndWhichConstraint<FileSystemAssertions, DirectoryAssertions>(
 			new FileSystemAssertions(Subject!.FileSystem),
-			new DirectoryAssertions(Subject!.GetDirectories(searchPattern).Single()));
+			new DirectoryAssertions(subdirectory));
 	}
 
 	/// <summary>
@@ -93,6 +100,7 @@ public AndWhichConstraint<FileSystemAssertions, DirectoryAssertions> HasDirector
 	public AndWhichConstraint<FileSystemAssertions, FileAssertions> HasFile(
 		string searchPattern = "*", string because = "", params object[] becauseArgs)
 	{
+		var file = Subject?.GetFiles(searchPattern).FirstOrDefault();
 		Execute.Assertion
 			.WithDefaultIdentifier(Identifier)
 			.BecauseOf(because, becauseArgs)
@@ -106,16 +114,22 @@ public AndWhichConstraint<FileSystemAssertions, FileAssertions> HasFile(
 			.Then
 			.Given(() => Subject!)
 			.ForCondition(directoryInfo
-				=> directoryInfo.GetFiles(searchPattern).Length == 1)
+				=> directoryInfo.GetFiles(searchPattern).Length <= 1)
 			.FailWith(
 				"Expected {context} {1} to contain exactly one file matching {0}{reason}, but found {2}.",
 				_ => searchPattern,
 				directoryInfo => directoryInfo.Name,
-				directoryInfo => directoryInfo.GetFiles(searchPattern).Length);
+				directoryInfo => directoryInfo.GetFiles(searchPattern).Length)
+			.Then
+			.ForCondition(_ => file != null)
+			.FailWith(
+				"Expected {context} {1} to contain exactly one file matching {0}{reason}, but found none.",
+				_ => searchPattern,
+				directoryInfo => directoryInfo.Name);
 
 		return new AndWhichConstraint<FileSystemAssertions, FileAssertions>(
 			new FileSystemAssertions(Subject!.FileSystem),
-			new FileAssertions(Subject!.GetFiles(searchPattern).Single()));
+			new FileAssertions(file));
 	}
 
 	/// <summary>

diff --git a/Tests/Testably.Abstractions.FluentAssertions.Tests/DirectoryAssertionsTests.cs b/Tests/Testably.Abstractions.FluentAssertions.Tests/DirectoryAssertionsTests.cs
@@ -183,7 +183,7 @@ public void HasDirectory_WithoutMatchingDirectory_ShouldThrow(
 		exception.Should().NotBeNull();
 		exception!.Message.Should()
 			.Be(
-				$"Expected directory \"{directoryName}\" to contain exactly one directory matching \"{subdirectoryName}\" {because}, but found 0.");
+				$"Expected directory \"{directoryName}\" to contain exactly one directory matching \"{subdirectoryName}\" {because}, but found none.");
 	}
 
 	[Theory]
@@ -268,7 +268,7 @@ public void HasFile_WithoutMatchingFile_ShouldThrow(
 		exception.Should().NotBeNull();
 		exception!.Message.Should()
 			.Be(
-				$"Expected directory \"{directoryName}\" to contain exactly one file matching \"{fileName}\" {because}, but found 0.");
+				$"Expected directory \"{directoryName}\" to contain exactly one file matching \"{fileName}\" {because}, but found none.");
 	}
 
 	[Theory]

diff --git a/Tests/Testably.Abstractions.FluentAssertions.Tests/DirectoryInfoAssertionsTests.cs b/Tests/Testably.Abstractions.FluentAssertions.Tests/DirectoryInfoAssertionsTests.cs
@@ -182,7 +182,7 @@ public void HaveDirectory_WithoutMatchingDirectory_ShouldThrow(
 		exception.Should().NotBeNull();
 		exception!.Message.Should()
 			.Be(
-				$"Expected directory \"{directoryName}\" to contain exactly one directory matching \"{subdirectoryName}\" {because}, but found 0.");
+				$"Expected directory \"{directoryName}\" to contain exactly one directory matching \"{subdirectoryName}\" {because}, but found none.");
 	}
 
 	[Theory]
@@ -282,7 +282,7 @@ public void HaveFile_WithoutMatchingFile_ShouldThrow(
 		exception.Should().NotBeNull();
 		exception!.Message.Should()
 			.Be(
-				$"Expected directory \"{directoryName}\" to contain exactly one file matching \"{fileName}\" {because}, but found 0.");
+				$"Expected directory \"{directoryName}\" to contain exactly one file matching \"{fileName}\" {because}, but found none.");
 	}
 
 	[Theory]