Skip to content

Fix preserve arguments #198

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix preserve arguments #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9ed0fe
Fix X2022: Preserve all arguments when fixing negated boolean assertions
Tenno641 Nov 20, 2025
021ce1a
Added more tests
Tenno641 Nov 20, 2025
3dc0a45
Adjusting Tests
Tenno641 Nov 20, 2025
8f466fa
Fix BooleanAssertsShouldNotBeNegated code fix to preserve comments
Tenno641 Nov 20, 2025
362d3d8
Removed preserve comments test
Tenno641 Nov 20, 2025
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
16 changes: 15 additions & 1 deletion src/xunit.analyzers.fixes/X2000/BooleanAssertsShouldNotBeNegatedFixer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.Composition;
using System.Linq;
using System.Threading;
Expand Down Expand Up @@ -57,13 +58,26 @@ static async Task<Document> UseSuggestedAssert(
var editor = await DocumentEditor.CreateAsync(document, cancellationToken).ConfigureAwait(false);

if (invocation.Expression is MemberAccessExpressionSyntax memberAccess)
{
if (invocation.ArgumentList.Arguments[0].Expression is PrefixUnaryExpressionSyntax prefixUnaryExpression)
{
var originalArguments = invocation.ArgumentList.Arguments;
var newFirstArgument = Argument(prefixUnaryExpression.Operand);

var newArguments = new List<ArgumentSyntax> { newFirstArgument };
if (originalArguments.Count > 1)
{
newArguments.AddRange(originalArguments.Skip(1));
}

editor.ReplaceNode(
invocation,
invocation
.WithArgumentList(ArgumentList(SeparatedList([Argument(prefixUnaryExpression.Operand)])))
.WithArgumentList(ArgumentList(SeparatedList(newArguments)))
.WithExpression(memberAccess.WithName(IdentifierName(replacement)))
);
}
}

return editor.GetChangedDocument();
}
Expand Down
78 changes: 70 additions & 8 deletions src/xunit.analyzers.tests/Fixes/X2000/BooleanAssertsShouldNotBeNegatedFixerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
public class BooleanAssertsShouldNotBeNegatedFixerTests
{
const string template = /* lang=c#-test */ """
using Xunit;
using Xunit;

public class TestClass {{
[Fact]
public void TestMethod() {{
bool condition = true;
public class TestClass {{
[Fact]
public void TestMethod() {{
bool condition = true;

{0};
}}
{0};
}}
""";
}}
""";

[Theory]
[InlineData("False", "True")]
Expand All @@ -30,4 +30,66 @@ public async Task ReplacesBooleanAssert(

await Verify.VerifyCodeFix(before, after, BooleanAssertsShouldNotBeNegatedFixer.Key_UseSuggestedAssert);
}

[Theory]
[InlineData("False", "True")]
[InlineData("True", "False")]
public async Task PreservesUserMessageNamedParameter(
string assertion,
string replacement)
{
var before = string.Format(template, $"[|Assert.{assertion}(!condition, userMessage: \"test message\")|]");
var after = string.Format(template, $"Assert.{replacement}(condition, userMessage: \"test message\")");

await Verify.VerifyCodeFix(before, after, BooleanAssertsShouldNotBeNegatedFixer.Key_UseSuggestedAssert);
}

[Theory]
[InlineData("False", "True")]
[InlineData("True", "False")]
public async Task PreservesUserMessagePositionalParameter(
string assertion,
string replacement)
{
var before = string.Format(template, $"[|Assert.{assertion}(!condition, \"test message\")|]");
var after = string.Format(template, $"Assert.{replacement}(condition, \"test message\")");

await Verify.VerifyCodeFix(before, after, BooleanAssertsShouldNotBeNegatedFixer.Key_UseSuggestedAssert);
}

[Fact]
public async Task PreservesWhitespace()
{
var before = string.Format(template, "[|Assert.True( !condition )|]");
var after = string.Format(template, "Assert.False(condition)");

await Verify.VerifyCodeFix(before, after, BooleanAssertsShouldNotBeNegatedFixer.Key_UseSuggestedAssert);
}

[Fact]
public async Task NegatedLiteral()
{
var before = string.Format(template, "[|Assert.True(!false)|]");
var after = string.Format(template, "Assert.False(false)");

await Verify.VerifyCodeFix(before, after, BooleanAssertsShouldNotBeNegatedFixer.Key_UseSuggestedAssert);
}

[Fact]
public async Task NegatedPropertyAccess()
{
var before = string.Format(template, "[|Assert.True(!condition)|]");
var after = string.Format(template, "Assert.False(condition)");

await Verify.VerifyCodeFix(before, after, BooleanAssertsShouldNotBeNegatedFixer.Key_UseSuggestedAssert);
}

[Fact]
public async Task PreservesUserMessageWithComplexExpression()
{
var before = string.Format(template, "[|Assert.True(!false, userMessage: \"test\")|]");
var after = string.Format(template, "Assert.False(false, userMessage: \"test\")");

await Verify.VerifyCodeFix(before, after, BooleanAssertsShouldNotBeNegatedFixer.Key_UseSuggestedAssert);
}
}