Separated IAndTestBuilder to two variants - one with action result and one without (#13)

Author: ivaylokenov

MyWebApi/Builders/Actions/ShouldHaveModelState.cs

@@ -1,8 +1,6 @@
 namespace MyWebApi.Builders.Actions
 {
-    using And;
     using Common.Extensions;
-    using Contracts.Actions;
     using Contracts.And;
     using Contracts.Models;
     using Exceptions;

MyWebApi/Builders/And/AndContinuityTestBuilder.cs

@@ -1,26 +1,19 @@
 namespace MyWebApi.Builders.And
 {
     using System.Web.Http;
-
-    using Actions;
+    using Base;
     using Contracts.And;
 
-    public class AndContinuityTestBuilder<TActionResult> : ActionResultTestBuilder<TActionResult>,
-        IAndContinuityTestBuilder<TActionResult>
+    public class AndContinuityTestBuilder : BaseTestBuilder, IAndContinuityTestBuilder
     {
-        public AndContinuityTestBuilder(ApiController controller, string actionName, TActionResult actionResult)
-            : base(controller, actionName, actionResult)
+        public AndContinuityTestBuilder(ApiController controller, string actionName)
+            : base(controller, actionName)
         {
         }
 
         public ApiController ProvideTheControllerInstance()
         {
             return this.Controller;
         }
-
-        public TActionResult ProvideTheActionResult()
-        {
-            return this.ActionResult;
-        }
     }
 }

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

@@ -0,0 +1,21 @@
+namespace MyWebApi.Builders.And
+{
+    using System.Web.Http;
+
+    using Actions;
+    using Contracts.And;
+
+    public class AndContinuityTestBuilder<TActionResult> : ActionResultTestBuilder<TActionResult>,
+        IAndContinuityTestBuilder<TActionResult>
+    {
+        public AndContinuityTestBuilder(ApiController controller, string actionName, TActionResult actionResult)
+            : base(controller, actionName, actionResult)
+        {
+        }
+
+        public TActionResult ProvideTheActionResult()
+        {
+            return this.ActionResult;
+        }
+    }
+}

MyWebApi/Builders/And/AndTestBuilder.cs

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

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

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

MyWebApi/Builders/BadRequests/BadRequestTestBuilder.cs

@@ -5,10 +5,8 @@
     using System.Web.Http;
     using System.Web.Http.ModelBinding;
     using System.Web.Http.Results;
-
     using Base;
     using Common.Extensions;
-    using Contracts.And;
     using Contracts.BadRequests;
     using Contracts.Models;
     using Exceptions;

MyWebApi/Builders/Contracts/And/IAndContinuityTestBuilder.cs

@@ -2,12 +2,8 @@
 {
     using System.Web.Http;
 
-    using Actions;
-
-    public interface IAndContinuityTestBuilder<out TActionResult> : IActionResultTestBuilder<TActionResult>
+    public interface IAndContinuityTestBuilder
     {
         ApiController ProvideTheControllerInstance();
-
-        TActionResult ProvideTheActionResult();
     }
 }

MyWebApi/Builders/Contracts/And/IAndContinuityTestBuilder{TActionResult}.cs

@@ -0,0 +1,11 @@
+namespace MyWebApi.Builders.Contracts.And
+{
+    using System.Web.Http;
+
+    using Actions;
+
+    public interface IAndContinuityTestBuilder<out TActionResult> : IActionResultTestBuilder<TActionResult>
+    {
+        TActionResult ProvideTheActionResult();
+    }
+}

MyWebApi/Builders/Contracts/And/IAndTestBuilder.cs

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

MyWebApi/Builders/Contracts/And/IAndTestBuilder{TActionResult}.cs

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