Service extensions now return the service collection

Author: ivaylokenov

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

@@ -13,9 +13,10 @@ public static class ServiceCollectionCachingExtensions
         /// Replaces the default <see cref="IMemoryCache"/> with a mocked implementation.
         /// </summary>
         /// <param name="serviceCollection">Instance of <see cref="IServiceCollection"/> type.</param>
-        public static void ReplaceMemoryCache(this IServiceCollection serviceCollection)
+        /// <returns>The same <see cref="IServiceCollection"/>.</returns>
+        public static IServiceCollection ReplaceMemoryCache(this IServiceCollection serviceCollection)
         {
-            serviceCollection.Replace<IMemoryCache, MockedMemoryCache>(ServiceLifetime.Transient);
+            return serviceCollection.Replace<IMemoryCache, MockedMemoryCache>(ServiceLifetime.Transient);
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Core/ServiceCollectionExtensions.cs

@@ -14,12 +14,14 @@ public static class EnumerableExtensions
         /// <typeparam name="T">Type of objects in the collection.</typeparam>
         /// <param name="collection">Collection to traverse.</param>
         /// <param name="action">Function to execute on each item in the collection.</param>
-        public static void ForEach<T>(this IEnumerable<T> collection, Action<T> action)
+        public static IEnumerable<T> ForEach<T>(this IEnumerable<T> collection, Action<T> action)
         {
             foreach (var item in collection)
             {
                 action(item);
             }
+
+            return collection;
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Core/Utilities/Extensions/EnumerableExtensions.cs

@@ -25,7 +25,8 @@ public static class ServiceCollectionEntityFrameworkCoreExtensions
         /// Replaces the registered <see cref="DbContext"/> with an in memory scoped implementation.
         /// </summary>
         /// <param name="serviceCollection">Instance of <see cref="IServiceCollection"/> type.</param>
-        public static void ReplaceDbContext(this IServiceCollection serviceCollection)
+        /// <returns>The same <see cref="IServiceCollection"/>.</returns>
+        public static IServiceCollection ReplaceDbContext(this IServiceCollection serviceCollection)
         {
             var existingDbContextOptionsService =
                 serviceCollection.FirstOrDefault(s => BaseDbContextOptionsType.IsAssignableFrom(s.ServiceType));
@@ -51,6 +52,8 @@ public static void ReplaceDbContext(this IServiceCollection serviceCollection)
                 var genericMethod = ReplaceDatabaseMethodInfo.MakeGenericMethod(existingDbContext.ImplementationType);
                 genericMethod.Invoke(null, new object[] { serviceCollection });
             }
+
+            return serviceCollection;
         }
 
         private static void ReplaceDatabase<TDbContext>(IServiceCollection serviceCollection)

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

@@ -1,27 +1,25 @@
 namespace MyTested.AspNetCore.Mvc.Options
 {
     using System;
-    using System.Linq;
     using Microsoft.Extensions.DependencyInjection;
-    using Utilities.Extensions;
+    using Microsoft.Extensions.Options;
 
     public class OptionsTestPlugin : IServiceRegistrationPlugin
     {
-        private const string OptionsPrefix = "IOptions<";
-
+        private readonly Type defaultOptionsServiceType = typeof(IOptions<>);
+        private readonly Type defaultOptionsImplementationType = typeof(OptionsManager<>);
+        
         public Func<ServiceDescriptor, bool> ServiceSelectorPredicate
         {
             get
             {
                 return
                     serviceDescriptor =>
-                        serviceDescriptor.ServiceType.Name.StartsWith(OptionsPrefix);
+                        serviceDescriptor.ServiceType == defaultOptionsServiceType &&
+                        serviceDescriptor.ImplementationType == defaultOptionsImplementationType;
             }
         }
 
-        public Action<IServiceCollection> ServiceRegistrationDelegate
-            => serviceCollection => serviceCollection
-                .ToArray()
-                .ForEach(s => serviceCollection.ReplaceLifetime(s.ServiceType, ServiceLifetime.Scoped));
+        public Action<IServiceCollection> ServiceRegistrationDelegate => serviceCollection => serviceCollection.ReplaceOptions();
     }
 }

src/MyTested.AspNetCore.Mvc.Options/Options/OptionsTestPlugin.cs

@@ -0,0 +1,21 @@
+namespace MyTested.AspNetCore.Mvc
+{
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.Options;
+
+    /// <summary>
+    /// Contains options extension methods for <see cref="IServiceCollection"/>.
+    /// </summary>
+    public static class ServiceCollectionOptionsExtensions
+    {
+        /// <summary>
+        /// Replaces the default <see cref="IOptions{TOptions}"/> with a scoped implementation.
+        /// </summary>
+        /// <param name="serviceCollection">Instance of <see cref="IServiceCollection"/> type.</param>
+        /// <returns>The same <see cref="IServiceCollection"/>.</returns>
+        public static IServiceCollection ReplaceOptions(this IServiceCollection serviceCollection)
+        {
+            return serviceCollection.Replace(typeof(IOptions<>), typeof(OptionsManager<>), ServiceLifetime.Scoped);
+        }
+    }
+}

src/MyTested.AspNetCore.Mvc.Options/ServiceCollectionOptionsExtensions.cs

@@ -13,9 +13,10 @@ public static class ServiceCollectionSessionExtensions
         /// Replaces the default <see cref="ISessionStore"/> with a mocked implementation.
         /// </summary>
         /// <param name="serviceCollection">Instance of <see cref="IServiceCollection"/> type.</param>
-        public static void ReplaceSession(this IServiceCollection serviceCollection)
+        /// <returns>The same <see cref="IServiceCollection"/>.</returns>
+        public static IServiceCollection ReplaceSession(this IServiceCollection serviceCollection)
         {
-            serviceCollection.ReplaceTransient<ISessionStore, MockedSessionStore>();
+            return serviceCollection.ReplaceTransient<ISessionStore, MockedSessionStore>();
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Session/ServiceCollectionSessionExtensions.cs

@@ -13,9 +13,10 @@ public static class ServiceCollectionViewFeaturesExtensions
         /// Replaces the default <see cref="ITempDataProvider"/> with a mocked implementation.
         /// </summary>
         /// <param name="serviceCollection">Instance of <see cref="IServiceCollection"/> type.</param>
-        public static void ReplaceTempDataProvider(this IServiceCollection serviceCollection)
+        /// <returns>The same <see cref="IServiceCollection"/>.</returns>
+        public static IServiceCollection ReplaceTempDataProvider(this IServiceCollection serviceCollection)
         {
-            serviceCollection.ReplaceSingleton<ITempDataProvider, MockedTempDataProvider>();
+            return serviceCollection.ReplaceSingleton<ITempDataProvider, MockedTempDataProvider>();
         }
     }
 }

src/MyTested.AspNetCore.Mvc.ViewFeatures/ServiceCollectionViewFeaturesExtensions.cs

@@ -1,12 +1,7 @@
 {
   "buildOptions": {
     "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk",
-    "copyToOutput": {
-      "include": [
-        "testconfig.json"
-      ]
-    }
+    "keyFile": "../../tools/Key.snk"
   },
 
   "testRunner": "xunit",

test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/project.json

@@ -15,5 +15,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>