Add ObjectAssertions.WithStatusCode. Simplify FailureMessageHelper.

Author: faddiv

src/FluentAssertions.AspNetCore.Mvc/ObjectResultAssertionsBase.cs

@@ -142,25 +142,50 @@ public TObjectResultAssertion WithContentType(string expected, string reason = "
         }
 
         /// <summary>
-        /// Asserts that the <see cref="ObjectResult.DeclaredType"/> contains the specified content type.
+        /// Asserts that the <see cref="ObjectResult.DeclaredType"/> is the expected declared type.
         /// </summary>
-        /// <param name="expected">The expectation content type.</param>
+        /// <param name="expectedDeclaredType">The expected declared type.</param>
         /// <param name="reason">
         ///     A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
         ///     is needed. If the phrase does not start with the word <i>because</i>, it is prepended automatically.
         /// </param>
         /// <param name="reasonArgs">
         ///     Zero or more objects to format using the placeholders in <paramref name="reason"/>.
         /// </param>
-        public TObjectResultAssertion WithDeclaredType(Type expected, string reason = "", params object[] reasonArgs)
+        public TObjectResultAssertion WithDeclaredType(Type expectedDeclaredType, string reason = "", params object[] reasonArgs)
         {
             var actual = ObjectResultSubject.DeclaredType;
 
             Execute.Assertion
-                .ForCondition(expected == actual)
+                .ForCondition(expectedDeclaredType == actual)
                 .WithDefaultIdentifier(Identifier + ".DeclaredType")
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(FailureMessages.CommonTypeFailMessage, expected, actual);
+                .FailWith(FailureMessages.CommonTypeFailMessage, expectedDeclaredType, actual);
+
+            return (TObjectResultAssertion)this;
+        }
+
+
+        /// <summary>
+        /// Asserts that the <see cref="ObjectResult.StatusCode"/> is the expected status code.
+        /// </summary>
+        /// <param name="expectedStatusCode">The expected status code.</param>
+        /// <param name="reason">
+        ///     A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
+        ///     is needed. If the phrase does not start with the word <i>because</i>, it is prepended automatically.
+        /// </param>
+        /// <param name="reasonArgs">
+        ///     Zero or more objects to format using the placeholders in <paramref name="reason"/>.
+        /// </param>
+        public TObjectResultAssertion WithStatusCode(int? expectedStatusCode, string reason = "", params object[] reasonArgs)
+        {
+            var actual = ObjectResultSubject.StatusCode;
+
+            Execute.Assertion
+                .ForCondition(expectedStatusCode == actual)
+                .WithDefaultIdentifier(Identifier + ".StatusCode")
+                .BecauseOf(reason, reasonArgs)
+                .FailWith(FailureMessages.CommonFailMessage, expectedStatusCode, actual);
 
             return (TObjectResultAssertion)this;
         }

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

@@ -77,7 +77,7 @@ public void WithUri_GivenExpectedUri_ShouldPass()
         public void WithUri_GivenWrongUri_ShouldFail()
         {
             var result = new TestController().Created(TestWrongUri, TestValue);
-            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("CreatedResult.Uri", TestUri, TestWrongUri);
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("CreatedResult.Uri", TestUri.ToString(), TestWrongUri.ToString());
 
             Action a = () => result.Should().BeCreatedResult().WithUri(TestUri, Reason, ReasonArgs);
 

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

@@ -18,24 +18,9 @@ public static string Format(string message, params string[] args)
             return String.Format(message, formattedArg);
         }
 
-        public static string ExpectedContextToBeXButY(string context, Uri expected, Uri actual)
-        {
-            return ExpectedContextToBeXButY(context, expected?.ToString(), actual?.ToString());
-        }
-
-        public static string ExpectedContextToBeXButY(string context, string expected, string actual)
-        {
-            return ExpectedContextToBeXButY(context, (object)$"\"{expected}\"", (object)$"\"{actual}\"");
-        }
-
-        public static string ExpectedContextToBeXButY(string context, DateTimeOffset? expected, DateTimeOffset? actual)
-        {
-            return ExpectedContextToBeXButY(context, ToString(expected), ToString(actual));
-        }
-
         public static string ExpectedContextToBeXButY(string context, object expected, object actual)
         {
-            return $"Expected {context} to be {expected} because it is 10 but found {actual}.";
+            return $"Expected {context} to be {Formatter.ToString(expected)} because it is 10 but found {Formatter.ToString(actual)}.";
         }
 
         public static string ExpectedAtKeyValueXButFoundY(string context, string key, string expected, string actual)
@@ -48,29 +33,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.";
         }
 
-        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)
-                {
-                    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)
-                {
-                    builder.AppendFormat(" -{0}h", expected.Value.Offset.Hours);
-                }
-                builder.Append('>');
-                return builder.ToString();
-            }
-            return "<null>";
-        }
-
         internal static string ExpectedToContainItemButFoundNull(string context, object item)
         {
             return $"Expected {context} to contain {Formatter.ToString(item)} because it is 10 but found <null>.";

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

@@ -156,7 +156,6 @@ public void WithContentType_GivenUnexpected_ShouldFail()
                 .WithMessage(failureMessage);
         }
 
-
         [Fact]
         public void WithDeclaredType_GivenExpected_ShouldPass()
         {
@@ -188,5 +187,37 @@ public void WithDeclaredType_GivenUnexpected_ShouldFail()
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);
         }
+
+        [Fact]
+        public void WithStatusCode_GivenExpected_ShouldPass()
+        {
+            var expectedStatusCode = 200;
+            var result = new ObjectResult(TestValue)
+            {
+                StatusCode = expectedStatusCode
+            };
+
+            result.Should().BeObjectResult().WithStatusCode(expectedStatusCode);
+        }
+
+        [Fact]
+        public void WithStatusCode_GivenUnexpected_ShouldFail()
+        {
+            var expectedStatusCode = 200;
+            var actualStatusCode = 500;
+            var result = new ObjectResult(TestValue)
+            {
+                StatusCode = actualStatusCode
+            };
+            string failureMessage = FailureMessageHelper.ExpectedContextToBeXButY(
+                "ObjectResult.StatusCode",
+                expectedStatusCode,
+                actualStatusCode);
+
+            Action a = () => result.Should().BeObjectResult().WithStatusCode(expectedStatusCode, Reason, ReasonArgs);
+
+            a.Should().Throw<Exception>()
+                .WithMessage(failureMessage);
+        }
     }
 }