Skip to content

Migrate string AreEqual overloads to RFC 012 messages #8331

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
May 19, 2026
Merged

Migrate string AreEqual overloads to RFC 012 messages #8331

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
44 changes: 28 additions & 16 deletions src/TestFramework/TestFramework/Assertions/Assert.AreEqual.InterpolatedStringHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,16 @@ internal void ComputeAssertion(string notExpectedExpression, string actualExpres
public readonly struct AssertNonGenericAreEqualInterpolatedStringHandler
{
private readonly StringBuilder? _builder;
private readonly Action<string>? _failAction;
private readonly Action<string, string, string>? _failAction;

public AssertNonGenericAreEqualInterpolatedStringHandler(int literalLength, int formattedCount, float expected, float actual, float delta, out bool shouldAppend)
{
shouldAppend = AreEqualFailing(expected, actual, delta);
if (shouldAppend)
{
_builder = new StringBuilder(literalLength + formattedCount);
_failAction = userMessage => ReportAssertAreEqualFailed(expected, actual, delta, userMessage);
_failAction = (userMessage, expectedExpression, actualExpression) =>
ReportAssertAreEqualFailed(expected, actual, delta, BuildUserMessageForExpectedExpressionAndActualExpression(userMessage, expectedExpression, actualExpression));
}
}

Expand All @@ -175,7 +176,8 @@ public AssertNonGenericAreEqualInterpolatedStringHandler(int literalLength, int
if (shouldAppend)
{
_builder = new StringBuilder(literalLength + formattedCount);
_failAction = userMessage => ReportAssertAreEqualFailed(expected, actual, delta, userMessage);
_failAction = (userMessage, expectedExpression, actualExpression) =>
ReportAssertAreEqualFailed(expected, actual, delta, BuildUserMessageForExpectedExpressionAndActualExpression(userMessage, expectedExpression, actualExpression));
}
}

Expand All @@ -185,7 +187,8 @@ public AssertNonGenericAreEqualInterpolatedStringHandler(int literalLength, int
if (shouldAppend)
{
_builder = new StringBuilder(literalLength + formattedCount);
_failAction = userMessage => ReportAssertAreEqualFailed(expected, actual, delta, userMessage);
_failAction = (userMessage, expectedExpression, actualExpression) =>
ReportAssertAreEqualFailed(expected, actual, delta, BuildUserMessageForExpectedExpressionAndActualExpression(userMessage, expectedExpression, actualExpression));
}
}

Expand All @@ -195,13 +198,20 @@ public AssertNonGenericAreEqualInterpolatedStringHandler(int literalLength, int
if (shouldAppend)
{
_builder = new StringBuilder(literalLength + formattedCount);
_failAction = userMessage => ReportAssertAreEqualFailed(expected, actual, delta, userMessage);
_failAction = (userMessage, expectedExpression, actualExpression) =>
ReportAssertAreEqualFailed(expected, actual, delta, BuildUserMessageForExpectedExpressionAndActualExpression(userMessage, expectedExpression, actualExpression));
}
}

public AssertNonGenericAreEqualInterpolatedStringHandler(int literalLength, int formattedCount, string? expected, string? actual, bool ignoreCase, out bool shouldAppend)
: this(literalLength, formattedCount, expected, actual, ignoreCase, CultureInfo.InvariantCulture, out shouldAppend)
{
shouldAppend = AreEqualFailing(expected, actual, ignoreCase, CultureInfo.InvariantCulture);
if (shouldAppend)
{
_builder = new StringBuilder(literalLength + formattedCount);
_failAction = (userMessage, expectedExpression, actualExpression) =>
ReportAssertAreEqualFailed(expected, actual, ignoreCase, CultureInfo.InvariantCulture, cultureExplicit: false, userMessage, expectedExpression, actualExpression);
}
}

public AssertNonGenericAreEqualInterpolatedStringHandler(int literalLength, int formattedCount, string? expected, string? actual, bool ignoreCase, CultureInfo culture, out bool shouldAppend)
Expand All @@ -211,18 +221,13 @@ public AssertNonGenericAreEqualInterpolatedStringHandler(int literalLength, int
if (shouldAppend)
{
_builder = new StringBuilder(literalLength + formattedCount);
_failAction = userMessage => ReportAssertAreEqualFailed(expected, actual, ignoreCase, culture, userMessage);
_failAction = (userMessage, expectedExpression, actualExpression) =>
ReportAssertAreEqualFailed(expected, actual, ignoreCase, culture, cultureExplicit: true, userMessage, expectedExpression, actualExpression);
}
}

internal void ComputeAssertion(string expectedExpression, string actualExpression)
{
if (_failAction is not null)
{
_builder!.Insert(0, string.Format(CultureInfo.CurrentCulture, FrameworkMessages.CallerArgumentExpressionTwoParametersMessage, "expected", expectedExpression, "actual", actualExpression) + " ");
_failAction.Invoke(_builder!.ToString());
}
}
=> _failAction?.Invoke(_builder!.ToString(), expectedExpression, actualExpression);

public void AppendLiteral(string value) => _builder!.Append(value);

Expand Down Expand Up @@ -310,8 +315,14 @@ public AssertNonGenericAreNotEqualInterpolatedStringHandler(int literalLength, i
}

public AssertNonGenericAreNotEqualInterpolatedStringHandler(int literalLength, int formattedCount, string? notExpected, string? actual, bool ignoreCase, out bool shouldAppend)
: this(literalLength, formattedCount, notExpected, actual, ignoreCase, CultureInfo.InvariantCulture, out shouldAppend)
{
shouldAppend = AreNotEqualFailing(notExpected, actual, ignoreCase, CultureInfo.InvariantCulture);
if (shouldAppend)
{
_builder = new StringBuilder(literalLength + formattedCount);
_failAction = (userMessage, notExpectedExpr, actualExpr) =>
ReportAssertAreNotEqualFailed(notExpected, actual, ignoreCase, CultureInfo.InvariantCulture, cultureExplicit: false, userMessage, notExpectedExpr, actualExpr);
}
}

public AssertNonGenericAreNotEqualInterpolatedStringHandler(int literalLength, int formattedCount, string? notExpected, string? actual, bool ignoreCase, CultureInfo culture, out bool shouldAppend)
Expand All @@ -321,7 +332,8 @@ public AssertNonGenericAreNotEqualInterpolatedStringHandler(int literalLength, i
if (shouldAppend)
{
_builder = new StringBuilder(literalLength + formattedCount);
_failAction = (userMessage, notExpectedExpr, actualExpr) => ReportAssertAreNotEqualFailed(notExpected, actual, userMessage, notExpectedExpr, actualExpr);
_failAction = (userMessage, notExpectedExpr, actualExpr) =>
ReportAssertAreNotEqualFailed(notExpected, actual, ignoreCase, culture, cultureExplicit: true, userMessage, notExpectedExpr, actualExpr);
}
}

Expand Down
Loading
Loading