Bad request model state test builder now uses the same style as the other model state builders (closes #189)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.DataAnnotations/BadRequestTestBuilderDataAnnotationsExtensions.cs

@@ -1,5 +1,6 @@
 namespace MyTested.AspNetCore.Mvc
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using Builders.ActionResults.BadRequest;
@@ -101,18 +102,24 @@ public static IAndBadRequestTestBuilder WithModelStateError(
         /// <summary>
         /// Tests whether <see cref="BadRequestObjectResult"/> contains specific model state errors using test builder.
         /// </summary>
-        /// <typeparam name="TRequestModel">Type of model for which the model state errors will be tested.</typeparam>
         /// <param name="badRequestTestBuilder">Instance of <see cref="IBadRequestTestBuilder"/> type.</param>
+        /// <param name="modelStateTestBuilder">Model state errors test builder.</param>
         /// <returns>The same <see cref="IAndBadRequestTestBuilder"/>.</returns>
-        public static IModelErrorTestBuilder<TRequestModel> WithModelStateErrorFor<TRequestModel>(this IBadRequestTestBuilder badRequestTestBuilder)
+        public static IAndBadRequestTestBuilder WithModelStateError(
+            this IBadRequestTestBuilder badRequestTestBuilder,
+            Action<IModelStateTestBuilder> modelStateTestBuilder)
         {
             var actualBadRequestTestBuilder = GetBadRequestTestBuilder(badRequestTestBuilder);
 
             actualBadRequestTestBuilder.TestContext.Model = actualBadRequestTestBuilder.GetBadRequestObjectResultValue();
 
-            return new ModelErrorTestBuilder<TRequestModel>(
+            var newModelStateTestBuilder = new ModelStateTestBuilder(
                 actualBadRequestTestBuilder.TestContext,
                 modelState: actualBadRequestTestBuilder.GetModelStateFromSerializableError(actualBadRequestTestBuilder.TestContext.Model));
+
+            modelStateTestBuilder(newModelStateTestBuilder);
+
+            return actualBadRequestTestBuilder;
         }
 
         private static BadRequestTestBuilder<BadRequestObjectResult> GetBadRequestTestBuilder(IBadRequestTestBuilder badRequestTestBuilder)

test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/BuildersTests/ActionResultsTests/BadRequestTests/BadRequestTestBuilderTests.cs

@@ -1,11 +1,12 @@
 namespace MyTested.AspNetCore.Mvc.Test.BuildersTests.ActionResultsTests.BadRequestTests
 {
+    using Exceptions;
     using Microsoft.AspNetCore.Mvc.ModelBinding;
     using Setups;
     using Setups.Controllers;
     using Setups.Models;
     using Xunit;
-    
+
     public class BadRequestTestBuilderTests
     {
         [Fact]
@@ -21,16 +22,48 @@ public void WithModelStateForShouldNotThrowExceptionWhenModelStateHasSameErrors(
                 .Calling(c => c.BadRequestWithModelState(requestModelWithErrors))
                 .ShouldReturn()
                 .BadRequest()
-                .WithModelStateErrorFor<RequestModel>()
-                .ContainingErrorFor(m => m.Integer).ThatEquals("The field Integer must be between 1 and 2147483647.")
-                .AndAlso()
-                .ContainingErrorFor(m => m.RequiredString).BeginningWith("The RequiredString")
-                .AndAlso()
-                .ContainingErrorFor(m => m.RequiredString).EndingWith("required.")
-                .AndAlso()
-                .ContainingErrorFor(m => m.RequiredString).Containing("field")
-                .AndAlso()
-                .ContainingNoErrorFor(m => m.NonRequiredString);
+                .WithModelStateError(modelStateError => modelStateError
+                    .For<RequestModel>()
+                    .ContainingErrorFor(m => m.Integer).ThatEquals("The field Integer must be between 1 and 2147483647.")
+                    .AndAlso()
+                    .ContainingErrorFor(m => m.RequiredString).BeginningWith("The RequiredString")
+                    .AndAlso()
+                    .ContainingErrorFor(m => m.RequiredString).EndingWith("required.")
+                    .AndAlso()
+                    .ContainingErrorFor(m => m.RequiredString).Containing("field")
+                    .AndAlso()
+                    .ContainingNoErrorFor(m => m.NonRequiredString));
+        }
+        
+        [Fact]
+        public void WithModelStateForShouldThrowExceptionWhenModelStateHasSameErrors()
+        {
+            Test.AssertException<ModelErrorAssertionException>(
+                () =>
+                {
+                    var requestModelWithErrors = TestObjectFactory.GetRequestModelWithErrors();
+                    var modelState = new ModelStateDictionary();
+                    modelState.AddModelError("Integer", "The field Integer must be between 1 and 2147483647.");
+                    modelState.AddModelError("RequiredString", "The RequiredString field is required.");
+
+                    MyController<MvcController>
+                        .Instance()
+                        .Calling(c => c.BadRequestWithModelState(requestModelWithErrors))
+                        .ShouldReturn()
+                        .BadRequest()
+                        .WithModelStateError(modelStateError => modelStateError
+                            .For<RequestModel>()
+                            .ContainingErrorFor(m => m.Integer).ThatEquals("The field Integer 1 must be between 1 and 2147483647.")
+                            .AndAlso()
+                            .ContainingErrorFor(m => m.RequiredString).BeginningWith("The RequiredString")
+                            .AndAlso()
+                            .ContainingErrorFor(m => m.RequiredString).EndingWith("required.")
+                            .AndAlso()
+                            .ContainingErrorFor(m => m.RequiredString).Containing("field")
+                            .AndAlso()
+                            .ContainingNoErrorFor(m => m.NonRequiredString));
+                },
+                "When calling BadRequestWithModelState action in MvcController expected error message for key Integer to be 'The field Integer 1 must be between 1 and 2147483647.', but instead found 'The field Integer must be between 1 and 2147483647.'.");
         }
     }
 }