Refactor AcceptedResultAssertions to use ObjectResultAssertionsBase. (And fix the error messages.)

Author: faddiv

src/FluentAssertions.AspNetCore.Mvc/AcceptedResultAssertions.cs

@@ -1,16 +1,15 @@
-using System;
-using System.Diagnostics;
-using FluentAssertions.Execution;
-using FluentAssertions.Primitives;
+using FluentAssertions.Execution;
 using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Diagnostics;
 
 namespace FluentAssertions.AspNetCore.Mvc
 {
     /// <summary>
     /// Contains a number of methods to assert that a <see cref="AcceptedResult"/> is in the expected state.
     /// </summary>
     [DebuggerNonUserCode]
-    public class AcceptedResultAssertions : ObjectAssertions
+    public class AcceptedResultAssertions : ObjectResultAssertionsBase<AcceptedResult, AcceptedResultAssertions>
     {
         #region Public Constructors
 
@@ -25,46 +24,14 @@ public AcceptedResultAssertions(AcceptedResult subject) : base(subject)
         #endregion
 
         #region Public Properties
-        /// <summary>
-        ///     The value on the AcceptedResult
-        /// </summary>
-        public object Value => AcceptedResultSubject.Value;
-
         /// <summary>
         ///     The location on the AcceptedResult
         /// </summary>
-        public string Location => AcceptedResultSubject.Location;
-
-        #endregion
-
-        #region Private Properties
-        private AcceptedResult AcceptedResultSubject => (AcceptedResult)Subject;
+        public string Location => ObjectResultSubject.Location;
 
         #endregion
 
         #region Public Methods
-        /// <summary>
-        ///     Asserts the value is of the expected type.
-        /// </summary>
-        /// <typeparam name="TValue">The expected type.</typeparam>
-        /// <returns>The typed value.</returns>
-        public TValue ValueAs<TValue>()
-        {
-            var value = AcceptedResultSubject.Value;
-
-            if (value == null)
-                Execute.Assertion
-                    .WithDefaultIdentifier("AcceptedResultAssertions.Value")
-                    .FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, typeof(TValue));
-
-            Execute.Assertion
-                .ForCondition(value is TValue)
-                .WithDefaultIdentifier("AcceptedResultAssertions.Value")
-                .FailWith(FailureMessages.CommonTypeFailMessage, typeof(TValue), value.GetType());
-
-            return (TValue)value;
-        }
-
         /// <summary>
         ///     Asserts the uri has the expected value.
         /// </summary>
@@ -86,7 +53,7 @@ public AcceptedResultAssertions WithUri(Uri uri, string reason = "", params obje
             Execute.Assertion
                 .BecauseOf(reason, reasonArgs)
                 .ForCondition(expectedUri == Location)
-                .WithDefaultIdentifier("AcceptedResultAssertions.Uri")
+                .WithDefaultIdentifier("AcceptedResult.Uri")
                 .FailWith(FailureMessages.CommonFailMessage, expectedUri, Location);
 
             return this;
@@ -111,7 +78,7 @@ public AcceptedResultAssertions WithUri(string uri, string reason = "", params o
             Execute.Assertion
                 .BecauseOf(reason, reasonArgs)
                 .ForCondition(uri == Location)
-                .WithDefaultIdentifier("AcceptedResultAssertions.Uri")
+                .WithDefaultIdentifier("AcceptedResult.Uri")
                 .FailWith(FailureMessages.CommonFailMessage, uri, Location);
 
             return this;

src/FluentAssertions.AspNetCore.Mvc/ObjectResultAssertionsBase.cs

@@ -12,7 +12,7 @@ namespace FluentAssertions.AspNetCore.Mvc
     /// <summary>
     /// Base class for <see cref="ObjectResultAssertions"/>.
     /// </summary>
-    [DebuggerNonUserCode]
+    //[DebuggerNonUserCode]
     public class ObjectResultAssertionsBase<TObjectResult, TObjectResultAssertion> : ObjectAssertions
         where TObjectResult : ObjectResult
         where TObjectResultAssertion : ObjectResultAssertionsBase<TObjectResult, TObjectResultAssertion>

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

@@ -1,6 +1,6 @@
-using System;
-using FluentAssertions.Mvc.Tests.Helpers;
+using FluentAssertions.Mvc.Tests.Helpers;
 using Microsoft.AspNetCore.Mvc;
+using System;
 using Xunit;
 
 namespace FluentAssertions.AspNetCore.Mvc.Tests

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

@@ -1,11 +1,11 @@
-using System;
-using FluentAssertions.Mvc.Tests.Helpers;
+using FluentAssertions.Mvc.Tests.Helpers;
 using Microsoft.AspNetCore.Mvc;
+using System;
 using Xunit;
 
 namespace FluentAssertions.AspNetCore.Mvc.Tests
 {
-    
+
     public class AcceptedAtRouteResultAssertions_Tests
     {
         public const string Reason = FailureMessageHelper.Reason;

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

@@ -1,6 +1,6 @@
-using System;
-using FluentAssertions.Mvc.Tests.Helpers;
+using FluentAssertions.Mvc.Tests.Helpers;
 using Microsoft.AspNetCore.Mvc;
+using System;
 using Xunit;
 
 namespace FluentAssertions.AspNetCore.Mvc.Tests
@@ -38,7 +38,7 @@ public void ValueAs_GivenWrongType_ShouldFail()
         {
             var result = new TestController().Accepted(TestUri, TestValue);
             var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundY(
-                "AcceptedResultAssertions.Value", typeof(int), typeof(string));
+                "AcceptedResult.Value", typeof(int), typeof(string));
 
             Action a = () => result.Should().BeAcceptedResult().ValueAs<int>().Should().Be(2);
 
@@ -50,7 +50,7 @@ public void ValueAs_Null_ShouldFail()
         {
             ActionResult result = new AcceptedResult(TestUri, null);
             var failureMessage = FailureMessageHelper.ExpectedContextTypeXButFoundNull(
-                "AcceptedResultAssertions.Value", typeof(object));
+                "AcceptedResult.Value", typeof(object));
 
             Action a = () => result.Should().BeAcceptedResult().ValueAs<object>();
 
@@ -69,7 +69,7 @@ public void WithUri_GivenExpectedUri_ShouldPass()
         public void WithUri_GivenWrongUri_ShouldFail()
         {
             var result = new TestController().Accepted(TestWrongUri, TestValue);
-            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("AcceptedResultAssertions.Uri", TestUri.ToString(), TestWrongUri.ToString());
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("AcceptedResult.Uri", TestUri.ToString(), TestWrongUri.ToString());
 
             Action a = () => result.Should().BeAcceptedResult().WithUri(TestUri, Reason, ReasonArgs);
 
@@ -88,7 +88,7 @@ public void WithUri_GivenExpectedUriAsString_ShouldPass()
         public void WithUri_GivenWrongUriAsString_ShouldFail()
         {
             var result = new TestController().Accepted(TestWrongUriAsString, TestValue);
-            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("AcceptedResultAssertions.Uri", TestUriAsString, TestWrongUriAsString);
+            var failureMessage = FailureMessageHelper.ExpectedContextToBeXButY("AcceptedResult.Uri", TestUriAsString, TestWrongUriAsString);
 
             Action a = () => result.Should().BeAcceptedResult().WithUri(TestUriAsString, Reason, ReasonArgs);