* Refactor workflow instance deletion to use `IWorkflowRuntime` for enhanced coordination and separation of concerns. * Remove `EnumerableTypeConverter` and update related usages for serialization. - Deleted the `EnumerableTypeConverter` class and its JSON serialization logic. - Removed associated type descriptor attribute in `DefaultFormattersFeature`. - Updated `ObjectFormatter` to handle collection serialization directly with JSON. * Remove `EnumerableTypeConverter` tests and consolidate serialization logic into `ObjectFormatter`. - Deleted `EnumerableTypeConverterTests` as the related functionality was removed. - Added comprehensive tests in `ObjectFormatterTests` to handle serialization of collections and arrays with JSON. * Add integration tests for `TriggerIndexer` to handle workflows with failing materialization - Introduced comprehensive test scenarios verifying `DeleteTriggersAsync` behavior when workflows fail to load or partially succeed. - Enhanced error handling in `TriggerIndexer` to skip failed workflows while ensuring remaining workflows are processed. * Add exception handling in `TriggerIndexer.DeleteTriggersAsync` and integration tests - Enhanced `DeleteTriggersAsync` with exception handling to skip failed workflows while processing others. - Logged warnings for failed workflows without halting execution. - Added comprehensive integration tests to verify behavior across success, failure, and mixed scenarios. - Refactored tests for improved clarity, maintainability, and consistency. * Add exception handling for `ResumeWorkflowTask` to skip deleted workflow instances - Enhanced `ResumeWorkflowTask.ExecuteAsync` to handle `WorkflowInstanceNotFoundException` gracefully when a scheduled workflow instance is missing. - Logged warnings for skipped executions to improve observability. - Ensured remaining workflows and scheduled tasks are processed seamlessly without disruption. * Add thread safety to `LocalScheduler` to prevent race conditions during concurrent scheduling - Introduced a `lock` object to synchronize access to internal dictionaries. - Resolved `IndexOutOfRangeException` caused by concurrent modifications during startup. - Ensured thread-safe operations in `ScheduleAsync`, `ClearScheduleAsync`, and related methods. - Improved reliability and stability of scheduling under concurrent workloads. * Improve exception handling, thread safety, and workflow instance deletion - Added exception handling in `TriggerIndexer.DeleteTriggersAsync` to skip failed workflows while continuing processing. - Enhanced `ResumeWorkflowTask` to handle missing workflow instances gracefully and log warnings. - Introduced thread synchronization in `LocalScheduler` with `lock` to prevent concurrent access issues. - Implemented and refactored tests to ensure behavior consistency and improve maintainability. - Added component tests for workflow deletion scenarios, covering running, completed, and non-existent workflows. * Add component tests for workflow instance deletion and refactor bulk delete logic - Added comprehensive component tests for workflow instance deletion scenarios (running, completed, bulk, and non-existent instances). - Refactored `BulkDelete` API to use `IWorkflowInstanceManager` for proper cleanup of related records (execution logs, activity executions, bookmarks). * Add integration tests and fakes for `TriggerIndexer` to verify behavior with failing and successful workflows - Introduced `FailingMaterializer` and `WorkingMaterializer` for simulating failing and successful workflow materializations. - Added `TriggerDeletionTestScenario`, `TriggerTestDataBuilder`, and related test data classes to define comprehensive test cases. - Updated `DeleteTriggersAsync` tests with scenarios for materialization failures and mixed success. - Improved test coverage and maintainability with reusable test data builders and utilities.
210 lines
8.4 KiB
C#
210 lines
8.4 KiB
C#
using Elsa.Common;
|
|
using Elsa.Mediator.Contracts;
|
|
using Elsa.Scheduling.ScheduledTasks;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging;
|
|
using NSubstitute;
|
|
|
|
namespace Elsa.Scheduling.UnitTests.ScheduledTasks;
|
|
|
|
/// <summary>
|
|
/// Tests for ScheduledCronTask to ensure cron triggers continue to fire even in edge cases.
|
|
/// </summary>
|
|
public class ScheduledCronTaskTests : IDisposable
|
|
{
|
|
private const string DefaultCronExpression = "0 */5 * * * *";
|
|
private static readonly DateTimeOffset DefaultNow = new(2025, 11, 06, 22, 50, 00, 0, TimeSpan.Zero);
|
|
|
|
private readonly ServiceProvider _serviceProvider;
|
|
private readonly ISystemClock _systemClock;
|
|
private readonly ICronParser _cronParser;
|
|
private readonly ILogger<ScheduledCronTask> _logger;
|
|
private readonly List<ScheduledCronTask> _tasksToDispose = new();
|
|
|
|
public ScheduledCronTaskTests()
|
|
{
|
|
var services = new ServiceCollection();
|
|
_systemClock = Substitute.For<ISystemClock>();
|
|
_cronParser = Substitute.For<ICronParser>();
|
|
_logger = Substitute.For<ILogger<ScheduledCronTask>>();
|
|
|
|
services.AddSingleton(Substitute.For<ICommandSender>());
|
|
_serviceProvider = services.BuildServiceProvider();
|
|
}
|
|
|
|
private ScheduledCronTask CreateScheduledTask(
|
|
string? cronExpression = null,
|
|
ICronParser? cronParser = null,
|
|
ISystemClock? systemClock = null)
|
|
{
|
|
var task = Substitute.For<ITask>();
|
|
var scheduledTask = new ScheduledCronTask(
|
|
task,
|
|
cronExpression ?? DefaultCronExpression,
|
|
cronParser ?? _cronParser,
|
|
_serviceProvider.CreateScope().ServiceProvider.GetRequiredService<IServiceScopeFactory>(),
|
|
systemClock ?? _systemClock,
|
|
_logger
|
|
);
|
|
_tasksToDispose.Add(scheduledTask);
|
|
return scheduledTask;
|
|
}
|
|
|
|
private void SetupCronParser(params DateTimeOffset[] occurrences)
|
|
{
|
|
_cronParser.GetNextOccurrence(Arg.Any<string>()).Returns(occurrences[0], occurrences.Skip(1).ToArray());
|
|
}
|
|
|
|
private void SetupSystemClock(params DateTimeOffset[] times)
|
|
{
|
|
_systemClock.UtcNow.Returns(times[0], times.Skip(1).ToArray());
|
|
}
|
|
|
|
private void AssertNoErrorLogged()
|
|
{
|
|
_logger.DidNotReceive().Log(
|
|
LogLevel.Error,
|
|
Arg.Any<EventId>(),
|
|
Arg.Any<object>(),
|
|
Arg.Any<Exception>(),
|
|
Arg.Any<Func<object, Exception?, string>>());
|
|
}
|
|
|
|
private void AssertWarningLogged(int expectedCount = 1)
|
|
{
|
|
_logger.Received(expectedCount).Log(
|
|
LogLevel.Warning,
|
|
Arg.Any<EventId>(),
|
|
Arg.Any<object>(),
|
|
Arg.Any<Exception>(),
|
|
Arg.Any<Func<object, Exception?, string>>());
|
|
}
|
|
|
|
[Fact]
|
|
public void Schedule_WithVerySmallDelay_ShouldStillSetupTimer()
|
|
{
|
|
// Arrange - simulate a case where the delay is very small (1 tick = 100ns)
|
|
SetupSystemClock(DefaultNow);
|
|
SetupCronParser(DefaultNow.AddTicks(1)); // Only 1 tick in the future (100 nanoseconds)
|
|
|
|
// Act
|
|
CreateScheduledTask();
|
|
|
|
// Assert - Verify that no error was logged (timer should be set up successfully)
|
|
AssertNoErrorLogged();
|
|
}
|
|
|
|
[Fact]
|
|
public void Schedule_WithZeroDelay_ShouldRetryAndSetupTimer()
|
|
{
|
|
// Arrange - simulate a case where the first call returns exactly now
|
|
// but the second call returns a proper future time
|
|
SetupSystemClock(DefaultNow, DefaultNow);
|
|
SetupCronParser(DefaultNow, DefaultNow.AddMinutes(5)); // First: delay=0, Second: proper future time
|
|
|
|
// Act
|
|
var task = CreateScheduledTask();
|
|
|
|
// Dispose immediately to prevent timer from firing
|
|
((IDisposable)task).Dispose();
|
|
|
|
// Assert - Should call GetNextOccurrence at least twice (initial + retry)
|
|
// May be called more if timer fires before disposal in rare race conditions
|
|
_cronParser.Received().GetNextOccurrence(DefaultCronExpression);
|
|
var calls = _cronParser.ReceivedCalls().Count(c => c.GetMethodInfo().Name == nameof(_cronParser.GetNextOccurrence));
|
|
Assert.True(calls >= 2, $"Expected at least 2 calls to GetNextOccurrence, but got {calls}");
|
|
}
|
|
|
|
[Fact]
|
|
public void Schedule_WithNegativeDelay_ShouldRetryAndSetupTimer()
|
|
{
|
|
// Arrange - simulate a case where the first call returns a time in the past
|
|
SetupSystemClock(DefaultNow, DefaultNow);
|
|
SetupCronParser(DefaultNow.AddMinutes(-1), DefaultNow.AddMinutes(5)); // First: past, Second: future
|
|
|
|
// Act
|
|
var task = CreateScheduledTask();
|
|
|
|
// Dispose immediately to prevent timer from firing
|
|
((IDisposable)task).Dispose();
|
|
Thread.Sleep(5); // Brief wait to ensure disposal completes
|
|
|
|
// Assert - Should call GetNextOccurrence at least twice
|
|
_cronParser.Received().GetNextOccurrence(DefaultCronExpression);
|
|
var calls = _cronParser.ReceivedCalls().Count(c => c.GetMethodInfo().Name == nameof(_cronParser.GetNextOccurrence));
|
|
Assert.True(calls >= 2, $"Expected at least 2 calls to GetNextOccurrence, but got {calls}");
|
|
}
|
|
|
|
[Fact]
|
|
public void Schedule_WithPersistentZeroDelay_ShouldLogWarningAndUseMinimumDelay()
|
|
{
|
|
// Arrange - simulate the bug scenario: both attempts return zero/negative delay
|
|
// This can happen if the system clock doesn't advance or if there's clock drift
|
|
SetupSystemClock(DefaultNow);
|
|
SetupCronParser(DefaultNow); // Both calls return exactly now (delay = 0)
|
|
|
|
// Act - This should not crash and should set up a timer with minimum delay
|
|
var task = CreateScheduledTask();
|
|
|
|
// Dispose immediately to prevent timer from firing and recursing
|
|
((IDisposable)task).Dispose();
|
|
Thread.Sleep(5); // Brief wait to ensure disposal completes
|
|
|
|
// Assert - Should call GetNextOccurrence at least twice (initial + retry)
|
|
// May be called more if timer fires before disposal and triggers Schedule() again
|
|
_cronParser.Received().GetNextOccurrence(DefaultCronExpression);
|
|
var calls = _cronParser.ReceivedCalls().Count(c => c.GetMethodInfo().Name == nameof(_cronParser.GetNextOccurrence));
|
|
Assert.True(calls >= 2, $"Expected at least 2 calls to GetNextOccurrence, but got {calls}");
|
|
AssertWarningLogged();
|
|
}
|
|
|
|
[Fact]
|
|
public void Schedule_WithNegativeDelayAfterRetry_ShouldLogWarningAndUseMinimumDelay()
|
|
{
|
|
// Arrange - simulate a case where even after retry, delay is negative
|
|
// This could happen due to system clock adjustments
|
|
SetupSystemClock(DefaultNow, DefaultNow);
|
|
SetupCronParser(DefaultNow.AddMilliseconds(-100), DefaultNow.AddMilliseconds(-50));
|
|
|
|
// Act - Should handle negative delay gracefully
|
|
var task = CreateScheduledTask();
|
|
|
|
// Dispose immediately to prevent timer from firing
|
|
((IDisposable)task).Dispose();
|
|
|
|
// Assert - Should log a warning and still set up timer
|
|
AssertWarningLogged();
|
|
}
|
|
|
|
[Fact]
|
|
public void ReproduceOriginalIssue_WithRealCronParser_DemonstratesBugScenario()
|
|
{
|
|
// This test reproduces the exact scenario from the original issue report
|
|
// Using the real CronosCronParser with specific times that trigger the bug
|
|
|
|
// Arrange - Use the exact times from the issue that cause delay.Milliseconds to be 0
|
|
var now = new DateTimeOffset(2025, 11, 06, 22, 50, 00, 0, TimeZoneInfo.Utc.GetUtcOffset(DateTimeOffset.UtcNow));
|
|
var systemClock = Substitute.For<ISystemClock>();
|
|
systemClock.UtcNow.Returns(now);
|
|
var realCronParser = new Elsa.Scheduling.Services.CronosCronParser(systemClock);
|
|
|
|
// Act - Create scheduled task with real cron parser
|
|
// Before the fix: This would silently fail to schedule if delay <= 0
|
|
// After the fix: This should log warning and use minimum delay
|
|
CreateScheduledTask(cronParser: realCronParser, systemClock: systemClock);
|
|
|
|
// Assert - The key is that the task was created successfully without throwing or silently failing
|
|
// This test passes with the fix, demonstrating the issue is resolved
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
// Dispose tasks first to stop timers before disposing ServiceProvider
|
|
foreach (var task in _tasksToDispose)
|
|
{
|
|
((IDisposable)task).Dispose();
|
|
}
|
|
_serviceProvider.Dispose();
|
|
}
|
|
}
|