add middleware tests

Author: jaredcnance

JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -2,7 +2,6 @@
 using AutoMapper;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Routing;
-using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace JsonApiDotNetCore.Extensions
@@ -18,7 +17,6 @@ public static void AddJsonApi(this IServiceCollection services, Action<IJsonApiM
       {
         config.ResourceMapper = new MapperConfiguration(cfg => {}).CreateMapper();
       }
-
       services.AddSingleton(_ => new Router(config));
     }
   }

JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs

@@ -3,25 +3,24 @@
 using JsonApiDotNetCore.Routing;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using JsonApiDotNetCore.Services;
 
 namespace JsonApiDotNetCore.Middleware
 {
   public class JsonApiMiddleware
   {
       private readonly RequestDelegate _next;
       private readonly ILogger _logger;
-      private readonly Router _jsonApiService;
+      private readonly IRouter _router;
       private readonly IServiceProvider _serviceProvider;
 
       public JsonApiMiddleware(RequestDelegate next,
         ILogger<JsonApiMiddleware> logger,
-        Router jsonApiService,
+        IRouter router,
         IServiceProvider serviceProvider)
       {
         _next = next;
         _logger = logger;
-        _jsonApiService = jsonApiService;
+        _router = router;
         _serviceProvider = serviceProvider;
       }
 
@@ -30,7 +29,7 @@ public async Task Invoke(HttpContext context)
         _logger.LogInformation("Passing request to JsonApiService: " + context.Request.Path);
 
         if(context.Request.ContentType == "application/vnd.api+json") {
-          var wasHandled = _jsonApiService.HandleJsonApiRoute(context, _serviceProvider);
+          _router.HandleJsonApiRoute(context, _serviceProvider);
         }
         else
         {

JsonApiDotNetCore/Routing/IRouter.cs

@@ -0,0 +1,10 @@
+using System;
+using Microsoft.AspNetCore.Http;
+
+namespace JsonApiDotNetCore.Routing
+{
+  public interface IRouter
+  {
+    bool HandleJsonApiRoute(HttpContext context, IServiceProvider serviceProvider);
+  }
+}

JsonApiDotNetCore/Routing/Router.cs

@@ -8,7 +8,7 @@
 
 namespace JsonApiDotNetCore.Routing
 {
-  public class Router
+  public class Router : IRouter
   {
     private readonly JsonApiModelConfiguration _jsonApiModelConfiguration;
     private IServiceProvider _serviceProvider;

JsonApiDotNetCoreTests/Extensions/IServiceCollectionExtensionsTests.cs

@@ -21,6 +21,5 @@ public void AddJsonApi_AddsRouterToServiceCollection()
             // assert
             Assert.True(serviceCollection.ContainsType(typeof(Router)));
         }
-
     }
 }

JsonApiDotNetCoreTests/Helpers/ServiceCollection.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;

JsonApiDotNetCoreTests/Helpers/TestRouter.cs

@@ -0,0 +1,16 @@
+using System;
+using JsonApiDotNetCore.Routing;
+using Microsoft.AspNetCore.Http;
+
+namespace JsonApiDotNetCoreTests.Helpers
+{
+  public class TestRouter : IRouter
+  {
+    public bool DidHandleRoute { get; set; }
+    public bool HandleJsonApiRoute(HttpContext context, IServiceProvider serviceProvider)
+    {
+      DidHandleRoute = true;
+      return true;
+    }
+  }
+}

JsonApiDotNetCoreTests/Middleware/UnitTests/JsonApiMiddlewareTests.cs

@@ -0,0 +1,66 @@
+using Xunit;
+using Microsoft.AspNetCore.Http;
+using JsonApiDotNetCore.Middleware;
+using JsonApiDotNetCoreTests.Helpers;
+using Microsoft.Extensions.Logging;
+using Moq;
+using System.IO;
+
+namespace JsonApiDotNetCoreTests.Middleware.UnitTests
+{
+    // see example explanation on xUnit.net website:
+    // https://xunit.github.io/docs/getting-started-dotnet-core.html
+    public class JsonApiMiddlewareTests
+    {
+        [Fact]
+        public async void Invoke_CallsHandleJsonApiRequest_OnRouter()
+        {
+            // arrange
+            var httpRequestMock = new Mock<HttpRequest>();
+            httpRequestMock.Setup(r => r.Path).Returns(new PathString(""));
+            httpRequestMock.Setup(r => r.ContentType).Returns("application/vnd.api+json");
+
+            var httpContextMock = new Mock<HttpContext>();
+            httpContextMock.Setup(c => c.Request).Returns(httpRequestMock.Object);
+
+            var router = new TestRouter();
+            var loggerMock = new Mock<ILogger<JsonApiMiddleware>>();
+            var middleware = new JsonApiMiddleware(null, loggerMock.Object, router, null);
+
+            // act
+            await middleware.Invoke(httpContextMock.Object);
+
+            // assert
+            Assert.True(router.DidHandleRoute);
+        }
+
+        [Fact]
+        public async void Invoke_SetsStatusCode_To415_ForInvalidContentType()
+        {
+            // arrange
+            var httpRequestMock = new Mock<HttpRequest>();
+            httpRequestMock.Setup(r => r.Path).Returns(new PathString(""));
+            httpRequestMock.Setup(r => r.ContentType).Returns("");
+
+            var httpResponsMock = new Mock<HttpResponse>();
+            httpResponsMock.SetupAllProperties();
+            httpResponsMock.Setup(r => r.Body).Returns(new MemoryStream());
+
+            var httpContextMock = new Mock<HttpContext>();
+            httpContextMock.Setup(c => c.Request).Returns(httpRequestMock.Object);
+            httpContextMock.Setup(c => c.Response).Returns(httpResponsMock.Object);
+
+            var requestDelegateMock = new Mock<RequestDelegate>();
+
+            var router = new TestRouter();
+            var loggerMock = new Mock<ILogger<JsonApiMiddleware>>();
+            var middleware = new JsonApiMiddleware(requestDelegateMock.Object, loggerMock.Object, router, null);
+
+            // act
+            await middleware.Invoke(httpContextMock.Object);
+
+            // assert
+            Assert.Equal(415, httpResponsMock.Object.StatusCode);
+        }
+    }
+}

JsonApiDotNetCoreTests/project.json

@@ -4,7 +4,8 @@
   "dependencies": {
     "JsonApiDotNetCore": "1.0.0",
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
-    "xunit": "2.2.0-beta2-build3300"
+    "xunit": "2.2.0-beta2-build3300",
+    "moq": "4.6.38-alpha"
   },
   "frameworks": {
     "netcoreapp1.0": {