#283 Renaming of all related classes and interfaces to "With and without" model state.

vaptsarov · vaptsarov · commit 0bf16e529897 · 2019-10-22T15:03:46.000+03:00
diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/Builders/Contracts/Models/IAndWithModelStateBuilder.cs b/src/MyTested.AspNetCore.Mvc.ModelState/Builders/Contracts/Models/IAndWithModelStateBuilder.cs
@@ -3,12 +3,12 @@
     /// <summary>
     /// Used for adding AndAlso() method to the <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/> builder.
     /// </summary>
-    public interface IAndModelStateBuilder : IModelStateBuilder
+    public interface IAndWithModelStateBuilder : IWithModelStateBuilder
     {
         /// <summary>
         /// AndAlso method for better readability when building <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/>.
         /// </summary>
-        /// <returns>The same <see cref="IModelStateBuilder"/>.</returns>
-        IModelStateBuilder AndAlso();
+        /// <returns>The same <see cref="IWithModelStateBuilder"/>.</returns>
+        IWithModelStateBuilder AndAlso();
     }
 }
diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/Builders/Contracts/Models/IWithModelStateBuilder.cs b/src/MyTested.AspNetCore.Mvc.ModelState/Builders/Contracts/Models/IWithModelStateBuilder.cs
@@ -5,28 +5,28 @@
     /// <summary>
     /// Used for building <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/>.
     /// </summary>
-    public interface IModelStateBuilder
+    public interface IWithModelStateBuilder
     {
         /// <summary>
         /// Adds an error to the built <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/>
         /// </summary>
         /// <param name="key">Key to set as string.</param>
         /// <param name="errorMessage">Error message to set as string.</param>
         /// <returns></returns>
-        IAndModelStateBuilder WithError(string key, string errorMessage);
+        IAndWithModelStateBuilder WithError(string key, string errorMessage);
 
         /// <summary>
         /// Adds model state entries to the built <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/>
         /// </summary>
         /// <param name="errors">Model state entries as dictionary.</param>
         /// <returns></returns>
-        IAndModelStateBuilder WithErrors(IDictionary<string, string> errors);
+        IAndWithModelStateBuilder WithErrors(IDictionary<string, string> errors);
 
         /// <summary>
         /// Adds model state entries to the built <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/>
         /// </summary>
         /// <param name="errors">Model state entries as anonymous object.</param>
         /// <returns></returns>
-        IAndModelStateBuilder WithErrors(object errors);
+        IAndWithModelStateBuilder WithErrors(object errors);
     }
 }
diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/Builders/Models/WithModelStateBuilder.cs b/src/MyTested.AspNetCore.Mvc.ModelState/Builders/Models/WithModelStateBuilder.cs
@@ -10,33 +10,33 @@
     /// <summary>
     /// Used for building <see cref="ModelStateDictionary"/>
     /// </summary>
-    public class ModelStateBuilder : BaseModelStateBuilder, IAndModelStateBuilder
+    public class WithModelStateBuilder : BaseModelStateBuilder, IAndWithModelStateBuilder
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ModelStateBuilder"/> class.
+        /// Initializes a new instance of the <see cref="WithModelStateBuilder"/> class.
         /// </summary>
         /// <param name="actionContext"><see cref="ModelStateDictionary"/> to build.</param>
-        public ModelStateBuilder(ActionTestContext actionContext) 
+        public WithModelStateBuilder(ActionTestContext actionContext) 
             : base(actionContext)
         {
         }
 
         /// <inheritdoc />
-        public IAndModelStateBuilder WithError(string key, string errorMessage)
+        public IAndWithModelStateBuilder WithError(string key, string errorMessage)
         {
             this.AddError(key, errorMessage);
             return this;
         }
 
         /// <inheritdoc />
-        public IAndModelStateBuilder WithErrors(IDictionary<string, string> errors)
+        public IAndWithModelStateBuilder WithErrors(IDictionary<string, string> errors)
         {
             errors.ForEach(err => this.AddError(err.Key, err.Value));
             return this;
         }
 
         /// <inheritdoc />
-        public IAndModelStateBuilder WithErrors(object errors)
+        public IAndWithModelStateBuilder WithErrors(object errors)
         {
             var errorsAsDictionary = new RouteValueDictionary(errors);
             errorsAsDictionary
@@ -46,7 +46,7 @@ public IAndModelStateBuilder WithErrors(object errors)
         }
             
         /// <inheritdoc />
-        public IModelStateBuilder AndAlso() => this;
+        public IWithModelStateBuilder AndAlso() => this;
 
         private void AddError(string key, string errorMessage) 
             => this.ModelState.AddModelError(key, errorMessage);
diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/ComponentBuilderModelStateWithExtensions.cs b/src/MyTested.AspNetCore.Mvc.ModelState/ComponentBuilderModelStateWithExtensions.cs
@@ -14,12 +14,12 @@ public static class ComponentBuilderModelStateWithExtensions
     {
         public static TBuilder WithModelState<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
-            Action<IModelStateBuilder> modelStateTestBuilder)
+            Action<IWithModelStateBuilder> modelStateTestBuilder)
             where TBuilder : IBaseTestBuilder
         {
             var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
-            modelStateTestBuilder(new ModelStateBuilder(actualBuilder.TestContext as ActionTestContext));
+            modelStateTestBuilder(new WithModelStateBuilder(actualBuilder.TestContext as ActionTestContext));
 
             return actualBuilder.Builder;
         }

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Used for adding AndAlso() method to the <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/> builder.`
`5`	`5`	`/// </summary>`
`6`		`- public interface IAndModelStateBuilder : IModelStateBuilder`
	`6`	`+ public interface IAndWithModelStateBuilder : IWithModelStateBuilder`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// AndAlso method for better readability when building <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/>.`
`10`	`10`	`/// </summary>`
`11`		`- /// <returns>The same <see cref="IModelStateBuilder"/>.</returns>`
`12`		`- IModelStateBuilder AndAlso();`
	`11`	`+ /// <returns>The same <see cref="IWithModelStateBuilder"/>.</returns>`
	`12`	`+ IWithModelStateBuilder AndAlso();`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,33 +10,33 @@`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Used for building <see cref="ModelStateDictionary"/>`
`12`	`12`	`/// </summary>`
`13`		`- public class ModelStateBuilder : BaseModelStateBuilder, IAndModelStateBuilder`
	`13`	`+ public class WithModelStateBuilder : BaseModelStateBuilder, IAndWithModelStateBuilder`
`14`	`14`	`{`
`15`	`15`	`/// <summary>`
`16`		`- /// Initializes a new instance of the <see cref="ModelStateBuilder"/> class.`
	`16`	`+ /// Initializes a new instance of the <see cref="WithModelStateBuilder"/> class.`
`17`	`17`	`/// </summary>`
`18`	`18`	`/// <param name="actionContext"><see cref="ModelStateDictionary"/> to build.</param>`
`19`		`- public ModelStateBuilder(ActionTestContext actionContext)`
	`19`	`+ public WithModelStateBuilder(ActionTestContext actionContext)`
`20`	`20`	`: base(actionContext)`
`21`	`21`	`{`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/// <inheritdoc />`
`25`		`- public IAndModelStateBuilder WithError(string key, string errorMessage)`
	`25`	`+ public IAndWithModelStateBuilder WithError(string key, string errorMessage)`
`26`	`26`	`{`
`27`	`27`	`this.AddError(key, errorMessage);`
`28`	`28`	`return this;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/// <inheritdoc />`
`32`		`- public IAndModelStateBuilder WithErrors(IDictionary<string, string> errors)`
	`32`	`+ public IAndWithModelStateBuilder WithErrors(IDictionary<string, string> errors)`
`33`	`33`	`{`
`34`	`34`	`errors.ForEach(err => this.AddError(err.Key, err.Value));`
`35`	`35`	`return this;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/// <inheritdoc />`
`39`		`- public IAndModelStateBuilder WithErrors(object errors)`
	`39`	`+ public IAndWithModelStateBuilder WithErrors(object errors)`
`40`	`40`	`{`
`41`	`41`	`var errorsAsDictionary = new RouteValueDictionary(errors);`
`42`	`42`	`errorsAsDictionary`
`@@ -46,7 +46,7 @@ public IAndModelStateBuilder WithErrors(object errors)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/// <inheritdoc />`
`49`		`- public IModelStateBuilder AndAlso() => this;`
	`49`	`+ public IWithModelStateBuilder AndAlso() => this;`
`50`	`50`
`51`	`51`	`private void AddError(string key, string errorMessage)`
`52`	`52`	`=> this.ModelState.AddModelError(key, errorMessage);`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ public static class ComponentBuilderModelStateWithExtensions`
`14`	`14`	`{`
`15`	`15`	`public static TBuilder WithModelState<TBuilder>(`
`16`	`16`	`this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,`
`17`		`- Action<IModelStateBuilder> modelStateTestBuilder)`
	`17`	`+ Action<IWithModelStateBuilder> modelStateTestBuilder)`
`18`	`18`	`where TBuilder : IBaseTestBuilder`
`19`	`19`	`{`
`20`	`20`	`var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;`
`21`	`21`
`22`		`- modelStateTestBuilder(new ModelStateBuilder(actualBuilder.TestContext as ActionTestContext));`
	`22`	`+ modelStateTestBuilder(new WithModelStateBuilder(actualBuilder.TestContext as ActionTestContext));`
`23`	`23`
`24`	`24`	`return actualBuilder.Builder;`
`25`	`25`	`}`