Removed response model state error test builder (closes #159)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Base/BaseTestBuilderWithComponent.cs

@@ -69,5 +69,7 @@ public IAndTestBuilder ShouldPassForThe<TComponent>(Func<TComponent, bool> predi
 
             return new AndTestBuilder(this.TestContext);
         }
+
+        protected IAndTestBuilder NewAndTestBuilder() => new AndTestBuilder(this.TestContext);
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/ActionResults/Ok/OkTestBuilder.cs

@@ -4,7 +4,6 @@
     using System.Net;
     using Base;
     using Contracts.ActionResults.Ok;
-    using Contracts.Base;
     using Exceptions;
     using Internal.TestContexts;
     using Microsoft.AspNetCore.Mvc;

src/MyTested.AspNetCore.Mvc.Controllers/Builders/And/AndActionResultTestBuilder.cs

@@ -26,8 +26,6 @@ public AndActionResultTestBuilder(ControllerTestContext testContext)
 
         /// <inheritdoc />
         public IActionResultTestBuilder<TActionResult> AndAlso()
-        {
-            return new ActionResultTestBuilder<TActionResult>(this.TestContext);
-        }
+            => new ActionResultTestBuilder<TActionResult>(this.TestContext);
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/And/AndTestBuilderWithInvokedAction.cs

@@ -1,12 +1,14 @@
 namespace MyTested.AspNetCore.Mvc.Builders.And
 {
     using Base;
+    using Contracts.And;
     using Internal.TestContexts;
+    using Contracts.Base;
 
     /// <summary>
     /// Provides additional testing methods.
     /// </summary>
-    public class AndTestBuilderWithInvokedAction : BaseTestBuilderWithInvokedAction
+    public class AndTestBuilderWithInvokedAction : BaseTestBuilderWithInvokedAction, IAndTestBuilderWithInvokedAction
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AndTestBuilderWithInvokedAction"/> class.
@@ -16,5 +18,8 @@ public AndTestBuilderWithInvokedAction(ControllerTestContext testContext)
             : base(testContext)
         {
         }
+
+        /// <inheritdoc />
+        public IBaseTestBuilderWithInvokedAction AndAlso() => this;
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Base/BaseTestBuilderWithActionResult.cs

@@ -28,15 +28,6 @@ protected BaseTestBuilderWithActionResult(ControllerTestContext testContext)
         /// <value>Action result to be tested.</value>
         public TActionResult ActionResult => this.TestContext.MethodResultAs<TActionResult>();
 
-        /// <summary>
-        /// Initializes new instance of builder providing AndAlso method.
-        /// </summary>
-        /// <returns>Test builder of type <see cref="IAndActionResultTestBuilder{TActionResult}"/>.</returns>
-        public IAndActionResultTestBuilder<TActionResult> NewAndTestBuilder()
-        {
-            return new AndActionResultTestBuilder<TActionResult>(this.TestContext);
-        }
-
         /// <summary>
         /// Creates new <see cref="AndTestBuilderWithActionResult{TActionResult}"/>.
         /// </summary>

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Base/BaseTestBuilderWithInvokedAction.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using And;
+    using Contracts.And;
     using Contracts.Base;
     using Internal.TestContexts;
 
@@ -30,7 +31,7 @@ protected BaseTestBuilderWithInvokedAction(ControllerTestContext testContext)
         /// Creates new <see cref="AndTestBuilderWithInvokedAction"/>.
         /// </summary>
         /// <returns>Test builder of type <see cref="IBaseTestBuilderWithInvokedAction"/>.</returns>
-        public IBaseTestBuilderWithInvokedAction NewAndTestBuilderWithInvokedAction()
+        public IAndTestBuilderWithInvokedAction NewAndTestBuilderWithInvokedAction()
             => new AndTestBuilderWithInvokedAction(this.TestContext);
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/And/IAndActionResultTestBuilder.cs

@@ -4,7 +4,7 @@
     using Base;
 
     /// <summary>
-    /// Class containing AndAlso() method allowing additional assertions after the action tests.
+    /// Contains AndAlso() method allowing additional assertions after the action result tests.
     /// </summary>
     /// <typeparam name="TActionResult">Result from invoked action in ASP.NET Core MVC controller.</typeparam>
     public interface IAndActionResultTestBuilder<TActionResult> : IBaseTestBuilderWithActionResult<TActionResult>

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/And/IAndTestBuilderWithInvokedAction.cs

@@ -0,0 +1,16 @@
+namespace MyTested.AspNetCore.Mvc.Builders.Contracts.And
+{
+    using Base;
+
+    /// <summary>
+    /// Contains AndAlso() method allowing additional assertions after the action call tests.
+    /// </summary>
+    public interface IAndTestBuilderWithInvokedAction : IBaseTestBuilderWithInvokedAction
+    {
+        /// <summary>
+        /// Method allowing additional assertions after the action call tests.
+        /// </summary>
+        /// <returns>Test builder of <see cref="IBaseTestBuilderWithInvokedAction"/>.</returns>
+        IBaseTestBuilderWithInvokedAction AndAlso();
+    }
+}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Models/IModelDetailsTestBuilder.cs

@@ -1,5 +1,6 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Models
 {
+    using And;
     using System;
 
     /// <summary>
@@ -13,13 +14,13 @@ public interface IModelDetailsTestBuilder<TModel> : IModelErrorTestBuilder<TMode
         /// </summary>
         /// <param name="assertions">Action containing all assertions on the model.</param>
         /// <returns>Test builder of <see cref="IAndModelErrorTestBuilder{TResponseModel}"/>.</returns>
-        IAndModelErrorTestBuilder<TModel> Passing(Action<TModel> assertions);
+        IAndTestBuilderWithInvokedAction Passing(Action<TModel> assertions);
 
         /// <summary>
         /// Tests whether the returned model from the invoked action passes the given predicate.
         /// </summary>
         /// <param name="predicate">Predicate testing the model.</param>
         /// <returns>Test builder of <see cref="IAndModelErrorTestBuilder{TResponseModel}"/>.</returns>
-        IAndModelErrorTestBuilder<TModel> Passing(Func<TModel, bool> predicate);
+        IAndTestBuilderWithInvokedAction Passing(Func<TModel, bool> predicate);
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Models/ModelDetailsTestBuilder.cs

@@ -1,6 +1,7 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Models
 {
     using System;
+    using Contracts.And;
     using Contracts.Models;
     using Exceptions;
     using Internal.TestContexts;
@@ -24,14 +25,14 @@ public ModelDetailsTestBuilder(ControllerTestContext testContext)
         }
 
         /// <inheritdoc />
-        public IAndModelErrorTestBuilder<TModel> Passing(Action<TModel> assertions)
+        public IAndTestBuilderWithInvokedAction Passing(Action<TModel> assertions)
         {
             assertions(this.Model);
-            return new ModelErrorTestBuilder<TModel>(this.TestContext);
+            return this.NewAndTestBuilderWithInvokedAction();
         }
 
         /// <inheritdoc />
-        public IAndModelErrorTestBuilder<TModel> Passing(Func<TModel, bool> predicate)
+        public IAndTestBuilderWithInvokedAction Passing(Func<TModel, bool> predicate)
         {
             if (!predicate(this.Model))
             {
@@ -42,7 +43,7 @@ public IAndModelErrorTestBuilder<TModel> Passing(Func<TModel, bool> predicate)
                     typeof(TModel).ToFriendlyTypeName()));
             }
 
-            return new ModelErrorTestBuilder<TModel>(this.TestContext);
+            return this.NewAndTestBuilderWithInvokedAction();
         }
 
         /// <inheritdoc />