Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion src/TUnit.Engine/Building/TestBuilderPipeline.cs
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,17 @@ public ValueTask InvokePostResolutionEventsAsync(AbstractExecutableTest test)
/// can access dependency information on any TestContext.
/// </summary>
/// <param name="tests">All tests that have had their dependencies resolved</param>
public void PopulateAllDependencies(IEnumerable<AbstractExecutableTest> tests)
/// <param name="refresh">Rebuild context lists after deferred dependency edges change</param>
public void PopulateAllDependencies(IEnumerable<AbstractExecutableTest> tests, bool refresh = false)
{
foreach (var test in tests)
{
if (refresh)
{
test.Context._dependencies?.Clear();
test.Context._dependenciesPopulated = false;
}

_testBuilder.PopulateDependenciesOnly(test);
}
}
Expand Down
9 changes: 9 additions & 0 deletions src/TUnit.Engine/DeferredEnumerationExecutableTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ namespace TUnit.Engine;
/// </summary>
internal sealed class DeferredEnumerationExecutableTest : AbstractExecutableTest
{
internal bool ExpansionCompletedWithoutChildren { get; set; }

internal void CompleteExpansionWithoutChildren(Exception? exception = null)
{
EndTime = DateTimeOffset.UtcNow;
SetResult(exception is null ? TestState.Passed : TestState.Failed, exception);
ExpansionCompletedWithoutChildren = true;
}

public override Task<object> CreateInstanceAsync() =>
throw new InvalidOperationException(
$"Deferred enumeration placeholder '{TestId}' was scheduled directly. It must be expanded by DeferredTestExpander before execution.");
Expand Down
6 changes: 4 additions & 2 deletions src/TUnit.Engine/Framework/TUnitServiceProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ public TUnitServiceProvider(IExtension extension,
ContextProvider,
EventReceiverOrchestrator));

DiscoveryService = Register(new TestDiscoveryService(TestExecutor, TestBuilderPipeline, TestFilterService, dependencyExpander));
var dependencyResolver = Register(new TestDependencyResolver());
DiscoveryService = Register(new TestDiscoveryService(TestExecutor, TestBuilderPipeline, TestFilterService, dependencyExpander, dependencyResolver));

// Create test finder service after discovery service so it can use its cache
TestFinder = Register<ITestFinder>(new TestFinder(DiscoveryService));
Expand Down Expand Up @@ -298,7 +299,8 @@ public TUnitServiceProvider(IExtension extension,
MessageBus,
staticPropertyInitializer,
objectTracker,
deferredTestExpander));
deferredTestExpander,
dependencyResolver));

Register<ITestRegistry>(new TestRegistry(TestBuilderPipeline, testCoordinator, dynamicTestQueue, TestFilterService, objectTracker, TestSessionId, CancellationToken.Token));

Expand Down
5 changes: 5 additions & 0 deletions src/TUnit.Engine/Scheduling/TestRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ internal TestRunner(

public ValueTask ExecuteTestAsync(AbstractExecutableTest test, CancellationToken cancellationToken)
{
if (test is DeferredEnumerationExecutableTest { ExpansionCompletedWithoutChildren: true })
{
return default;
}

if (!test.RequiresExecutionDedup)
{
if (test.ExecutionTask is { } executionTask)
Expand Down
69 changes: 69 additions & 0 deletions src/TUnit.Engine/Services/TestDependencyResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,70 @@ public void RegisterTest(AbstractExecutableTest test)
}
}

public IReadOnlyList<AbstractExecutableTest> RegisteredTests => _allTests;

// Expansion happens before scheduling. Replace all discovery identities in one pass,
// then invalidate affected edges once rather than scanning the growing list per placeholder.
public void ReplaceDeferredTests(
IReadOnlyList<(AbstractExecutableTest Placeholder, IReadOnlyList<AbstractExecutableTest> Children)> expansions)
{
lock (_resolutionLock)
{
var replaced = new HashSet<AbstractExecutableTest>();
foreach (var (placeholder, children) in expansions)
{
// Keep empty placeholders as completed dependency outcomes.
if (children.Count > 0)
{
replaced.Add(placeholder);
}
}

// Completed placeholders are terminal outcomes, so their old outgoing edges must
// not participate in scheduling or circular-dependency detection.
foreach (var test in _allTests)
{
if (test is DeferredEnumerationExecutableTest { ExpansionCompletedWithoutChildren: true })
{
test.Dependencies = [];
}
}

// Empty and failed expansions must retain their outcome, not be resolved again.
_testsWithPendingDependencies.RemoveWhere(static test =>
test is DeferredEnumerationExecutableTest { ExpansionCompletedWithoutChildren: true });

if (replaced.Count == 0)
{
return;
}

_allTests.RemoveAll(replaced.Contains);
foreach (var (placeholder, children) in expansions)
{
_allTests.AddRange(children);
_testsWithPendingDependencies.Remove(placeholder);
}

_testsByType.Clear();
_testsByMethodName.Clear();
_testLookupCache.Clear();
_indexedCount = 0;

foreach (var test in _allTests)
{
foreach (var dependency in test.Dependencies)
{
if (replaced.Contains(dependency.Test))
{
test.Dependencies = [];
break;
}
}
Comment thread
thomhurst marked this conversation as resolved.
Resolved
}
}
}

// Must be called under _resolutionLock (or before a lock-free batch starts).
private void EnsureIndexed()
{
Expand Down Expand Up @@ -279,6 +343,11 @@ public void ResolveAllDependencies()
{
foreach (var test in _allTests)
{
if (test is DeferredEnumerationExecutableTest { ExpansionCompletedWithoutChildren: true })
{
continue;
}

if (test.Dependencies.Length == 0 && test.Metadata.Dependencies.Length > 0)
{
ResolveDependenciesForTest(test);
Expand Down
63 changes: 36 additions & 27 deletions src/TUnit.Engine/Services/TestFinder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ namespace TUnit.Engine.Services;
internal class TestFinder : ITestFinder
{
private readonly TestDiscoveryService _discoveryService;
private Dictionary<Type, List<TestContext>>? _testsByType;
private Dictionary<(Type ClassType, string TestName), List<TestContext>>? _testsByTypeAndName;
private readonly Lock _indexLock = new();
private IndexSnapshot? _indexes;

private sealed record IndexSnapshot(
int Version,
Dictionary<Type, List<TestContext>> ByType,
Dictionary<(Type ClassType, string TestName), List<TestContext>> ByTypeAndName);

public TestFinder(TestDiscoveryService discoveryService)
{
Expand All @@ -20,46 +25,50 @@ public TestFinder(TestDiscoveryService discoveryService)
/// <summary>
/// Builds index dictionaries from cached tests for O(1) lookups
/// </summary>
private void EnsureIndexesBuilt()
private IndexSnapshot EnsureIndexesBuilt()
{
if (_testsByType != null)
lock (_indexLock)
{
return; // Already built
}
if (_indexes is { } indexes && indexes.Version == _discoveryService.CachedTestsVersion)
{
return indexes;
}

var allTests = _discoveryService.GetCachedTestContexts();
var testsByType = new Dictionary<Type, List<TestContext>>();
var testsByTypeAndName = new Dictionary<(Type, string), List<TestContext>>();
// Capture the version before reading contexts; a concurrent update must invalidate this snapshot.
var version = _discoveryService.CachedTestsVersion;
var allTests = _discoveryService.GetCachedTestContexts();
var testsByType = new Dictionary<Type, List<TestContext>>();
var testsByTypeAndName = new Dictionary<(Type, string), List<TestContext>>();

foreach (var test in allTests)
{
if (test.TestDetails?.ClassType == null)
foreach (var test in allTests)
{
continue;
}
if (test.TestDetails?.ClassType == null)
{
continue;
}

var classType = test.Metadata.TestDetails.ClassType;
var testName = test.Metadata.TestDetails.TestName;
var classType = test.Metadata.TestDetails.ClassType;
var testName = test.Metadata.TestDetails.TestName;

// Index by type
testsByType.AddToList(classType, test);
// Index by type
testsByType.AddToList(classType, test);

// Index by (type, name)
testsByTypeAndName.AddToList((classType, testName), test);
}
// Index by (type, name)
testsByTypeAndName.AddToList((classType, testName), test);
}

_testsByType = testsByType;
_testsByTypeAndName = testsByTypeAndName;
return _indexes = new IndexSnapshot(version, testsByType, testsByTypeAndName);
}
}

/// <summary>
/// Gets all test contexts for the specified class type
/// </summary>
public IEnumerable<TestContext> GetTests(Type classType)
{
EnsureIndexesBuilt();
var indexes = EnsureIndexesBuilt();

if (_testsByType!.TryGetValue(classType, out var tests))
if (indexes.ByType.TryGetValue(classType, out var tests))
{
return tests;
}
Expand All @@ -73,14 +82,14 @@ public IEnumerable<TestContext> GetTests(Type classType)
public TestContext[] GetTestsByNameAndParameters(string testName, IEnumerable<Type>? methodParameterTypes,
Type classType, IEnumerable<Type>? classParameterTypes, IEnumerable<object?>? classArguments)
{
EnsureIndexesBuilt();
var indexes = EnsureIndexesBuilt();

var paramTypes = methodParameterTypes as Type[] ?? methodParameterTypes?.ToArray() ?? [];
var classParamTypes = classParameterTypes as Type[] ?? classParameterTypes?.ToArray() ?? [];

// Use the (type, name) index for O(1) lookup instead of O(n) scan
var key = (classType, testName);
if (!_testsByTypeAndName!.TryGetValue(key, out var candidateTests))
if (!indexes.ByTypeAndName.TryGetValue(key, out var candidateTests))
{
return [];
}
Expand Down
46 changes: 43 additions & 3 deletions src/TUnit.Engine/TestDiscoveryService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ internal sealed class TestDiscoveryService : IDataProducer
private readonly TestFilterService _testFilterService;
private readonly MetadataDependencyExpander _dependencyExpander;
private readonly ConcurrentQueue<AbstractExecutableTest> _cachedTests = new();
private readonly TestDependencyResolver _dependencyResolver = new();
private readonly TestDependencyResolver _dependencyResolver;

public string Uid => "TUnit";
public string Version => "2.0.0";
Expand All @@ -45,9 +45,11 @@ public TestDiscoveryService(
TestExecutor testExecutor,
TestBuilderPipeline testBuilderPipeline,
TestFilterService testFilterService,
MetadataDependencyExpander dependencyExpander)
MetadataDependencyExpander dependencyExpander,
TestDependencyResolver dependencyResolver)
{
_testExecutor = testExecutor;
_dependencyResolver = dependencyResolver;
_testBuilderPipeline = testBuilderPipeline ?? throw new ArgumentNullException(nameof(testBuilderPipeline));
_testFilterService = testFilterService;
_dependencyExpander = dependencyExpander ?? throw new ArgumentNullException(nameof(dependencyExpander));
Expand Down Expand Up @@ -422,12 +424,50 @@ private Task InvokePostResolutionEventsInParallelAsync(List<AbstractExecutableTe
Environment.ProcessorCount);
}

private Dictionary<AbstractExecutableTest, IReadOnlyList<AbstractExecutableTest>> _deferredReplacements = new();
internal int CachedTestsVersion { get; private set; }

internal void ReplaceDeferredTests(
IReadOnlyList<(AbstractExecutableTest Placeholder, IReadOnlyList<AbstractExecutableTest> Children)> expansions)
{
// Publish replacements before scheduling. Keep the original discovery queue so later
// discovery requests and unselected tests remain visible as well.
var replacements = new Dictionary<AbstractExecutableTest, IReadOnlyList<AbstractExecutableTest>>(_deferredReplacements);
foreach (var (placeholder, children) in expansions)
{
if (children.Count > 0)
{
replacements[placeholder] = children;
}
}

if (replacements.Count == _deferredReplacements.Count)
{
return;
}

_deferredReplacements = replacements;
CachedTestsVersion++;
}

public IEnumerable<TestContext> GetCachedTestContexts()
{
var list = new List<TestContext>(_cachedTests.Count);
var replacements = _deferredReplacements;
foreach (var test in _cachedTests)
{
list.Add(test.Context);
if (replacements.TryGetValue(test, out var children))
{
foreach (var child in children)
{
list.Add(child.Context);
}
}
else
{
// Empty and failed placeholders remain completed lookup targets.
list.Add(test.Context);
}
}
return list;
}
Expand Down
16 changes: 13 additions & 3 deletions src/TUnit.Engine/TestSessionCoordinator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ internal sealed class TestSessionCoordinator : ITestExecutor, IDisposable, IAsyn
private readonly IStaticPropertyInitializer _staticPropertyInitializer;
private readonly ObjectTracker _objectTracker;
private readonly DeferredTestExpander _deferredTestExpander;
private readonly TestDependencyResolver _dependencyResolver;

public TestSessionCoordinator(EventReceiverOrchestrator eventReceiverOrchestrator,
TUnitFrameworkLogger logger,
Expand All @@ -40,7 +41,8 @@ public TestSessionCoordinator(EventReceiverOrchestrator eventReceiverOrchestrato
ITUnitMessageBus messageBus,
IStaticPropertyInitializer staticPropertyInitializer,
ObjectTracker objectTracker,
DeferredTestExpander deferredTestExpander)
DeferredTestExpander deferredTestExpander,
TestDependencyResolver dependencyResolver)
{
_eventReceiverOrchestrator = eventReceiverOrchestrator;
_logger = logger;
Expand All @@ -52,6 +54,7 @@ public TestSessionCoordinator(EventReceiverOrchestrator eventReceiverOrchestrato
_staticPropertyInitializer = staticPropertyInitializer;
_objectTracker = objectTracker;
_deferredTestExpander = deferredTestExpander;
_dependencyResolver = dependencyResolver;
}

public async Task ExecuteTests(
Expand Down Expand Up @@ -233,19 +236,26 @@ private void InitializeEventReceivers(List<AbstractExecutableTest> testList, Can
{
var children = await _deferredTestExpander.ExpandAsync(placeholder, cancellationToken);
testList.AddRange(children);
if (children.Count == 0)
{
placeholder.CompleteExpansionWithoutChildren();
}
expanded.Add((placeholder, children));
}
catch (Exception ex)
{
// Expansion itself failed (as opposed to a per-row data error, which becomes a failed
// child). Surface it on the placeholder node so the failure is visible.
await _logger.LogErrorAsync($"Failed to expand deferred test '{placeholder.TestId}': {ex}");
placeholder.EndTime = DateTimeOffset.UtcNow;
placeholder.SetResult(TestState.Failed, ex);
placeholder.CompleteExpansionWithoutChildren(ex);
await _messageBus.Failed(placeholder.Context, ex, placeholder.StartTime.GetValueOrDefault());
}
}

_serviceProvider.DiscoveryService.ReplaceDeferredTests(expanded);
_dependencyResolver.ReplaceDeferredTests(expanded);
_dependencyResolver.ResolveAllDependencies();
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
_serviceProvider.TestBuilderPipeline.PopulateAllDependencies(_dependencyResolver.RegisteredTests, refresh: true);
Comment thread
thomhurst marked this conversation as resolved.
Resolved
return expanded;
}

Expand Down
Loading
Loading