#283 Fixing PR comments

- Adding more options from to provide to WithoutSession and WithoutData components.
- Placing System usings on top of the using list
- Class renaming, small code style fixes.

Author: vaptsarov

src/MyTested.AspNetCore.Mvc.Caching/Builders/Contracts/Data/IWithoutMemoryCacheBuilder.cs

@@ -1,7 +1,7 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Data
 {
-    using Microsoft.Extensions.Caching.Memory;
     using System.Collections.Generic;
+    using Microsoft.Extensions.Caching.Memory;
 
     /// <summary>
     /// Used for building mocked <see cref="IMemoryCache"/>.
@@ -22,10 +22,17 @@ public interface IWithoutMemoryCacheBuilder
         /// <returns>The same <see cref="IAndWithoutMemoryCacheBuilder"/>.</returns>
         IAndWithoutMemoryCacheBuilder WithoutEntries(IEnumerable<object> keys);
 
+        /// <summary>
+        /// Remove cache params to the mocked <see cref="IMemoryCache"/>.
+        /// </summary>
+        /// <param name="keys">Keys of the cache entries.</param>
+        /// <returns>The same <see cref="IAndWithoutMemoryCacheBuilder"/>.</returns>
+        IAndWithoutMemoryCacheBuilder WithoutEntries(params object[] keys);
+
         /// <summary>
         /// Clear all entries persisted into the <see cref="IMemoryCache"/>.
         /// </summary>
         /// <returns>The same <see cref="IAndWithoutMemoryCacheBuilder"/>.</returns>
-        IAndWithoutMemoryCacheBuilder ClearCache();
+        IAndWithoutMemoryCacheBuilder WithoutAllEntries();
     }
 }

src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/MemoryCacheBaseBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/BaseMemoryCacheBuilder.cs

@@ -1,22 +1,20 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Data
 {
+    using System;
     using Microsoft.Extensions.Caching.Memory;
     using Microsoft.Extensions.DependencyInjection;
-    using System;
 
     /// <summary>
     /// Used for building mocked <see cref="IMemoryCache"/>.
     /// </summary>
-    public abstract class MemoryCacheBaseBuilder
+    public abstract class BaseMemoryCacheBuilder
     {
         /// <summary>
-        /// Abstract <see cref="MemoryCacheBaseBuilder"/> class.
+        /// Abstract <see cref="BaseMemoryCacheBuilder"/> class.
         /// </summary>
         /// <param name="services"><see cref="IServiceProvider"/> providing the current <see cref="IMemoryCache"/>.</param>
-        public MemoryCacheBaseBuilder(IServiceProvider services)
-        {
-            this.MemoryCache = services.GetRequiredService<IMemoryCache>();
-        }
+        public BaseMemoryCacheBuilder(IServiceProvider services)
+            => this.MemoryCache = services.GetRequiredService<IMemoryCache>();
 
         protected IMemoryCache MemoryCache { get; private set; }
     }

src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/MemoryCacheWithBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/WithMemoryCacheBuilder.cs

@@ -7,13 +7,16 @@
     using Utilities.Extensions;
 
     /// <inheritdoc />
-    public class MemoryCacheWithBuilder : MemoryCacheBaseBuilder, IAndWithMemoryCacheBuilder
+    public class WithMemoryCacheBuilder : BaseMemoryCacheBuilder, IAndWithMemoryCacheBuilder
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryCacheWithBuilder"/> class.
+        /// Initializes a new instance of the <see cref="WithMemoryCacheBuilder"/> class.
         /// </summary>
         /// <param name="services"><see cref="IServiceProvider"/> providing the current <see cref="IMemoryCache"/>.</param>
-        public MemoryCacheWithBuilder(IServiceProvider services) : base(services) { }
+        public WithMemoryCacheBuilder(IServiceProvider services)
+            : base(services)
+        {
+        }
 
         /// <inheritdoc />
         public IAndWithMemoryCacheBuilder WithEntry(object key, object value)

src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/MemoryCacheWithoutBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/WithoutMemoryCacheBuilder.cs

@@ -7,13 +7,16 @@
     using Utilities.Extensions;
 
     /// <inheritdoc />
-    public class MemoryCacheWithoutBuilder : MemoryCacheBaseBuilder, IAndWithoutMemoryCacheBuilder
+    public class WithoutMemoryCacheBuilder : BaseMemoryCacheBuilder, IAndWithoutMemoryCacheBuilder
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryCacheWithoutBuilder"/> class.
+        /// Initializes a new instance of the <see cref="WithoutMemoryCacheBuilder"/> class.
         /// </summary>
         /// <param name="services"><see cref="IServiceProvider"/> providing the current <see cref="IMemoryCache"/>.</param>
-        public MemoryCacheWithoutBuilder(IServiceProvider services) : base(services) { }
+        public WithoutMemoryCacheBuilder(IServiceProvider services) 
+            : base(services)
+        {
+        }
 
         /// <inheritdoc />
         public IAndWithoutMemoryCacheBuilder WithoutEntry(object key)
@@ -30,12 +33,19 @@ public IAndWithoutMemoryCacheBuilder WithoutEntries(IEnumerable<object> keys)
         }
 
         /// <inheritdoc />
-        public IAndWithoutMemoryCacheBuilder ClearCache()
+        public IAndWithoutMemoryCacheBuilder WithoutAllEntries()
         {
             this.MemoryCache.AsMemoryCacheMock().ClearCache();
             return this;
         }
 
+        /// <inheritdoc />
+        public IAndWithoutMemoryCacheBuilder WithoutEntries(params object[] keys)
+        {
+            this.MemoryCache.AsMemoryCacheMock().RemoveKeys(keys);
+            return this;
+        }
+
         /// <inheritdoc />
         public IWithoutMemoryCacheBuilder AndAlso() => this;
     }

src/MyTested.AspNetCore.Mvc.Caching/ComponentBuilderCachingExtensions.cs

@@ -1,11 +1,11 @@
 namespace MyTested.AspNetCore.Mvc
 {
     using System;
+    using System.Collections.Generic;
     using Builders.Contracts.Base;
     using Builders.Contracts.Data;
     using Builders.Data;
     using Builders.Base;
-    using System.Collections.Generic;
 
     /// <summary>
     /// Contains <see cref="Microsoft.Extensions.Caching.Memory.IMemoryCache"/> extension methods for <see cref="IBaseTestBuilderWithComponentBuilder{TBuilder}"/>.
@@ -26,7 +26,7 @@ public static TBuilder WithMemoryCache<TBuilder>(
         {
             var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
-            memoryCacheBuilder(new MemoryCacheWithBuilder(actualBuilder.TestContext.HttpContext.RequestServices));
+            memoryCacheBuilder(new WithMemoryCacheBuilder(actualBuilder.TestContext.HttpContext.RequestServices));
 
             return actualBuilder.Builder;
         }
@@ -40,7 +40,7 @@ public static TBuilder WithMemoryCache<TBuilder>(
         public static TBuilder WithoutMemoryCache<TBuilder>(
             this IBaseTestBuilderWithComponentBuilder<TBuilder> builder)
             where TBuilder : IBaseTestBuilder
-            => builder.WithoutMemoryCache(cache => cache.ClearCache());
+            => builder.WithoutMemoryCache(cache => cache.WithoutAllEntries());
 
         /// <summary>
         /// Remove given entity with key from <see cref="Microsoft.Extensions.Caching.Memory.IMemoryCache"/> service.
@@ -68,6 +68,19 @@ public static TBuilder WithoutMemoryCache<TBuilder>(
             where TBuilder : IBaseTestBuilder
             => builder.WithoutMemoryCache(cache => cache.WithoutEntries(keys));
 
+        /// <summary>
+        /// Remove given entities from <see cref="Microsoft.Extensions.Caching.Memory.IMemoryCache"/> service.
+        /// </summary>
+        /// <typeparam name="TBuilder">Class representing ASP.NET Core MVC test builder.</typeparam>
+        /// <param name="builder">Instance of <see cref="IBaseTestBuilderWithComponentBuilder{TBuilder}"/> type.</param>
+        /// <param name="keys">Keys of the entities that will be removed.</param>
+        /// <returns>The same component builder.</returns>
+        public static TBuilder WithoutMemoryCache<TBuilder>(
+            this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
+            params object[] keys)
+            where TBuilder : IBaseTestBuilder
+            => builder.WithoutMemoryCache(cache => cache.WithoutEntries(keys));
+
         /// <summary>
         /// Remove entity or entities from <see cref="Microsoft.Extensions.Caching.Memory.IMemoryCache"/> service.
         /// </summary>
@@ -82,7 +95,7 @@ public static TBuilder WithoutMemoryCache<TBuilder>(
         {
             var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
-            memoryCacheBuilder(new MemoryCacheWithoutBuilder(actualBuilder.TestContext.HttpContext.RequestServices));
+            memoryCacheBuilder(new WithoutMemoryCacheBuilder(actualBuilder.TestContext.HttpContext.RequestServices));
 
             return actualBuilder.Builder;
         }

src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithoutDbContextBuilder.cs

@@ -1,8 +1,8 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Data
 {
-    using Microsoft.EntityFrameworkCore;
     using System;
     using System.Collections.Generic;
+    using Microsoft.EntityFrameworkCore;
 
     public interface IWithoutDbContextBuilder
     {
@@ -75,9 +75,9 @@ IAndWithoutDbContextBuilder WithoutSet<TDbContext, TEntity>(Action<DbSet<TEntity
             where TEntity : class;
 
         /// <summary>
-        /// Wipe the whole database data, returning it to a clean state.
+        /// Wipes the whole database data, returning it to a clean state.
         /// </summary>
         /// <returns>The same <see cref="DbContext"/> builder.</returns>
-        IAndWithoutDbContextBuilder WipeDatabase();
+        IAndWithoutDbContextBuilder WithoutAllEntities();
     }
 }

src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithoutDbContextBuilder.cs

@@ -1,13 +1,13 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Data
 {
-    using Microsoft.EntityFrameworkCore;
-    using MyTested.AspNetCore.Mvc.Builders.Base;
-    using MyTested.AspNetCore.Mvc.Builders.Contracts.Data;
-    using MyTested.AspNetCore.Mvc.Internal.TestContexts;
-    using MyTested.AspNetCore.Mvc.Utilities.Validators;
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Base;
+    using Contracts.Data;
+    using Internal.TestContexts;
+    using Microsoft.EntityFrameworkCore;
+    using Utilities.Validators;
 
     /// <summary>
     /// Used for building <see cref="DbContext"/>.
@@ -46,7 +46,7 @@ public IAndWithoutDbContextBuilder WithoutEntities(Action<DbContext> dbContextSe
             => this.WithoutEntities<DbContext>(dbContextSetup);
 
         /// <inheritdoc />
-        public IAndWithoutDbContextBuilder WipeDatabase()
+        public IAndWithoutDbContextBuilder WithoutAllEntities()
             => this.WithoutEntities<DbContext>(dbContext => dbContext.Database.EnsureDeleted());
 
         /// <inheritdoc />

src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ComponentBuilderEntityFrameworkCoreExtensions.cs

@@ -125,7 +125,7 @@ public static TBuilder WithoutData<TBuilder>(
             where TBuilder : IBaseTestBuilder
             => builder
                 .WithoutData(data => data
-                    .WipeDatabase());
+                    .WithoutAllEntities());
 
         /// <summary>
         /// Remove values from the <see cref="Microsoft.EntityFrameworkCore.DbContext"/> on the tested component or wipes all tables from it.

src/MyTested.AspNetCore.Mvc.Session/Builders/Contracts/Data/IAndWithoutSessionBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Session/Builders/Contracts/Data/IAndWithoutSessionTestBuilder.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// Used for adding AndAlso() method to the <see cref="Microsoft.AspNetCore.Http.ISession"/> builder.
     /// </summary>
-    public interface IAndWithoutSessionBuilder : IWithoutSessionBuilder
+    public interface IAndWithoutSessionTestBuilder : IWithoutSessionBuilder
     {
         /// <summary>
         /// AndAlso method for better readability when building <see cref="Microsoft.AspNetCore.Http.ISession"/>.

src/MyTested.AspNetCore.Mvc.Session/Builders/Contracts/Data/IWithoutSessionBuilder.cs

@@ -1,5 +1,7 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Data
 {
+    using System.Collections.Generic;
+
     /// <summary>
     /// Used for building <see cref="Microsoft.AspNetCore.Http.ISession"/>.
     /// </summary>
@@ -9,13 +11,27 @@ public interface IWithoutSessionBuilder
         /// Removes session key from <see cref="Microsoft.AspNetCore.Http.ISession"/>.
         /// </summary>
         /// <param name="key">The key to remove as string.</param>
-        /// <returns>The same <see cref="IAndWithoutSessionBuilder"/>.</returns>
-        IAndWithoutSessionBuilder WithoutEntry(string key);
+        /// <returns>The same <see cref="IAndWithoutSessionTestBuilder"/>.</returns>
+        IAndWithoutSessionTestBuilder WithoutEntry(string key);
+
+        /// <summary>
+        /// Removes provided keys from <see cref="Microsoft.AspNetCore.Http.ISession"/>.
+        /// </summary>
+        /// <param name="keys">The given collection of keys to remove as string.</param>
+        /// <returns>The same <see cref="IAndWithoutSessionTestBuilder"/>.</returns>
+        IAndWithoutSessionTestBuilder WithoutEntries(IEnumerable<string> keys);
+
+        /// <summary>
+        /// Removes provided keys from <see cref="Microsoft.AspNetCore.Http.ISession"/>.
+        /// </summary>
+        /// <param name="keys">The given param colletion of keys to remove as string.</param>
+        /// <returns>The same <see cref="IAndWithoutSessionTestBuilder"/>.</returns>
+        IAndWithoutSessionTestBuilder WithoutEntries(params string[] keys);
 
         /// <summary>
-        /// Clears the whole <see cref="Microsoft.AspNetCore.Http.ISession"/>.
+        /// Clears all entries from <see cref="Microsoft.AspNetCore.Http.ISession"/>.
         /// </summary>
-        /// <returns>The same <see cref="IAndWithoutSessionBuilder"/>.</returns>
-        IAndWithoutSessionBuilder ClearSession();
+        /// <returns>The same <see cref="IAndWithoutSessionTestBuilder"/>.</returns>
+        IAndWithoutSessionTestBuilder WithoutAllEntries();
     }
 }