Fix VirtualFileResult and PhysicalFileResult messages.

Author: faddiv

src/FluentAssertions.AspNetCore.Mvc/PhysicalFileResultAssertions.cs

@@ -56,7 +56,8 @@ public FileResultAssertions WithFileName(string expectedFileName, string reason
             Execute.Assertion
                 .ForCondition(string.Equals(expectedFileName, actualFileName, StringComparison.OrdinalIgnoreCase))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(FailureMessages.CommonFailMessage, "PhysicalFileResult.FileName", expectedFileName, actualFileName);
+                .WithDefaultIdentifier("PhysicalFileResult.FileName")
+                .FailWith(FailureMessages.CommonFailMessage2, expectedFileName, actualFileName);
             return this;
         }
 

src/FluentAssertions.AspNetCore.Mvc/VirtualFileResultAssertions.cs

@@ -56,7 +56,8 @@ public FileResultAssertions WithFileName(string expectedFileName, string reason
             Execute.Assertion
                 .ForCondition(string.Equals(expectedFileName, actualFileName, StringComparison.OrdinalIgnoreCase))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(FailureMessages.CommonFailMessage, "VirtualFileResult.FileName", expectedFileName, actualFileName);
+                .WithDefaultIdentifier("VirtualFileResult.FileName")
+                .FailWith(FailureMessages.CommonFailMessage2, expectedFileName, actualFileName);
             return this;
         }
 

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

@@ -1,4 +1,5 @@
 using FluentAssertions.AspNetCore.Mvc.Tests.Helpers;
+using FluentAssertions.Mvc.Tests.Helpers;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using Xunit;
@@ -26,11 +27,11 @@ public void WithFileName_GivenUnexpectedValue_ShouldFail()
             string actualFileName = "Test1.txt";
             string expectedFileName = "Test2.txt";
             ActionResult result = TestDataGenerator.CreatePhysicalFileResult(actualFileName);
-            var failureMessage = "Expected \"PhysicalFileResult.FileName\" to be '\"Test2.txt\"' but found '\"Test1.txt\"'";
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("PhysicalFileResult.FileName", expectedFileName, actualFileName);
 
             Action a = () => result.Should()
                 .BePhysicalFileResult()
-                .WithFileName(expectedFileName);
+                .WithFileName(expectedFileName, "it is {0}", 10);
 
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);

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

@@ -1,4 +1,5 @@
 using FluentAssertions.AspNetCore.Mvc.Tests.Helpers;
+using FluentAssertions.Mvc.Tests.Helpers;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using Xunit;
@@ -26,11 +27,11 @@ public void WithFileName_GivenUnexpectedValue_ShouldFail()
             string actualFileName = "Test1.txt";
             string expectedFileName = "Test2.txt";
             ActionResult result = TestDataGenerator.CreateVirtualFileResult(actualFileName);
-            var failureMessage = "Expected \"VirtualFileResult.FileName\" to be '\"Test2.txt\"' but found '\"Test1.txt\"'";
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("VirtualFileResult.FileName", expectedFileName, actualFileName);
 
             Action a = () => result.Should()
                 .BeVirtualFileResult()
-                .WithFileName(expectedFileName);
+                .WithFileName(expectedFileName, "it is {0}", 10);
 
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);