Fix tests.

JohanLarsson · JohanLarsson · commit 3f979c40c0b1 · 2021-12-12T14:45:00.000+01:00
diff --git a/AspNetCoreAnalyzers.Tests/ASP001ParameterNameTests/CodeFix.cs b/AspNetCoreAnalyzers.Tests/ASP001ParameterNameTests/CodeFix.cs
@@ -117,7 +117,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var before = @"
diff --git a/AspNetCoreAnalyzers.Tests/ASP003ParameterSymbolTypeTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP003ParameterSymbolTypeTests/Valid.cs
@@ -93,7 +93,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
@@ -181,7 +181,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
@@ -239,7 +239,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
@@ -289,7 +289,7 @@ namespace AspBox
 {
     public class Order
     {
-        public string Id { get; set; }
+        public string? Id { get; set; }
     }
 }";
 
@@ -300,7 +300,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
diff --git a/AspNetCoreAnalyzers.Tests/ASP004RouteParameterTypeTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP004RouteParameterTypeTests/Valid.cs
@@ -92,7 +92,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
@@ -143,14 +143,14 @@ namespace AspBox
 {
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [ApiController]
     public class OrdersController : Controller
     {
         [HttpGet(""api/{value}"")]
         public async Task<int> GetOrder(int value)
         {
+            await Task.Delay(10).ConfigureAwait(false);
             return value;
         }
     }
@@ -183,7 +183,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
@@ -241,7 +241,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
@@ -291,7 +291,7 @@ namespace AspBox
 {
     public class Order
     {
-        public string Id { get; set; }
+        public string? Id { get; set; }
     }
 }";
 
@@ -302,7 +302,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
diff --git a/AspNetCoreAnalyzers.Tests/ASP005ParameterSyntaxTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP005ParameterSyntaxTests/Valid.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP005ParameterSyntaxTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP005ParameterSyntaxTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis.Diagnostics;
@@ -40,9 +40,7 @@ public static void WithParameter(string parameter, string type)
             var code = @"
 namespace AspBox
 {
-    using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [ApiController]
     public class OrdersController : Controller
diff --git a/AspNetCoreAnalyzers.Tests/ASP006ParameterRegexTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP006ParameterRegexTests/Valid.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP006ParameterRegexTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP006ParameterRegexTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis.Diagnostics;
@@ -41,9 +41,7 @@ public static void WithParameter(string parameter, string type)
             var code = @"
 namespace AspBox
 {
-    using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [ApiController]
     public class OrdersController : Controller
diff --git a/AspNetCoreAnalyzers.Tests/ASP007MissingParameterTests/Diagnostics.cs b/AspNetCoreAnalyzers.Tests/ASP007MissingParameterTests/Diagnostics.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP007MissingParameterTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP007MissingParameterTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis.Diagnostics;
@@ -47,7 +47,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
@@ -103,7 +103,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
diff --git a/AspNetCoreAnalyzers.Tests/ASP007MissingParameterTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP007MissingParameterTests/Valid.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP007MissingParameterTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP007MissingParameterTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis;
@@ -18,9 +18,7 @@ public static void WhenHttpGet(string after)
             var code = @"
 namespace AspBox
 {
-    using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [ApiController]
     public class OrdersController : Controller
@@ -106,7 +104,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
@@ -161,7 +159,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
@@ -216,7 +214,7 @@ namespace AspBox
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
 }";
             var code = @"
diff --git a/AspNetCoreAnalyzers.Tests/ASP008ValidRouteParameterNameTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP008ValidRouteParameterNameTests/Valid.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP008ValidRouteParameterNameTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP008ValidRouteParameterNameTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis.Diagnostics;
@@ -41,9 +41,7 @@ public static void WithParameter(string parameter, string type)
             var code = @"
 namespace AspBox
 {
-    using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [ApiController]
     public class OrdersController : Controller
diff --git a/AspNetCoreAnalyzers.Tests/ASP009KebabCaseUrlTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP009KebabCaseUrlTests/Valid.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP009KebabCaseUrlTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP009KebabCaseUrlTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis.Diagnostics;
@@ -16,9 +16,7 @@ public static void WithParameter(string parameter)
             var code = @"
 namespace AspBox
 {
-    using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [ApiController]
     public class OrdersController : Controller
diff --git a/AspNetCoreAnalyzers.Tests/ASP010UrlSyntaxTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP010UrlSyntaxTests/Valid.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP010UrlSyntaxTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP010UrlSyntaxTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis.Diagnostics;
@@ -16,9 +16,7 @@ public static void WithParameter(string parameter)
             var code = @"
 namespace AspBox
 {
-    using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [ApiController]
     public class OrdersController : Controller
diff --git a/AspNetCoreAnalyzers.Tests/ASP011RouteParameterNameMustBeUniqueTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP011RouteParameterNameMustBeUniqueTests/Valid.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP011RouteParameterNameMustBeUniqueTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP011RouteParameterNameMustBeUniqueTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis.Diagnostics;
@@ -16,9 +16,7 @@ public static void WithParameter(string parameter)
             var code = @"
 namespace AspBox
 {
-    using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [ApiController]
     public class OrdersController : Controller
diff --git a/AspNetCoreAnalyzers.Tests/ASP012UseExplicitRouteTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP012UseExplicitRouteTests/Valid.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP012UseExplicitRouteTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP012UseExplicitRouteTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis.Diagnostics;
@@ -14,9 +14,7 @@ public static void Simple()
             var code = @"
 namespace AspBox
 {
-    using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [Route(""api/orders"")]
     [ApiController]
diff --git a/AspNetCoreAnalyzers.Tests/ASP013ControllerNameShouldMatchRouteTests/Valid.cs b/AspNetCoreAnalyzers.Tests/ASP013ControllerNameShouldMatchRouteTests/Valid.cs
@@ -1,4 +1,4 @@
-namespace AspNetCoreAnalyzers.Tests.ASP013ControllerNameShouldMatchRouteTests
+﻿namespace AspNetCoreAnalyzers.Tests.ASP013ControllerNameShouldMatchRouteTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis;
@@ -17,9 +17,7 @@ public static void Simple(string template)
             var code = @"
 namespace AspBox
 {
-    using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.EntityFrameworkCore;
 
     [Route(""api/orders"")]
     [ApiController]
diff --git a/AspNetCoreAnalyzers/CodeFixes/ParameterTypeFix.cs b/AspNetCoreAnalyzers/CodeFixes/ParameterTypeFix.cs
@@ -31,7 +31,7 @@ protected override async Task RegisterCodeFixesAsync(DocumentEditorCodeFixContex
                         $"Change type to match route: {typeName}",
                         (e, _) => e.ReplaceNode(
                             typeSyntax,
-                            x => SyntaxFactory.ParseTypeName(typeName)
+                            x => SyntaxFactory.ParseTypeName(typeName!)
                                               .WithSimplifiedNames()
                                               .WithTriviaFrom(x)),
                         nameof(ParameterTypeFix),
diff --git a/ValidCode/Db.cs b/ValidCode/Db.cs
@@ -4,6 +4,6 @@
 
     public class Db : DbContext
     {
-        public DbSet<Order> Orders { get; set; }
+        public DbSet<Order> Orders => this.Set<Order>();
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ namespace AspBox`
`117`	`117`
`118`	`118`	`public class Db : DbContext`
`119`	`119`	`{`
`120`		`- public DbSet<Order> Orders { get; set; }`
	`120`	`+ public DbSet<Order> Orders => this.Set<Order>();`
`121`	`121`	`}`
`122`	`122`	`}";`
`123`	`123`	`var before = @"`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ namespace AspBox`
`93`	`93`
`94`	`94`	`public class Db : DbContext`
`95`	`95`	`{`
`96`		`- public DbSet<Order> Orders { get; set; }`
	`96`	`+ public DbSet<Order> Orders => this.Set<Order>();`
`97`	`97`	`}`
`98`	`98`	`}";`
`99`	`99`	`var code = @"`
`@@ -181,7 +181,7 @@ namespace AspBox`
`181`	`181`
`182`	`182`	`public class Db : DbContext`
`183`	`183`	`{`
`184`		`- public DbSet<Order> Orders { get; set; }`
	`184`	`+ public DbSet<Order> Orders => this.Set<Order>();`
`185`	`185`	`}`
`186`	`186`	`}";`
`187`	`187`	`var code = @"`
`@@ -239,7 +239,7 @@ namespace AspBox`
`239`	`239`
`240`	`240`	`public class Db : DbContext`
`241`	`241`	`{`
`242`		`- public DbSet<Order> Orders { get; set; }`
	`242`	`+ public DbSet<Order> Orders => this.Set<Order>();`
`243`	`243`	`}`
`244`	`244`	`}";`
`245`	`245`	`var code = @"`
`@@ -289,7 +289,7 @@ namespace AspBox`
`289`	`289`	`{`
`290`	`290`	`public class Order`
`291`	`291`	`{`
`292`		`- public string Id { get; set; }`
	`292`	`+ public string? Id { get; set; }`
`293`	`293`	`}`
`294`	`294`	`}";`
`295`	`295`
`@@ -300,7 +300,7 @@ namespace AspBox`
`300`	`300`
`301`	`301`	`public class Db : DbContext`
`302`	`302`	`{`
`303`		`- public DbSet<Order> Orders { get; set; }`
	`303`	`+ public DbSet<Order> Orders => this.Set<Order>();`
`304`	`304`	`}`
`305`	`305`	`}";`
`306`	`306`	`var code = @"`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ namespace AspBox`
`92`	`92`
`93`	`93`	`public class Db : DbContext`
`94`	`94`	`{`
`95`		`- public DbSet<Order> Orders { get; set; }`
	`95`	`+ public DbSet<Order> Orders => this.Set<Order>();`
`96`	`96`	`}`
`97`	`97`	`}";`
`98`	`98`	`var code = @"`
`@@ -143,14 +143,14 @@ namespace AspBox`
`143`	`143`	`{`
`144`	`144`	`using System.Threading.Tasks;`
`145`	`145`	`using Microsoft.AspNetCore.Mvc;`
`146`		`- using Microsoft.EntityFrameworkCore;`
`147`	`146`
`148`	`147`	`[ApiController]`
`149`	`148`	`public class OrdersController : Controller`
`150`	`149`	`{`
`151`	`150`	`[HttpGet(""api/{value}"")]`
`152`	`151`	`public async Task<int> GetOrder(int value)`
`153`	`152`	`{`
	`153`	`+ await Task.Delay(10).ConfigureAwait(false);`
`154`	`154`	`return value;`
`155`	`155`	`}`
`156`	`156`	`}`
`@@ -183,7 +183,7 @@ namespace AspBox`
`183`	`183`
`184`	`184`	`public class Db : DbContext`
`185`	`185`	`{`
`186`		`- public DbSet<Order> Orders { get; set; }`
	`186`	`+ public DbSet<Order> Orders => this.Set<Order>();`
`187`	`187`	`}`
`188`	`188`	`}";`
`189`	`189`	`var code = @"`
`@@ -241,7 +241,7 @@ namespace AspBox`
`241`	`241`
`242`	`242`	`public class Db : DbContext`
`243`	`243`	`{`
`244`		`- public DbSet<Order> Orders { get; set; }`
	`244`	`+ public DbSet<Order> Orders => this.Set<Order>();`
`245`	`245`	`}`
`246`	`246`	`}";`
`247`	`247`	`var code = @"`
`@@ -291,7 +291,7 @@ namespace AspBox`
`291`	`291`	`{`
`292`	`292`	`public class Order`
`293`	`293`	`{`
`294`		`- public string Id { get; set; }`
	`294`	`+ public string? Id { get; set; }`
`295`	`295`	`}`
`296`	`296`	`}";`
`297`	`297`
`@@ -302,7 +302,7 @@ namespace AspBox`
`302`	`302`
`303`	`303`	`public class Db : DbContext`
`304`	`304`	`{`
`305`		`- public DbSet<Order> Orders { get; set; }`
	`305`	`+ public DbSet<Order> Orders => this.Set<Order>();`
`306`	`306`	`}`
`307`	`307`	`}";`
`308`	`308`	`var code = @"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace AspNetCoreAnalyzers.Tests.ASP005ParameterSyntaxTests`
	`1`	`+namespace AspNetCoreAnalyzers.Tests.ASP005ParameterSyntaxTests`
`2`	`2`	`{`
`3`	`3`	`using Gu.Roslyn.Asserts;`
`4`	`4`	`using Microsoft.CodeAnalysis.Diagnostics;`
`@@ -40,9 +40,7 @@ public static void WithParameter(string parameter, string type)`
`40`	`40`	`var code = @"`
`41`	`41`	`namespace AspBox`
`42`	`42`	`{`
`43`		`- using System.Threading.Tasks;`
`44`	`43`	`using Microsoft.AspNetCore.Mvc;`
`45`		`- using Microsoft.EntityFrameworkCore;`
`46`	`44`
`47`	`45`	`[ApiController]`
`48`	`46`	`public class OrdersController : Controller`