Skip to content

Commit 2b6059e

Browse files
authored
add support for StringAsserts Contains (#221)
1 parent 88746ae commit 2b6059e

File tree

3 files changed

+72
-0
lines changed

3 files changed

+72
-0
lines changed

src/FluentAssertions.Analyzers.Tests/Tips/XunitTests.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,20 @@ public void AssertNotNull_TestAnalyzer(string assertion) =>
340340
public void AssertNotNull_TestCodeFix(string oldAssertion, string newAssertion)
341341
=> VerifyCSharpFix<AssertNotNullCodeFix, AssertNotNullAnalyzer>("object actual", oldAssertion, newAssertion);
342342

343+
[DataTestMethod]
344+
[DataRow("Assert.Contains(expected, actual);")]
345+
[Implemented]
346+
public void AssertStringContains_TestAnalyzer(string assertion) =>
347+
VerifyCSharpDiagnostic<AssertContainsAnalyzer>("string actual, string expected", assertion);
348+
349+
[DataTestMethod]
350+
[DataRow(
351+
/* oldAssertion: */ "Assert.Contains(expected, actual);",
352+
/* newAssertion: */ "actual.Should().Contain(expected);")]
353+
[Implemented]
354+
public void AssertStringContains_TestCodeFix(string oldAssertion, string newAssertion)
355+
=> VerifyCSharpFix<AssertContainsCodeFix, AssertContainsAnalyzer>("string actual, string expected", oldAssertion, newAssertion);
356+
343357
private void VerifyCSharpDiagnostic<TDiagnosticAnalyzer>(string methodArguments, string assertion) where TDiagnosticAnalyzer : Microsoft.CodeAnalysis.Diagnostics.DiagnosticAnalyzer, new()
344358
{
345359
var source = GenerateCode.XunitAssertion(methodArguments, assertion);

src/FluentAssertions.Analyzers/Constants.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ public static class Xunit
129129
public const string AssertNotStrictEqual = $"{DiagnosticProperties.IdPrefix}0707";
130130
public const string AssertNull = $"{DiagnosticProperties.IdPrefix}0708";
131131
public const string AssertNotNull = $"{DiagnosticProperties.IdPrefix}0709";
132+
public const string AssertContains = $"{DiagnosticProperties.IdPrefix}0710";
132133
}
133134
}
134135

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
using System.Collections.Generic;
2+
using System.Collections.Immutable;
3+
using System.Composition;
4+
using Microsoft.CodeAnalysis;
5+
using Microsoft.CodeAnalysis.CodeFixes;
6+
using Microsoft.CodeAnalysis.CSharp.Syntax;
7+
using Microsoft.CodeAnalysis.Diagnostics;
8+
using TypeSelector = FluentAssertions.Analyzers.Utilities.SemanticModelTypeExtensions;
9+
10+
namespace FluentAssertions.Analyzers.Xunit;
11+
12+
[DiagnosticAnalyzer(LanguageNames.CSharp)]
13+
public class AssertContainsAnalyzer : XunitAnalyzer
14+
{
15+
public const string DiagnosticId = Constants.Tips.Xunit.AssertContains;
16+
public const string Category = Constants.Tips.Category;
17+
18+
public const string Message = "Use .Should().Contain().";
19+
20+
protected override DiagnosticDescriptor Rule => new(DiagnosticId, Title, Message, Category, DiagnosticSeverity.Info, true);
21+
22+
protected override IEnumerable<FluentAssertionsCSharpSyntaxVisitor> Visitors => new FluentAssertionsCSharpSyntaxVisitor[]
23+
{
24+
new AssertContainsStringSyntaxVisitor()
25+
};
26+
27+
//public static void Contains(string expectedSubstring, string? actualString)
28+
public class AssertContainsStringSyntaxVisitor : FluentAssertionsCSharpSyntaxVisitor
29+
{
30+
public AssertContainsStringSyntaxVisitor() : base(
31+
MemberValidator.ArgumentsMatch("Contains",
32+
ArgumentValidator.IsType(TypeSelector.GetStringType),
33+
ArgumentValidator.IsType(TypeSelector.GetStringType))
34+
)
35+
{
36+
}
37+
}
38+
}
39+
40+
[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(AssertContainsCodeFix)), Shared]
41+
public class AssertContainsCodeFix : XunitCodeFixProvider
42+
{
43+
public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(AssertContainsAnalyzer.DiagnosticId);
44+
45+
protected override ExpressionSyntax GetNewExpression(
46+
ExpressionSyntax expression,
47+
FluentAssertionsDiagnosticProperties properties)
48+
{
49+
switch (properties.VisitorName)
50+
{
51+
case nameof(AssertContainsAnalyzer.AssertContainsStringSyntaxVisitor):
52+
return RenameMethodAndReorderActualExpectedAndReplaceWithSubjectShould(expression, "Contains", "Contain");
53+
default:
54+
throw new System.InvalidOperationException($"Invalid visitor name - {properties.VisitorName}");
55+
}
56+
}
57+
}

0 commit comments

Comments
 (0)