Added simple And method for better readability and updated README.md

Author: ivaylokenov

MyWebApi.Tests/BuildersTests/ResponseModelsTests/ResponseModelErrorDetailsTestBuilderTests.cs

@@ -19,8 +19,11 @@ public void ThatEqualsShouldNotThrowExceptionWhenProvidedMessageIsValid()
                 .ShouldHaveModelStateFor<RequestModel>()
                 .ContainingNoModelStateErrorFor(m => m.NonRequiredString)
                 .ContainingModelStateErrorFor(m => m.RequiredString).ThatEquals("The RequiredString field is required.")
+                .And()
                 .ContainingModelStateErrorFor(m => m.RequiredString)
+                .And()
                 .ContainingNoModelStateErrorFor(m => m.NotValidateInteger)
+                .And()
                 .ContainingModelStateError("RequiredString")
                 .ContainingModelStateErrorFor(m => m.Integer).ThatEquals(string.Format("The field Integer must be between {0} and {1}.", 1, int.MaxValue))
                 .ContainingModelStateError("RequiredString")
@@ -41,6 +44,7 @@ public void ThatEqualsShouldThrowExceptionWhenProvidedMessageIsValid()
                 .Calling(c => c.ModelStateCheck(requestModelWithErrors))
                 .ShouldHaveModelStateFor<RequestModel>()
                 .ContainingNoModelStateErrorFor(m => m.NonRequiredString)
+                .And()
                 .ContainingModelStateErrorFor(m => m.RequiredString).ThatEquals("RequiredString field is required.")
                 .ContainingModelStateErrorFor(m => m.Integer).ThatEquals(string.Format("Integer must be between {0} and {1}.", 1, int.MaxValue));
         }

MyWebApi/Builders/Actions/ShouldHaveModelState.cs

@@ -18,23 +18,23 @@ public partial class ActionResultTestBuilder<TActionResult>
         /// <returns>Response model test builder.</returns>
         public IResponseModelErrorTestBuilder<TRequestModel> ShouldHaveModelStateFor<TRequestModel>()
         {
-            return new ResponseModelErrorTestBuilder<TRequestModel>(Controller, ActionName);
+            return new ResponseModelErrorTestBuilder<TRequestModel>(this.Controller, this.ActionName);
         }
 
         /// <summary>
         /// Checks whether the tested action's provided model state is valid.
         /// </summary>
         public void ShouldHaveValidModelState()
         {
-            CheckValidModelState();
+            this.CheckValidModelState();
         }
 
         /// <summary>
         /// Checks whether the tested action's provided model state is not valid.
         /// </summary>
         public void ShouldHaveInvalidModelState()
         {
-            if (Controller.ModelState.Count == 0)
+            if (this.Controller.ModelState.Count == 0)
             {
                 throw new ResponseModelErrorAssertionException(string.Format(
                     "When calling {0} action in {1} expected to have invalid model state, but was in fact valid.",

MyWebApi/Builders/Contracts/IResponseModelErrorDetailsTestBuilder.cs

@@ -61,5 +61,11 @@ IResponseModelErrorDetailsTestBuilder<TResponseModel> ContainingModelStateErrorF
         /// <returns>Response model error details test builder.</returns>
         IResponseModelErrorTestBuilder<TResponseModel> ContainingNoModelStateErrorFor<TMember>(
             Expression<Func<TResponseModel, TMember>> memberWithNoError);
+
+        /// <summary>
+        /// And method for better readability when chaining error message tests.
+        /// </summary>
+        /// <returns>Response model error details test builder.</returns>
+        IResponseModelErrorTestBuilder<TResponseModel> And();
     }
 }

MyWebApi/Builders/Contracts/IResponseModelErrorTestBuilder{TResponseModel}.cs

@@ -32,5 +32,11 @@ public interface IResponseModelErrorTestBuilder<TResponseModel> : IResponseModel
         /// <returns>This instance in order to support method chaining.</returns>
         IResponseModelErrorTestBuilder<TResponseModel> ContainingNoModelStateErrorFor<TMember>(
             Expression<Func<TResponseModel, TMember>> memberWithNoError);
+
+        /// <summary>
+        /// And method for better readability when chaining error message tests.
+        /// </summary>
+        /// <returns>Response model error details test builder.</returns>
+        IResponseModelErrorTestBuilder<TResponseModel> And();
     }
 }

MyWebApi/Builders/ResponseModels/ResponseModelErrorDetailsTestBuilder.cs

@@ -143,6 +143,15 @@ public IResponseModelErrorTestBuilder<TResponseModel> ContainingNoModelStateErro
             return this.responseModelErrorTestBuilder.ContainingNoModelStateErrorFor(memberWithNoError);
         }
 
+        /// <summary>
+        /// And method for better readability when chaining error message tests.
+        /// </summary>
+        /// <returns>Response model error details test builder.</returns>
+        public IResponseModelErrorTestBuilder<TResponseModel> And()
+        {
+            return this.responseModelErrorTestBuilder;
+        }
+
         private void ThrowNewResponseModelErrorAssertionException(string messageFormat, string operation)
         {
             throw new ResponseModelErrorAssertionException(string.Format(

MyWebApi/Builders/ResponseModels/ResponseModelErrorTestBuilder{TResponseModel}.cs

@@ -84,6 +84,15 @@ public IResponseModelErrorTestBuilder<TResponseModel> ContainingNoModelStateErro
             return this;
         }
 
+        /// <summary>
+        /// And method for better readability when chaining error message tests.
+        /// </summary>
+        /// <returns>Response model error details test builder.</returns>
+        public IResponseModelErrorTestBuilder<TResponseModel> And()
+        {
+            return this;
+        }
+
         private void ThrowNewResponseModelErrorAssertionException(string messageFormat, string errorKey)
         {
             throw new ResponseModelErrorAssertionException(string.Format(

README.md

@@ -9,7 +9,7 @@ MyWebApi is unit testing framework providing easy fluent interface to test the A
 
 ### Controller instantiation
 
-You have a couple of options from which you can setup the controller you want to test. The framework gives you static `MyWebApi` class from which the test builder starts.
+You have a couple of options from which you can setup the controller you want to test. The framework gives you static `MyWebApi` class from which the test builder starts:
 
 ```c#
 // instantiates controller with parameterless constructor
@@ -23,7 +23,7 @@ MyWebApi
 
 ### Calling actions
 
-You can call any action using lambda expression. All parameter values will be resolved and model state validation will be performed on them.
+You can call any action using lambda expression. All parameter values will be resolved and model state validation will be performed on them:
 
 ```c#
 // calls action with no parameters
@@ -42,6 +42,55 @@ MyWebApi
 	.CallingAsync(c => c.SomeActionAsync());
 ```
 
+### Model state validation
+
+You can test whether model state is valid/invalid or contains any specific error:
+
+```c#
+// tests whether model state is valid
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction(requestModel))
+	.ShouldHaveValidModelState();
+	
+// tests whether model state is not valid
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction(requestModel))
+	.ShouldHaveInvalidModelState();
+	
+// tests whether model state error exists (or does not exist) for specific key (not recommended because of magic string)
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction(requestModel))
+	.ShouldHaveModelStateFor<RequestModel>()
+	.ContainingModelStateError("propertyName")
+	.And() // calling And method is not necessary but provides better readability
+	.ContainingNoModelStateError("anotherPropertyName");
+	
+// tests whether model state error exists by using lambda expression
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction(requestModel))
+	.ShouldHaveModelStateFor<RequestModel>()
+	.ContainingModelStateErrorFor(m => m.SomeProperty)
+	.And()
+	.ContainingNoModelStateErrorFor(m => m.AnotherProperty);
+	
+// tests the error message for specific property
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction(requestModel))
+	.ShouldHaveModelStateFor<RequestModel>()
+	.ContainingModelStateErrorFor(m => m.SomeProperty).ThatEquals("Error message") // error message must be equal to the provided string
+	.And()
+	.ContainingModelStateErrorFor(m => m.SecondProperty).BeginningWith("Error") // error message must begin with the provided string
+	.And()
+	.ContainingModelStateErrorFor(m => m.ThirdProperty).EndingWith("message") // error message must end with the provided string
+	.And()
+	.ContainingModelStateErrorFor(m => m.SecondProperty).Containing("ror mes"); // error message must contain the provided string
+```
+
 ## Any questions, comments or additions?
 
 Leave an issue on the [issues page](https://github.com/ivaylokenov/MyWebApi/issues) or send a [pull request](https://github.com/ivaylokenov/MyWebApi/pulls).