Skip to content

[450] Surround unpack with try/catch block #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[450] Surround unpack with try/catch block #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 38 additions & 8 deletions src/Stateless/TransitionGuard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,52 @@ internal class TransitionGuard

public static Func<object[], bool> ToPackedGuard<TArg0>(Func<TArg0, bool> guard)
{
return args => guard(ParameterConversion.Unpack<TArg0>(args, 0));
return args =>
{
try
{
return guard(ParameterConversion.Unpack<TArg0>(args, 0));
}
catch (ArgumentException)
{
return false;
}
};
}

public static Func<object[], bool> ToPackedGuard<TArg0, TArg1>(Func<TArg0, TArg1, bool> guard)
{
return args => guard(
ParameterConversion.Unpack<TArg0>(args, 0),
ParameterConversion.Unpack<TArg1>(args, 1));
return args =>
{
try
{
return guard(
ParameterConversion.Unpack<TArg0>(args, 0),
ParameterConversion.Unpack<TArg1>(args, 1));
}
catch (ArgumentException)
{
return false;
}
};
}

public static Func<object[], bool> ToPackedGuard<TArg0, TArg1, TArg2>(Func<TArg0, TArg1, TArg2, bool> guard)
{
return args => guard(
ParameterConversion.Unpack<TArg0>(args, 0),
ParameterConversion.Unpack<TArg1>(args, 1),
ParameterConversion.Unpack<TArg2>(args, 2));
return args =>
{
try
{
return guard(
ParameterConversion.Unpack<TArg0>(args, 0),
ParameterConversion.Unpack<TArg1>(args, 1),
ParameterConversion.Unpack<TArg2>(args, 2));
}
catch (ArgumentException)
{
return false;
}
};
}

public static Tuple<Func<object[], bool>, string>[] ToPackedGuards<TArg0>(Tuple<Func<TArg0, bool>, string>[] guards)
Expand Down
27 changes: 27 additions & 0 deletions test/Stateless.Tests/TriggerWithParametersFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Xunit;

namespace Stateless.Tests
Expand Down Expand Up @@ -73,5 +75,30 @@ public void ParameterListOfCorrectTypeAreAccepted()
var twp = new StateMachine<State, Trigger>.TriggerWithParameters(Trigger.X, new Type[] { typeof(int), typeof(string) });
twp.ValidateParameters(new object[] { 123, "arg" });
}

/// <summary>
/// Issue #450 - GetPermittedTriggers throws exception when triggers have different parameter types.
/// </summary>
[Theory]
[MemberData(nameof(DifferentTypeTriggersData))]
public void DifferentTypeTriggersThrowNoException(params object[] arg)
{
var fsm = new StateMachine<State, Trigger>(State.A);
StateMachine<State, Trigger>.TriggerWithParameters<bool> twp1 = fsm.SetTriggerParameters<bool>(Trigger.X);
StateMachine<State, Trigger>.TriggerWithParameters<int, string> twp2 = fsm.SetTriggerParameters<int, string>(Trigger.Y);
StateMachine<State, Trigger>.TriggerWithParameters<string, int, bool> twp3 = fsm.SetTriggerParameters<string, int, bool>(Trigger.Z);
fsm.Configure(State.A)
.PermitIf(twp1, State.B, p1 => true)
.PermitIf(twp2, State.C, (p1, p2) => true)
.PermitIf(twp3, State.D, (p1, p2, p3) => true);
Assert.Equal(1, fsm.GetPermittedTriggers(arg).Count());
}

public static IEnumerable<object[]> DifferentTypeTriggersData()
{
yield return new object[] { "arg", 123, true };
yield return new object[] { 123, "arg" };
yield return new object[] { true };
}
}
}