Skip to content

feat: reorder After(TestDiscovery) hooks to run before event receivers #4597

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
thomhurst merged 1 commit into from
Jan 29, 2026
Merged

feat: reorder After(TestDiscovery) hooks to run before event receivers #4597

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
12 changes: 6 additions & 6 deletions TUnit.Engine/Building/TestBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,10 +957,13 @@ public async ValueTask InvokePostResolutionEventsAsync(AbstractExecutableTest te
TestContext.Current = context;

// Populate TestContext._dependencies from resolved test.Dependencies
// This makes dependencies available to ITestRegisteredEventReceiver
// This makes dependencies available to event receivers
PopulateDependencies(test, context._dependencies);

// Invoke test registered event receivers
// Invoke discovery event receivers first (discovery phase)
await InvokeDiscoveryEventReceiversAsync(context);

// Invoke test registered event receivers (registration phase)
try
{
await InvokeTestRegisteredReceiversAsync(context);
Expand All @@ -971,10 +974,7 @@ public async ValueTask InvokePostResolutionEventsAsync(AbstractExecutableTest te
test.SetResult(TestState.Failed, ex);
}

// Invoke discovery event receivers
await InvokeDiscoveryEventReceiversAsync(context);

// Clear the cached display name after discovery events
// Clear the cached display name after registration events
// This ensures that ArgumentDisplayFormatterAttribute and similar attributes
// have a chance to register their formatters before the display name is finalized
context.InvalidateDisplayNameCache();
Expand Down
26 changes: 17 additions & 9 deletions TUnit.Engine/TestDiscoveryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,14 @@ public async Task<TestDiscoveryResult> DiscoverTests(string testSessionId, ITest
_dependencyResolver.TryResolveDependencies(test);
}

// Now that dependencies are resolved, invoke event receivers
// This ensures ITestRegisteredEventReceiver can access dependency information
// Add tests to context and run After(TestDiscovery) hooks before event receivers
// This marks the end of the discovery phase, before registration begins
contextProvider.TestDiscoveryContext.AddTests(allTests.Select(static t => t.Context));
await _testExecutor.ExecuteAfterTestDiscoveryHooksAsync(cancellationToken).ConfigureAwait(false);
contextProvider.TestDiscoveryContext.RestoreExecutionContext();

// Now invoke event receivers (registration phase)
// ITestRegisteredEventReceiver can access dependency information and any state set by After(TestDiscovery) hooks
foreach (var test in allTests)
{
await _testBuilderPipeline.InvokePostResolutionEventsAsync(test).ConfigureAwait(false);
Expand Down Expand Up @@ -138,11 +144,6 @@ public async Task<TestDiscoveryResult> DiscoverTests(string testSessionId, ITest
filteredTests = [.. testsToInclude];
}

contextProvider.TestDiscoveryContext.AddTests(allTests.Select(static t => t.Context));

await _testExecutor.ExecuteAfterTestDiscoveryHooksAsync(cancellationToken).ConfigureAwait(false);
contextProvider.TestDiscoveryContext.RestoreExecutionContext();

await _testFilterService.RegisterTestsAsync(filteredTests).ConfigureAwait(false);

var finalContext = ExecutionContext.Capture();
Expand Down Expand Up @@ -190,8 +191,15 @@ public async IAsyncEnumerable<AbstractExecutableTest> DiscoverTestsFullyStreamin
_dependencyResolver.TryResolveDependencies(test);
}

// Now that dependencies are resolved, invoke event receivers
// This ensures ITestRegisteredEventReceiver can access dependency information
// Add tests to context and run After(TestDiscovery) hooks before event receivers
// This marks the end of the discovery phase, before registration begins
var contextProvider = _testExecutor.GetContextProvider();
contextProvider.TestDiscoveryContext.AddTests(allTests.Select(static t => t.Context));
await _testExecutor.ExecuteAfterTestDiscoveryHooksAsync(cancellationToken).ConfigureAwait(false);
contextProvider.TestDiscoveryContext.RestoreExecutionContext();

// Now invoke event receivers (registration phase)
// ITestRegisteredEventReceiver can access dependency information and any state set by After(TestDiscovery) hooks
foreach (var test in allTests)
{
await _testBuilderPipeline.InvokePostResolutionEventsAsync(test).ConfigureAwait(false);
Expand Down
Loading