General cleanup

Bart Koelman · Bart Koelman · commit 255ed36df6e9 · 2021-02-03T01:47:31.000+01:00
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/PassportsController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/PassportsController.cs
@@ -8,7 +8,7 @@ namespace JsonApiDotNetCoreExample.Controllers
 {
     public sealed class PassportsController : JsonApiController<Passport>
     {
-        public PassportsController(IJsonApiOptions options, ILoggerFactory loggerFactory, IResourceService<Passport, int> resourceService)
+        public PassportsController(IJsonApiOptions options, ILoggerFactory loggerFactory, IResourceService<Passport> resourceService)
             : base(options, loggerFactory, resourceService)
         {
         }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/TagsController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/TagsController.cs
@@ -11,7 +11,7 @@ public sealed class TagsController : JsonApiController<Tag>
         public TagsController(
             IJsonApiOptions options,
             ILoggerFactory loggerFactory,
-            IResourceService<Tag, int> resourceService)
+            IResourceService<Tag> resourceService)
             : base(options, loggerFactory, resourceService)
         { }
     }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs b/src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs
@@ -12,13 +12,10 @@ public sealed class AppDbContext : DbContext
         public DbSet<TodoItem> TodoItems { get; set; }
         public DbSet<Passport> Passports { get; set; }
         public DbSet<Person> People { get; set; }
-        public DbSet<TodoItemCollection> TodoItemCollections { get; set; }
         public DbSet<Article> Articles { get; set; }
         public DbSet<Author> AuthorDifferentDbContextName { get; set; }
         public DbSet<User> Users { get; set; }
-        public DbSet<PersonRole> PersonRoles { get; set; }
         public DbSet<ArticleTag> ArticleTags { get; set; }
-        public DbSet<Tag> Tags { get; set; }
         public DbSet<Blog> Blogs { get; set; }
 
         public AppDbContext(DbContextOptions<AppDbContext> options, ISystemClock systemClock) : base(options)
diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs
@@ -14,38 +14,30 @@ namespace JsonApiDotNetCoreExample
 {
     public class Startup : EmptyStartup
     {
+        private static readonly Version _postgresCiBuildVersion = new Version(9, 6);
         private readonly string _connectionString;
 
-        public Startup(IConfiguration configuration) : base(configuration)
+        public Startup(IConfiguration configuration)
+            : base(configuration)
         {
             string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
             _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
         }
 
         public override void ConfigureServices(IServiceCollection services)
         {
-            ConfigureClock(services);
+            services.AddSingleton<ISystemClock, SystemClock>();
 
             services.AddDbContext<AppDbContext>(options =>
             {
                 options.EnableSensitiveDataLogging();
-                options.UseNpgsql(_connectionString, innerOptions => innerOptions.SetPostgresVersion(new Version(9, 6)));
-            },
-                // TODO: Remove ServiceLifetime.Transient, after all integration tests have been converted to use IntegrationTestContext.
-                ServiceLifetime.Transient);
+                options.UseNpgsql(_connectionString, postgresOptions => postgresOptions.SetPostgresVersion(_postgresCiBuildVersion));
+            });
 
             services.AddJsonApi<AppDbContext>(ConfigureJsonApiOptions, discovery => discovery.AddCurrentAssembly());
-
-            // once all tests have been moved to WebApplicationFactory format we can get rid of this line below
-            services.AddClientSerialization();
         }
 
-        protected virtual void ConfigureClock(IServiceCollection services)
-        {
-            services.AddSingleton<ISystemClock, SystemClock>();
-        }
-
-        protected virtual void ConfigureJsonApiOptions(JsonApiOptions options)
+        protected void ConfigureJsonApiOptions(JsonApiOptions options)
         {
             options.IncludeExceptionStackTraceInErrors = true;
             options.Namespace = "api/v1";
@@ -63,7 +55,7 @@ public override void Configure(IApplicationBuilder app, IWebHostEnvironment envi
                 var appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
                 appDbContext.Database.EnsureCreated();
             }
-            
+
             app.UseRouting();
             app.UseJsonApi();
             app.UseEndpoints(endpoints => endpoints.MapControllers());
diff --git a/test/JsonApiDotNetCoreExampleTests/AppDbContextExtensions.cs b/test/JsonApiDotNetCoreExampleTests/AppDbContextExtensions.cs
@@ -57,27 +57,5 @@ private static async Task ClearTablesAsync(this DbContext dbContext, params Type
                 }   
             }
         }
-
-        public static void ClearTable<TEntity>(this DbContext dbContext) where TEntity : class
-        {
-            var entityType = dbContext.Model.FindEntityType(typeof(TEntity));
-            if (entityType == null)
-            {
-                throw new InvalidOperationException($"Table for '{typeof(TEntity).Name}' not found.");
-            }
-
-            string tableName = entityType.GetTableName();
-
-            // PERF: We first try to clear the table, which is fast and usually succeeds, unless foreign key constraints are violated.
-            // In that case, we recursively delete all related data, which is slow.
-            try
-            {
-                dbContext.Database.ExecuteSqlRaw("delete from \"" + tableName + "\"");
-            }
-            catch (PostgresException)
-            {
-                dbContext.Database.ExecuteSqlRaw("truncate table \"" + tableName + "\" cascade");
-            }
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreExampleTests/ExampleFakers.cs b/test/JsonApiDotNetCoreExampleTests/ExampleFakers.cs
@@ -2,12 +2,13 @@
 using Bogus;
 using JsonApiDotNetCoreExample.Data;
 using JsonApiDotNetCoreExample.Models;
+using JsonApiDotNetCoreExampleTests.IntegrationTests;
 using Microsoft.Extensions.DependencyInjection;
 using Person = JsonApiDotNetCoreExample.Models.Person;
 
-namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceHooks
+namespace JsonApiDotNetCoreExampleTests
 {
-    internal sealed class HookFakers : FakerContainer
+    internal sealed class ExampleFakers : FakerContainer
     {
         private readonly IServiceProvider _serviceProvider;
 
@@ -58,7 +59,7 @@ internal sealed class HookFakers : FakerContainer
         public Faker<Person> Person => _lazyPersonFaker.Value;
         public Faker<Tag> Tag => _lazyTagFaker.Value;
 
-        public HookFakers(IServiceProvider serviceProvider)
+        public ExampleFakers(IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
 
diff --git a/test/JsonApiDotNetCoreExampleTests/FakerContainer.cs b/test/JsonApiDotNetCoreExampleTests/FakerContainer.cs
@@ -4,7 +4,7 @@
 using System.Reflection;
 using Xunit;
 
-namespace JsonApiDotNetCoreExampleTests.IntegrationTests
+namespace JsonApiDotNetCoreExampleTests
 {
     internal abstract class FakerContainer
     {
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Pagination/PaginationWithTotalCountTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Pagination/PaginationWithTotalCountTests.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using Bogus;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
@@ -12,7 +11,6 @@
 using JsonApiDotNetCoreExample.Models;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
-using Person = JsonApiDotNetCoreExample.Models.Person;
 
 namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Pagination
 {
@@ -21,7 +19,7 @@ public sealed class PaginationWithTotalCountTests : IClassFixture<IntegrationTes
         private const int _defaultPageSize = 5;
 
         private readonly IntegrationTestContext<Startup, AppDbContext> _testContext;
-        private readonly Faker<TodoItem> _todoItemFaker = new Faker<TodoItem>();
+        private readonly ExampleFakers _fakers;
 
         public PaginationWithTotalCountTests(IntegrationTestContext<Startup, AppDbContext> testContext)
         {
@@ -36,6 +34,8 @@ public PaginationWithTotalCountTests(IntegrationTestContext<Startup, AppDbContex
 
             options.DisableTopPagination = false;
             options.DisableChildrenPagination = false;
+
+            _fakers = new ExampleFakers(testContext.Factory.Services);
         }
 
         [Fact]
@@ -714,7 +714,7 @@ public async Task Renders_correct_top_level_links_for_page_number(int pageNumber
             };
 
             const int totalCount = 3 * _defaultPageSize + 3;
-            var todoItems = _todoItemFaker.Generate(totalCount);
+            var todoItems = _fakers.TodoItem.Generate(totalCount);
             
             foreach (var todoItem in todoItems)
             {
@@ -739,46 +739,46 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             // Assert
             httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            Assert.Equal("http://localhost" + route, responseDocument.Links.Self);
+            responseDocument.Links.Self.Should().Be("http://localhost" + route);
 
             if (firstLink != null)
             {
                 var expected = "http://localhost" + SetPageNumberInUrl(routePrefix, firstLink.Value);
-                Assert.Equal(expected, responseDocument.Links.First);
+                responseDocument.Links.First.Should().Be(expected);
             }
             else
             {
-                Assert.Null(responseDocument.Links.First);
+                responseDocument.Links.First.Should().BeNull();
             }
 
             if (prevLink != null)
             {
                 var expected = "http://localhost" + SetPageNumberInUrl(routePrefix, prevLink.Value);
-                Assert.Equal(expected, responseDocument.Links.Prev);
+                responseDocument.Links.Prev.Should().Be(expected);
             }
             else
             {
-                Assert.Null(responseDocument.Links.Prev);
+                responseDocument.Links.Prev.Should().BeNull();
             }
 
             if (nextLink != null)
             {
                 var expected = "http://localhost" + SetPageNumberInUrl(routePrefix, nextLink.Value);
-                Assert.Equal(expected, responseDocument.Links.Next);
+                responseDocument.Links.Next.Should().Be(expected);
             }
             else
             {
-                Assert.Null(responseDocument.Links.Next);
+                responseDocument.Links.Next.Should().BeNull();
             }
 
             if (lastLink != null)
             {
                 var expected = "http://localhost" + SetPageNumberInUrl(routePrefix, lastLink.Value);
-                Assert.Equal(expected, responseDocument.Links.Last);
+                responseDocument.Links.Last.Should().Be(expected);
             }
             else
             {
-                Assert.Null(responseDocument.Links.Last);
+                responseDocument.Links.Last.Should().BeNull();
             }
 
             static string SetPageNumberInUrl(string url, int pageNumber)
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Pagination/PaginationWithoutTotalCountTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Pagination/PaginationWithoutTotalCountTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Threading.Tasks;
-using Bogus;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -17,8 +16,7 @@ public sealed class PaginationWithoutTotalCountTests : IClassFixture<Integration
         private const int _defaultPageSize = 5;
 
         private readonly IntegrationTestContext<Startup, AppDbContext> _testContext;
-
-        private readonly Faker<Article> _articleFaker = new Faker<Article>();
+        private readonly ExampleFakers _fakers;
 
         public PaginationWithoutTotalCountTests(IntegrationTestContext<Startup, AppDbContext> testContext)
         {
@@ -29,6 +27,8 @@ public PaginationWithoutTotalCountTests(IntegrationTestContext<Startup, AppDbCon
             options.IncludeTotalResourceCount = false;
             options.DefaultPageSize = new PageSize(_defaultPageSize);
             options.AllowUnknownQueryStringParameters = true;
+
+            _fakers = new ExampleFakers(testContext.Factory.Services);
         }
 
         [Fact]
@@ -113,7 +113,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         public async Task When_page_number_is_specified_in_query_string_with_partially_filled_page_it_should_render_pagination_links()
         {
             // Arrange
-            var articles = _articleFaker.Generate(12);
+            var articles = _fakers.Article.Generate(12);
 
             await _testContext.RunOnDatabaseAsync(async dbContext =>
             {
@@ -145,7 +145,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         public async Task When_page_number_is_specified_in_query_string_with_full_page_it_should_render_pagination_links()
         {
             // Arrange
-            var articles = _articleFaker.Generate(_defaultPageSize * 3);
+            var articles = _fakers.Article.Generate(_defaultPageSize * 3);
 
             await _testContext.RunOnDatabaseAsync(async dbContext =>
             {
@@ -179,7 +179,7 @@ public async Task When_page_number_is_specified_in_query_string_with_full_page_o
             // Arrange
             var author = new Author
             {
-                Articles = _articleFaker.Generate(_defaultPageSize * 3)
+                Articles = _fakers.Article.Generate(_defaultPageSize * 3)
             };
 
             await _testContext.RunOnDatabaseAsync(async dbContext =>
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Pagination/RangeValidationTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Pagination/RangeValidationTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Threading.Tasks;
-using Bogus;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -15,7 +14,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Pagination
     public sealed class RangeValidationTests : IClassFixture<IntegrationTestContext<Startup, AppDbContext>>
     {
         private readonly IntegrationTestContext<Startup, AppDbContext> _testContext;
-        private readonly Faker<TodoItem> _todoItemFaker = new Faker<TodoItem>();
+        private readonly ExampleFakers _fakers;
 
         private const int _defaultPageSize = 5;
 
@@ -27,6 +26,8 @@ public RangeValidationTests(IntegrationTestContext<Startup, AppDbContext> testCo
             options.DefaultPageSize = new PageSize(_defaultPageSize);
             options.MaximumPageSize = null;
             options.MaximumPageNumber = null;
+
+            _fakers = new ExampleFakers(testContext.Factory.Services);
         }
 
         [Fact]
@@ -84,7 +85,7 @@ public async Task When_page_number_is_positive_it_must_succeed()
         public async Task When_page_number_is_too_high_it_must_return_empty_set_of_resources()
         {
             // Arrange
-            var todoItems = _todoItemFaker.Generate(3);
+            var todoItems = _fakers.TodoItem.Generate(3);
 
             await _testContext.RunOnDatabaseAsync(async dbContext =>
             {
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/ResourceHooks/ResourceHookTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/ResourceHooks/ResourceHookTests.cs
@@ -24,7 +24,7 @@ public sealed class ResourceHookTests
         : IClassFixture<IntegrationTestContext<ResourceHooksStartup<AppDbContext>, AppDbContext>>
     {
         private readonly IntegrationTestContext<ResourceHooksStartup<AppDbContext>, AppDbContext> _testContext;
-        private readonly HookFakers _fakers;
+        private readonly ExampleFakers _fakers;
 
         public ResourceHookTests(IntegrationTestContext<ResourceHooksStartup<AppDbContext>, AppDbContext> testContext)
         {
@@ -43,7 +43,7 @@ public ResourceHookTests(IntegrationTestContext<ResourceHooksStartup<AppDbContex
             options.DisableTopPagination = false;
             options.DisableChildrenPagination = false;
 
-            _fakers = new HookFakers(testContext.Factory.Services);
+            _fakers = new ExampleFakers(testContext.Factory.Services);
         }
 
         [Fact]
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/BlockingHttpDeleteController.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/BlockingHttpDeleteController.cs
@@ -12,7 +12,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers
     public sealed class BlockingHttpDeleteController : JsonApiController<Sofa>
     {
         public BlockingHttpDeleteController(IJsonApiOptions options, ILoggerFactory loggerFactory,
-            IResourceService<Sofa, int> resourceService)
+            IResourceService<Sofa> resourceService)
             : base(options, loggerFactory, resourceService)
         {
         }
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/BlockingHttpPatchController.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/BlockingHttpPatchController.cs
@@ -10,7 +10,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers
     public sealed class BlockingHttpPatchController : JsonApiController<Chair>
     {
         public BlockingHttpPatchController(IJsonApiOptions options, ILoggerFactory loggerFactory,
-            IResourceService<Chair, int> resourceService)
+            IResourceService<Chair> resourceService)
             : base(options, loggerFactory, resourceService)
         {
         }
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/BlockingHttpPostController.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/BlockingHttpPostController.cs
@@ -10,7 +10,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers
     public sealed class BlockingHttpPostController : JsonApiController<Table>
     {
         public BlockingHttpPostController(IJsonApiOptions options, ILoggerFactory loggerFactory,
-            IResourceService<Table, int> resourceService)
+            IResourceService<Table> resourceService)
             : base(options, loggerFactory, resourceService)
         {
         }
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/BlockingWritesController.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RestrictedControllers/BlockingWritesController.cs
@@ -11,7 +11,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers
     public sealed class BlockingWritesController : JsonApiController<Bed>
     {
         public BlockingWritesController(IJsonApiOptions options, ILoggerFactory loggerFactory,
-            IResourceService<Bed, int> resourceService)
+            IResourceService<Bed> resourceService)
             : base(options, loggerFactory, resourceService)
         {
         }
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Sorting/SortTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Sorting/SortTests.cs
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/SparseFieldSets/SparseFieldSetTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/SparseFieldSets/SparseFieldSetTests.cs
diff --git a/test/JsonApiDotNetCoreExampleTests/ObjectAssertionsExtensions.cs b/test/JsonApiDotNetCoreExampleTests/ObjectAssertionsExtensions.cs
diff --git a/test/JsonApiDotNetCoreExampleTests/ServiceCollectionExtensions.cs b/test/JsonApiDotNetCoreExampleTests/ServiceCollectionExtensions.cs
diff --git a/test/JsonApiDotNetCoreExampleTests/TestableStartup.cs b/test/JsonApiDotNetCoreExampleTests/TestableStartup.cs
diff --git a/test/UnitTests/Controllers/BaseJsonApiController_Tests.cs b/test/UnitTests/Controllers/BaseJsonApiController_Tests.cs

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace JsonApiDotNetCoreExample.Controllers`
`8`	`8`	`{`
`9`	`9`	`public sealed class PassportsController : JsonApiController<Passport>`
`10`	`10`	`{`
`11`		`- public PassportsController(IJsonApiOptions options, ILoggerFactory loggerFactory, IResourceService<Passport, int> resourceService)`
	`11`	`+ public PassportsController(IJsonApiOptions options, ILoggerFactory loggerFactory, IResourceService<Passport> resourceService)`
`12`	`12`	`: base(options, loggerFactory, resourceService)`
`13`	`13`	`{`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public sealed class TagsController : JsonApiController<Tag>`
`11`	`11`	`public TagsController(`
`12`	`12`	`IJsonApiOptions options,`
`13`	`13`	`ILoggerFactory loggerFactory,`
`14`		`- IResourceService<Tag, int> resourceService)`
	`14`	`+ IResourceService<Tag> resourceService)`
`15`	`15`	`: base(options, loggerFactory, resourceService)`
`16`	`16`	`{ }`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,38 +14,30 @@ namespace JsonApiDotNetCoreExample`
`14`	`14`	`{`
`15`	`15`	`public class Startup : EmptyStartup`
`16`	`16`	`{`
	`17`	`+ private static readonly Version _postgresCiBuildVersion = new Version(9, 6);`
`17`	`18`	`private readonly string _connectionString;`
`18`	`19`
`19`		`- public Startup(IConfiguration configuration) : base(configuration)`
	`20`	`+ public Startup(IConfiguration configuration)`
	`21`	`+ : base(configuration)`
`20`	`22`	`{`
`21`	`23`	`string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";`
`22`	`24`	`_connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`public override void ConfigureServices(IServiceCollection services)`
`26`	`28`	`{`
`27`		`- ConfigureClock(services);`
	`29`	`+ services.AddSingleton<ISystemClock, SystemClock>();`
`28`	`30`
`29`	`31`	`services.AddDbContext<AppDbContext>(options =>`
`30`	`32`	`{`
`31`	`33`	`options.EnableSensitiveDataLogging();`
`32`		`- options.UseNpgsql(_connectionString, innerOptions => innerOptions.SetPostgresVersion(new Version(9, 6)));`
`33`		`- },`
`34`		`- // TODO: Remove ServiceLifetime.Transient, after all integration tests have been converted to use IntegrationTestContext.`
`35`		`- ServiceLifetime.Transient);`
	`34`	`+ options.UseNpgsql(_connectionString, postgresOptions => postgresOptions.SetPostgresVersion(_postgresCiBuildVersion));`
	`35`	`+ });`
`36`	`36`
`37`	`37`	`services.AddJsonApi<AppDbContext>(ConfigureJsonApiOptions, discovery => discovery.AddCurrentAssembly());`
`38`		`-`
`39`		`- // once all tests have been moved to WebApplicationFactory format we can get rid of this line below`
`40`		`- services.AddClientSerialization();`
`41`	`38`	`}`
`42`	`39`
`43`		`- protected virtual void ConfigureClock(IServiceCollection services)`
`44`		`- {`
`45`		`- services.AddSingleton<ISystemClock, SystemClock>();`
`46`		`- }`
`47`		`-`
`48`		`- protected virtual void ConfigureJsonApiOptions(JsonApiOptions options)`
	`40`	`+ protected void ConfigureJsonApiOptions(JsonApiOptions options)`
`49`	`41`	`{`
`50`	`42`	`options.IncludeExceptionStackTraceInErrors = true;`
`51`	`43`	`options.Namespace = "api/v1";`
`@@ -63,7 +55,7 @@ public override void Configure(IApplicationBuilder app, IWebHostEnvironment envi`
`63`	`55`	`var appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();`
`64`	`56`	`appDbContext.Database.EnsureCreated();`
`65`	`57`	`}`
`66`		`-`
	`58`	`+`
`67`	`59`	`app.UseRouting();`
`68`	`60`	`app.UseJsonApi();`
`69`	`61`	`app.UseEndpoints(endpoints => endpoints.MapControllers());`
Original file line number	Diff line number	Diff line change
`@@ -57,27 +57,5 @@ private static async Task ClearTablesAsync(this DbContext dbContext, params Type`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`-`
`61`		`- public static void ClearTable<TEntity>(this DbContext dbContext) where TEntity : class`
`62`		`- {`
`63`		`- var entityType = dbContext.Model.FindEntityType(typeof(TEntity));`
`64`		`- if (entityType == null)`
`65`		`- {`
`66`		`- throw new InvalidOperationException($"Table for '{typeof(TEntity).Name}' not found.");`
`67`		`- }`
`68`		`-`
`69`		`- string tableName = entityType.GetTableName();`
`70`		`-`
`71`		`- // PERF: We first try to clear the table, which is fast and usually succeeds, unless foreign key constraints are violated.`
`72`		`- // In that case, we recursively delete all related data, which is slow.`
`73`		`- try`
`74`		`- {`
`75`		`- dbContext.Database.ExecuteSqlRaw("delete from \"" + tableName + "\"");`
`76`		`- }`
`77`		`- catch (PostgresException)`
`78`		`- {`
`79`		`- dbContext.Database.ExecuteSqlRaw("truncate table \"" + tableName + "\" cascade");`
`80`		`- }`
`81`		`- }`
`82`	`60`	`}`
`83`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Reflection;`
`5`	`5`	`using Xunit;`
`6`	`6`
`7`		`-namespace JsonApiDotNetCoreExampleTests.IntegrationTests`
	`7`	`+namespace JsonApiDotNetCoreExampleTests`
`8`	`8`	`{`
`9`	`9`	`internal abstract class FakerContainer`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Net;`
`4`	`4`	`using System.Threading.Tasks;`
`5`		`-using Bogus;`
`6`	`5`	`using FluentAssertions;`
`7`	`6`	`using FluentAssertions.Extensions;`
`8`	`7`	`using JsonApiDotNetCore.Configuration;`
`@@ -12,7 +11,6 @@`
`12`	`11`	`using JsonApiDotNetCoreExample.Models;`
`13`	`12`	`using Microsoft.Extensions.DependencyInjection;`
`14`	`13`	`using Xunit;`
`15`		`-using Person = JsonApiDotNetCoreExample.Models.Person;`
`16`	`14`
`17`	`15`	`namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Pagination`
`18`	`16`	`{`
`@@ -21,7 +19,7 @@ public sealed class PaginationWithTotalCountTests : IClassFixture<IntegrationTes`
`21`	`19`	`private const int _defaultPageSize = 5;`
`22`	`20`
`23`	`21`	`private readonly IntegrationTestContext<Startup, AppDbContext> _testContext;`
`24`		`- private readonly Faker<TodoItem> _todoItemFaker = new Faker<TodoItem>();`
	`22`	`+ private readonly ExampleFakers _fakers;`
`25`	`23`
`26`	`24`	`public PaginationWithTotalCountTests(IntegrationTestContext<Startup, AppDbContext> testContext)`
`27`	`25`	`{`
`@@ -36,6 +34,8 @@ public PaginationWithTotalCountTests(IntegrationTestContext<Startup, AppDbContex`
`36`	`34`
`37`	`35`	`options.DisableTopPagination = false;`
`38`	`36`	`options.DisableChildrenPagination = false;`
	`37`	`+`
	`38`	`+ _fakers = new ExampleFakers(testContext.Factory.Services);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`[Fact]`
`@@ -714,7 +714,7 @@ public async Task Renders_correct_top_level_links_for_page_number(int pageNumber`
`714`	`714`	`};`
`715`	`715`
`716`	`716`	`const int totalCount = 3 * _defaultPageSize + 3;`
`717`		`- var todoItems = _todoItemFaker.Generate(totalCount);`
	`717`	`+ var todoItems = _fakers.TodoItem.Generate(totalCount);`
`718`	`718`
`719`	`719`	`foreach (var todoItem in todoItems)`
`720`	`720`	`{`
`@@ -739,46 +739,46 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`739`	`739`	`// Assert`
`740`	`740`	`httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);`
`741`	`741`
`742`		`- Assert.Equal("http://localhost" + route, responseDocument.Links.Self);`
	`742`	`+ responseDocument.Links.Self.Should().Be("http://localhost" + route);`
`743`	`743`
`744`	`744`	`if (firstLink != null)`
`745`	`745`	`{`
`746`	`746`	`var expected = "http://localhost" + SetPageNumberInUrl(routePrefix, firstLink.Value);`
`747`		`- Assert.Equal(expected, responseDocument.Links.First);`
	`747`	`+ responseDocument.Links.First.Should().Be(expected);`
`748`	`748`	`}`
`749`	`749`	`else`
`750`	`750`	`{`
`751`		`- Assert.Null(responseDocument.Links.First);`
	`751`	`+ responseDocument.Links.First.Should().BeNull();`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`if (prevLink != null)`
`755`	`755`	`{`
`756`	`756`	`var expected = "http://localhost" + SetPageNumberInUrl(routePrefix, prevLink.Value);`
`757`		`- Assert.Equal(expected, responseDocument.Links.Prev);`
	`757`	`+ responseDocument.Links.Prev.Should().Be(expected);`
`758`	`758`	`}`
`759`	`759`	`else`
`760`	`760`	`{`
`761`		`- Assert.Null(responseDocument.Links.Prev);`
	`761`	`+ responseDocument.Links.Prev.Should().BeNull();`
`762`	`762`	`}`
`763`	`763`
`764`	`764`	`if (nextLink != null)`
`765`	`765`	`{`
`766`	`766`	`var expected = "http://localhost" + SetPageNumberInUrl(routePrefix, nextLink.Value);`
`767`		`- Assert.Equal(expected, responseDocument.Links.Next);`
	`767`	`+ responseDocument.Links.Next.Should().Be(expected);`
`768`	`768`	`}`
`769`	`769`	`else`
`770`	`770`	`{`
`771`		`- Assert.Null(responseDocument.Links.Next);`
	`771`	`+ responseDocument.Links.Next.Should().BeNull();`
`772`	`772`	`}`
`773`	`773`
`774`	`774`	`if (lastLink != null)`
`775`	`775`	`{`
`776`	`776`	`var expected = "http://localhost" + SetPageNumberInUrl(routePrefix, lastLink.Value);`
`777`		`- Assert.Equal(expected, responseDocument.Links.Last);`
	`777`	`+ responseDocument.Links.Last.Should().Be(expected);`
`778`	`778`	`}`
`779`	`779`	`else`
`780`	`780`	`{`
`781`		`- Assert.Null(responseDocument.Links.Last);`
	`781`	`+ responseDocument.Links.Last.Should().BeNull();`
`782`	`782`	`}`
`783`	`783`
`784`	`784`	`static string SetPageNumberInUrl(string url, int pageNumber)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public sealed class ResourceHookTests`
`24`	`24`	`: IClassFixture<IntegrationTestContext<ResourceHooksStartup<AppDbContext>, AppDbContext>>`
`25`	`25`	`{`
`26`	`26`	`private readonly IntegrationTestContext<ResourceHooksStartup<AppDbContext>, AppDbContext> _testContext;`
`27`		`- private readonly HookFakers _fakers;`
	`27`	`+ private readonly ExampleFakers _fakers;`
`28`	`28`
`29`	`29`	`public ResourceHookTests(IntegrationTestContext<ResourceHooksStartup<AppDbContext>, AppDbContext> testContext)`
`30`	`30`	`{`
`@@ -43,7 +43,7 @@ public ResourceHookTests(IntegrationTestContext<ResourceHooksStartup<AppDbContex`
`43`	`43`	`options.DisableTopPagination = false;`
`44`	`44`	`options.DisableChildrenPagination = false;`
`45`	`45`
`46`		`- _fakers = new HookFakers(testContext.Factory.Services);`
	`46`	`+ _fakers = new ExampleFakers(testContext.Factory.Services);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers`
`12`	`12`	`public sealed class BlockingHttpDeleteController : JsonApiController<Sofa>`
`13`	`13`	`{`
`14`	`14`	`public BlockingHttpDeleteController(IJsonApiOptions options, ILoggerFactory loggerFactory,`
`15`		`- IResourceService<Sofa, int> resourceService)`
	`15`	`+ IResourceService<Sofa> resourceService)`
`16`	`16`	`: base(options, loggerFactory, resourceService)`
`17`	`17`	`{`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers`
`10`	`10`	`public sealed class BlockingHttpPatchController : JsonApiController<Chair>`
`11`	`11`	`{`
`12`	`12`	`public BlockingHttpPatchController(IJsonApiOptions options, ILoggerFactory loggerFactory,`
`13`		`- IResourceService<Chair, int> resourceService)`
	`13`	`+ IResourceService<Chair> resourceService)`
`14`	`14`	`: base(options, loggerFactory, resourceService)`
`15`	`15`	`{`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers`
`11`	`11`	`public sealed class BlockingWritesController : JsonApiController<Bed>`
`12`	`12`	`{`
`13`	`13`	`public BlockingWritesController(IJsonApiOptions options, ILoggerFactory loggerFactory,`
`14`		`- IResourceService<Bed, int> resourceService)`
	`14`	`+ IResourceService<Bed> resourceService)`
`15`	`15`	`: base(options, loggerFactory, resourceService)`
`16`	`16`	`{`
`17`	`17`	`}`