Using single scope per test improves performance

tests/Application.IntegrationTests/TestBase.cs

@@ -1,16 +1,55 @@
-using NUnit.Framework;
+using MediatR;
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
 using System.Threading.Tasks;
 
 namespace CleanTesting.Application.IntegrationTests
 {
     using static Testing;
 
+    [TestFixture]
     public class TestBase
     {
+        protected IServiceScope Scope { get; private set; }
+
         [SetUp]
         public async Task SetUp()
         {
             await ResetState();
+
+            this.Scope = CreateScope();
+        }
+
+        [TearDown]
+        public void BaseTearDown() 
+        {
+            if (Scope != null)
+            {
+                Scope.Dispose();
+                Scope = null;
+            }
+        }
+
+        protected virtual async Task<TEntity> FindAsync<TEntity>(int id)
+            where TEntity : class
+        {
+            return await Testing.FindAsync<TEntity>(id, Scope);
+        }
+
+        protected virtual async Task AddAsync<TEntity>(TEntity entity)
+            where TEntity : class
+        {
+            await Testing.AddAsync<TEntity>(entity, Scope);
+        }
+
+        protected virtual async Task<TResponse> SendAsync<TResponse>(IRequest<TResponse> request)
+        {
+            return await Testing.SendAsync<TResponse>(request, Scope);
+        }
+
+        protected virtual async Task<string> RunAsDefaultUserAsync()
+        {
+            return await Testing.RunAsDefaultUserAsync(Scope);
         }
     }
 }

tests/Application.IntegrationTests/Testing.cs

@@ -53,8 +53,12 @@ public void RunBeforeAnyTests()
             services.Remove(currentUserServiceDescriptor);
 
             // Register testing version
-            services.AddScoped(provider =>
-                Mock.Of<ICurrentUserService>(s => s.UserId == _currentUserId));
+            services.AddTransient<ICurrentUserService>(provider =>
+            {
+                var res = new Mock<ICurrentUserService>();
+                res.SetupGet(x => x.UserId).Returns(() => _currentUserId);
+                return res.Object;
+            });
 
             _scopeFactory = services.BuildServiceProvider().GetService<IServiceScopeFactory>();
 
@@ -75,51 +79,48 @@ private void EnsureDatabase()
             context.Database.Migrate();
         }
 
+        public static IServiceScope CreateScope()
+        {
+            return _scopeFactory.CreateScope();
+        }
+
         public static async Task ResetState()
         {
             await _checkpoint.Reset(_configuration.GetConnectionString("DefaultConnection"));
 
             _currentUserId = null;
         }
 
-        public static async Task<TEntity> FindAsync<TEntity>(int id)
+        public static async Task<TEntity> FindAsync<TEntity>(int id, IServiceScope scope)
             where TEntity : class
         {
-            using var scope = _scopeFactory.CreateScope();
-
             var context = scope.ServiceProvider.GetService<ApplicationDbContext>();
 
             return await context.FindAsync<TEntity>(id);
         }
 
-        public static async Task AddAsync<TEntity>(TEntity entity)
+        public static async Task AddAsync<TEntity>(TEntity entity, IServiceScope scope)
             where TEntity : class
         {
-            using var scope = _scopeFactory.CreateScope();
-
             var context = scope.ServiceProvider.GetService<ApplicationDbContext>();
 
             context.Add(entity);
 
             await context.SaveChangesAsync();
         }
 
-        public static async Task<TResponse> SendAsync<TResponse>(IRequest<TResponse> request)
+        public static async Task<TResponse> SendAsync<TResponse>(IRequest<TResponse> request, IServiceScope scope)
         {
-            using var scope = _scopeFactory.CreateScope();
-
             var mediator = scope.ServiceProvider.GetService<IMediator>();
 
             return await mediator.Send(request);
         }
 
-        public static async Task<string> RunAsDefaultUserAsync()
+        public static async Task<string> RunAsDefaultUserAsync(IServiceScope scope)
         {
             var userName = "test@local";
             var password = "Testing1234!";
 
-            using var scope = _scopeFactory.CreateScope();
-
             var userManager = scope.ServiceProvider.GetService<UserManager<ApplicationUser>>();
 
             var user = new ApplicationUser { UserName = userName, Email = userName };

tests/Application.IntegrationTests/TodoItems/Commands/CreateTodoItemTests.cs

@@ -9,8 +9,6 @@
 
 namespace CleanTesting.Application.IntegrationTests.TodoItems.Commands
 {
-    using static Testing;
-
     public class CreateTodoItemTests : TestBase
     {
         [Test]

tests/Application.IntegrationTests/TodoItems/Commands/DeleteTodoItemTests.cs

@@ -9,8 +9,6 @@
 
 namespace CleanTesting.Application.IntegrationTests.TodoItems.Commands
 {
-    using static Testing;
-
     public class DeleteTodoItemTests : TestBase
     {
         [Test]

tests/Application.IntegrationTests/TodoItems/Commands/UpdateTodoItemDetailTests.cs

@@ -12,8 +12,6 @@
 
 namespace CleanTesting.Application.IntegrationTests.TodoItems.Commands
 {
-    using static Testing;
-
     public class UpdateTodoItemDetailTests : TestBase
     {
         [Test]

tests/Application.IntegrationTests/TodoItems/Commands/UpdateTodoItemTests.cs

@@ -10,8 +10,6 @@
 
 namespace CleanTesting.Application.IntegrationTests.TodoItems.Commands
 {
-    using static Testing;
-
     public class UpdateTodoItemTests : TestBase
     {
         [Test]

tests/Application.IntegrationTests/TodoLists/Commands/CreateTodoListTests.cs

@@ -8,8 +8,6 @@
 
 namespace CleanTesting.Application.IntegrationTests.TodoLists.Commands
 {
-    using static Testing;
-
     public class CreateTodoListTests : TestBase
     {
         [Test]

tests/Application.IntegrationTests/TodoLists/Commands/DeleteTodoListTests.cs

@@ -8,8 +8,6 @@
 
 namespace CleanTesting.Application.IntegrationTests.TodoLists.Commands
 {
-    using static Testing;
-
     public class DeleteTodoListTests : TestBase
     {
         [Test]

tests/Application.IntegrationTests/TodoLists/Commands/UpdateTodoListTests.cs

@@ -9,8 +9,6 @@
 
 namespace CleanTesting.Application.IntegrationTests.TodoLists.Commands
 {
-    using static Testing;
-
     public class UpdateTodoListTests : TestBase
     {
         [Test]

tests/Application.IntegrationTests/TodoLists/Queries/GetTodosTests.cs

@@ -7,8 +7,6 @@
 
 namespace CleanTesting.Application.IntegrationTests.TodoLists.Queries
 {
-    using static Testing;
-
     public class GetTodosTests : TestBase
     {
         [Test]