Skip to content

perf: replace LINQ with loops in test execution hot paths (#4855) #4910

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

Closed
thomhurst wants to merge 1 commit into from
Closed

perf: replace LINQ with loops in test execution hot paths (#4855) #4910

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
52 changes: 36 additions & 16 deletions TUnit.Core/TestContext.Dependencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,23 @@ internal List<TestContext> GetTests(Func<TestContext, bool> predicate)
return [];
}

var tests = testFinder.GetTests(classType).Where(predicate).ToList();
var allTests = testFinder.GetTests(classType);
var tests = new List<TestContext>();
var hasUnfinished = false;

if (tests.Any(x => x.Result == null))
foreach (var test in allTests)
{
if (predicate(test))
{
tests.Add(test);
if (test.Result == null)
{
hasUnfinished = true;
}
}
}

if (hasUnfinished)
{
throw new InvalidOperationException(
"Cannot get unfinished tests - Did you mean to add a [DependsOn] attribute?"
Expand All @@ -47,43 +61,49 @@ internal List<TestContext> GetTests(string testName)

var classType = TestDetails.ClassType;

var tests = testFinder.GetTestsByNameAndParameters(
var testsArray = testFinder.GetTestsByNameAndParameters(
testName,
[],
classType,
[],
[]
).ToList();
);

if (tests.Any(x => x.Result == null))
foreach (var test in testsArray)
{
throw new InvalidOperationException(
"Cannot get unfinished tests - Did you mean to add a [DependsOn] attribute?"
);
if (test.Result == null)
{
throw new InvalidOperationException(
"Cannot get unfinished tests - Did you mean to add a [DependsOn] attribute?"
);
}
}

return tests;
return new List<TestContext>(testsArray);
}

internal List<TestContext> GetTests(string testName, Type classType)
{
var testFinder = ServiceProvider.GetService<ITestFinder>()!;

var tests = testFinder.GetTestsByNameAndParameters(
var testsArray = testFinder.GetTestsByNameAndParameters(
testName,
[],
classType,
[],
[]
).ToList();
);

if (tests.Any(x => x.Result == null))
foreach (var test in testsArray)
{
throw new InvalidOperationException(
"Cannot get unfinished tests - Did you mean to add a [DependsOn] attribute?"
);
if (test.Result == null)
{
throw new InvalidOperationException(
"Cannot get unfinished tests - Did you mean to add a [DependsOn] attribute?"
);
}
}

return tests;
return new List<TestContext>(testsArray);
}
}
4 changes: 2 additions & 2 deletions TUnit.Engine/Services/ObjectLifecycleService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,8 @@ private async Task InitializeNestedObjectsAsync(

var objectsAtDepth = graph.GetObjectsAtDepth(depth);

// Pre-allocate task list without LINQ Select
var tasks = new List<Task>();
// Pre-allocate task list with known capacity
var tasks = new List<Task>(objectsAtDepth.Count);
foreach (var obj in objectsAtDepth)
{
tasks.Add(initializer(obj, cancellationToken).AsTask());
Expand Down
27 changes: 24 additions & 3 deletions TUnit.Engine/Services/TestDependencyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,14 @@ private bool ResolveDependenciesForTest(AbstractExecutableTest test)
}
}

test.Dependencies = uniqueDependencies.Values.ToArray();
var depsArray = new ResolvedDependency[uniqueDependencies.Count];
var i = 0;
foreach (var dep in uniqueDependencies.Values)
{
depsArray[i++] = dep;
}

test.Dependencies = depsArray;

_testsWithPendingDependencies.Remove(test);

Expand Down Expand Up @@ -191,7 +198,14 @@ private void ResolvePendingDependencies()
/// </summary>
public void BatchResolveDependencies(List<AbstractExecutableTest> tests)
{
var testsWithDependencies = tests.Where(t => t.Metadata.Dependencies.Length > 0).ToList();
var testsWithDependencies = new List<AbstractExecutableTest>();
foreach (var t in tests)
{
if (t.Metadata.Dependencies.Length > 0)
{
testsWithDependencies.Add(t);
}
}

if (testsWithDependencies.Count == 0)
{
Expand Down Expand Up @@ -256,7 +270,14 @@ private void ResolveDependenciesForTestLockFree(AbstractExecutableTest test)
}
}

test.Dependencies = uniqueDependencies.Values.ToArray();
var depsArray = new ResolvedDependency[uniqueDependencies.Count];
var i = 0;
foreach (var dep in uniqueDependencies.Values)
{
depsArray[i++] = dep;
}

test.Dependencies = depsArray;
}
}

Expand Down
Loading