Skip to content

Commit b9a9fdf

Browse files
committed
Fix xUnit2013 by using Assert.Single where appropriate
1 parent 43998b4 commit b9a9fdf

25 files changed

Lines changed: 28 additions & 28 deletions

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/Lightup/IsPatternExpressionSyntaxWrapperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void TestProperties()
4949
var newIsKeyword = SyntaxFactory.Token(SyntaxKind.IsKeyword).WithLeadingTrivia(SyntaxFactory.Space);
5050
var modifiedIsKeyword = isPatternExpressionSyntax.WithIsKeyword(newIsKeyword);
5151
Assert.NotNull(modifiedIsKeyword.SyntaxNode);
52-
Assert.Equal(1, modifiedIsKeyword.IsKeyword.LeadingTrivia.Count);
52+
Assert.Single(modifiedIsKeyword.IsKeyword.LeadingTrivia);
5353
Assert.Equal(" ", modifiedIsKeyword.IsKeyword.LeadingTrivia.ToString());
5454

5555
var newPattern = SyntaxFactory.ConstantPattern(newExpression);

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/Lightup/LocalFunctionStatementSyntaxWrapperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void TestProperties()
115115
var newSemicolonToken = SyntaxFactory.Token(SyntaxKind.SemicolonToken).WithLeadingTrivia(SyntaxFactory.Space);
116116
var wrapperWithModifiedSemicolonToken = wrapper.WithSemicolonToken(newSemicolonToken);
117117
Assert.NotNull(wrapperWithModifiedSemicolonToken.SyntaxNode);
118-
Assert.Equal(1, wrapperWithModifiedSemicolonToken.SemicolonToken.LeadingTrivia.Count);
118+
Assert.Single(wrapperWithModifiedSemicolonToken.SemicolonToken.LeadingTrivia);
119119
Assert.Equal(" ", wrapperWithModifiedSemicolonToken.SemicolonToken.LeadingTrivia.ToString());
120120

121121
var addedModifiers = new SyntaxToken[] { SyntaxFactory.Token(SyntaxKind.AsyncKeyword) };

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/Lightup/RefExpressionSyntaxWrapperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void TestProperties()
4545
var newRefKeyword = SyntaxFactory.Token(SyntaxKind.RefKeyword).WithLeadingTrivia(SyntaxFactory.Space);
4646
var wrapperWithModifiedRefKeyword = wrapper.WithRefKeyword(newRefKeyword);
4747
Assert.NotNull(wrapperWithModifiedRefKeyword.SyntaxNode);
48-
Assert.Equal(1, wrapperWithModifiedRefKeyword.RefKeyword.LeadingTrivia.Count);
48+
Assert.Single(wrapperWithModifiedRefKeyword.RefKeyword.LeadingTrivia);
4949
Assert.Equal(" ", wrapperWithModifiedRefKeyword.RefKeyword.LeadingTrivia.ToString());
5050
}
5151

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/Lightup/RefTypeSyntaxWrapperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void TestProperties()
4545
var newRefKeyword = SyntaxFactory.Token(SyntaxKind.RefKeyword).WithLeadingTrivia(SyntaxFactory.Space);
4646
var wrapperWithModifiedRefKeyword = wrapper.WithRefKeyword(newRefKeyword);
4747
Assert.NotNull(wrapperWithModifiedRefKeyword.SyntaxNode);
48-
Assert.Equal(1, wrapperWithModifiedRefKeyword.RefKeyword.LeadingTrivia.Count);
48+
Assert.Single(wrapperWithModifiedRefKeyword.RefKeyword.LeadingTrivia);
4949
Assert.Equal(" ", wrapperWithModifiedRefKeyword.RefKeyword.LeadingTrivia.ToString());
5050
}
5151

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/Lightup/ThrowExpressionSyntaxWrapperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void TestProperties()
4545
var newThrowKeyword = SyntaxFactory.Token(SyntaxKind.ThrowKeyword).WithLeadingTrivia(SyntaxFactory.Space);
4646
var modifiedThrowKeyword = throwExpressionSyntax.WithThrowKeyword(newThrowKeyword);
4747
Assert.NotNull(modifiedThrowKeyword.SyntaxNode);
48-
Assert.Equal(1, modifiedThrowKeyword.ThrowKeyword.LeadingTrivia.Count);
48+
Assert.Single(modifiedThrowKeyword.ThrowKeyword.LeadingTrivia);
4949
Assert.Equal(" ", modifiedThrowKeyword.ThrowKeyword.LeadingTrivia.ToString());
5050
}
5151

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/Lightup/TupleElementSyntaxWrapperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void TestProperties()
4646
var newIdentifier = SyntaxFactory.Identifier("y").WithLeadingTrivia(SyntaxFactory.Space);
4747
var wrapperWithModifiedIdentifier = wrapper.WithIdentifier(newIdentifier);
4848
Assert.NotNull(wrapperWithModifiedIdentifier.SyntaxNode);
49-
Assert.Equal(1, wrapperWithModifiedIdentifier.Identifier.LeadingTrivia.Count);
49+
Assert.Single(wrapperWithModifiedIdentifier.Identifier.LeadingTrivia);
5050
Assert.Equal(" ", wrapperWithModifiedIdentifier.Identifier.LeadingTrivia.ToString());
5151
}
5252

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/Lightup/TupleExpressionSyntaxWrapperTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void TestProperties()
4747
var newOpenParenToken = SyntaxFactory.Token(SyntaxKind.OpenParenToken).WithLeadingTrivia(SyntaxFactory.Space);
4848
var wrapperWithModifiedOpenParenToken = wrapper.WithOpenParenToken(newOpenParenToken);
4949
Assert.NotNull(wrapperWithModifiedOpenParenToken.SyntaxNode);
50-
Assert.Equal(1, wrapperWithModifiedOpenParenToken.OpenParenToken.LeadingTrivia.Count);
50+
Assert.Single(wrapperWithModifiedOpenParenToken.OpenParenToken.LeadingTrivia);
5151
Assert.Equal(" ", wrapperWithModifiedOpenParenToken.OpenParenToken.LeadingTrivia.ToString());
5252

5353
var newArguments = wrapper.Arguments.Replace(wrapper.Arguments[0], SyntaxFactory.Argument(SyntaxFactory.LiteralExpression(SyntaxKind.NullLiteralExpression)));
@@ -65,7 +65,7 @@ public void TestProperties()
6565
var newCloseParenToken = SyntaxFactory.Token(SyntaxKind.CloseParenToken).WithLeadingTrivia(SyntaxFactory.Space);
6666
var wrapperWithModifiedCloseParenToken = wrapper.WithCloseParenToken(newCloseParenToken);
6767
Assert.NotNull(wrapperWithModifiedCloseParenToken.SyntaxNode);
68-
Assert.Equal(1, wrapperWithModifiedCloseParenToken.CloseParenToken.LeadingTrivia.Count);
68+
Assert.Single(wrapperWithModifiedCloseParenToken.CloseParenToken.LeadingTrivia);
6969
Assert.Equal(" ", wrapperWithModifiedCloseParenToken.CloseParenToken.LeadingTrivia.ToString());
7070
}
7171

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/Lightup/TupleTypeSyntaxWrapperTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void TestProperties()
4444
var newOpenParenToken = SyntaxFactory.Token(SyntaxKind.OpenParenToken).WithLeadingTrivia(SyntaxFactory.Space);
4545
var wrapperWithModifiedOpenParenToken = wrapper.WithOpenParenToken(newOpenParenToken);
4646
Assert.NotNull(wrapperWithModifiedOpenParenToken.SyntaxNode);
47-
Assert.Equal(1, wrapperWithModifiedOpenParenToken.OpenParenToken.LeadingTrivia.Count);
47+
Assert.Single(wrapperWithModifiedOpenParenToken.OpenParenToken.LeadingTrivia);
4848
Assert.Equal(" ", wrapperWithModifiedOpenParenToken.OpenParenToken.LeadingTrivia.ToString());
4949

5050
var newElements = wrapper.Elements.Replace(wrapper.Elements[0], (TupleElementSyntaxWrapper)SyntaxFactory.TupleElement(SyntaxFactory.PredefinedType(SyntaxFactory.Token(SyntaxKind.StringKeyword))));
@@ -62,7 +62,7 @@ public void TestProperties()
6262
var newCloseParenToken = SyntaxFactory.Token(SyntaxKind.CloseParenToken).WithLeadingTrivia(SyntaxFactory.Space);
6363
var wrapperWithModifiedCloseParenToken = wrapper.WithCloseParenToken(newCloseParenToken);
6464
Assert.NotNull(wrapperWithModifiedCloseParenToken.SyntaxNode);
65-
Assert.Equal(1, wrapperWithModifiedCloseParenToken.CloseParenToken.LeadingTrivia.Count);
65+
Assert.Single(wrapperWithModifiedCloseParenToken.CloseParenToken.LeadingTrivia);
6666
Assert.Equal(" ", wrapperWithModifiedCloseParenToken.CloseParenToken.LeadingTrivia.ToString());
6767
}
6868

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/Lightup/WhenClauseSyntaxWrapperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void TestProperties()
4545
var newWhenKeyword = SyntaxFactory.Token(SyntaxKind.WhenKeyword).WithLeadingTrivia(SyntaxFactory.Space);
4646
var wrapperWithModifiedWhenKeyword = wrapper.WithWhenKeyword(newWhenKeyword);
4747
Assert.NotNull(wrapperWithModifiedWhenKeyword.SyntaxNode);
48-
Assert.Equal(1, wrapperWithModifiedWhenKeyword.WhenKeyword.LeadingTrivia.Count);
48+
Assert.Single(wrapperWithModifiedWhenKeyword.WhenKeyword.LeadingTrivia);
4949
Assert.Equal(" ", wrapperWithModifiedWhenKeyword.WhenKeyword.LeadingTrivia.ToString());
5050
}
5151

StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1603UnitTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class SA1603UnitTests : DiagnosticVerifier
2020
public void TestDisabledByDefaultAndNotConfigurable()
2121
{
2222
var analyzer = this.GetCSharpDiagnosticAnalyzers().Single();
23-
Assert.Equal(1, analyzer.SupportedDiagnostics.Length);
23+
Assert.Single(analyzer.SupportedDiagnostics);
2424
Assert.False(analyzer.SupportedDiagnostics[0].IsEnabledByDefault);
2525
Assert.Contains(WellKnownDiagnosticTags.NotConfigurable, analyzer.SupportedDiagnostics[0].CustomTags);
2626
}

0 commit comments

Comments
 (0)