Added And method after checking for model state (#13)

Author: ivaylokenov

MyWebApi/Builders/Actions/ShouldReturnNotFound.cs

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

MyWebApi/Builders/Actions/ShouldReturnStatusCode.cs

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

MyWebApi/Builders/And/AndContinuityTestBuilder.cs

@@ -1,19 +1,22 @@
 namespace MyWebApi.Builders.And
 {
     using System.Web.Http;
+    using Actions;
     using Base;
+    using Contracts.Actions;
     using Contracts.And;
 
-    public class AndTestBuilder : BaseTestBuilder, IAndTestBuilder
+    public class AndTestBuilder<TActionResult> : BaseTestBuilderWithActionResult<TActionResult>,
+        IAndTestBuilder<TActionResult>
     {
-        protected AndTestBuilder(ApiController controller, string actionName)
-            : base(controller, actionName)
+        public AndTestBuilder(ApiController controller, string actionName, TActionResult actionResult)
+            : base(controller, actionName, actionResult)
         {
         }
 
-        public IAndContinuityTestBuilder And()
+        public IActionResultTestBuilder<TActionResult> And()
         {
-            return new AndContinuityTestBuilder(this.Controller, this.ActionName);
+            return new ActionResultTestBuilder<TActionResult>(this.Controller, this.ActionName, this.ActionResult);
         }
     }
 }

MyWebApi/Builders/And/AndContinuityTestBuilder{TActionResult}.cs

@@ -41,18 +41,18 @@ public interface IActionResultTestBuilder<out TActionResult> : IBaseTestBuilderW
         /// <summary>
         /// Tests whether action result is StatusCodeResult.
         /// </summary>
-        IAndTestBuilder<TActionResult> ShouldReturnStatusCode();
+        void ShouldReturnStatusCode();
 
         /// <summary>
         /// Tests whether action result is StatusCodeResult and is the same as provided HttpStatusCode.
         /// </summary>
         /// <param name="statusCode">HttpStatusCode enumeration.</param>
-        IAndTestBuilder<TActionResult> ShouldReturnStatusCode(HttpStatusCode statusCode);
+        void ShouldReturnStatusCode(HttpStatusCode statusCode);
 
         /// <summary>
         /// Tests whether action result is NotFoundResult.
         /// </summary>
-        IAndTestBuilder<TActionResult> ShouldReturnNotFound();
+        void ShouldReturnNotFound();
 
         /// <summary>
         /// Tests whether action result is BadRequestResult, InvalidModelStateResult or BadRequestErrorMessageResult.

MyWebApi/Builders/And/AndTestBuilder.cs

@@ -1,7 +1,9 @@
 namespace MyWebApi.Builders.Contracts.And
 {
-    public interface IAndTestBuilder
+    using Actions;
+
+    public interface IAndTestBuilder<out TActionResult>
     {
-        IAndContinuityTestBuilder And();
+        IActionResultTestBuilder<TActionResult> And();
     }
 }