Replaced message parameter of CSharpCompilerError with WithMessage()

vweijsters · vweijsters · commit 0bfd6c5423ea · 2016-05-19T23:58:56.000+02:00
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1600UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1600UnitTests.cs
@@ -33,7 +33,7 @@ public async Task TestRegressionMethodGlobalNamespaceAsync(string code, int colu
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS0116", "A namespace cannot directly contain members such as fields or methods").WithLocation(4, column),
+                this.CSharpCompilerError("CS0116").WithMessage("A namespace cannot directly contain members such as fields or methods").WithLocation(4, column),
                 this.CSharpDiagnostic().WithLocation(4, column),
             };
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1606UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1606UnitTests.cs
@@ -779,7 +779,7 @@ public string MethodName
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1002", "; expected").WithLocation(5, 29),
+                this.CSharpCompilerError("CS1002").WithMessage("; expected").WithLocation(5, 29),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/DiagnosticResult.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/DiagnosticResult.cs
@@ -100,6 +100,13 @@ public DiagnosticResult WithArguments(params object[] arguments)
             return result;
         }
 
+        public DiagnosticResult WithMessage(string message)
+        {
+            DiagnosticResult result = this;
+            result.Message = message;
+            return result;
+        }
+
         public DiagnosticResult WithMessageFormat(LocalizableString messageFormat)
         {
             DiagnosticResult result = this;
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/DiagnosticVerifier.Helper.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/DiagnosticVerifier.Helper.cs
@@ -209,13 +209,12 @@ protected DiagnosticResult CSharpDiagnostic(DiagnosticDescriptor descriptor)
             return new DiagnosticResult(descriptor);
         }
 
-        protected DiagnosticResult CSharpCompilerError(string errorIdentifier, string message)
+        protected DiagnosticResult CSharpCompilerError(string errorIdentifier)
         {
             return new DiagnosticResult
             {
                 Id = errorIdentifier,
                 Severity = DiagnosticSeverity.Error,
-                Message = message,
             };
         }
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1504UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1504UnitTests.cs
@@ -291,7 +291,7 @@ public int Prop
 }";
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS0501", "'Foo.Prop.get' must declare a body because it is not marked abstract, extern, or partial").WithLocation(6, 9),
+                this.CSharpCompilerError("CS0501").WithMessage("'Foo.Prop.get' must declare a body because it is not marked abstract, extern, or partial").WithLocation(6, 9),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1508UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1508UnitTests.cs
@@ -851,10 +851,10 @@ public class TestClass /
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1022", "Type or namespace definition, or end-of-file expected").WithLocation(3, 28),
-                this.CSharpCompilerError("CS1513", "} expected").WithLocation(3, 28),
-                this.CSharpCompilerError("CS1514", "{ expected").WithLocation(3, 28),
-                this.CSharpCompilerError("CS1022", "Type or namespace definition, or end-of-file expected").WithLocation(6, 1),
+                this.CSharpCompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(3, 28),
+                this.CSharpCompilerError("CS1513").WithMessage("} expected").WithLocation(3, 28),
+                this.CSharpCompilerError("CS1514").WithMessage("{ expected").WithLocation(3, 28),
+                this.CSharpCompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(6, 1),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1202UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1202UnitTests.cs
@@ -936,8 +936,8 @@ public string
             // We don't care about the syntax errors.
             var expected = new[]
             {
-                this.CSharpCompilerError("CS1585", "Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
-                this.CSharpCompilerError("CS1519", "Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
+                this.CSharpCompilerError("CS1585").WithMessage("Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
+                this.CSharpCompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
@@ -961,8 +961,8 @@ public string
             // We don't care about the syntax errors.
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1585", "Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
-                this.CSharpCompilerError("CS1519", "Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
+                this.CSharpCompilerError("CS1585").WithMessage("Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
+                this.CSharpCompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1204UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1204UnitTests.cs
@@ -578,8 +578,8 @@ public static string
             // We don't care about the syntax errors.
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1585", "Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
-                this.CSharpCompilerError("CS1519", "Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
+                this.CSharpCompilerError("CS1585").WithMessage("Member modifier 'public' must precede the member type and name").WithLocation(5, 5),
+                this.CSharpCompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(6, 1),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1206UnitTests.cs
@@ -193,7 +193,7 @@ public async Task TestWithIncompleteMembersAsync()
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1519", "Invalid token '}' in class, struct, or interface member declaration").WithLocation(4, 1),
+                this.CSharpCompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(4, 1),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1132UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1132UnitTests.cs
@@ -126,7 +126,7 @@ class Foo
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError(id, message).WithLocation(4, column),
+                this.CSharpCompilerError(id).WithMessage(message).WithLocation(4, column),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1000UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1000UnitTests.cs
@@ -852,7 +852,7 @@ void MethodName()
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS0742", "A query body must end with a select clause or a group clause").WithLocation(6, 42),
+                this.CSharpCompilerError("CS0742").WithMessage("A query body must end with a select clause or a group clause").WithLocation(6, 42),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1001UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1001UnitTests.cs
@@ -193,7 +193,7 @@ void MethodName()
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1003", "Syntax error, ',' expected").WithLocation(6, 25),
+                this.CSharpCompilerError("CS1003").WithMessage("Syntax error, ',' expected").WithLocation(6, 25),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1002UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1002UnitTests.cs
@@ -406,7 +406,7 @@ int x
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1002", "; expected").WithLocation(6, 14),
+                this.CSharpCompilerError("CS1002").WithMessage("; expected").WithLocation(6, 14),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1007UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1007UnitTests.cs
@@ -76,7 +76,7 @@ public static explicit bool(ClassName x)
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1003", "Syntax error, 'operator' expected").WithLocation(4, 28),
+                this.CSharpCompilerError("CS1003").WithMessage("Syntax error, 'operator' expected").WithLocation(4, 28),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1008UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1008UnitTests.cs
@@ -2026,7 +2026,7 @@ class ClassName
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1003", "Syntax error, '(' expected").WithLocation(5, 15),
+                this.CSharpCompilerError("CS1003").WithMessage("Syntax error, '(' expected").WithLocation(5, 15),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1009UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1009UnitTests.cs
@@ -850,7 +850,7 @@ class ClassName
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1026", ") expected").WithLocation(5, 16),
+                this.CSharpCompilerError("CS1026").WithMessage(") expected").WithLocation(5, 16),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1011UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1011UnitTests.cs
@@ -304,9 +304,9 @@ void Method()
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS0443", "Syntax error; value expected").WithLocation(6, 28),
-                this.CSharpCompilerError("CS1003", "Syntax error, ',' expected").WithLocation(6, 28),
-                this.CSharpCompilerError("CS1003", "Syntax error, ']' expected").WithLocation(6, 28),
+                this.CSharpCompilerError("CS0443").WithMessage("Syntax error; value expected").WithLocation(6, 28),
+                this.CSharpCompilerError("CS1003").WithMessage("Syntax error, ',' expected").WithLocation(6, 28),
+                this.CSharpCompilerError("CS1003").WithMessage("Syntax error, ']' expected").WithLocation(6, 28),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1012UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1012UnitTests.cs
@@ -236,7 +236,7 @@ void Method()
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1514", "{ expected").WithLocation(6, 25),
+                this.CSharpCompilerError("CS1514").WithMessage("{ expected").WithLocation(6, 25),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1013UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1013UnitTests.cs
@@ -395,7 +395,7 @@ class ClassName
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1513", "} expected").WithLocation(3, 2),
+                this.CSharpCompilerError("CS1513").WithMessage("} expected").WithLocation(3, 2),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1015UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1015UnitTests.cs
@@ -384,7 +384,7 @@ void Method()
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1003", "Syntax error, '>' expected").WithLocation(7, 35),
+                this.CSharpCompilerError("CS1003").WithMessage("Syntax error, '>' expected").WithLocation(7, 35),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1018UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1018UnitTests.cs
@@ -134,7 +134,7 @@ private void Test()
 
             DiagnosticResult[] expected =
             {
-                this.CSharpCompilerError("CS1031", "Type expected").WithLocation(10, 2),
+                this.CSharpCompilerError("CS1031").WithMessage("Type expected").WithLocation(10, 2),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async Task TestRegressionMethodGlobalNamespaceAsync(string code, int colu`
`33`	`33`
`34`	`34`	`DiagnosticResult[] expected =`
`35`	`35`	`{`
`36`		`- this.CSharpCompilerError("CS0116", "A namespace cannot directly contain members such as fields or methods").WithLocation(4, column),`
	`36`	`+ this.CSharpCompilerError("CS0116").WithMessage("A namespace cannot directly contain members such as fields or methods").WithLocation(4, column),`
`37`	`37`	`this.CSharpDiagnostic().WithLocation(4, column),`
`38`	`38`	`};`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,7 @@ public string MethodName`
`779`	`779`
`780`	`780`	`DiagnosticResult[] expected =`
`781`	`781`	`{`
`782`		`- this.CSharpCompilerError("CS1002", "; expected").WithLocation(5, 29),`
	`782`	`+ this.CSharpCompilerError("CS1002").WithMessage("; expected").WithLocation(5, 29),`
`783`	`783`	`};`
`784`	`784`
`785`	`785`	`await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,13 @@ public DiagnosticResult WithArguments(params object[] arguments)`
`100`	`100`	`return result;`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ public DiagnosticResult WithMessage(string message)`
	`104`	`+ {`
	`105`	`+ DiagnosticResult result = this;`
	`106`	`+ result.Message = message;`
	`107`	`+ return result;`
	`108`	`+ }`
	`109`	`+`
`103`	`110`	`public DiagnosticResult WithMessageFormat(LocalizableString messageFormat)`
`104`	`111`	`{`
`105`	`112`	`DiagnosticResult result = this;`
Original file line number	Diff line number	Diff line change
`@@ -209,13 +209,12 @@ protected DiagnosticResult CSharpDiagnostic(DiagnosticDescriptor descriptor)`
`209`	`209`	`return new DiagnosticResult(descriptor);`
`210`	`210`	`}`
`211`	`211`
`212`		`- protected DiagnosticResult CSharpCompilerError(string errorIdentifier, string message)`
	`212`	`+ protected DiagnosticResult CSharpCompilerError(string errorIdentifier)`
`213`	`213`	`{`
`214`	`214`	`return new DiagnosticResult`
`215`	`215`	`{`
`216`	`216`	`Id = errorIdentifier,`
`217`	`217`	`Severity = DiagnosticSeverity.Error,`
`218`		`- Message = message,`
`219`	`218`	`};`
`220`	`219`	`}`
`221`	`220`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ public int Prop`
`291`	`291`	`}";`
`292`	`292`	`DiagnosticResult[] expected =`
`293`	`293`	`{`
`294`		`- this.CSharpCompilerError("CS0501", "'Foo.Prop.get' must declare a body because it is not marked abstract, extern, or partial").WithLocation(6, 9),`
	`294`	`+ this.CSharpCompilerError("CS0501").WithMessage("'Foo.Prop.get' must declare a body because it is not marked abstract, extern, or partial").WithLocation(6, 9),`
`295`	`295`	`};`
`296`	`296`
`297`	`297`	`await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public async Task TestWithIncompleteMembersAsync()`
`193`	`193`
`194`	`194`	`DiagnosticResult[] expected =`
`195`	`195`	`{`
`196`		`- this.CSharpCompilerError("CS1519", "Invalid token '}' in class, struct, or interface member declaration").WithLocation(4, 1),`
	`196`	`+ this.CSharpCompilerError("CS1519").WithMessage("Invalid token '}' in class, struct, or interface member declaration").WithLocation(4, 1),`
`197`	`197`	`};`
`198`	`198`
`199`	`199`	`await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ class Foo`
`126`	`126`
`127`	`127`	`DiagnosticResult[] expected =`
`128`	`128`	`{`
`129`		`- this.CSharpCompilerError(id, message).WithLocation(4, column),`
	`129`	`+ this.CSharpCompilerError(id).WithMessage(message).WithLocation(4, column),`
`130`	`130`	`};`
`131`	`131`
`132`	`132`	`await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`