Removed base class: I can't think of a reason why we should have an intermediate base class for these tests

Author: Bart Koelman

test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultTests.cs

@@ -47,7 +47,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         public async Task Converts_empty_ActionResult_to_error_collection()
         {
             // Arrange
-            string route = $"/toothbrushes/{BaseToothbrushesController.EmptyActionResultId}";
+            string route = $"/toothbrushes/{ToothbrushesController.EmptyActionResultId}";
 
             // Act
             (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
@@ -67,7 +67,7 @@ public async Task Converts_empty_ActionResult_to_error_collection()
         public async Task Converts_ActionResult_with_error_object_to_error_collection()
         {
             // Arrange
-            string route = $"/toothbrushes/{BaseToothbrushesController.ActionResultWithErrorObjectId}";
+            string route = $"/toothbrushes/{ToothbrushesController.ActionResultWithErrorObjectId}";
 
             // Act
             (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
@@ -87,7 +87,7 @@ public async Task Converts_ActionResult_with_error_object_to_error_collection()
         public async Task Cannot_convert_ActionResult_with_string_parameter_to_error_collection()
         {
             // Arrange
-            string route = $"/toothbrushes/{BaseToothbrushesController.ActionResultWithStringParameter}";
+            string route = $"/toothbrushes/{ToothbrushesController.ActionResultWithStringParameter}";
 
             // Act
             (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
@@ -107,7 +107,7 @@ public async Task Cannot_convert_ActionResult_with_string_parameter_to_error_col
         public async Task Converts_ObjectResult_with_error_object_to_error_collection()
         {
             // Arrange
-            string route = $"/toothbrushes/{BaseToothbrushesController.ObjectResultWithErrorObjectId}";
+            string route = $"/toothbrushes/{ToothbrushesController.ObjectResultWithErrorObjectId}";
 
             // Act
             (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
@@ -127,7 +127,7 @@ public async Task Converts_ObjectResult_with_error_object_to_error_collection()
         public async Task Converts_ObjectResult_with_error_objects_to_error_collection()
         {
             // Arrange
-            string route = $"/toothbrushes/{BaseToothbrushesController.ObjectResultWithErrorCollectionId}";
+            string route = $"/toothbrushes/{ToothbrushesController.ObjectResultWithErrorCollectionId}";
 
             // Act
             (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);

test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/BaseToothbrushesController.cs

@@ -1,23 +1,70 @@
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults
 {
-    public sealed class ToothbrushesController : BaseToothbrushesController
+    public sealed class ToothbrushesController : BaseJsonApiController<Toothbrush, int>
     {
+        internal const int EmptyActionResultId = 11111111;
+        internal const int ActionResultWithErrorObjectId = 22222222;
+        internal const int ActionResultWithStringParameter = 33333333;
+        internal const int ObjectResultWithErrorObjectId = 44444444;
+        internal const int ObjectResultWithErrorCollectionId = 55555555;
+
         public ToothbrushesController(IJsonApiOptions options, ILoggerFactory loggerFactory, IResourceService<Toothbrush> resourceService)
             : base(options, loggerFactory, resourceService)
         {
         }
 
         [HttpGet("{id}")]
-        public override Task<IActionResult> GetAsync(int id, CancellationToken cancellationToken)
+        public override async Task<IActionResult> GetAsync(int id, CancellationToken cancellationToken)
         {
-            return base.GetAsync(id, cancellationToken);
+            if (id == EmptyActionResultId)
+            {
+                return NotFound();
+            }
+
+            if (id == ActionResultWithErrorObjectId)
+            {
+                return NotFound(new ErrorObject(HttpStatusCode.NotFound)
+                {
+                    Title = "No toothbrush with that ID exists."
+                });
+            }
+
+            if (id == ActionResultWithStringParameter)
+            {
+                return Conflict("Something went wrong.");
+            }
+
+            if (id == ObjectResultWithErrorObjectId)
+            {
+                return Error(new ErrorObject(HttpStatusCode.BadGateway));
+            }
+
+            if (id == ObjectResultWithErrorCollectionId)
+            {
+                var errors = new[]
+                {
+                    new ErrorObject(HttpStatusCode.PreconditionFailed),
+                    new ErrorObject(HttpStatusCode.Unauthorized),
+                    new ErrorObject(HttpStatusCode.ExpectationFailed)
+                    {
+                        Title = "This is not a very great request."
+                    }
+                };
+
+                return Error(errors);
+            }
+
+            return await base.GetAsync(id, cancellationToken);
         }
     }
 }