Extracted RouteHandlerMock (#326)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Actions/ActionContextAccessorMock.cs

@@ -3,7 +3,7 @@
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Infrastructure;
 
-    public class ActionContextAccessorMock : ActionContextAccessor
+    public class ActionContextAccessorMock
     {
         internal static readonly IActionContextAccessor Null = new NullActionContextAccessor();
 

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Actions/ActionDescriptorMock.cs

@@ -7,7 +7,7 @@
     using Microsoft.AspNetCore.Mvc.Abstractions;
     using Microsoft.AspNetCore.Mvc.Filters;
 
-    public class ActionDescriptorMock : ActionDescriptor
+    public class ActionDescriptorMock
     {
         public static ActionDescriptor Default
             => new ControllerActionDescriptor

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/ApplicationBuilderMock.cs

@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using Internal.Routing;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Http.Features;
@@ -88,6 +89,7 @@ public IApplicationBuilder Use(Func<RequestDelegate, RequestDelegate> middleware
             this.ExtractLegacyRoutes(middleware);
 
             this.components.Add(middleware);
+
             return this;
         }
 
@@ -148,7 +150,7 @@ private void ExtractEndpointRoutes(Func<RequestDelegate, RequestDelegate> middle
 
             var routeBuilder = new RouteBuilder(this)
             {
-                DefaultHandler = new RouteHandler(c => Task.CompletedTask)
+                DefaultHandler = RouteHandlerMock.Null
             };
 
             var endpointDataSources = routeOptions.Exposed().EndpointDataSources;
@@ -165,6 +167,7 @@ private void ExtractEndpointRoutes(Func<RequestDelegate, RequestDelegate> middle
                     {
                         var routeNameMetadata = route.Metadata.GetMetadata<IRouteNameMetadata>();
                         var routeName = routeNameMetadata?.RouteName;
+
                         if (routeName != null && !routeEndpoints.ContainsKey(routeName))
                         {
                             routeEndpoints[routeName] = route;

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs

@@ -1,13 +1,12 @@
 namespace MyTested.AspNetCore.Mvc.Internal.Application
 {
     using System;
+    using System.Globalization;
     using Configuration;
     using Licensing;
     using Microsoft.AspNetCore.Builder;
-    using Services;
-    using System.Globalization;
-    using System.Threading.Tasks;
     using Server;
+    using Services;
 
     public static partial class TestApplication
     {
@@ -19,8 +18,6 @@ static TestApplication()
         {
             Sync = new object();
 
-            NullHandler = c => Task.CompletedTask;
-
             TestWebServer.TryFindTestAssembly();
         }
 

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationRouter.cs

@@ -1,14 +1,12 @@
 namespace MyTested.AspNetCore.Mvc.Internal.Application
 {
     using System;
+    using Internal.Routing;
     using Microsoft.AspNetCore.Builder;
-    using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Routing;
 
     public static partial class TestApplication
     {
-        private static readonly RequestDelegate NullHandler;
-
         private static volatile IRouter router;
 
         public static IRouter Router
@@ -32,7 +30,7 @@ private static void PrepareApplicationAndRouting()
 
             var routeBuilder = new RouteBuilder(applicationBuilder)
             {
-                DefaultHandler = new RouteHandler(NullHandler)
+                DefaultHandler = RouteHandlerMock.Null
             };
 
             for (int i = 0; i < applicationBuilder.Routes.Count; i++)

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Logging/LoggerFactoryMock.cs

@@ -30,9 +30,7 @@ public void AddProvider(ILoggerProvider provider)
         /// <param name="categoryName">Not used category name parameter. This method is used for testing with <see cref="ILogger"/> service.</param>
         /// <returns>Mock of <see cref="ILogger"/>.</returns>
         public ILogger CreateLogger(string categoryName)
-        {
-            return LoggerMock.Instance;
-        }
+            => LoggerMock.Instance;
 
         /// <summary>
         /// Does nothing. Used for testing with ILogger service.

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Logging/LoggerMock.cs

@@ -17,19 +17,14 @@ public class LoggerMock : ILogger
         /// <param name="state">Not used parameter. Used for testing with <see cref="ILogger"/> service.</param>
         /// <returns>Disposable object.</returns>
         public IDisposable BeginScope<TState>(TState state)
-        {
-            return DisposableMock.Instance;
-        }
+            => DisposableMock.Instance;
 
         /// <summary>
         /// Does nothing. Always returns false.
         /// </summary>
         /// <param name="logLevel">Not used parameter. Used for testing with <see cref="ILogger"/> service.</param>
         /// <returns>Always false.</returns>
-        public bool IsEnabled(LogLevel logLevel)
-        {
-            return false;
-        }
+        public bool IsEnabled(LogLevel logLevel) => false;
 
         /// <summary>
         /// Does nothing. Used for testing purposes.

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Routing/RouteHandlerMock.cs

@@ -0,0 +1,10 @@
+namespace MyTested.AspNetCore.Mvc.Internal.Routing
+{
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Routing;
+
+    public class RouteHandlerMock
+    {
+        internal static readonly IRouter Null = new RouteHandler(c => Task.CompletedTask);
+    }
+}

src/MyTested.AspNetCore.Mvc.Controllers/Internal/Controllers/ControllerContextMock.cs

@@ -11,11 +11,9 @@
     public class ControllerContextMock : ControllerContext
     {
         private ControllerContextMock(ActionContext actionContext)
-            : base(actionContext)
-        {
-            this.PrepareControllerContext(actionContext);
-        }
-        
+            : base(actionContext) 
+            => this.PrepareControllerContext(actionContext);
+
         public static ControllerContext Default(HttpTestContext testContext)
             => FromActionContext(testContext, new ActionContext());
 

src/MyTested.AspNetCore.Mvc.ViewComponents/Internal/ViewComponents/ViewComponentContextMock.cs

@@ -10,18 +10,13 @@
     public class ViewComponentContextMock : ViewComponentContext
     {
         private HttpTestContext testContext;
-        
-        private ViewComponentContextMock(HttpTestContext testContext, ViewComponentContext viewComponentContext)
-        {
-            this.PrepareViewComponentContext(testContext, viewComponentContext);
-        }
-        
+
+        private ViewComponentContextMock(HttpTestContext testContext, ViewComponentContext viewComponentContext) 
+            => this.PrepareViewComponentContext(testContext, viewComponentContext);
+
         private HttpTestContext TestContext
         {
-            get
-            {
-                return this.testContext;
-            }
+            get => this.testContext;
 
             set
             {