Fix NotFoundObjectResultAssertions and OkObjectResultAssertions tests.

Author: faddiv

src/FluentAssertions.AspNetCore.Mvc/NotFoundObjectResultAssertions.cs

@@ -47,11 +47,14 @@ public TValue ValueAs<TValue>()
             var value = NotFoundObjectResultSubject.Value;
 
             if (value == null)
-                Execute.Assertion.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, "NotFoundObjectResult.Value", typeof(TValue).Name);
+                Execute.Assertion
+                    .WithDefaultIdentifier("NotFoundObjectResult.Value")
+                    .FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, typeof(TValue));
 
             Execute.Assertion
                 .ForCondition(value is TValue)
-                .FailWith(FailureMessages.CommonTypeFailMessage, "NotFoundObjectResult.Value", typeof(TValue).Name, value.GetType().Name);
+                .WithDefaultIdentifier("NotFoundObjectResult.Value")
+                .FailWith(FailureMessages.CommonTypeFailMessage, typeof(TValue), value.GetType());
 
             return (TValue)value;
         }

src/FluentAssertions.AspNetCore.Mvc/OkObjectResultAssertions.cs

@@ -47,11 +47,14 @@ public TValue ValueAs<TValue>()
             var value = OkObjectResultSubject.Value;
 
             if (value == null)
-                Execute.Assertion.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, "OkObjectResult.Value", typeof(TValue).Name);
+                Execute.Assertion
+                    .WithDefaultIdentifier("OkObjectResult.Value")
+                    .FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, typeof(TValue));
 
             Execute.Assertion
                 .ForCondition(value is TValue)
-                .FailWith(FailureMessages.CommonTypeFailMessage, "OkObjectResult.Value", typeof(TValue).Name, value.GetType().Name);
+                .WithDefaultIdentifier("OkObjectResult.Value")
+                .FailWith(FailureMessages.CommonTypeFailMessage, typeof(TValue), value.GetType());
 
             return (TValue)value;
         }

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

@@ -41,19 +41,25 @@ public static string ExpectedKeyButNotFound(string context, string key, string e
             return $"Expected {context} to contain value \"{expected}\" at key \"{key}\" because it is 10, but the key was not found.";
         }
 
+        internal static string ExpectedContextTypeXButFoundY(string context, string expected, string actual)
+        {
+            return $"Expected {context} to be of type {expected} but was {actual}.";
+        }
+
         private static object ToString(DateTimeOffset? expected)
         {
             if (expected.HasValue)
             {
                 var builder = new StringBuilder($"<{expected:yyyy-MM-dd HH:mm:ss}");
-                if(expected.Value.Millisecond > 0)
+                if (expected.Value.Millisecond > 0)
                 {
                     builder.AppendFormat(".{0:fffffff}", expected.Value);
                 }
                 if (expected.Value.Offset.Hours > 0)
                 {
                     builder.AppendFormat(" +{0}h", expected.Value.Offset.Hours);
-                } else if (expected.Value.Offset.Hours < 0)
+                }
+                else if (expected.Value.Offset.Hours < 0)
                 {
                     builder.AppendFormat(" -{0}h", expected.Value.Offset.Hours);
                 }
@@ -63,6 +69,11 @@ private static object ToString(DateTimeOffset? expected)
             return "<null>";
         }
 
+        internal static string ExpectedContextTypeXButFoundNull(string context, string expectedType)
+        {
+            return $"Expected {context} to be of type {expectedType}, but no value was supplied.";
+        }
+
         internal static string ExpectedContextContainValueAtKeyButFoundNull(string context, string value, string key)
         {
             return $"Expected {context} to contain value \"{value}\" at key \"{key}\" because it is 10, but it is <null>.";

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

@@ -97,7 +97,7 @@ public void ValueAs_GivenWrongType_ShouldFail()
         public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new JsonResult(null);
-            string failureMessage = $"Expected Value to be of type System.Object, but no value was supplied.";
+            string failureMessage = $"Expected JsonResult.Value to be of type System.Object, but no value was supplied.";
 
             Action a = () => result.Should().BeJsonResult().ValueAs<Object>();
 

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

@@ -45,16 +45,21 @@ public void ValueAs_GivenUnexpectedValue_ShouldFail()
         public void ValueAs_GivenWrongType_ShouldFail()
         {
             var result = new TestController().NotFound(TestValue);
+            string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY(
+                "NotFoundObjectResult.Value", typeof(int).FullName, typeof(string).FullName);
 
             Action a = () => result.Should().BeNotFoundObjectResult().ValueAs<int>().Should().Be(2);
-            a.Should().Throw<Exception>();
+
+            a.Should().Throw<Exception>()
+                .WithMessage(failureMessage);
         }
 
         [Fact]
         public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new NotFoundObjectResult(null);
-            string failureMessage = FailureMessageHelper.Format(FailureMessages.CommonNullWasSuppliedFailMessage, "NotFoundObjectResult.Value", typeof(object).Name);
+            string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull(
+                "NotFoundObjectResult.Value", typeof(object).FullName);
 
             Action a = () => result.Should().BeNotFoundObjectResult().ValueAs<object>();
 

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

@@ -45,16 +45,20 @@ public void ValueAs_GivenUnexpectedValue_ShouldFail()
         public void ValueAs_GivenWrongType_ShouldFail()
         {
             var result = new TestController().Ok(TestValue);
+            string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY(
+                "OkObjectResult.Value", typeof(int).FullName, typeof(string).FullName);
 
             Action a = () => result.Should().BeOkObjectResult().ValueAs<int>().Should().Be(2);
-            a.Should().Throw<Exception>();
+            a.Should().Throw<Exception>()
+                .WithMessage(failureMessage);
         }
 
         [Fact]
         public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new OkObjectResult(null);
-            string failureMessage = FailureMessageHelper.Format(FailureMessages.CommonNullWasSuppliedFailMessage, "OkObjectResult.Value", typeof(object).Name);
+            string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull(
+                "OkObjectResult.Value", typeof(object).FullName);
 
             Action a = () => result.Should().BeOkObjectResult().ValueAs<object>();
 

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

@@ -101,7 +101,7 @@ public void WithLastModified_GivenNull_ShouldPass()
         public void WithLastModified_GivenActualNull_ShouldFail()
         {
             var actualLastModified = null as DateTimeOffset?;
-            var expectedLastModified = DateTimeOffset.Now;
+            var expectedLastModified = TestLastModified;
             ActionResult result = new PhysicalFileResult(string.Empty, TestContentType) { LastModified = actualLastModified };
             var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("PhysicalFileResult.LastModified", expectedLastModified, actualLastModified);
 
@@ -113,7 +113,7 @@ public void WithLastModified_GivenActualNull_ShouldFail()
         [Fact]
         public void WithLastModified_GivenExpectedNull_ShouldFail()
         {
-            var actualLastModified = DateTimeOffset.Now;
+            var actualLastModified = TestLastModified;
             var expectedLastModified = null as DateTimeOffset?;
             ActionResult result = new PhysicalFileResult(string.Empty, TestContentType) { LastModified = actualLastModified };
             var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("PhysicalFileResult.LastModified", expectedLastModified, actualLastModified);