Remove Moq usage from middleware tests

Author: bkoelman

Diff for: Directory.Build.props

@@ -39,7 +39,6 @@
   <PropertyGroup>
     <CoverletVersion>6.0.*</CoverletVersion>
     <GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
-    <MoqVersion>4.18.*</MoqVersion>
     <TestSdkVersion>17.7.*</TestSdkVersion>
   </PropertyGroup>
 </Project>

Diff for: src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs

@@ -23,10 +23,12 @@ public sealed class JsonApiMiddleware
     private static readonly MediaTypeHeaderValue MediaType = MediaTypeHeaderValue.Parse(HeaderConstants.MediaType);
     private static readonly MediaTypeHeaderValue AtomicOperationsMediaType = MediaTypeHeaderValue.Parse(HeaderConstants.AtomicOperationsMediaType);
 
-    private readonly RequestDelegate _next;
+    private readonly RequestDelegate? _next;
 
-    public JsonApiMiddleware(RequestDelegate next, IHttpContextAccessor httpContextAccessor)
+    public JsonApiMiddleware(RequestDelegate? next, IHttpContextAccessor httpContextAccessor)
     {
+        ArgumentGuard.NotNull(httpContextAccessor);
+
         _next = next;
 
         var session = new AspNetCodeTimerSession(httpContextAccessor);
@@ -77,9 +79,12 @@ public async Task InvokeAsync(HttpContext httpContext, IControllerResourceMappin
                 httpContext.RegisterJsonApiRequest();
             }
 
-            using (CodeTimingSessionManager.Current.Measure("Subsequent middleware"))
+            if (_next != null)
             {
-                await _next(httpContext);
+                using (CodeTimingSessionManager.Current.Measure("Subsequent middleware"))
+                {
+                    await _next(httpContext);
+                }
             }
         }
 

Diff for: test/UnitTests/Middleware/JsonApiRequestTests.cs renamed to test/JsonApiDotNetCoreTests/UnitTests/Middleware/JsonApiMiddlewareTests.cs

@@ -7,17 +7,17 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.Extensions.Logging.Abstractions;
-using Moq;
 using TestBuildingBlocks;
 using Xunit;
 
 #pragma warning disable AV1561 // Signature contains too many parameters
 
-namespace UnitTests.Middleware;
+namespace JsonApiDotNetCoreTests.UnitTests.Middleware;
 
-public sealed class JsonApiRequestTests
+public sealed class JsonApiMiddlewareTests
 {
     // @formatter:wrap_lines false
     [Theory]
@@ -65,7 +65,7 @@ public async Task Sets_request_properties_correctly(string requestMethod, string
         var httpContext = new DefaultHttpContext();
         IControllerResourceMapping controllerResourceMapping = SetupRoutes(httpContext, resourceGraph, requestMethod, requestPath);
 
-        var middleware = new JsonApiMiddleware(_ => Task.CompletedTask, new HttpContextAccessor
+        var middleware = new JsonApiMiddleware(null, new HttpContextAccessor
         {
             HttpContext = httpContext
         });
@@ -153,16 +153,10 @@ private static IControllerResourceMapping SetupRoutes(HttpContext httpContext, I
             ControllerTypeInfo = (TypeInfo)typeof(object)
         };
 
-        var controllerResourceMappingMock = new Mock<IControllerResourceMapping>();
+        httpContext.SetEndpoint(new Endpoint(null, new EndpointMetadataCollection(controllerActionDescriptor), null));
 
-        controllerResourceMappingMock.Setup(mapping => mapping.GetResourceTypeForController(It.IsAny<Type>())).Returns(() =>
-        {
-            return pathSegments.Length > 0 ? resourceGraph.GetResourceTypes().FirstOrDefault(resourceType => resourceType.PublicName == pathSegments[0]) : null;
-        });
-
-        httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(controllerActionDescriptor), null));
-
-        return controllerResourceMappingMock.Object;
+        string? resourceTypePublicName = pathSegments.Length > 0 ? pathSegments[0] : null;
+        return new FakeJsonApiRoutingConvention(resourceGraph, resourceTypePublicName);
     }
 
     public enum IsReadOnly
@@ -198,4 +192,31 @@ private sealed class TodoItem : Identifiable<int>
         [HasMany]
         public ISet<ItemTag> Tags { get; set; } = new HashSet<ItemTag>();
     }
+
+    private sealed class FakeJsonApiRoutingConvention : IJsonApiRoutingConvention
+    {
+        private readonly IResourceGraph _resourceGraph;
+        private readonly string? _resourceTypePublicName;
+
+        public FakeJsonApiRoutingConvention(IResourceGraph resourceGraph, string? resourceTypePublicName)
+        {
+            _resourceGraph = resourceGraph;
+            _resourceTypePublicName = resourceTypePublicName;
+        }
+
+        public void Apply(ApplicationModel application)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ResourceType? GetResourceTypeForController(Type? controllerType)
+        {
+            return _resourceTypePublicName != null ? _resourceGraph.FindResourceType(_resourceTypePublicName) : null;
+        }
+
+        public string GetControllerNameForResourceType(ResourceType? resourceType)
+        {
+            throw new NotImplementedException();
+        }
+    }
 }

Diff for: test/UnitTests/UnitTests.csproj

@@ -12,6 +12,5 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="$(GitHubActionsTestLoggerVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>
 </Project>