Skip to content

perf: PropertyInjector defer state machine creation #4321

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 12, 2026
Merged

perf: PropertyInjector defer state machine creation #4321

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
33 changes: 28 additions & 5 deletions TUnit.Engine/Services/PropertyInjector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public PropertyInjector(Lazy<IInitializationCallback> initializationCallback, st
/// Resolves and caches property values for a test class type WITHOUT setting them on an instance.
/// Used during registration to create shared objects early and enable proper reference counting.
/// </summary>
public async Task ResolveAndCachePropertiesAsync(
public Task ResolveAndCachePropertiesAsync(
Type testClassType,
ConcurrentDictionary<string, object?> objectBag,
MethodMetadata? methodMetadata,
Expand All @@ -47,16 +47,27 @@ public async Task ResolveAndCachePropertiesAsync(
// Skip property resolution if this test is reusing the discovery instance (already initialized)
if (testContext.IsDiscoveryInstanceReused)
{
return;
return Task.CompletedTask;
}

var plan = PropertyInjectionCache.GetOrCreatePlan(testClassType);

if (!plan.HasProperties)
{
return;
return Task.CompletedTask;
}

if (plan.SourceGeneratedProperties.Length > 0 || plan.ReflectionProperties.Length > 0)
{
return ResolveAndCachePropertiesCoreAsync(objectBag, methodMetadata, events, testContext, plan);
}

return Task.CompletedTask;
}

private async Task ResolveAndCachePropertiesCoreAsync(ConcurrentDictionary<string, object?> objectBag, MethodMetadata? methodMetadata,
TestContextEvents events, TestContext testContext, PropertyInjectionPlan plan)
{
// Resolve properties based on what's available in the plan
if (plan.SourceGeneratedProperties.Length > 0)
{
Expand Down Expand Up @@ -333,7 +344,7 @@ private async Task InjectReflectionPropertyAsync(
propertySetter(instance, resolvedValue);
}

private async Task RecurseIntoNestedPropertiesAsync(
private Task RecurseIntoNestedPropertiesAsync(
object instance,
PropertyInjectionPlan plan,
ConcurrentDictionary<string, object?> objectBag,
Expand All @@ -343,9 +354,21 @@ private async Task RecurseIntoNestedPropertiesAsync(
{
if (!plan.HasProperties)
{
return;
return Task.CompletedTask;
}

if (plan.SourceGeneratedProperties.Length > 0 || plan.ReflectionProperties.Length > 0)
{
return RecurseIntoNestedPropertiesCoreAsync(instance, plan, objectBag, methodMetadata, events, visitedObjects);
}

return Task.CompletedTask;
}

private async Task RecurseIntoNestedPropertiesCoreAsync(object instance, PropertyInjectionPlan plan,
ConcurrentDictionary<string, object?> objectBag, MethodMetadata? methodMetadata, TestContextEvents events,
ConcurrentDictionary<object, byte> visitedObjects)
{
if (plan.SourceGeneratedProperties.Length > 0)
{
foreach (var metadata in plan.SourceGeneratedProperties)
Expand Down
Loading