Skip to content
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

Fix an off by one in our test code #569

Merged
merged 2 commits into from
Mar 27, 2015
Merged

Fix an off by one in our test code #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e66fb5
Fix that unit tests don't verify locations at line/column start
pdelvo Mar 27, 2015
c727608
Fix failing unit tests
pdelvo Mar 27, 2015
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
2 changes: 1 addition & 1 deletion StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/NumberSignSpacingTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ void Foo()
await this.VerifyCSharpFixAsync(test, fixedTest, cancellationToken: CancellationToken.None);

test = string.Format(testFormat, this.Sign + " 3");
DiagnosticResult expected = this.CSharpDiagnostic().WithArguments(" not", "followed").WithLocation(8, 17);
DiagnosticResult expected = this.CSharpDiagnostic().WithArguments(" not", "followed").WithLocation(8, 1);

await this.VerifyCSharpDiagnosticAsync(test, expected, CancellationToken.None);
await this.VerifyCSharpFixAsync(test, fixedTest, cancellationToken: CancellationToken.None);
Expand Down
2 changes: 1 addition & 1 deletion StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1000UnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ join @a in b on x.A equals a.B

await this.TestKeywordStatement(statementWithSpace, EmptyDiagnosticResults, statementWithSpace);

DiagnosticResult expected = this.CSharpDiagnostic().WithArguments("join", string.Empty, "followed").WithLocation(8, 16);
DiagnosticResult expected = this.CSharpDiagnostic().WithArguments("join", string.Empty, "followed").WithLocation(8, 1);

await this.TestKeywordStatement(statementWithoutSpace, expected, statementWithSpace);
}
Expand Down
8 changes: 4 additions & 4 deletions StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno

var actualLinePosition = actualSpan.StartLinePosition;

// Only check line position if there is an actual line in the real diagnostic
if (actualLinePosition.Line > 0)
// Only check line position if it matters
if (expected.Line > 0)
{
if (actualLinePosition.Line + 1 != expected.Line)
{
Expand All @@ -206,8 +206,8 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
}
}

// Only check column position if there is an actual column position in the real diagnostic
if (actualLinePosition.Character > 0)
// Only check column position if it matters
if (expected.Column > 0)
{
if (actualLinePosition.Character + 1 != expected.Column)
{
Expand Down