Browse Source

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

pull/26228/head
github-actions[bot] 2 months ago
parent
commit
0db55f450f
  1. 1
      framework/Volo.Abp.slnx
  2. 2
      framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
  3. 3
      framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.abppkg
  4. 18
      framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.csproj
  5. 66
      framework/test/Volo.Abp.Quartz.Tests/Volo/Abp/Quartz/AbpQuartzModule_Shutdown_Tests.cs

1
framework/Volo.Abp.slnx

@ -251,6 +251,7 @@
<Project Path="test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj" />
<Project Path="test/Volo.Abp.ObjectExtending.Tests/Volo.Abp.ObjectExtending.Tests.csproj" />
<Project Path="test/Volo.Abp.ObjectMapping.Tests/Volo.Abp.ObjectMapping.Tests.csproj" />
<Project Path="test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.csproj" />
<Project Path="test/Volo.Abp.RabbitMQ.Tests/Volo.Abp.RabbitMQ.Tests.csproj" />
<Project Path="test/Volo.Abp.RemoteServices.Tests/Volo.Abp.RemoteServices.Tests.csproj" />
<Project Path="test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.csproj" />

2
framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs

@ -74,7 +74,7 @@ public class AbpQuartzModule : AbpModule
public async override Task OnApplicationShutdownAsync(ApplicationShutdownContext context)
{
if (_scheduler.IsStarted)
if (!_scheduler.IsShutdown)
{
await _scheduler.Shutdown();
}

3
framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.abppkg

@ -0,0 +1,3 @@
{
"role": "lib.test"
}

18
framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.csproj

@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.test.props" />
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>Volo.Abp.Quartz.Tests</AssemblyName>
<PackageId>Volo.Abp.Quartz.Tests</PackageId>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Volo.Abp.Quartz\Volo.Abp.Quartz.csproj" />
<ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
</ItemGroup>
</Project>

66
framework/test/Volo.Abp.Quartz.Tests/Volo/Abp/Quartz/AbpQuartzModule_Shutdown_Tests.cs

@ -0,0 +1,66 @@
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Quartz;
using Shouldly;
using Volo.Abp.Modularity;
using Xunit;
namespace Volo.Abp.Quartz;
public class AbpQuartzModule_Shutdown_Tests
{
[Fact]
public async Task Should_Shutdown_Started_Scheduler()
{
using var application = await AbpApplicationFactory.CreateAsync<AbpQuartzModule>();
await application.InitializeAsync();
var scheduler = application.ServiceProvider.GetRequiredService<IScheduler>();
scheduler.IsStarted.ShouldBeTrue();
await application.ShutdownAsync();
scheduler.IsShutdown.ShouldBeTrue();
}
[Fact]
public async Task Should_Shutdown_Scheduler_That_Was_Never_Started()
{
using var application = await AbpApplicationFactory.CreateAsync<AbpQuartzNotStartedTestModule>();
await application.InitializeAsync();
var scheduler = application.ServiceProvider.GetRequiredService<IScheduler>();
scheduler.IsStarted.ShouldBeFalse();
await application.ShutdownAsync();
scheduler.IsShutdown.ShouldBeTrue();
}
[Fact]
public void Should_Shutdown_Scheduler_That_Was_Never_Started_On_Sync_Shutdown()
{
using var application = AbpApplicationFactory.Create<AbpQuartzNotStartedTestModule>();
application.Initialize();
var scheduler = application.ServiceProvider.GetRequiredService<IScheduler>();
scheduler.IsStarted.ShouldBeFalse();
application.Shutdown();
scheduler.IsShutdown.ShouldBeTrue();
}
}
[DependsOn(typeof(AbpQuartzModule))]
public class AbpQuartzNotStartedTestModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
// Same as disabling background workers or jobs: the scheduler is created but not started.
Configure<AbpQuartzOptions>(options =>
{
options.StartSchedulerFactory = _ => Task.CompletedTask;
});
}
}
Loading…
Cancel
Save