move file paths to top of exception

SimonCropp · SimonCropp · commit 4e39d7e83d56 · 2022-01-12T21:52:39.000+11:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;xUnit1026;xUnit1013;msb3277;CS0436</NoWarn>
-    <Version>14.13.1</Version>
+    <Version>14.14.0</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>10</LangVersion>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
diff --git a/src/OmitContentFromException/OmitContentFromExceptionTests.String.verified.txt b/src/OmitContentFromException/OmitContentFromExceptionTests.String.verified.txt
@@ -1,7 +1,4 @@
 &#65279;Results do not match.
 Differences:
-Received: OmitContentFromExceptionTests.String.received.txt
-Verified: OmitContentFromExceptionTests.String.verified.txt
-
-Received path: {ProjectDirectory}OmitContentFromExceptionTests.String.received.txt
-Verified path: {ProjectDirectory}OmitContentFromExceptionTests.String.verified.txt
+Received: {ProjectDirectory}OmitContentFromExceptionTests.String.received.txt
+Verified: {ProjectDirectory}OmitContentFromExceptionTests.String.verified.txt
diff --git a/src/Verify/Verifier/VerifyEngine.cs b/src/Verify/Verifier/VerifyEngine.cs
@@ -225,8 +225,8 @@ async Task ProcessNotEquals(StringBuilder builder, FilePair item, string? messag
     {
         await VerifierSettings.RunOnVerifyMismatch(item, message);
 
-        builder.AppendLine($"Received: {Path.GetFileName(item.Received)}");
-        builder.AppendLine($"Verified: {Path.GetFileName(item.Verified)}");
+        builder.AppendLine($"Received: {item.Received}");
+        builder.AppendLine($"Verified: {item.Verified}");
         if (message is null)
         {
             if (!VerifierSettings.omitContentFromException &&
@@ -244,29 +244,23 @@ async Task ProcessNotEquals(StringBuilder builder, FilePair item, string? messag
             builder.AppendLine(message);
         }
 
-        builder.AppendLine();
-        builder.AppendLine($"Received path: {item.Received}");
-        builder.AppendLine($"Verified path: {item.Verified}");
-        builder.AppendLine();
-
         await RunClipboardDiffAutoCheck(item);
     }
 
     async Task ProcessMissing(StringBuilder builder, FilePair item)
     {
         await VerifierSettings.RunOnFirstVerify(item);
 
-        builder.AppendLine($"{Path.GetFileName(item.Verified)}: Empty or does not exist");
+        builder.AppendLine("Verified file empty or does not exist");
+        builder.AppendLine($"Received: {item.Received}");
+        builder.AppendLine($"Verified: {item.Verified}");
         if (!VerifierSettings.omitContentFromException &&
             EmptyFiles.Extensions.IsText(item.Extension))
         {
             builder.AppendLine($"{Path.GetFileName(item.Received)}");
             builder.AppendLine($"{await FileHelpers.ReadText(item.Received)}");
         }
 
-        builder.AppendLine();
-        builder.AppendLine($"Received path: {item.Received}");
-        builder.AppendLine($"Verified path: {item.Verified}");
         await RunClipboardDiffAutoCheck(item);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -225,8 +225,8 @@ async Task ProcessNotEquals(StringBuilder builder, FilePair item, string? messag`
`225`	`225`	`{`
`226`	`226`	`await VerifierSettings.RunOnVerifyMismatch(item, message);`
`227`	`227`
`228`		`- builder.AppendLine($"Received: {Path.GetFileName(item.Received)}");`
`229`		`- builder.AppendLine($"Verified: {Path.GetFileName(item.Verified)}");`
	`228`	`+ builder.AppendLine($"Received: {item.Received}");`
	`229`	`+ builder.AppendLine($"Verified: {item.Verified}");`
`230`	`230`	`if (message is null)`
`231`	`231`	`{`
`232`	`232`	`if (!VerifierSettings.omitContentFromException &&`
`@@ -244,29 +244,23 @@ async Task ProcessNotEquals(StringBuilder builder, FilePair item, string? messag`
`244`	`244`	`builder.AppendLine(message);`
`245`	`245`	`}`
`246`	`246`
`247`		`- builder.AppendLine();`
`248`		`- builder.AppendLine($"Received path: {item.Received}");`
`249`		`- builder.AppendLine($"Verified path: {item.Verified}");`
`250`		`- builder.AppendLine();`
`251`		`-`
`252`	`247`	`await RunClipboardDiffAutoCheck(item);`
`253`	`248`	`}`
`254`	`249`
`255`	`250`	`async Task ProcessMissing(StringBuilder builder, FilePair item)`
`256`	`251`	`{`
`257`	`252`	`await VerifierSettings.RunOnFirstVerify(item);`
`258`	`253`
`259`		`- builder.AppendLine($"{Path.GetFileName(item.Verified)}: Empty or does not exist");`
	`254`	`+ builder.AppendLine("Verified file empty or does not exist");`
	`255`	`+ builder.AppendLine($"Received: {item.Received}");`
	`256`	`+ builder.AppendLine($"Verified: {item.Verified}");`
`260`	`257`	`if (!VerifierSettings.omitContentFromException &&`
`261`	`258`	`EmptyFiles.Extensions.IsText(item.Extension))`
`262`	`259`	`{`
`263`	`260`	`builder.AppendLine($"{Path.GetFileName(item.Received)}");`
`264`	`261`	`builder.AppendLine($"{await FileHelpers.ReadText(item.Received)}");`
`265`	`262`	`}`
`266`	`263`
`267`		`- builder.AppendLine();`
`268`		`- builder.AppendLine($"Received path: {item.Received}");`
`269`		`- builder.AppendLine($"Verified path: {item.Verified}");`
`270`	`264`	`await RunClipboardDiffAutoCheck(item);`
`271`	`265`	`}`
`272`	`266`