Update test infra and dependencies; refactor user mocking

- Bump ActualLab.Fusion, QuestPDF, and Blazor.Serilog.Sinks.SQLite to latest versions.
- Refactor ICurrentUserAccessor mocking to singleton with SessionInfo setup.
- Use live DbConnection for Respawner checkpoint and database resets.
- Switch SendAsync to use IMediator directly.
- Add CreateDbContext helper and improve AddAsync/CountAsync.
- Clean up usings and minor formatting in test base.
- Improves reliability and maintainability of integration tests.

Author: neozhu

src/Application/Application.csproj

@@ -24,9 +24,9 @@
         <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.1" />
         <PackageReference Include="Hangfire.Core" Version="1.8.22" />
         <PackageReference Include="ZiggyCreatures.FusionCache" Version="2.4.0" />
-           <PackageReference Include="ActualLab.Fusion" Version="11.3.81" />
-        <PackageReference Include="ActualLab.Fusion.Blazor" Version="11.3.81" />
-        <PackageReference Include="ActualLab.Generators" Version="11.3.81">
+           <PackageReference Include="ActualLab.Fusion" Version="11.3.84" />
+        <PackageReference Include="ActualLab.Fusion.Blazor" Version="11.3.84" />
+        <PackageReference Include="ActualLab.Generators" Version="11.3.84">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

src/Infrastructure/Infrastructure.csproj

@@ -11,13 +11,13 @@
         <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="10.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="10.0.1" />
-        <PackageReference Include="QuestPDF" Version="2025.7.4" />
+        <PackageReference Include="QuestPDF" Version="2025.12.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
         <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="9.0.2" />
         <PackageReference Include="Serilog.Sinks.Postgresql.Alternative" Version="4.2.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
-        <PackageReference Include="Blazor.Serilog.Sinks.SQLite" Version="1.0.8" />
+        <PackageReference Include="Blazor.Serilog.Sinks.SQLite" Version="1.0.9" />
         <PackageReference Include="Serilog.Sinks.Seq" Version="9.0.0" />
     </ItemGroup>
     <ItemGroup>

tests/Application.IntegrationTests/TestBase.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using NUnit.Framework;
 
 namespace CleanArchitecture.Blazor.Application.IntegrationTests;
@@ -12,4 +12,4 @@ public async Task TestSetUp()
     {
         await ResetState();
     }
-}
+}

tests/Application.IntegrationTests/Testing.cs

@@ -4,11 +4,9 @@
 using System.Threading.Tasks;
 using CleanArchitecture.Blazor.Application.Common.Interfaces;
 using CleanArchitecture.Blazor.Application.Common.Interfaces.Identity;
-using CleanArchitecture.Blazor.Application.Common.Interfaces.MediatorWrapper;
-using CleanArchitecture.Blazor.Application.Common.Interfaces.MultiTenant;
 using CleanArchitecture.Blazor.Domain.Identity;
 using CleanArchitecture.Blazor.Infrastructure;
-using CleanArchitecture.Blazor.Infrastructure.Extensions;
+using CleanArchitecture.Blazor.Application.Common.Extensions;
 using CleanArchitecture.Blazor.Infrastructure.Persistence;
 using MediatR;
 using Microsoft.AspNetCore.Hosting;
@@ -20,6 +18,12 @@
 using NUnit.Framework;
 using Respawn;
 using Respawn.Graph;
+using CleanArchitecture.Blazor.Application.Features.PicklistSets.DTOs;
+using CleanArchitecture.Blazor.Infrastructure.Services;
+using CleanArchitecture.Blazor.Application.Features.Tenants.DTOs;
+using CleanArchitecture.Blazor.Infrastructure.Services.MultiTenant;
+using System.Data.Common;
+using CleanArchitecture.Blazor.Application.Common.Interfaces.MultiTenant;
 
 namespace CleanArchitecture.Blazor.Application.IntegrationTests;
 
@@ -30,7 +34,6 @@ public class Testing
     private static IServiceScopeFactory _scopeFactory;
     private static Respawner _checkpoint;
     private static string _currentUserId;
-    private static string _currentTenantId;
 
     [OneTimeSetUp]
     public async Task RunBeforeAnyTests()
@@ -46,7 +49,6 @@ public async Task RunBeforeAnyTests()
 
         var services = new ServiceCollection();
 
-
         services.AddSingleton(Mock.Of<IWebHostEnvironment>(w =>
             w.EnvironmentName == "Development" &&
             w.ApplicationName == "Server.UI"));
@@ -58,44 +60,60 @@ public async Task RunBeforeAnyTests()
 
         //startup.ConfigureServices(services);
 
-        // Replace service registration for ICurrentUserService
-        // Remove existing registration
-        var currentUserServiceDescriptor = services.FirstOrDefault(d =>
+        // 替换 IUserContextAccessor 的注册
+        var userContextServiceDescriptor = services.FirstOrDefault(d =>
             d.ServiceType == typeof(ICurrentUserAccessor));
+        if (userContextServiceDescriptor != null)
+        {
+            services.Remove(userContextServiceDescriptor);
+        }
 
-        services.Remove(currentUserServiceDescriptor);
-
-        // Register testing version
-        services.AddScoped(provider =>
-            Mock.Of<ICurrentUserAccessor>(s => s.SessionInfo.UserId == _currentUserId));
-
-
-        _scopeFactory = services.BuildServiceProvider().GetService<IServiceScopeFactory>();
-
-        _checkpoint = await Respawner.CreateAsync(_configuration.GetValue<string>("DatabaseSettings:ConnectionString"),
-            new RespawnerOptions
+        // 使用 Moq 创建 Mock 对象并配置 Current 属性
+        services.AddSingleton<ICurrentUserAccessor>(provider =>
+        {
+            var mockUserContextAccessor = new Mock<ICurrentUserAccessor>();
+            if (!string.IsNullOrEmpty(_currentUserId))
             {
-                TablesToIgnore = new Table[] { "__EFMigrationsHistory" }
-            });
+                var userContext = new SessionInfo("admin", "admin","admin", null,"", "", UserPresence.Available);
+                mockUserContextAccessor.Setup(x => x.SessionInfo).Returns(userContext);
+            }
+            return mockUserContextAccessor.Object;
+        });
 
+        _scopeFactory = services.BuildServiceProvider().GetService<IServiceScopeFactory>();
         EnsureDatabase();
+        using var scope = services.BuildServiceProvider().CreateScope();
+        var context = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+        var connection = context.Database.GetDbConnection();
+        await connection.OpenAsync();
+        try
+        {
+            _checkpoint = await Respawner.CreateAsync(
+                connection,
+                new RespawnerOptions
+                {
+                    TablesToIgnore = new Table[] { "__EFMigrationsHistory" }
+                });
+        }
+        finally
+        {
+            await connection.CloseAsync();
+        }
+
+        
     }
 
     private static void EnsureDatabase()
     {
         using var scope = _scopeFactory.CreateScope();
-
         var context = scope.ServiceProvider.GetService<ApplicationDbContext>();
-
         context.Database.Migrate();
     }
 
     public static async Task<TResponse> SendAsync<TResponse>(IRequest<TResponse> request)
     {
         using var scope = _scopeFactory.CreateScope();
-
-        var mediator = scope.ServiceProvider.GetService<IScopedMediator>();
-
+        var mediator = scope.ServiceProvider.GetService<IMediator>();
         return await mediator.Send(request);
     }
 
@@ -112,69 +130,73 @@ public static async Task<string> RunAsAdministratorAsync()
     public static async Task<string> RunAsUserAsync(string userName, string password, string[] roles)
     {
         using var scope = _scopeFactory.CreateScope();
-
         var userManager = scope.ServiceProvider.GetService<UserManager<ApplicationUser>>();
-
         var user = new ApplicationUser { UserName = userName, Email = userName };
-
         var result = await userManager.CreateAsync(user, password);
 
         if (roles.Any())
         {
             var roleManager = scope.ServiceProvider.GetService<RoleManager<IdentityRole>>();
-
-            foreach (var role in roles) await roleManager.CreateAsync(new IdentityRole(role));
-
+            foreach (var role in roles)
+            {
+                await roleManager.CreateAsync(new IdentityRole(role));
+            }
             await userManager.AddToRolesAsync(user, roles);
         }
 
         if (result.Succeeded)
         {
             _currentUserId = user.Id;
-
             return _currentUserId;
         }
 
-        var errors = string.Join(Environment.NewLine, result.ToApplicationResult().Errors);
-
+        var errors = string.Join(Environment.NewLine, result.Errors);
         throw new Exception($"Unable to create {userName}.{Environment.NewLine}{errors}");
     }
 
     public static async Task ResetState()
     {
-        await _checkpoint.ResetAsync(_configuration.GetValue<string>("DatabaseSettings:ConnectionString"));
+        using var scope = _scopeFactory.CreateScope();
+        var context = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+        var connection = context.Database.GetDbConnection();
+        await connection.OpenAsync();
+        try
+        {
+            await _checkpoint.ResetAsync(connection);
+        }
+        finally
+        {
+            await connection.CloseAsync();
+        }
         _currentUserId = null;
-        _currentTenantId = null;
     }
 
     public static async Task<TEntity> FindAsync<TEntity>(params object[] keyValues)
         where TEntity : class
     {
         using var scope = _scopeFactory.CreateScope();
-
         var context = scope.ServiceProvider.GetService<ApplicationDbContext>();
-
         return await context.FindAsync<TEntity>(keyValues);
     }
+    public static IApplicationDbContext CreateDbContext()
+    {
+        var scope = _scopeFactory.CreateScope();
+        return scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+    }
 
     public static async Task AddAsync<TEntity>(TEntity entity)
         where TEntity : class
     {
         using var scope = _scopeFactory.CreateScope();
-
         var context = scope.ServiceProvider.GetService<ApplicationDbContext>();
-
         context.Add(entity);
-
         await context.SaveChangesAsync();
     }
 
     public static async Task<int> CountAsync<TEntity>() where TEntity : class
     {
         using var scope = _scopeFactory.CreateScope();
-
         var context = scope.ServiceProvider.GetService<ApplicationDbContext>();
-
         return await context.Set<TEntity>().CountAsync();
     }
 
@@ -194,4 +216,4 @@ public static ITenantService CreateTenantsService()
     public void RunAfterAnyTests()
     {
     }
-}
+}