Fix CreatedAtActionResultAssertions tests.

Author: faddiv

src/FluentAssertions.AspNetCore.Mvc/CreatedAtActionResultAssertions.cs

@@ -35,7 +35,8 @@ public CreatedAtActionResultAssertions WithActionName(string expectedActionName,
             Execute.Assertion
                    .ForCondition(string.Equals(actualActionName, expectedActionName, StringComparison.OrdinalIgnoreCase))
                    .BecauseOf(reason, reasonArgs)
-                   .FailWith("Expected CreatedAtActionResult.ActionName to be {0}{reason} but was {1}", expectedActionName, actualActionName);
+                   .WithDefaultIdentifier("CreatedAtActionResult.ActionName")
+                   .FailWith(FailureMessages.CommonFailMessage, expectedActionName, actualActionName);
 
             return this;
         }
@@ -58,7 +59,8 @@ public CreatedAtActionResultAssertions WithControllerName(string expectedControl
             Execute.Assertion
                 .ForCondition(string.Equals(actualControllerName, expectedControllerName, StringComparison.OrdinalIgnoreCase))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith("Expected CreatedAtActionResult.ControllerName to be {0}{reason} but was {1}", expectedControllerName, actualControllerName);
+                .WithDefaultIdentifier("CreatedAtActionResult.ControllerName")
+                .FailWith(FailureMessages.CommonFailMessage, expectedControllerName, actualControllerName);
 
             return this;
         }

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

@@ -8,38 +8,51 @@ namespace FluentAssertions.AspNetCore.Mvc.Tests
 
     public class CreatedAtActionResultAssertions_Tests
     {
+        public const string Reason = FailureMessageHelper.Reason;
+        public readonly static object[] ReasonArgs = FailureMessageHelper.ReasonArgs;
         private const string TestValue = "testValue";
 
         [Fact]
         public void WithActionName_GivenExpectedActionName_ShouldPass()
         {
             var expectedActionName = "expectedAction";
             var result = new CreatedAtActionResult(expectedActionName, string.Empty, null, null);
+
             result.Should().BeCreatedAtActionResult().WithActionName(expectedActionName);
         }
 
         [Fact]
         public void WithActionName_GivenUnexpectedActionName_ShouldFail()
         {
             var result = new CreatedAtActionResult("someOtherAction", string.Empty, null, null);
-            Action a = () => result.Should().BeCreatedAtActionResult().WithActionName("expectedAction");
-            a.Should().Throw<Exception>().WithMessage("Expected CreatedAtActionResult.ActionName to be \"expectedAction\" but was \"someOtherAction\"");
+            string failureMessage = FailureMessageHelper.ExpectedContextToBeXButY(
+                "CreatedAtActionResult.ActionName", "expectedAction", "someOtherAction");
+
+            Action a = () => result.Should().BeCreatedAtActionResult().WithActionName("expectedAction", Reason, ReasonArgs);
+
+            a.Should().Throw<Exception>().WithMessage(
+                failureMessage);
         }
 
         [Fact]
         public void WithControllerName_GivenExpectedControllerName_ShouldPass()
         {
             var expectedControllerName = "expectedController";
             var result = new CreatedAtActionResult(string.Empty, expectedControllerName, null, null);
+
             result.Should().BeCreatedAtActionResult().WithControllerName(expectedControllerName);
         }
 
         [Fact]
         public void WithControllerName_GivenUnexpectedControllerName_ShouldFail()
         {
             var result = new CreatedAtActionResult(string.Empty, "someOtherController", null, null);
-            Action a = () => result.Should().BeCreatedAtActionResult().WithControllerName("expectedController");
-            a.Should().Throw<Exception>().WithMessage("Expected CreatedAtActionResult.ControllerName to be \"expectedController\" but was \"someOtherController\"");
+            string failureMessage = FailureMessageHelper.ExpectedContextToBeXButY(
+                "CreatedAtActionResult.ControllerName", "expectedController", "someOtherController");
+
+            Action a = () => result.Should().BeCreatedAtActionResult().WithControllerName("expectedController", Reason, ReasonArgs);
+
+            a.Should().Throw<Exception>().WithMessage(failureMessage);
         }
 
         [Fact]
@@ -49,9 +62,12 @@ public void WithRouteValue_GivenKeyDoesntExist_ShouldFail()
 
             var routeValues = new {myKey = "MyValue"};
             var result = new CreatedAtActionResult(string.Empty, string.Empty, routeValues, null);
+            string failureMessage = FailureMessageHelper.ExpectedContextContainValueAtKeyButKeyNotFound(
+                "CreatedAtActionResult.RouteValues", "Val", expectedKey);
 
-            Action a = () => result.Should().BeCreatedAtActionResult().WithRouteValue(expectedKey, "");
-            a.Should().Throw<Exception>().WithMessage("Expected CreatedAtActionResult.ControllerName to be \"expectedController\" but was \"someOtherController\"");
+            Action a = () => result.Should().BeCreatedAtActionResult().WithRouteValue(expectedKey, "Val", Reason, ReasonArgs);
+
+            a.Should().Throw<Exception>().WithMessage(failureMessage);
         }
 
         [Fact]
@@ -60,21 +76,24 @@ public void WithRouteValue_GivenExpectedKeyValuePair_ShouldPass()
             var expectedKey = "expectedKey";
             var expectedValue = "expectedValue";
             var routeValues = new {expectedKey = expectedValue};
-
             var result = new CreatedAtActionResult(string.Empty, string.Empty, routeValues, null);
+
             result.Should().BeCreatedAtActionResult().WithRouteValue(expectedKey, expectedValue);
         }
 
         [Fact]
-        public void HaveValue_GivenUnexpectedKeyValuePair_ShouldFail()
+        public void WithRouteValue_GivenUnexpectedValue_ShouldFail()
         {
             var expectedKey = "expectedKey";
             var expectedValue = "expectedValue";
             var routeValues = new { expectedKey = "someOtherValue" };
-
             var result = new CreatedAtActionResult(string.Empty, string.Empty, routeValues, null);
-            Action a = () => result.Should().BeCreatedAtActionResult().WithRouteValue(expectedKey, expectedValue);
-            a.Should().Throw<Exception>().WithMessage("Expected CreatedAtActionResult.ControllerName to be \"expectedController\" but was \"someOtherController\"");
+            string failureMessage = FailureMessageHelper.ExpectedAtKeyValueXButFoundY(
+                "CreatedAtActionResult.RouteValues", expectedKey, expectedValue, "someOtherValue");
+
+            Action a = () => result.Should().BeCreatedAtActionResult().WithRouteValue(expectedKey, expectedValue, Reason, ReasonArgs);
+
+            a.Should().Throw<Exception>().WithMessage(failureMessage);
         }
 
         [Fact]
@@ -104,8 +123,10 @@ public void ValueAs_GivenWrongType_ShouldFail()
         public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new CreatedAtActionResult(string.Empty, string.Empty, null, null);
-            var failureMessage = FailureMessageHelper.Format(FailureMessages.CommonNullWasSuppliedFailMessage, "CreatedAtActionResult.Value", typeof(object).Name);
+            var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull("CreatedAtActionResult.Value", typeof(object).FullName);
+
             Action a = () => result.Should().BeCreatedAtActionResult().ValueAs<object>();
+
             a.Should().Throw<Exception>().WithMessage(failureMessage);
         }
     }