Browse Source

Merge remote-tracking branch 'origin/rel-10.7' into auto-merge-forward/rel-10.7-to-dev-99

pull/26323/head
github-actions[bot] 1 month ago
parent
commit
47246ca577
  1. 5
      modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
  2. 74
      modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule_Shutdown_Tests.cs
  3. 5
      modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs
  4. 74
      modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule_Shutdown_Tests.cs
  5. 5
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs
  6. 74
      modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule_Shutdown_Tests.cs

5
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs

@ -65,6 +65,11 @@ public class AbpFeatureManagementDomainModule : AbpModule
await initializer.InitializeAsync(true, _cancellationTokenSource.Token); await initializer.InitializeAsync(true, _cancellationTokenSource.Token);
} }
public override void OnApplicationShutdown(ApplicationShutdownContext context)
{
AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context));
}
public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context) public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context)
{ {
_cancellationTokenSource.Cancel(); _cancellationTokenSource.Cancel();

74
modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule_Shutdown_Tests.cs

@ -0,0 +1,74 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Shouldly;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Modularity;
using Xunit;
namespace Volo.Abp.FeatureManagement;
public class AbpFeatureManagementDomainModule_Shutdown_Tests
{
[Fact]
public async Task Shutdown_Should_Cancel_The_Dynamic_Initialization()
{
using var application = await AbpApplicationFactory.CreateAsync<ShutdownTestModule>(options => options.UseAutofac());
await application.InitializeAsync();
var token = application.ServiceProvider.GetRequiredService<InitializationTokenRecorder>().Token;
token.IsCancellationRequested.ShouldBeFalse();
application.Shutdown();
token.IsCancellationRequested.ShouldBeTrue();
}
[Fact]
public async Task ShutdownAsync_Should_Cancel_The_Dynamic_Initialization()
{
using var application = await AbpApplicationFactory.CreateAsync<ShutdownTestModule>(options => options.UseAutofac());
await application.InitializeAsync();
var token = application.ServiceProvider.GetRequiredService<InitializationTokenRecorder>().Token;
await application.ShutdownAsync();
token.IsCancellationRequested.ShouldBeTrue();
}
public class InitializationTokenRecorder
{
public CancellationToken Token { get; set; }
}
[DisableConventionalRegistration]
public class RecordingFeatureDynamicInitializer : FeatureDynamicInitializer
{
public RecordingFeatureDynamicInitializer(IServiceProvider serviceProvider)
: base(serviceProvider)
{
}
public override Task InitializeAsync(bool runInBackground, CancellationToken cancellationToken = default)
{
// The module starts it in the background; a test module may run it again in the foreground without a token.
if (runInBackground)
{
ServiceProvider.GetRequiredService<InitializationTokenRecorder>().Token = cancellationToken;
}
return Task.CompletedTask;
}
}
[DependsOn(typeof(AbpFeatureManagementDomainTestModule))]
public class ShutdownTestModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddSingleton<InitializationTokenRecorder>();
context.Services.Replace(ServiceDescriptor.Transient<FeatureDynamicInitializer, RecordingFeatureDynamicInitializer>());
}
}
}

5
modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs

@ -55,6 +55,11 @@ public class AbpPermissionManagementDomainModule : AbpModule
} }
} }
public override void OnApplicationShutdown(ApplicationShutdownContext context)
{
AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context));
}
public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context) public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context)
{ {
_cancellationTokenSource.Cancel(); _cancellationTokenSource.Cancel();

74
modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule_Shutdown_Tests.cs

@ -0,0 +1,74 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Shouldly;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Modularity;
using Xunit;
namespace Volo.Abp.PermissionManagement;
public class AbpPermissionManagementDomainModule_Shutdown_Tests
{
[Fact]
public async Task Shutdown_Should_Cancel_The_Dynamic_Initialization()
{
using var application = await AbpApplicationFactory.CreateAsync<ShutdownTestModule>(options => options.UseAutofac());
await application.InitializeAsync();
var token = application.ServiceProvider.GetRequiredService<InitializationTokenRecorder>().Token;
token.IsCancellationRequested.ShouldBeFalse();
application.Shutdown();
token.IsCancellationRequested.ShouldBeTrue();
}
[Fact]
public async Task ShutdownAsync_Should_Cancel_The_Dynamic_Initialization()
{
using var application = await AbpApplicationFactory.CreateAsync<ShutdownTestModule>(options => options.UseAutofac());
await application.InitializeAsync();
var token = application.ServiceProvider.GetRequiredService<InitializationTokenRecorder>().Token;
await application.ShutdownAsync();
token.IsCancellationRequested.ShouldBeTrue();
}
public class InitializationTokenRecorder
{
public CancellationToken Token { get; set; }
}
[DisableConventionalRegistration]
public class RecordingPermissionDynamicInitializer : PermissionDynamicInitializer
{
public RecordingPermissionDynamicInitializer(IServiceProvider serviceProvider)
: base(serviceProvider)
{
}
public override Task InitializeAsync(bool runInBackground, CancellationToken cancellationToken = default)
{
// The module starts it in the background; a test module may run it again in the foreground without a token.
if (runInBackground)
{
ServiceProvider.GetRequiredService<InitializationTokenRecorder>().Token = cancellationToken;
}
return Task.CompletedTask;
}
}
[DependsOn(typeof(AbpPermissionManagementTestModule))]
public class ShutdownTestModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddSingleton<InitializationTokenRecorder>();
context.Services.Replace(ServiceDescriptor.Transient<PermissionDynamicInitializer, RecordingPermissionDynamicInitializer>());
}
}
}

5
modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs

@ -58,6 +58,11 @@ public class AbpSettingManagementDomainModule : AbpModule
await initializer.InitializeAsync(true, _cancellationTokenSource.Token); await initializer.InitializeAsync(true, _cancellationTokenSource.Token);
} }
public override void OnApplicationShutdown(ApplicationShutdownContext context)
{
AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context));
}
public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context) public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context)
{ {
_cancellationTokenSource.Cancel(); _cancellationTokenSource.Cancel();

74
modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule_Shutdown_Tests.cs

@ -0,0 +1,74 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Shouldly;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Modularity;
using Xunit;
namespace Volo.Abp.SettingManagement;
public class AbpSettingManagementDomainModule_Shutdown_Tests
{
[Fact]
public async Task Shutdown_Should_Cancel_The_Dynamic_Initialization()
{
using var application = await AbpApplicationFactory.CreateAsync<ShutdownTestModule>(options => options.UseAutofac());
await application.InitializeAsync();
var token = application.ServiceProvider.GetRequiredService<InitializationTokenRecorder>().Token;
token.IsCancellationRequested.ShouldBeFalse();
application.Shutdown();
token.IsCancellationRequested.ShouldBeTrue();
}
[Fact]
public async Task ShutdownAsync_Should_Cancel_The_Dynamic_Initialization()
{
using var application = await AbpApplicationFactory.CreateAsync<ShutdownTestModule>(options => options.UseAutofac());
await application.InitializeAsync();
var token = application.ServiceProvider.GetRequiredService<InitializationTokenRecorder>().Token;
await application.ShutdownAsync();
token.IsCancellationRequested.ShouldBeTrue();
}
public class InitializationTokenRecorder
{
public CancellationToken Token { get; set; }
}
[DisableConventionalRegistration]
public class RecordingSettingDynamicInitializer : SettingDynamicInitializer
{
public RecordingSettingDynamicInitializer(IServiceProvider serviceProvider)
: base(serviceProvider)
{
}
public override Task InitializeAsync(bool runInBackground, CancellationToken cancellationToken = default)
{
// The module starts it in the background; a test module may run it again in the foreground without a token.
if (runInBackground)
{
ServiceProvider.GetRequiredService<InitializationTokenRecorder>().Token = cancellationToken;
}
return Task.CompletedTask;
}
}
[DependsOn(typeof(AbpSettingManagementTestModule))]
public class ShutdownTestModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddSingleton<InitializationTokenRecorder>();
context.Services.Replace(ServiceDescriptor.Transient<SettingDynamicInitializer, RecordingSettingDynamicInitializer>());
}
}
}
Loading…
Cancel
Save