test: Modify unit tests

Author: zhenlei520

src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Tests/DbContextTest.cs

@@ -81,7 +81,7 @@ public async Task TestSoftDeleteAsync()
         dbContext.Set<Student>().Remove(student);
         await dbContext.SaveChangesAsync();
 
-        Assert.IsTrue(await dbContext.Set<Student>().CountAsync() == 0);
+        Assert.IsFalse(await dbContext.Set<Student>().AnyAsync());
 
         var dataFilter = serviceProvider.GetRequiredService<IDataFilter>();
         using (dataFilter.Disable<ISoftDelete>())
@@ -150,8 +150,8 @@ public async Task TestAddMultiDbContextAsync()
         dbContext.Set<Student>().Remove(student);
         await dbContext.SaveChangesAsync();
 
-        Assert.IsTrue(await dbContext.Set<Student>().CountAsync() == 0);
-        Assert.IsTrue(await queryDbContext.Set<Student>().CountAsync() == 0);
+        Assert.IsFalse(await dbContext.Set<Student>().AnyAsync());
+        Assert.IsFalse(await queryDbContext.Set<Student>().AnyAsync());
 
         var dataFilter = serviceProvider.GetRequiredService<IDataFilter>();
         using (dataFilter.Disable<ISoftDelete>())
@@ -217,7 +217,7 @@ public void TestAddMultiMasaDbContextReturnSaveChangeFilterEqual1()
             .AddMasaDbContext<CustomDbContext>();
 
         var serviceProvider = services.BuildServiceProvider();
-        Assert.IsTrue(serviceProvider.GetServices<ISaveChangesFilter>().Count() == 2);
+        Assert.IsTrue(serviceProvider.GetServices<ISaveChangesFilter<CustomDbContext>>().Count() == 2);
     }
 
     [TestMethod]
@@ -231,7 +231,7 @@ public void TestAddMasaDbContextReturnSaveChangeFilterEqual2()
 
         var serviceProvider = services.BuildServiceProvider();
 
-        var filters = serviceProvider.GetServices<ISaveChangesFilter>();
+        var filters = serviceProvider.GetServices<ISaveChangesFilter<CustomDbContext>>();
         Assert.IsTrue(filters.Count() == 2);
     }
 

src/Contrib/Isolation/UoW/Masa.Contrib.Isolation.UoW.EFCore/IsolationDbContext.cs

@@ -8,52 +8,13 @@ namespace Masa.Contrib.Isolation.UoW.EFCore;
 /// </summary>
 /// <typeparam name="TKey">tenant id type</typeparam>
 /// <typeparam name="TDbContext"></typeparam>
-public abstract class IsolationDbContext<TDbContext, TKey> : MasaDbContext<TDbContext>
+public abstract class IsolationDbContext<TDbContext, TKey> : IsolationDbContext<TKey>
     where TKey : IComparable
     where TDbContext : MasaDbContext, IMasaDbContext
 {
-    private readonly IMultiEnvironmentContext? _environmentContext;
-    private readonly IMultiTenantContext? _tenantContext;
-
-    public IsolationDbContext(MasaDbContextOptions<TDbContext> options) : base(options)
-    {
-        _environmentContext = options.ServiceProvider?.GetService<IMultiEnvironmentContext>();
-        _tenantContext = options.ServiceProvider?.GetService<IMultiTenantContext>();
-    }
-
-    protected override Expression<Func<TEntity, bool>>? CreateFilterExpression<TEntity>()
-        where TEntity : class
+    protected IsolationDbContext(MasaDbContextOptions<TDbContext> options) : base(options)
     {
-        Expression<Func<TEntity, bool>>? expression = null;
-
-        if (typeof(IMultiTenant<>).IsGenericInterfaceAssignableFrom(typeof(TEntity)) && _tenantContext != null)
-        {
-            string defaultTenantId = default(TKey)?.ToString() ?? string.Empty;
-            Expression<Func<TEntity, bool>> tenantFilter = entity => !IsTenantFilterEnabled ||
-                (EF.Property<TKey>(entity, nameof(IMultiTenant<TKey>.TenantId)).ToString() ?? string.Empty)
-                .Equals(_tenantContext.CurrentTenant != null ? _tenantContext.CurrentTenant.Id : defaultTenantId);
-
-            expression = tenantFilter.And(expression != null, expression);
-        }
-
-        if (typeof(IMultiEnvironment).IsAssignableFrom(typeof(TEntity)) && _environmentContext != null)
-        {
-            Expression<Func<TEntity, bool>> envFilter = entity => !IsEnvironmentFilterEnabled ||
-                EF.Property<string>(entity, nameof(IMultiEnvironment.Environment))
-                    .Equals(_environmentContext != null ? _environmentContext.CurrentEnvironment : default);
-            expression = envFilter.And(expression != null, expression);
-        }
-
-        var secondExpression = base.CreateFilterExpression<TEntity>();
-        if (secondExpression != null)
-            expression = secondExpression.And(expression != null, expression);
-
-        return expression;
     }
-
-    protected virtual bool IsEnvironmentFilterEnabled => DataFilter?.IsEnabled<IMultiEnvironment>() ?? false;
-
-    protected virtual bool IsTenantFilterEnabled => DataFilter?.IsEnabled<IMultiTenant<TKey>>() ?? false;
 }
 
 /// <summary>
@@ -76,7 +37,7 @@ public abstract class IsolationDbContext<TKey> : MasaDbContext
     private readonly IMultiEnvironmentContext? _environmentContext;
     private readonly IMultiTenantContext? _tenantContext;
 
-    public IsolationDbContext(MasaDbContextOptions options) : base(options)
+    protected IsolationDbContext(MasaDbContextOptions options) : base(options)
     {
         _environmentContext = options.ServiceProvider?.GetService<IMultiEnvironmentContext>();
         _tenantContext = options.ServiceProvider?.GetService<IMultiTenantContext>();

src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Web.Tests/EdgeDriverTest.cs

@@ -19,7 +19,7 @@ public void Initialize()
         _services.AddSingleton<IConfiguration>(configurationRoot);
         _services.AddEventBus(eventBusBuilder => eventBusBuilder.UseIsolationUoW<CustomDbContext, int>(
             isolationBuilder => isolationBuilder.UseMultiTenant("tenant").UseMultiEnvironment("env"), dbOptions => dbOptions.UseSqlite().UseFilter()));
-        System.Environment.SetEnvironmentVariable("env", "pro");
+        Environment.SetEnvironmentVariable("env", "pro");
     }
 
     [TestMethod]
@@ -39,7 +39,7 @@ public async Task TestTenantAsync()
         #endregion
 
         var registerUserEvent = new RegisterUserEvent("jim", "123456");
-        var eventBus = serviceProvider.GetRequiredService<IEventBus>();
+        var eventBus = serviceProvider.CreateScope().ServiceProvider.GetRequiredService<IEventBus>();
         await eventBus.PublishAsync(registerUserEvent);
     }
 

src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Web.Tests/EventHandlers/RegisterUserEventHandler.cs

@@ -10,7 +10,9 @@ public class RegisterUserEventHandler
     private readonly IMultiEnvironmentSetter _environmentSetter;
     private readonly IMultiEnvironmentContext _environmentContext;
 
-    public RegisterUserEventHandler(CustomDbContext customDbContext, IDataFilter dataFilter, IMultiEnvironmentSetter environmentSetter,
+    public RegisterUserEventHandler(CustomDbContext customDbContext,
+        IDataFilter dataFilter,
+        IMultiEnvironmentSetter environmentSetter,
         IMultiEnvironmentContext environmentContext)
     {
         _customDbContext = customDbContext;