* Introduce `FlowchartExecutionMode` to streamline flowchart execution logic. - Added `FlowchartExecutionMode` enum to represent execution modes (Default, TokenBased, CounterBased). - Updated flowchart-related integration and unit tests to use the new execution mode. - Removed the global `UseTokenFlow` flag in favor of execution-specific configuration via `RunWorkflowOptions`. - Refactored flowchart-related APIs and test helpers for improved flexibility and modularity. * Add support for configuring flowchart execution behavior via `FlowchartOptions` and DI. - Introduced extensions for `FlowchartFeature` to simplify configuration. - Added DI support for setting default execution modes. - Refactored flowchart execution logic to prioritize configuration. * Update default Flowchart execution settings to align with version 3.5.2 behavior - Changed `DefaultExecutionMode` to `CounterBased`. - Updated `UseTokenFlow` default to `false`. * Update src/modules/Elsa.Workflows.Core/Activities/Flowchart/Models/FlowchartExecutionMode.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Elsa.Workflows.Core/Activities/Flowchart/Extensions/FlowchartFeatureExtensions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update test/integration/Elsa.Workflows.IntegrationTests/Scenarios/FlowchartNextActivity/Tests.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Elsa.Workflows.Core/Activities/Flowchart/Extensions/RunWorkflowOptionsExtensions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Refactor flowchart integration tests for improved formatting and consistency * Refactor workflow tests and related services to improve reusability and align with updated Flowchart execution behavior * Update src/modules/Elsa.Workflows.Core/Activities/Flowchart/Options/FlowchartOptions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Refactor flowchart execution logic to use `FlowchartExecutionMode` enum, replacing boolean checks for improved clarity and extensibility. * Refactor tests and workflow logic to replace boolean `useTokenFlow` with `FlowchartExecutionMode` enum for clarity and consistency. * Refactor flowchart execution logic to centralize mode-based behavior handling and simplify implementation. * Remove unnecessary whitespace in Flowchart.cs to improve code formatting * Remove unnecessary whitespace in FlowJoinTests.cs to improve code formatting * Update src/common/Elsa.Testing.Shared.Integration/WorkflowTestFixture.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/Flowchart.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
197 lines
9.5 KiB
C#
197 lines
9.5 KiB
C#
using Elsa.Testing.Shared;
|
|
using Elsa.Workflows.Activities;
|
|
using Elsa.Workflows.Activities.Flowchart.Activities;
|
|
using Elsa.Workflows.Activities.Flowchart.Extensions;
|
|
using Elsa.Workflows.Activities.Flowchart.Models;
|
|
using Elsa.Workflows.Options;
|
|
using Xunit.Abstractions;
|
|
|
|
namespace Elsa.Activities.IntegrationTests.Branching;
|
|
|
|
/// <summary>
|
|
/// Integration tests for FlowDecision activity in flowchart scenarios.
|
|
/// </summary>
|
|
[Collection("FlowchartTests")]
|
|
public class FlowDecisionTests(ITestOutputHelper testOutputHelper)
|
|
{
|
|
private readonly WorkflowTestFixture _fixture = new(testOutputHelper);
|
|
|
|
[Theory(DisplayName = "FlowDecision follows correct path based on condition")]
|
|
[MemberData(nameof(BasicPathTestCases))]
|
|
public async Task Should_Follow_Correct_Path_Based_On_Condition(FlowchartExecutionMode executionMode, bool condition, string[] expectedOutputs, string[] unexpectedOutputs)
|
|
{
|
|
// Arrange
|
|
var start = new WriteLine("Start");
|
|
var decision = new FlowDecision(ctx => condition);
|
|
var truePath = new WriteLine("TruePath");
|
|
var falsePath = new WriteLine("FalsePath");
|
|
|
|
var flowchart = new Flowchart
|
|
{
|
|
Start = start,
|
|
Activities = { start, decision, truePath, falsePath },
|
|
Connections =
|
|
{
|
|
new() { Source = new(start, "Done"), Target = new(decision) },
|
|
new() { Source = new(decision, "True"), Target = new(truePath) },
|
|
new() { Source = new(decision, "False"), Target = new(falsePath) }
|
|
}
|
|
};
|
|
|
|
var options = new RunWorkflowOptions().WithFlowchartExecutionMode(executionMode);
|
|
|
|
// Act
|
|
await _fixture.RunActivityAsync(flowchart, options);
|
|
|
|
// Assert
|
|
AssertOutputs(expectedOutputs, unexpectedOutputs);
|
|
}
|
|
|
|
public static IEnumerable<object[]> BasicPathTestCases()
|
|
{
|
|
// useTokenFlow, condition, expectedOutputs, unexpectedOutputs
|
|
yield return [FlowchartExecutionMode.TokenBased, true, new[] { "Start", "TruePath" }, new[] { "FalsePath" }];
|
|
yield return [FlowchartExecutionMode.TokenBased, false, new[] { "Start", "FalsePath" }, new[] { "TruePath" }];
|
|
yield return [FlowchartExecutionMode.CounterBased, true, new[] { "Start", "TruePath" }, new[] { "FalsePath" }];
|
|
yield return [FlowchartExecutionMode.CounterBased, false, new[] { "Start", "FalsePath" }, new[] { "TruePath" }];
|
|
}
|
|
|
|
[Theory(DisplayName = "FlowDecision handles nested decisions")]
|
|
[MemberData(nameof(NestedDecisionTestCases))]
|
|
public async Task Should_Handle_Nested_Decisions(FlowchartExecutionMode executionMode, bool outerCondition, bool innerCondition, string[] expectedOutputs, string[] unexpectedOutputs)
|
|
{
|
|
// Arrange
|
|
var start = new WriteLine("Start");
|
|
var outerDecision = new FlowDecision(ctx => outerCondition);
|
|
var innerDecision = new FlowDecision(ctx => innerCondition);
|
|
var innerTrue = new WriteLine("InnerTrue");
|
|
var innerFalse = new WriteLine("InnerFalse");
|
|
var outerFalse = new WriteLine("OuterFalse");
|
|
|
|
var flowchart = new Flowchart
|
|
{
|
|
Start = start,
|
|
Activities = { start, outerDecision, innerDecision, innerTrue, innerFalse, outerFalse },
|
|
Connections =
|
|
{
|
|
new() { Source = new(start, "Done"), Target = new(outerDecision) },
|
|
new() { Source = new(outerDecision, "True"), Target = new(innerDecision) },
|
|
new() { Source = new(outerDecision, "False"), Target = new(outerFalse) },
|
|
new() { Source = new(innerDecision, "True"), Target = new(innerTrue) },
|
|
new() { Source = new(innerDecision, "False"), Target = new(innerFalse) }
|
|
}
|
|
};
|
|
|
|
var options = new RunWorkflowOptions().WithFlowchartExecutionMode(executionMode);
|
|
|
|
// Act
|
|
await _fixture.RunActivityAsync(flowchart, options);
|
|
|
|
// Assert
|
|
AssertOutputs(expectedOutputs, unexpectedOutputs);
|
|
}
|
|
|
|
public static IEnumerable<object[]> NestedDecisionTestCases()
|
|
{
|
|
// useTokenFlow, outerCondition, innerCondition, expectedOutputs, unexpectedOutputs
|
|
yield return [FlowchartExecutionMode.TokenBased, true, true, new[] { "Start", "InnerTrue" }, new[] { "InnerFalse", "OuterFalse" }];
|
|
yield return [FlowchartExecutionMode.TokenBased, true, false, new[] { "Start", "InnerFalse" }, new[] { "InnerTrue", "OuterFalse" }];
|
|
yield return [FlowchartExecutionMode.TokenBased, false, true, new[] { "Start", "OuterFalse" }, new[] { "InnerTrue", "InnerFalse" }];
|
|
yield return [FlowchartExecutionMode.TokenBased, false, false, new[] { "Start", "OuterFalse" }, new[] { "InnerTrue", "InnerFalse" }];
|
|
yield return [FlowchartExecutionMode.CounterBased, true, true, new[] { "Start", "InnerTrue" }, new[] { "InnerFalse", "OuterFalse" }];
|
|
yield return [FlowchartExecutionMode.CounterBased, true, false, new[] { "Start", "InnerFalse" }, new[] { "InnerTrue", "OuterFalse" }];
|
|
yield return [FlowchartExecutionMode.CounterBased, false, true, new[] { "Start", "OuterFalse" }, new[] { "InnerTrue", "InnerFalse" }];
|
|
yield return [FlowchartExecutionMode.CounterBased, false, false, new[] { "Start", "OuterFalse" }, new[] { "InnerTrue", "InnerFalse" }];
|
|
}
|
|
|
|
[Theory(DisplayName = "FlowDecision works with only one path connected")]
|
|
[MemberData(nameof(OnePathConnectedTestCases))]
|
|
public async Task Should_Work_With_Only_One_Path_Connected(FlowchartExecutionMode executionMode, bool condition, string[] expectedOutputs, string[] unexpectedOutputs)
|
|
{
|
|
// Arrange
|
|
var start = new WriteLine("Start");
|
|
var decision = new FlowDecision(ctx => condition);
|
|
var truePath = new WriteLine("TruePath");
|
|
var end = new WriteLine("End");
|
|
|
|
var flowchart = new Flowchart
|
|
{
|
|
Start = start,
|
|
Activities = { start, decision, truePath, end },
|
|
Connections =
|
|
{
|
|
new() { Source = new(start, "Done"), Target = new(decision) },
|
|
new() { Source = new(decision, "True"), Target = new(truePath) },
|
|
// False path not connected
|
|
new() { Source = new(truePath, "Done"), Target = new(end) }
|
|
}
|
|
};
|
|
|
|
var options = new RunWorkflowOptions().WithFlowchartExecutionMode(executionMode);
|
|
|
|
// Act
|
|
await _fixture.RunActivityAsync(flowchart, options);
|
|
|
|
// Assert
|
|
AssertOutputs(expectedOutputs, unexpectedOutputs);
|
|
}
|
|
|
|
public static IEnumerable<object[]> OnePathConnectedTestCases()
|
|
{
|
|
// useTokenFlow, condition, expectedOutputs, unexpectedOutputs
|
|
yield return [FlowchartExecutionMode.TokenBased, true, new[] { "Start", "TruePath", "End" }, Array.Empty<string>()];
|
|
yield return [FlowchartExecutionMode.TokenBased, false, new[] { "Start" }, new[] { "TruePath", "End" }];
|
|
yield return [FlowchartExecutionMode.CounterBased, true, new[] { "Start", "TruePath", "End" }, Array.Empty<string>()];
|
|
yield return [FlowchartExecutionMode.CounterBased, false, new[] { "Start" }, new[] { "TruePath", "End" }];
|
|
}
|
|
|
|
[Theory(DisplayName = "FlowDecision converges paths correctly")]
|
|
[MemberData(nameof(ConvergePathsTestCases))]
|
|
public async Task Should_Converge_Paths_Correctly(FlowchartExecutionMode executionMode, bool condition, string[] expectedOutputs, string[] unexpectedOutputs)
|
|
{
|
|
// Arrange
|
|
var start = new WriteLine("Start");
|
|
var decision = new FlowDecision(ctx => condition);
|
|
var truePath = new WriteLine("TruePath");
|
|
var falsePath = new WriteLine("FalsePath");
|
|
var converge = new WriteLine("Converge");
|
|
|
|
var flowchart = new Flowchart
|
|
{
|
|
Start = start,
|
|
Activities = { start, decision, truePath, falsePath, converge },
|
|
Connections =
|
|
{
|
|
new() { Source = new(start, "Done"), Target = new(decision) },
|
|
new() { Source = new(decision, "True"), Target = new(truePath) },
|
|
new() { Source = new(decision, "False"), Target = new(falsePath) },
|
|
new() { Source = new(truePath, "Done"), Target = new(converge) },
|
|
new() { Source = new(falsePath, "Done"), Target = new(converge) }
|
|
}
|
|
};
|
|
|
|
var options = new RunWorkflowOptions().WithFlowchartExecutionMode(executionMode);
|
|
|
|
// Act
|
|
await _fixture.RunActivityAsync(flowchart, options);
|
|
|
|
// Assert
|
|
AssertOutputs(expectedOutputs, unexpectedOutputs);
|
|
}
|
|
|
|
public static IEnumerable<object[]> ConvergePathsTestCases()
|
|
{
|
|
// useTokenFlow, condition, expectedOutputs, unexpectedOutputs
|
|
yield return [FlowchartExecutionMode.TokenBased, true, new[] { "Start", "TruePath", "Converge" }, new[] { "FalsePath" }];
|
|
yield return [FlowchartExecutionMode.TokenBased, false, new[] { "Start", "FalsePath", "Converge" }, new[] { "TruePath" }];
|
|
yield return [FlowchartExecutionMode.CounterBased, true, new[] { "Start", "TruePath", "Converge" }, new[] { "FalsePath" }];
|
|
yield return [FlowchartExecutionMode.CounterBased, false, new[] { "Start", "FalsePath", "Converge" }, new[] { "TruePath" }];
|
|
}
|
|
|
|
private void AssertOutputs(string[] expectedOutputs, string[] unexpectedOutputs)
|
|
{
|
|
foreach (var expected in expectedOutputs) Assert.Contains(expected, _fixture.CapturingTextWriter.Lines);
|
|
foreach (var unexpected in unexpectedOutputs) Assert.DoesNotContain(unexpected, _fixture.CapturingTextWriter.Lines);
|
|
}
|
|
}
|