Fix LocalRedirectObjectResultAssertions and JsonResultAssertions Tests.

Author: faddiv

src/FluentAssertions.AspNetCore.Mvc/LocalRedirectResultAssertions.cs

@@ -54,7 +54,8 @@ public LocalRedirectResultAssertions WithLocalUrl(string expectedLocalUrl, strin
             Execute.Assertion
                 .ForCondition(string.Equals(actualLocalUrl, expectedLocalUrl))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(string.Format(FailureMessages.CommonFailMessage, "LocalRedirectResult.LocalUrl", expectedLocalUrl, actualLocalUrl));
+                .WithDefaultIdentifier("LocalRedirectResult.LocalUrl")
+                .FailWith(FailureMessages.CommonFailMessage, expectedLocalUrl, actualLocalUrl);
 
             return this;
         }
@@ -77,7 +78,8 @@ public LocalRedirectResultAssertions WithPermanent(bool expectedPermanent, strin
             Execute.Assertion
                 .ForCondition(expectedPermanent == actualPermanent)
                 .BecauseOf(reason, reasonArgs)
-                .FailWith("Expected LocalRedirectResult.Permanent to be {0}{reason} but was {1}", expectedPermanent, actualPermanent);
+                .WithDefaultIdentifier("LocalRedirectResult.Permanent")
+                .FailWith(FailureMessages.CommonFailMessage, expectedPermanent, actualPermanent);
 
             return this;
         }
@@ -100,7 +102,8 @@ public LocalRedirectResultAssertions WithPreserveMethod(bool expectedPreserveMet
             Execute.Assertion
                 .ForCondition(expectedPreserveMethod == actualPreserveMethod)
                 .BecauseOf(reason, reasonArgs)
-                .FailWith("Expected LocalRedirectResult.PreserveMethod to be {0}{reason} but was {1}", expectedPreserveMethod, actualPreserveMethod);
+                .WithDefaultIdentifier("LocalRedirectResult.PreserveMethod")
+                .FailWith(FailureMessages.CommonFailMessage, expectedPreserveMethod, actualPreserveMethod);
 
             return this;
         }

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

@@ -86,7 +86,8 @@ public void ValueAs_GivenJsonResultWithValue_ShouldReturnTheSame()
         public void ValueAs_GivenWrongType_ShouldFail()
         {
             var result = new TestController().JsonSimpleValue();
-            const string failureMessage = "Expected Value to be of type System.Int32 but was System.String.";
+            string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY(
+                "JsonResult.Value", typeof(int).FullName, typeof(string).FullName);
 
             Action a = () => result.Should().BeJsonResult().ValueAs<int>().Should().Be(2);
             a.Should().Throw<Exception>()
@@ -97,9 +98,10 @@ public void ValueAs_GivenWrongType_ShouldFail()
         public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new JsonResult(null);
-            string failureMessage = $"Expected JsonResult.Value to be of type System.Object, but no value was supplied.";
+            string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull(
+                "JsonResult.Value", typeof(object).FullName);
 
-            Action a = () => result.Should().BeJsonResult().ValueAs<Object>();
+            Action a = () => result.Should().BeJsonResult().ValueAs<object>();
 
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);

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

@@ -1,17 +1,21 @@
 using System;
+using FluentAssertions.Mvc.Tests.Helpers;
 using Microsoft.AspNetCore.Mvc;
 using Xunit;
 
 namespace FluentAssertions.AspNetCore.Mvc.Tests
 {
     public class LocalRedirectObjectResultAssertions_Tests
     {
+        public const string Reason = FailureMessageHelper.Reason;
+        public readonly static object[] ReasonArgs = FailureMessageHelper.ReasonArgs;
         private const string TestLocalUrl = "localUrl";
 
         [Fact]
         public void WithLocalUrl_GivenExpectedLocalUrl_ShouldPass()
         {
             var result = new TestController().LocalRedirect(TestLocalUrl);
+
             result.Should().BeLocalRedirectResult().WithLocalUrl(TestLocalUrl);
         }
 
@@ -21,16 +25,18 @@ public void WithLocalUrl_GivenUnexpectedLocalUrl_ShouldFail()
             const string actualLocalUrl = TestLocalUrl;
             const string expectedLocalUrl = "otherUrl";
             ActionResult result = new LocalRedirectResult(TestLocalUrl);
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("LocalRedirectResult.LocalUrl", expectedLocalUrl, actualLocalUrl);
+
+            Action a = () => result.Should().BeLocalRedirectResult().WithLocalUrl(expectedLocalUrl, Reason, ReasonArgs);
 
-            var failureMessage = string.Format(FailureMessages.CommonFailMessage, "LocalRedirectResult.LocalUrl", expectedLocalUrl, actualLocalUrl);
-            Action a = () => result.Should().BeLocalRedirectResult().WithLocalUrl(expectedLocalUrl);
             a.Should().Throw<Exception>().WithMessage(failureMessage);
         }
 
         [Fact]
         public void WithPermanent_GivenExpectedPermanent_ShouldPass()
         {
             var result = new TestController().LocalRedirectPermanent(TestLocalUrl);
+
             result.Should().BeLocalRedirectResult().WithPermanent(true);
         }
 
@@ -39,18 +45,19 @@ public void WithPermanent_GivenUnexpectedPermanent_ShouldFail()
         {
             var actualPermanent = true;
             var expectedPermanent = false;
-
             ActionResult result = new LocalRedirectResult(TestLocalUrl) { Permanent = actualPermanent };
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("LocalRedirectResult.Permanent", expectedPermanent, actualPermanent);
+
+            Action a = () => result.Should().BeLocalRedirectResult().WithPermanent(expectedPermanent, Reason, ReasonArgs);
 
-            var failureMessage = $"Expected LocalRedirectResult.Permanent to be {expectedPermanent} but was {actualPermanent}";
-            Action a = () => result.Should().BeLocalRedirectResult().WithPermanent(expectedPermanent);
             a.Should().Throw<Exception>().WithMessage(failureMessage);
         }
 
         [Fact]
         public void WithPreserveMethod_GivenExpectedPreserveMethod_ShouldPass()
         {
             var result = new TestController().LocalRedirectPreserveMethod(TestLocalUrl);
+
             result.Should().BeLocalRedirectResult().WithPreserveMethod(true);
         }
 
@@ -59,18 +66,19 @@ public void WithPreserveMethod_GivenUnexpectedPreserveMethod_ShouldFail()
         {
             var actualPreserveMethod = true;
             var expectedPreserveMethod = false;
-
             ActionResult result = new LocalRedirectResult(TestLocalUrl) { PreserveMethod = actualPreserveMethod };
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("LocalRedirectResult.PreserveMethod", expectedPreserveMethod, actualPreserveMethod);
+
+            Action a = () => result.Should().BeLocalRedirectResult().WithPreserveMethod(expectedPreserveMethod, Reason, ReasonArgs);
 
-            var failureMessage = $"Expected LocalRedirectResult.PreserveMethod to be {expectedPreserveMethod} but was {actualPreserveMethod}";
-            Action a = () => result.Should().BeLocalRedirectResult().WithPreserveMethod(expectedPreserveMethod);
             a.Should().Throw<Exception>().WithMessage(failureMessage);
         }
 
         [Fact]
         public void WithPreserveMethod_GivenExpectedPermanentPreserveMethod_ShouldPass()
         {
             var result = new TestController().LocalRedirectPermanentPreserveMethod(TestLocalUrl);
+
             result.Should().BeLocalRedirectResult().WithPermanent(true).WithPreserveMethod(true);
         }
     }

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

@@ -21,6 +21,7 @@ public void Value_GivenUnexpectedValue_ShouldFail()
             var result = new TestController().Ok(TestValue);
 
             Action a = () => result.Should().BeOkObjectResult().Value.Should().Be("xyx");
+
             a.Should().Throw<Exception>();
         }
 
@@ -38,6 +39,7 @@ public void ValueAs_GivenUnexpectedValue_ShouldFail()
             var result = new TestController().Ok(TestValue);
 
             Action a = () => result.Should().BeOkObjectResult().ValueAs<string>().Should().Be("xyx");
+
             a.Should().Throw<Exception>();
         }
 
@@ -49,6 +51,7 @@ public void ValueAs_GivenWrongType_ShouldFail()
                 "OkObjectResult.Value", typeof(int).FullName, typeof(string).FullName);
 
             Action a = () => result.Should().BeOkObjectResult().ValueAs<int>().Should().Be(2);
+
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);
         }