And renamed to AndAlso (closes #13)

Author: ivaylokenov

MyWebApi.Tests/BuildersTests/ActionsTests/ShouldHaveModelStateTests.cs

@@ -83,7 +83,7 @@ public void AndShouldWorkCorrectlyWithValidModelState()
                 .Controller<WebApiController>()
                 .Calling(c => c.ModelStateCheck(requestModel))
                 .ShouldHaveValidModelState()
-                .And()
+                .AndAlso()
                 .ShouldReturnOk();
         }
 
@@ -96,7 +96,7 @@ public void AndShouldWorkCorrectlyWithInvalidModelState()
                 .Controller<WebApiController>()
                 .Calling(c => c.ModelStateCheck(requestModelWithErrors))
                 .ShouldHaveInvalidModelState()
-                .And()
+                .AndAlso()
                 .ShouldReturnOk();
         }
     }

MyWebApi/Builders/Actions/ShouldHaveModelState.cs

@@ -25,7 +25,7 @@ public IModelErrorTestBuilder<TRequestModel> ShouldHaveModelStateFor<TRequestMod
         /// <summary>
         /// Checks whether the tested action's provided model state is valid.
         /// </summary>
-        /// <returns>Test builder with And method.</returns>
+        /// <returns>Test builder with AndAlso method.</returns>
         public IAndTestBuilder<TActionResult> ShouldHaveValidModelState()
         {
             this.CheckValidModelState();
@@ -35,7 +35,7 @@ public IAndTestBuilder<TActionResult> ShouldHaveValidModelState()
         /// <summary>
         /// Checks whether the tested action's provided model state is not valid.
         /// </summary>
-        /// <returns>Test builder with And method.</returns>
+        /// <returns>Test builder with AndAlso method.</returns>
         public IAndTestBuilder<TActionResult> ShouldHaveInvalidModelState()
         {
             if (this.Controller.ModelState.Count == 0)

MyWebApi/Builders/And/AndTestBuilder.cs

@@ -7,7 +7,7 @@
     using Contracts.And;
 
     /// <summary>
-    /// Class containing And() method allowing additional assertions after model state tests.
+    /// Class containing AndAlso() method allowing additional assertions after model state tests.
     /// </summary>
     /// <typeparam name="TActionResult">Result from invoked action in ASP.NET Web API controller.</typeparam>
     public class AndTestBuilder<TActionResult> : BaseTestBuilderWithActionResult<TActionResult>,
@@ -28,7 +28,7 @@ public AndTestBuilder(ApiController controller, string actionName, TActionResult
         /// Method allowing additional assertions after the model state tests.
         /// </summary>
         /// <returns>Builder for testing the action result.</returns>
-        public IActionResultTestBuilder<TActionResult> And()
+        public IActionResultTestBuilder<TActionResult> AndAlso()
         {
             return new ActionResultTestBuilder<TActionResult>(this.Controller, this.ActionName, this.ActionResult);
         }

MyWebApi/Builders/Base/BaseTestBuilderWithActionResult.cs

@@ -70,9 +70,9 @@ protected TResponseModel GetActualModel<TResponseModel>()
         }
 
         /// <summary>
-        /// Initializes new instance of builder providing And method.
+        /// Initializes new instance of builder providing AndAlso method.
         /// </summary>
-        /// <returns>Test builder with And method.</returns>
+        /// <returns>Test builder with AndAlso method.</returns>
         protected IAndTestBuilder<TActionResult> NewAndTestBuilder()
         {
             return new AndTestBuilder<TActionResult>(this.Controller, this.ActionName, this.ActionResult);

MyWebApi/Builders/Contracts/Actions/IActionResultTestBuilder.cs

@@ -25,13 +25,13 @@ public interface IActionResultTestBuilder<out TActionResult> : IBaseTestBuilderW
         /// <summary>
         /// Checks whether the tested action's provided model state is valid.
         /// </summary>
-        /// <returns>Test builder with And method.</returns>
+        /// <returns>Test builder with AndAlso method.</returns>
         IAndTestBuilder<TActionResult> ShouldHaveValidModelState();
 
         /// <summary>
         /// Checks whether the tested action's provided model state is not valid.
         /// </summary>
-        /// <returns>Test builder with And method.</returns>
+        /// <returns>Test builder with AndAlso method.</returns>
         IAndTestBuilder<TActionResult> ShouldHaveInvalidModelState();
 
         /// <summary>

MyWebApi/Builders/Contracts/And/IAndTestBuilder.cs

@@ -3,7 +3,7 @@
     using Actions;
 
     /// <summary>
-    /// Class containing And() method allowing additional assertions after model state tests.
+    /// Class containing AndAlso() method allowing additional assertions after model state tests.
     /// </summary>
     /// <typeparam name="TActionResult">Result from invoked action in ASP.NET Web API controller.</typeparam>
     public interface IAndTestBuilder<out TActionResult>
@@ -12,6 +12,6 @@ public interface IAndTestBuilder<out TActionResult>
         /// Method allowing additional assertions after the model state tests.
         /// </summary>
         /// <returns>Builder for testing the action result.</returns>
-        IActionResultTestBuilder<TActionResult> And();
+        IActionResultTestBuilder<TActionResult> AndAlso();
     }
 }

README.md

@@ -114,7 +114,7 @@ MyWebApi
 	.Controller<WebApiController>()
 	.Calling(c => c.SomeAction(requestModel))
 	.ShouldHaveInvalidModelState()
-	.And()
+	.AndAlso()
 	.ShouldReturnOk();;
 
 // tests whether model state error exists (or does not exist) for specific key