All void ActionResultTestBuilders now return IAndTestBuilder (#13)

Author: ivaylokenov

MyWebApi/Builders/Actions/ShouldHaveModelState.cs

@@ -30,13 +30,13 @@ public IModelErrorTestBuilder<TRequestModel> ShouldHaveModelStateFor<TRequestMod
         public IAndTestBuilder<TActionResult> ShouldHaveValidModelState()
         {
             this.CheckValidModelState();
-            return new AndTestBuilder<TActionResult>(this.Controller, this.ActionName, this.ActionResult);
+            return this.NewAndTestBuilder();
         }
 
         /// <summary>
         /// Checks whether the tested action's provided model state is not valid.
         /// </summary>
-        public void ShouldHaveInvalidModelState()
+        public IAndTestBuilder<TActionResult> ShouldHaveInvalidModelState()
         {
             if (this.Controller.ModelState.Count == 0)
             {
@@ -45,6 +45,8 @@ public void ShouldHaveInvalidModelState()
                     this.ActionName,
                     this.Controller.GetName()));
             }
+
+            return this.NewAndTestBuilder();
         }
     }
 }

MyWebApi/Builders/Actions/ShouldReturnNotFound.cs

@@ -1,6 +1,8 @@
 namespace MyWebApi.Builders.Actions
 {
     using System.Web.Http.Results;
+    using And;
+    using Contracts.And;
 
     /// <summary>
     /// Class containing methods for testing NotFoundResult.
@@ -11,9 +13,10 @@ public partial class ActionResultTestBuilder<TActionResult>
         /// <summary>
         /// Tests whether action result is NotFoundResult.
         /// </summary>
-        public void ShouldReturnNotFound()
+        public IAndTestBuilder<TActionResult> ShouldReturnNotFound()
         {
             this.ShouldReturn<NotFoundResult>();
+            return this.NewAndTestBuilder();
         }
     }
 }

MyWebApi/Builders/Actions/ShouldReturnStatusCode.cs

@@ -3,6 +3,7 @@
     using System.Net;
     using System.Web.Http.Results;
     using Common.Extensions;
+    using Contracts.And;
     using Exceptions;
 
     /// <summary>
@@ -14,16 +15,17 @@ public partial class ActionResultTestBuilder<TActionResult>
         /// <summary>
         /// Tests whether action result is StatusCodeResult.
         /// </summary>
-        public void ShouldReturnStatusCode()
+        public IAndTestBuilder<TActionResult> ShouldReturnStatusCode()
         {
             this.ShouldReturn<StatusCodeResult>();
+            return this.NewAndTestBuilder();
         }
 
         /// <summary>
         /// Tests whether action result is StatusCodeResult and is the same as provided HttpStatusCode.
         /// </summary>
         /// <param name="statusCode">HttpStatusCode enumeration.</param>
-        public void ShouldReturnStatusCode(HttpStatusCode statusCode)
+        public IAndTestBuilder<TActionResult> ShouldReturnStatusCode(HttpStatusCode statusCode)
         {
             var statusCodeResult = this.GetReturnObject<StatusCodeResult>();
             if (statusCodeResult.StatusCode != statusCode)
@@ -37,6 +39,8 @@ public void ShouldReturnStatusCode(HttpStatusCode statusCode)
                     (int)statusCodeResult.StatusCode,
                     statusCodeResult.StatusCode));
             }
+
+            return this.NewAndTestBuilder();
         }
     }
 }

MyWebApi/Builders/Base/BaseTestBuilderWithActionResult.cs

@@ -1,8 +1,9 @@
 namespace MyWebApi.Builders.Base
 {
     using System.Web.Http;
-
+    using And;
     using Common.Extensions;
+    using Contracts.And;
     using Contracts.Base;
     using Exceptions;
     using Microsoft.CSharp.RuntimeBinder;
@@ -67,5 +68,10 @@ protected TResponseModel GetActualModel<TResponseModel>()
                     typeof(TResponseModel).ToFriendlyTypeName()));
             }
         }
+
+        protected IAndTestBuilder<TActionResult> NewAndTestBuilder()
+        {
+            return new AndTestBuilder<TActionResult>(this.Controller, this.ActionName, this.ActionResult);
+        }
     }
 }

MyWebApi/Builders/Contracts/Actions/IActionResultTestBuilder.cs

@@ -30,7 +30,7 @@ public interface IActionResultTestBuilder<out TActionResult> : IBaseTestBuilderW
         /// <summary>
         /// Checks whether the tested action's provided model state is not valid.
         /// </summary>
-        void ShouldHaveInvalidModelState();
+        IAndTestBuilder<TActionResult> ShouldHaveInvalidModelState();
 
         /// <summary>
         /// Tests whether action result is OkResult or OkNegotiatedContentResult{T}.
@@ -41,18 +41,18 @@ public interface IActionResultTestBuilder<out TActionResult> : IBaseTestBuilderW
         /// <summary>
         /// Tests whether action result is StatusCodeResult.
         /// </summary>
-        void ShouldReturnStatusCode();
+        IAndTestBuilder<TActionResult> ShouldReturnStatusCode();
 
         /// <summary>
         /// Tests whether action result is StatusCodeResult and is the same as provided HttpStatusCode.
         /// </summary>
         /// <param name="statusCode">HttpStatusCode enumeration.</param>
-        void ShouldReturnStatusCode(HttpStatusCode statusCode);
+        IAndTestBuilder<TActionResult> ShouldReturnStatusCode(HttpStatusCode statusCode);
 
         /// <summary>
         /// Tests whether action result is NotFoundResult.
         /// </summary>
-        void ShouldReturnNotFound();
+        IAndTestBuilder<TActionResult> ShouldReturnNotFound();
 
         /// <summary>
         /// Tests whether action result is BadRequestResult, InvalidModelStateResult or BadRequestErrorMessageResult.