Skip to content

fix: unwrap exceptions thrown in event handlers #385

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

Merged
vbreuss merged 3 commits into from
Jan 24, 2026
Merged

fix: unwrap exceptions thrown in event handlers #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d45217a
fix: thrown exception from event handlers
vbreuss Jan 24, 2026
3500281
Review Issue
vbreuss Jan 24, 2026
5afc642
Use `ExceptionDispatchInfo` to preserve the stack trace
vbreuss Jan 24, 2026
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
16 changes: 13 additions & 3 deletions Source/Mockolate/MockRegistration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Runtime.ExceptionServices;
using System.Text;
using Mockolate.Exceptions;
using Mockolate.Interactions;
Expand Down Expand Up @@ -78,11 +79,13 @@ public MethodSetupResult<TResult> InvokeMethod<TResult>(string methodName,
$"The method '{methodName}({string.Join(", ", parameters.Select(x => x.Value?.GetType().FormatType() ?? "<null>"))})' was invoked without prior setup.");
}

return new MethodSetupResult<TResult>(null, Behavior, defaultValue(parameters.Select(x => x.Value).ToArray()));
return new MethodSetupResult<TResult>(null, Behavior,
defaultValue(parameters.Select(x => x.Value).ToArray()));
}

return new MethodSetupResult<TResult>(matchingSetup, Behavior,
matchingSetup.Invoke(methodInvocation, Behavior, () => defaultValue(parameters.Select(x => x.Value).ToArray())));
matchingSetup.Invoke(methodInvocation, Behavior,
() => defaultValue(parameters.Select(x => x.Value).ToArray())));
}

/// <summary>
Expand Down Expand Up @@ -176,7 +179,14 @@ public void Raise(string eventName, params object?[] parameters)
{
foreach ((object? target, MethodInfo method) in GetEventHandlers(eventName))
{
method.Invoke(target, parameters);
try
{
method.Invoke(target, parameters);
}
catch (TargetInvocationException ex) when (ex.InnerException is not null)
{
ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
}
Comment thread
vbreuss marked this conversation as resolved.
}
}

Expand Down
20 changes: 20 additions & 0 deletions Tests/Mockolate.Tests/MockEvents/RaiseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,26 @@ public async Task WhenSubscribedToOtherEvent_ShouldNotTrigger()
await That(callCount).IsEqualTo(0);
}

[Fact]
public async Task WhenSubscriptionThrows_ShouldNotWrapException()
{
IMyEventService mock = Mock.Create<IMyEventService, IMyEventServiceBase1>();

mock.SomeEvent += SubscriptionThrowingException;

void Act()
{
mock.RaiseOnMock.SomeEvent(this, "event data");
}

await That(Act).Throws<MockException>().WithMessage("Subscription exception");

void SubscriptionThrowingException(object? sender, string e)
{
throw new MockException("Subscription exception");
}
}

[Fact]
public async Task WhenUnsubscribedFromOtherEvent_ShouldNotAffectOtherSubscriptions()
{
Expand Down
Loading