Fix FileResultAssertions messages.

Author: faddiv

src/FluentAssertions.AspNetCore.Mvc/FileResultAssertions.cs

@@ -49,7 +49,8 @@ public FileResultAssertions WithContentType(string expectedContentType, string r
             Execute.Assertion
                 .ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.OrdinalIgnoreCase))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(FailureMessages.CommonFailMessage, "FileResult.ContentType", expectedContentType, actualContentType);
+                .WithDefaultIdentifier("FileResult.ContentType")
+                .FailWith(FailureMessages.CommonFailMessage2, expectedContentType, actualContentType);
             return this;
         }
 
@@ -72,7 +73,8 @@ public FileResultAssertions WithEntityTag(EntityTagHeaderValue expectedEntityTag
             Execute.Assertion
                 .ForCondition(Equals(expectedEntityTag, actualEntityTag))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(FailureMessages.CommonFailMessage, "FileResult.EntityTag", expectedEntityTag, actualEntityTag);
+                .WithDefaultIdentifier("FileResult.EntityTag")
+                .FailWith(FailureMessages.CommonFailMessage2, expectedEntityTag, actualEntityTag);
             return this;
         }
 
@@ -95,7 +97,8 @@ public FileResultAssertions WithFileDownloadName(string expectedFileDownloadName
             Execute.Assertion
                 .ForCondition(string.Equals(expectedFileDownloadName, actualFileDownloadName, StringComparison.OrdinalIgnoreCase))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(FailureMessages.CommonFailMessage, "FileResult.FileDownloadName", expectedFileDownloadName, actualFileDownloadName);
+                .WithDefaultIdentifier("FileResult.FileDownloadName")
+                .FailWith(FailureMessages.CommonFailMessage2, expectedFileDownloadName, actualFileDownloadName);
             return this;
         }
 
@@ -118,7 +121,8 @@ public FileResultAssertions WithLastModified(DateTimeOffset? expectedLastModifie
             Execute.Assertion
                 .ForCondition(expectedLastModified == actualLastModified)
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(FailureMessages.CommonFailMessage, "FileResult.LastModified", expectedLastModified, actualLastModified);
+                .WithDefaultIdentifier("FileResult.LastModified")
+                .FailWith(FailureMessages.CommonFailMessage2, expectedLastModified, actualLastModified);
             return this;
         }
 

tests/FluentAssertions.AspNetCore.Mvc.Tests/ContentResultAssertions_Tests.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using FluentAssertions.Mvc.Tests.Helpers;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using Xunit;
 
@@ -20,7 +21,7 @@ public void WithContent_GivenUnexpected_ShouldFail()
             var actualContent = "content";
             var expectedContent = "xyz";
             ActionResult result = new ContentResult { Content = actualContent };
-            var failureMessage = ExpectedFailureMessage("ContentResult.Content", expectedContent, actualContent);
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("ContentResult.Content", expectedContent, actualContent);
 
             Action a = () => result.Should().BeContentResult().WithContent(expectedContent, "it is {0}", 10);
 
@@ -41,18 +42,12 @@ public void WithContentType_GivenUnexpected_ShouldFail()
             var actualContentType = "text/html";
             var expectedContentType = "xyz";
             ActionResult result = new ContentResult { ContentType = actualContentType };
-            var failureMessage = ExpectedFailureMessage("ContentResult.ContentType", expectedContentType, actualContentType);
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("ContentResult.ContentType", expectedContentType, actualContentType);
 
             Action a = () => result.Should().BeContentResult().WithContentType(expectedContentType, "it is {0}", 10);
 
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);
         }
-
-        private string ExpectedFailureMessage(string context, string expected, string actual)
-        {
-            return $"Expected {context} to be \"{expected}\" because it is 10 but found \"{actual}\".";
-        }
-
     }
 }

tests/FluentAssertions.AspNetCore.Mvc.Tests/FileResultAssertions_Tests.cs

@@ -25,9 +25,9 @@ public void WithContentType_GivenUnexpected_ShouldFail()
             var actualValue = "text/css";
             var expectedValue = "text/plain";
             ActionResult result = TestDataGenerator.CreateFileContentResult(contentType: actualValue);
-            var failureMessage = FailureMessageHelper.Format(FailureMessages.CommonFailMessage, "FileResult.ContentType", expectedValue, actualValue);
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("FileResult.ContentType", expectedValue, actualValue);
 
-            Action a = () => result.Should().BeFileResult().WithContentType(expectedValue);
+            Action a = () => result.Should().BeFileResult().WithContentType(expectedValue, "it is {0}", 10);
 
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);
@@ -49,9 +49,9 @@ public void WithFileDownloadName_GivenUnexpected_ShouldFail()
             var expectedValue = "file1.txt"; 
             var result = TestDataGenerator.CreateFileContentResult();
             result.FileDownloadName = actualValue;
-            var failureMessage = FailureMessageHelper.Format(FailureMessages.CommonFailMessage, "FileResult.FileDownloadName", expectedValue, actualValue);
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("FileResult.FileDownloadName", expectedValue, actualValue);
 
-            Action a = () => result.Should().BeFileResult().WithFileDownloadName(expectedValue);
+            Action a = () => result.Should().BeFileResult().WithFileDownloadName(expectedValue, "it is {0}", 10);
 
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);
@@ -80,9 +80,9 @@ public void WithLastModified_GivenUnexpected_ShouldFail(
             var expectedValue = TestDataGenerator.CreateDateTimeOffset(expected);
             var result = TestDataGenerator.CreateFileContentResult();
             result.LastModified = actualValue;
-            var failureMessage = $"Expected \"FileResult.LastModified\" to be '<{expected ?? "null"}>' but found '<{actual ?? "null"}>'";
+            var failureMessage = $"Expected FileResult.LastModified to be <{expected ?? "null"}> because it is 10 but found <{actual ?? "null"}>.";
 
-            Action a = () => result.Should().BeFileResult().WithLastModified(expectedValue);
+            Action a = () => result.Should().BeFileResult().WithLastModified(expectedValue, "it is {0}", 10);
 
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);
@@ -107,9 +107,9 @@ public void WithEntityTag_GivenUnexpected_ShouldFail()
             var expectedValue = new EntityTagHeaderValue("\"sha256 value 2\"", false);
             var result = TestDataGenerator.CreateFileContentResult();
             result.EntityTag = actualValue;
-            var failureMessage = "Expected \"FileResult.EntityTag\" to be '\"sha256 value 2\"' but found 'W/\"sha256 value 1\"'";
+            var failureMessage = "Expected FileResult.EntityTag to be \"sha256 value 2\" because it is 10 but found W/\"sha256 value 1\".";
 
-            Action a = () => result.Should().BeFileResult().WithEntityTag(expectedValue);
+            Action a = () => result.Should().BeFileResult().WithEntityTag(expectedValue, "it is {0}", 10);
 
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);

tests/FluentAssertions.AspNetCore.Mvc.Tests/Helpers/FailureMessageHelper.cs

@@ -11,5 +11,10 @@ public static string Format(string message, params string[] args)
 
             return String.Format(message, formattedArg);
         }
+
+        public static string ExpectedContextToBeXButY(string context, string expected, string actual)
+        {
+            return $"Expected {context} to be \"{expected}\" because it is 10 but found \"{actual}\".";
+        }
     }
 }