Updated tests for SA1402 to not contain any blank lines between declarations. Tests for enum and delegate had them, but not tests for class, interface and struct.

bjornhellander · bjornhellander · commit d1ef22418ac7 · 2016-10-08T09:36:09.000+02:00
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForDelegateUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForDelegateUnitTests.cs
@@ -24,22 +24,18 @@ public async Task TestOneElementAsync()
         public async Task TestTwoElementsAsync()
         {
             var testCode = @"public delegate void Foo();
-
 public delegate void Bar();
 ";
 
             var fixedCode = new[]
             {
                 @"public delegate void Foo();
 ",
-
-                // There should be no leading whitespace here... Why are there?
-                @"
-public delegate void Bar();
+                @"public delegate void Bar();
 "
             };
 
-            DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(3, 22);
+            DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(2, 22);
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
@@ -50,22 +46,18 @@ public async Task TestTwoElementsAsync()
         public async Task TestTwoGenericElementsAsync()
         {
             var testCode = @"public delegate void Foo();
-
 public delegate void Bar<T1, T2, T3>(T1 x, T2 y, T3 z);
 ";
 
             var fixedCode = new[]
             {
                 @"public delegate void Foo();
 ",
-
-                // There should be no leading whitespace here... Why are there?
-                @"
-public delegate void Bar<T1, T2, T3>(T1 x, T2 y, T3 z);
+                @"public delegate void Bar<T1, T2, T3>(T1 x, T2 y, T3 z);
 "
             };
 
-            DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(3, 22);
+            DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(2, 22);
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
@@ -78,7 +70,6 @@ public async Task TestTwoElementsWithRuleDisabledAsync()
             this.ConfigureAsNonTopLevelType = true;
 
             var testCode = @"public delegate void Foo();
-
 public delegate void Bar();
 ";
 
@@ -89,32 +80,24 @@ public async Task TestTwoElementsWithRuleDisabledAsync()
         public async Task TestThreeElementsAsync()
         {
             var testCode = @"public delegate void Foo();
-
 public delegate void Bar();
-
 public delegate void FooBar();
 ";
 
             var fixedCode = new[]
             {
                 @"public delegate void Foo();
 ",
-
-                // There should be no leading whitespace here... Why are there?
-                @"
-public delegate void Bar();
+                @"public delegate void Bar();
 ",
-
-                // There should be no leading whitespace here... Why are there?
-                @"
-public delegate void FooBar();
+                @"public delegate void FooBar();
 "
             };
 
             DiagnosticResult[] expected =
             {
-                this.CSharpDiagnostic().WithLocation(3, 22),
-                this.CSharpDiagnostic().WithLocation(5, 22)
+                this.CSharpDiagnostic().WithLocation(2, 22),
+                this.CSharpDiagnostic().WithLocation(3, 22)
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
@@ -126,17 +109,13 @@ public async Task TestThreeElementsAsync()
         public async Task TestPreferFilenameTypeAsync()
         {
             var testCode = @"public delegate void Foo();
-
 public delegate void Test0();
 ";
 
             var fixedCode = new[]
             {
-                // There should be no leading whitespace here... Why are there?
-                $@"
-public delegate void Test0();
+                $@"public delegate void Test0();
 ",
-
                 $@"public delegate void Foo();
 "
             };
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForEnumUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1402ForEnumUnitTests.cs
@@ -31,7 +31,6 @@ public async Task TestTwoElementsAsync()
 {
     A, B, C
 }
-
 enum Bar
 {
     D, E
@@ -45,17 +44,14 @@ enum Bar
     A, B, C
 }
 ",
-
-                // There should be no leading whitespace here... Why are there?
-                @"
-enum Bar
+                @"enum Bar
 {
     D, E
 }
 "
             };
 
-            DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(6, 6);
+            DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(5, 6);
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
@@ -71,7 +67,6 @@ public async Task TestTwoElementsWithRuleDisabledAsync()
 {
     A, B, C
 }
-
 enum Bar
 {
     D, E
@@ -88,12 +83,10 @@ public async Task TestThreeElementsAsync()
 {
     A, B, C
 }
-
 enum Bar
 {
     D, E
 }
-
 enum FooBar
 {
     F, G, H
@@ -107,18 +100,12 @@ enum FooBar
     A, B, C
 }
 ",
-
-                // There should be no leading whitespace here... Why are there?
-                @"
-enum Bar
+                @"enum Bar
 {
     D, E
 }
 ",
-
-                // There should be no leading whitespace here... Why are there?
-                @"
-enum FooBar
+                @"enum FooBar
 {
     F, G, H
 }
@@ -127,8 +114,8 @@ enum FooBar
 
             DiagnosticResult[] expected =
             {
-                this.CSharpDiagnostic().WithLocation(6, 6),
-                this.CSharpDiagnostic().WithLocation(11, 6)
+                this.CSharpDiagnostic().WithLocation(5, 6),
+                this.CSharpDiagnostic().WithLocation(9, 6)
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
@@ -143,7 +130,6 @@ public async Task TestPreferFilenameTypeAsync()
 {
     A, B, C
 }
-
 enum Test0
 {
     D, E
@@ -152,9 +138,7 @@ enum Test0
 
             var fixedCode = new[]
             {
-                // There should be no leading whitespace here... Why are there?
-                @"
-enum Test0
+                @"enum Test0
 {
     D, E
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ public async Task TestTwoElementsAsync()`
`31`	`31`	`{`
`32`	`32`	`A, B, C`
`33`	`33`	`}`
`34`		`-`
`35`	`34`	`enum Bar`
`36`	`35`	`{`
`37`	`36`	`D, E`
`@@ -45,17 +44,14 @@ enum Bar`
`45`	`44`	`A, B, C`
`46`	`45`	`}`
`47`	`46`	`",`
`48`		`-`
`49`		`- // There should be no leading whitespace here... Why are there?`
`50`		`- @"`
`51`		`-enum Bar`
	`47`	`+ @"enum Bar`
`52`	`48`	`{`
`53`	`49`	`D, E`
`54`	`50`	`}`
`55`	`51`	`"`
`56`	`52`	`};`
`57`	`53`
`58`		`- DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(6, 6);`
	`54`	`+ DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(5, 6);`
`59`	`55`
`60`	`56`	`await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
`61`	`57`	`await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);`
`@@ -71,7 +67,6 @@ public async Task TestTwoElementsWithRuleDisabledAsync()`
`71`	`67`	`{`
`72`	`68`	`A, B, C`
`73`	`69`	`}`
`74`		`-`
`75`	`70`	`enum Bar`
`76`	`71`	`{`
`77`	`72`	`D, E`
`@@ -88,12 +83,10 @@ public async Task TestThreeElementsAsync()`
`88`	`83`	`{`
`89`	`84`	`A, B, C`
`90`	`85`	`}`
`91`		`-`
`92`	`86`	`enum Bar`
`93`	`87`	`{`
`94`	`88`	`D, E`
`95`	`89`	`}`
`96`		`-`
`97`	`90`	`enum FooBar`
`98`	`91`	`{`
`99`	`92`	`F, G, H`
`@@ -107,18 +100,12 @@ enum FooBar`
`107`	`100`	`A, B, C`
`108`	`101`	`}`
`109`	`102`	`",`
`110`		`-`
`111`		`- // There should be no leading whitespace here... Why are there?`
`112`		`- @"`
`113`		`-enum Bar`
	`103`	`+ @"enum Bar`
`114`	`104`	`{`
`115`	`105`	`D, E`
`116`	`106`	`}`
`117`	`107`	`",`
`118`		`-`
`119`		`- // There should be no leading whitespace here... Why are there?`
`120`		`- @"`
`121`		`-enum FooBar`
	`108`	`+ @"enum FooBar`
`122`	`109`	`{`
`123`	`110`	`F, G, H`
`124`	`111`	`}`
`@@ -127,8 +114,8 @@ enum FooBar`
`127`	`114`
`128`	`115`	`DiagnosticResult[] expected =`
`129`	`116`	`{`
`130`		`- this.CSharpDiagnostic().WithLocation(6, 6),`
`131`		`- this.CSharpDiagnostic().WithLocation(11, 6)`
	`117`	`+ this.CSharpDiagnostic().WithLocation(5, 6),`
	`118`	`+ this.CSharpDiagnostic().WithLocation(9, 6)`
`132`	`119`	`};`
`133`	`120`
`134`	`121`	`await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);`
`@@ -143,7 +130,6 @@ public async Task TestPreferFilenameTypeAsync()`
`143`	`130`	`{`
`144`	`131`	`A, B, C`
`145`	`132`	`}`
`146`		`-`
`147`	`133`	`enum Test0`
`148`	`134`	`{`
`149`	`135`	`D, E`
`@@ -152,9 +138,7 @@ enum Test0`
`152`	`138`
`153`	`139`	`var fixedCode = new[]`
`154`	`140`	`{`
`155`		`- // There should be no leading whitespace here... Why are there?`
`156`		`- @"`
`157`		`-enum Test0`
	`141`	`+ @"enum Test0`
`158`	`142`	`{`
`159`	`143`	`D, E`
`160`	`144`	`}`