Moved all plugins into Plugins namespace (closes #151)

Author: ivaylokenov

samples/MusicStore/MusicStore.Test/Controllers/AccountControllerTest.cs

@@ -54,7 +54,7 @@ public void PostLoginShouldHaveCorrectActionFilters()
             MyMvc
                 .Controller<AccountController>()
                 .Calling(c => c.Login(
-                    new LoginViewModel { Email = "Test", Password = "Test" },
+                    With.Default<LoginViewModel>(),
                     With.No<string>()))
                 .ShouldHave()
                 .ActionAttributes(attrs => attrs

samples/MusicStore/MusicStore.Test/Controllers/ShoppingCartControllerTest.cs

@@ -119,7 +119,7 @@ public void RemoveFromCartShouldRemoveItemFromCart()
                 .Calling(c => c.RemoveFromCart(cartItemId, CancellationToken.None))
                 .ShouldReturn()
                 .Json()
-                .WithResponseModelOfType<ShoppingCartRemoveViewModel>()
+                .WithModelOfType<ShoppingCartRemoveViewModel>()
                 .Passing(model =>
                 {
                     Assert.Equal(numberOfItem - 1, model.CartCount);

samples/MusicStore/MusicStore.Test/Properties/AssemblyInfo.cs

@@ -2,20 +2,7 @@
 using System.Runtime.InteropServices;
 using Xunit;
 
-[assembly: CollectionBehavior(MaxParallelThreads = -1)]
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("MusicStore.Test")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("0a3a93a1-a79c-4d08-8ace-6e72b30c3ab7")]
+[assembly: CollectionBehavior(MaxParallelThreads = -1)]

samples/MusicStore/MusicStore.Test/TestStartup.cs

@@ -10,7 +10,7 @@
     using System.Reflection;
     using Microsoft.AspNetCore.Mvc.ApplicationParts;
     using MyTested.AspNetCore.Mvc.Internal;
-    using MyTested.AspNetCore.Mvc.Session;
+    using MyTested.AspNetCore.Mvc.Plugins;
 #endif
 
     public class TestStartup : Startup

samples/MusicStore/MusicStore.Web/Models/SampleData.cs

@@ -38,12 +38,12 @@ private static void InsertTestData(IServiceProvider serviceProvider)
         {
             var albums = GetAlbums(imgUrl, Genres, Artists);
 
-            AddOrUpdateAsync(serviceProvider, g => g.GenreId, Genres.Select(genre => genre.Value));
-            AddOrUpdateAsync(serviceProvider, a => a.ArtistId, Artists.Select(artist => artist.Value));
-            AddOrUpdateAsync(serviceProvider, a => a.AlbumId, albums);
+            AddOrUpdate(serviceProvider, g => g.GenreId, Genres.Select(genre => genre.Value));
+            AddOrUpdate(serviceProvider, a => a.ArtistId, Artists.Select(artist => artist.Value));
+            AddOrUpdate(serviceProvider, a => a.AlbumId, albums);
         }
 
-        private static void AddOrUpdateAsync<TEntity>(
+        private static void AddOrUpdate<TEntity>(
             IServiceProvider serviceProvider,
             Func<TEntity, object> propertyToMatch, IEnumerable<TEntity> entities)
             where TEntity : class

samples/MusicStore/MusicStore.Web/Startup.cs

@@ -206,6 +206,9 @@ public void Configure(IApplicationBuilder app)
                     name: "api",
                     template: "{controller}/{id?}");
             });
+
+            //Populates the MusicStore sample data
+            SampleData.InitializeMusicStoreDatabase(app.ApplicationServices, false);
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Caching/Caching/CachingTestPlugin.cs renamed to src/MyTested.AspNetCore.Mvc.Caching/Plugins/CachingTestPlugin.cs

@@ -1,11 +1,10 @@
-namespace MyTested.AspNetCore.Mvc.Caching
+namespace MyTested.AspNetCore.Mvc.Plugins
 {
     using System;
     using Internal;
     using Internal.Application;
     using Microsoft.Extensions.Caching.Memory;
     using Microsoft.Extensions.DependencyInjection;
-    using Plugins;
 
     public class CachingTestPlugin : IServiceRegistrationPlugin
     {

src/MyTested.AspNetCore.Mvc.Core/Builders/ActionResults/BadRequest/BadRequestTestBuilder.cs

@@ -44,13 +44,13 @@ public BadRequestTestBuilder(ControllerTestContext testContext)
         /// <inheritdoc />
         public IAndModelDetailsTestBuilder<TError> WithError<TError>(TError error)
         {
-            return this.WithResponseModel(error);
+            return this.WithModel(error);
         }
 
         /// <inheritdoc />
         public IAndModelDetailsTestBuilder<TError> WithErrorOfType<TError>()
         {
-            return this.WithResponseModelOfType<TError>();
+            return this.WithModelOfType<TError>();
         }
 
         /// <inheritdoc />

src/MyTested.AspNetCore.Mvc.Core/Builders/Base/BaseTestBuilderWithResponseModel.cs

@@ -50,7 +50,7 @@ protected BaseTestBuilderWithResponseModel(ControllerTestContext testContext)
         protected string OfTypeErrorMessageFormat { get; set; }
 
         /// <inheritdoc />
-        public IAndModelDetailsTestBuilder<TResponseModel> WithResponseModelOfType<TResponseModel>()
+        public IAndModelDetailsTestBuilder<TResponseModel> WithModelOfType<TResponseModel>()
         {
             var actualResponseDataType = this.GetReturnType();
             var expectedResponseDataType = typeof(TResponseModel);
@@ -74,9 +74,9 @@ public IAndModelDetailsTestBuilder<TResponseModel> WithResponseModelOfType<TResp
         }
 
         /// <inheritdoc />
-        public IAndModelDetailsTestBuilder<TResponseModel> WithResponseModel<TResponseModel>(TResponseModel expectedModel)
+        public IAndModelDetailsTestBuilder<TResponseModel> WithModel<TResponseModel>(TResponseModel expectedModel)
         {
-            this.WithResponseModelOfType<TResponseModel>();
+            this.WithModelOfType<TResponseModel>();
 
             var actualModel = this.GetActualModel<TResponseModel>();
             if (Reflection.AreNotDeeplyEqual(expectedModel, actualModel))

src/MyTested.AspNetCore.Mvc.Core/Builders/Contracts/Base/IBaseTestBuilderWithResponseModel.cs

@@ -12,14 +12,14 @@ public interface IBaseTestBuilderWithResponseModel : IBaseTestBuilderWithInvoked
         /// </summary>
         /// <typeparam name="TResponseModel">Type of the response model.</typeparam>
         /// <returns>Test builder of <see cref="IModelDetailsTestBuilder{TResponseModel}"/>.</returns>
-        IAndModelDetailsTestBuilder<TResponseModel> WithResponseModelOfType<TResponseModel>();
+        IAndModelDetailsTestBuilder<TResponseModel> WithModelOfType<TResponseModel>();
 
         /// <summary>
         /// Tests whether a deeply equal object to the provided one is returned from the invoked action.
         /// </summary>
         /// <typeparam name="TResponseModel">Type of the response model.</typeparam>
         /// <param name="expectedModel">Expected model to be returned.</param>
         /// <returns>Test builder of <see cref="IModelDetailsTestBuilder{TResponseModel}"/>.</returns>
-        IAndModelDetailsTestBuilder<TResponseModel> WithResponseModel<TResponseModel>(TResponseModel expectedModel);
+        IAndModelDetailsTestBuilder<TResponseModel> WithModel<TResponseModel>(TResponseModel expectedModel);
     }
 }