#365, #283 Resolving PR comments

vaptsarov · vaptsarov · commit 39a843ff1f8c · 2020-02-05T14:03:53.000+02:00
diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Authentication/BaseClaimsPrincipalUserBuilder.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Authentication/BaseClaimsPrincipalUserBuilder.cs
@@ -10,21 +10,21 @@
     /// </summary>
     public class BaseClaimsPrincipalUserBuilder : BaseUserBuilder
     {
-        private readonly ICollection<ClaimsIdentity> _identities;
+        private readonly ICollection<ClaimsIdentity> identities;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseClaimsPrincipalUserBuilder"/> class.
         /// </summary>
         public BaseClaimsPrincipalUserBuilder()
-            => this._identities = new List<ClaimsIdentity>();
+            => this.identities = new List<ClaimsIdentity>();
 
         /// <summary>
         /// Returns the principle based on provided identities and claims.
         /// </summary>
         /// <returns>This <see cref="ClaimsPrincipal"/>.</returns>
         public ClaimsPrincipal GetClaimsPrincipal()
         {
-            var claimIdentities = this._identities.Reverse().ToList();
+            var claimIdentities = this.identities.Reverse().ToList();
             claimIdentities.Add(this.GetAuthenticatedClaimsIdentity());
 
             var claimsPrincipal = new ClaimsPrincipal(claimIdentities);
@@ -52,9 +52,7 @@ public ClaimsPrincipal GetClaimsPrincipalBasedOnClaimsOnly()
             = new ClaimsPrincipal(CreateAuthenticatedClaimsIdentity());
 
         protected void AddIdentity(ClaimsIdentity identity)
-        {
-            this._identities.Add(identity);
-        }
+            => this.identities.Add(identity);   
 
         protected void AddIdentities(IEnumerable<ClaimsIdentity> identities)
         {
diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Authentication/BaseUserBuilder.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Authentication/BaseUserBuilder.cs
@@ -149,7 +149,9 @@ protected void AddRoles(IEnumerable<string> roles)
         protected void RemoveClaim(Claim claim)
         {
             if (this.claims.Contains(claim))
+            {
                 this.claims.Remove(claim);
+            }
         }
 
         /// <summary>
@@ -159,8 +161,9 @@ protected void RemoveClaim(Claim claim)
         /// <param name="value">Claim's value.</param>
         protected void RemoveClaim(string type, string value)
         {
-            var claimsToRemove =
-                this.claims.Where(x => x.Type.Equals(type) && x.Value.Equals(value)).ToList();
+            var claimsToRemove = this.claims
+                .Where(x => x.Type.Equals(type) && x.Value.Equals(value))
+                .ToList();
 
             claimsToRemove.ForEach(claim => this.claims.Remove(claim));
         }
diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Authentication/WithoutClaimsPrincipalBuilder.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Authentication/WithoutClaimsPrincipalBuilder.cs
@@ -12,39 +12,33 @@ public class WithoutClaimsPrincipalBuilder : BaseClaimsPrincipalUserBuilder, IAn
         /// Initializes a new instance of the <see cref="WithoutClaimsPrincipalBuilder"/> class.
         /// </summary>
         public WithoutClaimsPrincipalBuilder(ClaimsPrincipal principal)
-        {
-            base.AddClaims(principal.Claims);
-        }
+            => base.AddClaims(principal.Claims);
 
         /// <inheritdoc />
         public IAndWithoutClaimsPrincipalBuilder WithoutClaim(string type, string value)
         {
             base.RemoveClaim(type, value);
-
             return this;
         }
 
         /// <inheritdoc />
         public IAndWithoutClaimsPrincipalBuilder WithoutClaim(Claim claim)
         {
             base.RemoveClaim(claim);
-
             return this;
         }
 
         /// <inheritdoc />
         public IAndWithoutClaimsPrincipalBuilder WithoutRole(string role)
         {
             base.RemoveRole(role);
-
             return this;
         }
 
         /// <inheritdoc />
         public IAndWithoutClaimsPrincipalBuilder WithoutUsername(string username)
         {
             base.RemoveUsername(username);
-
             return this;
         }
 
diff --git a/src/MyTested.AspNetCore.Mvc.Authentication/ComponentBuilderAuthenticationWithoutExtensions.cs b/src/MyTested.AspNetCore.Mvc.Authentication/ComponentBuilderAuthenticationWithoutExtensions.cs
@@ -37,7 +37,9 @@ public static TBuilder WithoutUser<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
             Claim claim)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutUser(user => user.WithoutClaim(claim));
+            => builder
+                .WithoutUser(user => user
+                .WithoutClaim(claim));
 
         /// <summary>
         /// Removes the <see cref="Claim"/> that have the provided role from <see cref="ClaimsPrincipal"/>
@@ -50,7 +52,9 @@ public static TBuilder WithoutUser<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
             string role)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutUser(user => user.WithoutRole(role));
+            => builder
+                .WithoutUser(user => user
+                .WithoutRole(role));
 
         /// <summary>
         /// Sets custom authenticated <see cref="Microsoft.AspNetCore.Http.HttpContext.User"/> to the
diff --git a/src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/DistributedCache/WithDistributedCache/WithDistributedCacheBuilder.cs b/src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/DistributedCache/WithDistributedCache/WithDistributedCacheBuilder.cs
@@ -2,12 +2,13 @@
 {
     using System;
     using System.Collections.Generic;
+    using Builders.Contracts.Data;
+    using Builders.Data.DistributedCache;
     using Contracts.Data.DistributedCache;
     using Microsoft.Extensions.Caching.Distributed;
-    using Builders.Data.DistributedCache;
     using Utilities.Extensions;
-    using Builders.Contracts.Data;
 
+    /// <inheritdoc />
     public class WithDistributedCacheBuilder : BaseDistributedCacheBuilder, IAndWithDistributedCacheBuilder
     {
         /// <summary>
diff --git a/src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/DistributedCache/WithoutDistributedCache/WithoutDistributedCacheBuilder.cs b/src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/DistributedCache/WithoutDistributedCache/WithoutDistributedCacheBuilder.cs
@@ -6,6 +6,7 @@
     using MyTested.AspNetCore.Mvc.Builders.Contracts.Data;
     using MyTested.AspNetCore.Mvc.Utilities.Extensions;
 
+    /// <inheritdoc />
     public class WithoutDistributedCacheBuilder : BaseDistributedCacheBuilder, IAndWithoutDistributedCacheBuilder
     {
         /// <summary>
diff --git a/src/MyTested.AspNetCore.Mvc.Caching/ComponentBuilderDistributedCacheWithoutExtensions.cs b/src/MyTested.AspNetCore.Mvc.Caching/ComponentBuilderDistributedCacheWithoutExtensions.cs
@@ -2,10 +2,10 @@
 {
     using System;
     using System.Collections.Generic;
-    using MyTested.AspNetCore.Mvc.Builders.Base;
-    using MyTested.AspNetCore.Mvc.Builders.Contracts.Base;
-    using MyTested.AspNetCore.Mvc.Builders.Contracts.Data;
-    using MyTested.AspNetCore.Mvc.Builders.Data.DistributedCache.WithoutDistributedCache;
+    using Builders.Base;
+    using Builders.Contracts.Base;
+    using Builders.Contracts.Data;
+    using Builders.Data.DistributedCache.WithoutDistributedCache;
 
     /// <summary>
     /// Contains <see cref="Microsoft.Extensions.Caching.Distributed.IDistributedCache"/> extension methods for <see cref="IBaseTestBuilderWithComponentBuilder{TBuilder}"/>.
@@ -21,7 +21,9 @@ public static class ComponentBuilderDistributedCacheWithoutExtensions
         public static TBuilder WithoutDistributedCache<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutDistributedCache(cache => cache.WithoutAllEntries());
+            => builder
+                .WithoutDistributedCache(cache => cache
+                .WithoutAllEntries());
 
         /// <summary>
         /// Remove given entity with key from <see cref="Microsoft.Extensions.Caching.Distributed.IDistributedCache"/> service.
@@ -34,7 +36,9 @@ public static TBuilder WithoutDistributedCache<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
             string key)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutDistributedCache(cache => cache.WithoutEntry(key));
+            => builder
+                .WithoutDistributedCache(cache => cache
+                .WithoutEntry(key));
 
         /// <summary>
         /// Remove given entities from <see cref="Microsoft.Extensions.Caching.Distributed.IDistributedCache"/> service.
@@ -47,7 +51,9 @@ public static TBuilder WithoutDistributedCache<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
             IEnumerable<string> keys)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutDistributedCache(cache => cache.WithoutEntries(keys));
+            => builder
+                .WithoutDistributedCache(cache => cache
+                .WithoutEntries(keys));
 
         /// <summary>
         /// Remove given entities from <see cref="Microsoft.Extensions.Caching.Distributed.IDistributedCache"/> service.
@@ -60,7 +66,9 @@ public static TBuilder WithoutDistributedCache<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
             params string[] keys)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutDistributedCache(cache => cache.WithoutEntries(keys));
+            => builder
+                .WithoutDistributedCache(cache => cache
+                .WithoutEntries(keys));
 
         /// <summary>
         /// Remove entity or entities from <see cref="Microsoft.Extensions.Caching.Distributed.IDistributedCache"/> service.
@@ -75,7 +83,6 @@ public static TBuilder WithoutDistributedCache<TBuilder>(
             where TBuilder : IBaseTestBuilder
         {
             var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
-
             distributedCacheBuilder(new WithoutDistributedCacheBuilder(actualBuilder.TestContext.HttpContext.RequestServices));
 
             return actualBuilder.Builder;
diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/Builders/Models/WithoutModelStateBuilder.cs b/src/MyTested.AspNetCore.Mvc.ModelState/Builders/Models/WithoutModelStateBuilder.cs
@@ -28,8 +28,10 @@ public IAndWithoutModelStateBuilder WithoutModelState()
         /// <inheritdoc />
         public IAndWithoutModelStateBuilder WithoutModelState(string key)
         {
-            if(this.ModelState.ContainsKey(key))
+            if (this.ModelState.ContainsKey(key))
+            {
                 this.ModelState.Remove(key);
+            }
 
             return this;
         }
diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/ComponentBuilderModelStateWithoutExtensions.cs b/src/MyTested.AspNetCore.Mvc.ModelState/ComponentBuilderModelStateWithoutExtensions.cs
@@ -24,7 +24,9 @@ public static TBuilder WithoutModelState<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
             string key)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutModelState(state => state.WithoutModelState(key));
+            => builder
+                .WithoutModelState(state => state
+                .WithoutModelState(key));
 
         /// <summary>
         /// Removes all keys and values from <see cref="ModelStateDictionary"/>.
@@ -35,7 +37,9 @@ public static TBuilder WithoutModelState<TBuilder>(
         public static TBuilder WithoutModelState<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutModelState(state => state.WithoutModelState());
+            => builder
+                .WithoutModelState(state => state
+                .WithoutModelState());
 
         /// <summary>
         /// Used for removing a model state from <see cref="ModelStateDictionary"/> by using the builder.
diff --git a/src/MyTested.AspNetCore.Mvc.TempData/Builders/Contracts/Data/IWithoutTempDataBuilder.cs b/src/MyTested.AspNetCore.Mvc.TempData/Builders/Contracts/Data/IWithoutTempDataBuilder.cs
@@ -17,14 +17,21 @@ public interface IWithoutTempDataBuilder
         /// <summary>
         /// Remove temp data entries by providing their keys to the built <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"/>.
         /// </summary>
-        /// <param name="entriesKeys">Keys of the temp data entries to be deleted.</param>
+        /// <param name="keys">Keys of the temp data entries to be deleted.</param>
         /// <returns>The same <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"/>.</returns>
-        IAndWithoutTempDataBuilder WithoutEntries(IEnumerable<string> entriesKeys);
+        IAndWithoutTempDataBuilder WithoutEntries(IEnumerable<string> keys);
+
+        /// <summary>
+        /// Remove temp data entries by providing their keys as params to the built <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"/>.
+        /// </summary>
+        /// <param name="keys">Keys of the temp data entries to be deleted.</param>
+        /// <returns>The same <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"/>.</returns>
+        IAndWithoutTempDataBuilder WithoutEntries(params string[] keys);
 
         /// <summary>
         /// Clear all entities from the built <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"/>.
         /// </summary>
         /// <returns>The same <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"/>.</returns>
-        IAndWithoutTempDataBuilder WithoutAllEntries();
+        IAndWithoutTempDataBuilder WithoutEntries();
     }
 }
diff --git a/src/MyTested.AspNetCore.Mvc.TempData/Builders/Data/BaseTempDataBuilder.cs b/src/MyTested.AspNetCore.Mvc.TempData/Builders/Data/BaseTempDataBuilder.cs
@@ -1,7 +1,7 @@
 ﻿namespace MyTested.AspNetCore.Mvc.Builders.Data
 {
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
-    using MyTested.AspNetCore.Mvc.Utilities.Validators;
+    using Utilities.Validators;
 
     /// <summary>
     /// Used for building mocked <see cref="ITempDataDictionary"/>.
diff --git a/src/MyTested.AspNetCore.Mvc.TempData/Builders/Data/WithoutTempDataBuilder.cs b/src/MyTested.AspNetCore.Mvc.TempData/Builders/Data/WithoutTempDataBuilder.cs
@@ -1,8 +1,9 @@
 ﻿namespace MyTested.AspNetCore.Mvc.Builders.Data
 {
     using System.Collections.Generic;
+    using System.Linq;
+    using Contracts.Data;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
-    using MyTested.AspNetCore.Mvc.Builders.Contracts.Data;
 
     /// <summary>
     /// Used for building mocked <see cref="ITempDataDictionary"/>.
@@ -33,13 +34,19 @@ public IAndWithoutTempDataBuilder WithoutEntries(IEnumerable<string> entriesKeys
         public IAndWithoutTempDataBuilder WithoutEntry(string key)
         {
             if (this.TempData.ContainsKey(key))
+            {
                 this.TempData.Remove(key);
+            }
 
             return this;
         }
 
         /// <inheritdoc />
-        public IAndWithoutTempDataBuilder WithoutAllEntries()
+        public IAndWithoutTempDataBuilder WithoutEntries(params string[] keys)
+            => WithoutEntries(keys.AsEnumerable());
+
+        /// <inheritdoc />
+        public IAndWithoutTempDataBuilder WithoutEntries()
         {
             this.TempData.Clear();
             return this;
diff --git a/src/MyTested.AspNetCore.Mvc.TempData/ComponentBuilderTempDataWithoutExtensions.cs b/src/MyTested.AspNetCore.Mvc.TempData/ComponentBuilderTempDataWithoutExtensions.cs
@@ -24,7 +24,9 @@ public static TBuilder WithoutTempData<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
             string key)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutTempData(tempData => tempData.WithoutEntry(key));
+            => builder
+                .WithoutTempData(tempData => tempData
+                .WithoutEntry(key));
 
         /// <summary>
         /// Remove entities by providing their keys from <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.TempDataDictionary"/>.
@@ -37,7 +39,9 @@ public static TBuilder WithoutTempData<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
             params string[] keys)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutTempData(tempData => tempData.WithoutEntries(keys));
+            => builder
+                .WithoutTempData(tempData => tempData
+                .WithoutEntries(keys));
 
         /// <summary>
         /// Remove entities by providing their keys from <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.TempDataDictionary"/>.
@@ -50,7 +54,9 @@ public static TBuilder WithoutTempData<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
             IEnumerable<string> keys)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutTempData(tempData => tempData.WithoutEntries(keys));
+            => builder
+                .WithoutTempData(tempData => tempData
+                .WithoutEntries(keys));
 
         /// <summary>
         /// Removing all entities from <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.TempDataDictionary"/>.
@@ -61,7 +67,9 @@ public static TBuilder WithoutTempData<TBuilder>(
         public static TBuilder WithoutTempData<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutTempData(tempData => tempData.WithoutAllEntries());
+            => builder
+                .WithoutTempData(tempData => tempData
+                .WithoutEntries());
 
         /// <summary>
         /// Remove values from <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.TempDataDictionary"/> on the tested component.

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,9 @@ protected void AddRoles(IEnumerable<string> roles)`
`149`	`149`	`protected void RemoveClaim(Claim claim)`
`150`	`150`	`{`
`151`	`151`	`if (this.claims.Contains(claim))`
	`152`	`+ {`
`152`	`153`	`this.claims.Remove(claim);`
	`154`	`+ }`
`153`	`155`	`}`
`154`	`156`
`155`	`157`	`/// <summary>`
`@@ -159,8 +161,9 @@ protected void RemoveClaim(Claim claim)`
`159`	`161`	`/// <param name="value">Claim's value.</param>`
`160`	`162`	`protected void RemoveClaim(string type, string value)`
`161`	`163`	`{`
`162`		`- var claimsToRemove =`
`163`		`- this.claims.Where(x => x.Type.Equals(type) && x.Value.Equals(value)).ToList();`
	`164`	`+ var claimsToRemove = this.claims`
	`165`	`+ .Where(x => x.Type.Equals(type) && x.Value.Equals(value))`
	`166`	`+ .ToList();`
`164`	`167`
`165`	`168`	`claimsToRemove.ForEach(claim => this.claims.Remove(claim));`
`166`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,39 +12,33 @@ public class WithoutClaimsPrincipalBuilder : BaseClaimsPrincipalUserBuilder, IAn`
`12`	`12`	`/// Initializes a new instance of the <see cref="WithoutClaimsPrincipalBuilder"/> class.`
`13`	`13`	`/// </summary>`
`14`	`14`	`public WithoutClaimsPrincipalBuilder(ClaimsPrincipal principal)`
`15`		`- {`
`16`		`- base.AddClaims(principal.Claims);`
`17`		`- }`
	`15`	`+ => base.AddClaims(principal.Claims);`
`18`	`16`
`19`	`17`	`/// <inheritdoc />`
`20`	`18`	`public IAndWithoutClaimsPrincipalBuilder WithoutClaim(string type, string value)`
`21`	`19`	`{`
`22`	`20`	`base.RemoveClaim(type, value);`
`23`		`-`
`24`	`21`	`return this;`
`25`	`22`	`}`
`26`	`23`
`27`	`24`	`/// <inheritdoc />`
`28`	`25`	`public IAndWithoutClaimsPrincipalBuilder WithoutClaim(Claim claim)`
`29`	`26`	`{`
`30`	`27`	`base.RemoveClaim(claim);`
`31`		`-`
`32`	`28`	`return this;`
`33`	`29`	`}`
`34`	`30`
`35`	`31`	`/// <inheritdoc />`
`36`	`32`	`public IAndWithoutClaimsPrincipalBuilder WithoutRole(string role)`
`37`	`33`	`{`
`38`	`34`	`base.RemoveRole(role);`
`39`		`-`
`40`	`35`	`return this;`
`41`	`36`	`}`
`42`	`37`
`43`	`38`	`/// <inheritdoc />`
`44`	`39`	`public IAndWithoutClaimsPrincipalBuilder WithoutUsername(string username)`
`45`	`40`	`{`
`46`	`41`	`base.RemoveUsername(username);`
`47`		`-`
`48`	`42`	`return this;`
`49`	`43`	`}`
`50`	`44`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using MyTested.AspNetCore.Mvc.Builders.Contracts.Data;`
`7`	`7`	`using MyTested.AspNetCore.Mvc.Utilities.Extensions;`
`8`	`8`
	`9`	`+ /// <inheritdoc />`
`9`	`10`	`public class WithoutDistributedCacheBuilder : BaseDistributedCacheBuilder, IAndWithoutDistributedCacheBuilder`
`10`	`11`	`{`
`11`	`12`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,10 @@ public IAndWithoutModelStateBuilder WithoutModelState()`
`28`	`28`	`/// <inheritdoc />`
`29`	`29`	`public IAndWithoutModelStateBuilder WithoutModelState(string key)`
`30`	`30`	`{`
`31`		`- if(this.ModelState.ContainsKey(key))`
	`31`	`+ if (this.ModelState.ContainsKey(key))`
	`32`	`+ {`
`32`	`33`	`this.ModelState.Remove(key);`
	`34`	`+ }`
`33`	`35`
`34`	`36`	`return this;`
`35`	`37`	`}`