Modify type message checks.

Author: faddiv

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

@@ -123,7 +123,7 @@ public void ValueAs_GivenWrongType_ShouldFail()
         public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new CreatedAtActionResult(string.Empty, string.Empty, null, null);
-            var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull("CreatedAtActionResult.Value", typeof(object).FullName);
+            var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull("CreatedAtActionResult.Value", typeof(object));
 
             Action a = () => result.Should().BeCreatedAtActionResult().ValueAs<object>();
 

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

@@ -83,7 +83,7 @@ public void ValueAs_GivenExpectedValue_ShouldPass()
         public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new CreatedAtRouteResult(string.Empty, null, null);
-            string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull("CreatedAtRouteResult.Value", typeof(object).FullName);
+            string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull("CreatedAtRouteResult.Value", typeof(object));
 
             Action a = () => result.Should().BeCreatedAtRouteResult().ValueAs<object>();
 
@@ -95,7 +95,7 @@ public void ValueAs_GivenWrongType_ShouldFail()
         {
             ActionResult result = new CreatedAtRouteResult(string.Empty, null, "");
             string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY(
-                "CreatedAtRouteResult.Value", typeof(int).FullName, typeof(string).FullName);
+                "CreatedAtRouteResult.Value", typeof(int), typeof(string));
 
             Action a = () => result.Should().BeCreatedAtRouteResult().ValueAs<int>().Should().Be(2);
 

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

@@ -47,7 +47,7 @@ public void ValueAs_GivenUnexpectedValue_ShouldFail()
         public void ValueAs_GivenWrongType_ShouldFail()
         {
             var result = new TestController().Created(TestUri, TestValue);
-            var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY("CreatedResult.Value", typeof(int).FullName, typeof(string).FullName);
+            var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY("CreatedResult.Value", typeof(int), typeof(string));
 
             Action a = () => result.Should().BeCreatedResult().ValueAs<int>().Should().Be(2, Reason, ReasonArgs);
 
@@ -58,7 +58,7 @@ public void ValueAs_GivenWrongType_ShouldFail()
         public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new CreatedResult(TestUri, null);
-            var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull("CreatedResult.Value", typeof(object).FullName);
+            var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull("CreatedResult.Value", typeof(object));
 
             Action a = () => result.Should().BeCreatedResult().ValueAs<object>();
 

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

@@ -46,11 +46,6 @@ 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)
@@ -74,7 +69,12 @@ private static object ToString(DateTimeOffset? expected)
             return "<null>";
         }
 
-        internal static string ExpectedContextTypeXButFoundNull(string context, string expectedType)
+        internal static string ExpectedContextTypeXButFoundY(string context, Type expected, Type actual)
+        {
+            return $"Expected {context} to be of type {expected.FullName} but was {actual.FullName}.";
+        }
+
+        internal static string ExpectedContextTypeXButFoundNull(string context, Type expectedType)
         {
             return $"Expected {context} to be of type {expectedType}, but no value was supplied.";
         }

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

@@ -87,7 +87,7 @@ public void ValueAs_GivenWrongType_ShouldFail()
         {
             var result = new TestController().JsonSimpleValue();
             string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY(
-                "JsonResult.Value", typeof(int).FullName, typeof(string).FullName);
+                "JsonResult.Value", typeof(int), typeof(string));
 
             Action a = () => result.Should().BeJsonResult().ValueAs<int>().Should().Be(2);
 
@@ -100,7 +100,7 @@ public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new JsonResult(null);
             string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull(
-                "JsonResult.Value", typeof(object).FullName);
+                "JsonResult.Value", typeof(object));
 
             Action a = () => result.Should().BeJsonResult().ValueAs<object>();
 

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

@@ -46,7 +46,7 @@ public void ValueAs_GivenWrongType_ShouldFail()
         {
             var result = new TestController().NotFound(TestValue);
             string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY(
-                "NotFoundObjectResult.Value", typeof(int).FullName, typeof(string).FullName);
+                "NotFoundObjectResult.Value", typeof(int), typeof(string));
 
             Action a = () => result.Should().BeNotFoundObjectResult().ValueAs<int>().Should().Be(2);
 
@@ -59,7 +59,7 @@ public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new NotFoundObjectResult(null);
             string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull(
-                "NotFoundObjectResult.Value", typeof(object).FullName);
+                "NotFoundObjectResult.Value", typeof(object));
 
             Action a = () => result.Should().BeNotFoundObjectResult().ValueAs<object>();
 

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

@@ -48,7 +48,7 @@ public void ValueAs_GivenWrongType_ShouldFail()
         {
             var result = new TestController().Ok(TestValue);
             string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY(
-                "OkObjectResult.Value", typeof(int).FullName, typeof(string).FullName);
+                "OkObjectResult.Value", typeof(int), typeof(string));
 
             Action a = () => result.Should().BeOkObjectResult().ValueAs<int>().Should().Be(2);
 
@@ -61,7 +61,7 @@ public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new OkObjectResult(null);
             string failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull(
-                "OkObjectResult.Value", typeof(object).FullName);
+                "OkObjectResult.Value", typeof(object));
 
             Action a = () => result.Should().BeOkObjectResult().ValueAs<object>();