Skip to content

Optimize CollectionAssert: hoist GetTypeInfo() and avoid redundant eumerations #7536

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
Evangelink merged 1 commit into from
Mar 12, 2026
+7 −6
Merged

Optimize CollectionAssert: hoist GetTypeInfo() and avoid redundant eumerations #7536

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
13 changes: 7 additions & 6 deletions src/TestFramework/TestFramework/Assertions/CollectionAssert.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ public static void AreEquivalent<T>(
}

// If both collections are empty, they are equivalent.
if (!expected.Any())
if (expectedCollectionCount == 0)
{
return;
}
Expand Down Expand Up @@ -661,13 +661,15 @@ public static void AreNotEquivalent<T>(
DebugEx.Assert(notExpected is not null, "expected is not null here");

// Check whether the element counts are different.
if (notExpected.Count() != actual.Count())
int notExpectedCount = notExpected.Count();
int actualCount = actual.Count();
if (notExpectedCount != actualCount)
{
return;
}

// If both collections are empty, they are equivalent.
if (!notExpected.Any())
if (notExpectedCount == 0)
{
string userMessage = Assert.BuildUserMessage(message);
string finalMessage = string.Format(
Expand Down Expand Up @@ -743,9 +745,8 @@ public static void AllItemsAreInstancesOfType(
int i = 0;
foreach (object? element in collection)
{
if (expectedType.GetTypeInfo() is { } expectedTypeInfo
&& element?.GetType().GetTypeInfo() is { } elementTypeInfo
&& !expectedTypeInfo.IsAssignableFrom(elementTypeInfo))
if (element?.GetType() is { } elementType
&& !expectedType.IsAssignableFrom(elementType))
{
string userMessage = Assert.BuildUserMessage(message);
string finalMessage = string.Format(
Expand Down
Loading