1
- // Copyright (c) .NET Foundation. All rights reserved.
1
+ // Copyright (c) .NET Foundation. All rights reserved.
2
2
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3
3
4
- using System ;
5
4
using System . Collections . Concurrent ;
6
5
using System . Linq ;
7
6
using System . Threading . Tasks ;
8
7
using Microsoft . AspNetCore . Analyzer . Testing ;
9
- using Microsoft . AspNetCore . Mvc ;
10
8
using Microsoft . CodeAnalysis ;
11
9
using Xunit ;
12
10
13
11
namespace Microsoft . AspNetCore . Analyzers
14
12
{
15
- public class StartupAnalyzerTest
13
+ public class StartupAnalyzerTest : AnalyzerTestBase
16
14
{
17
15
public StartupAnalyzerTest ( )
18
16
{
19
17
StartupAnalyzer = new StartupAnalzyer ( ) ;
20
18
21
- Runner = new MvcDiagnosticAnalyzerRunner ( StartupAnalyzer ) ;
19
+ Runner = new AnalyzersDiagnosticAnalyzerRunner ( StartupAnalyzer ) ;
22
20
23
21
Analyses = new ConcurrentBag < object > ( ) ;
24
22
ConfigureServicesMethods = new ConcurrentBag < IMethodSymbol > ( ) ;
@@ -32,7 +30,7 @@ public StartupAnalyzerTest()
32
30
33
31
private StartupAnalzyer StartupAnalyzer { get ; }
34
32
35
- private MvcDiagnosticAnalyzerRunner Runner { get ; }
33
+ private AnalyzersDiagnosticAnalyzerRunner Runner { get ; }
36
34
37
35
private ConcurrentBag < object > Analyses { get ; }
38
36
@@ -44,7 +42,7 @@ public StartupAnalyzerTest()
44
42
public async Task StartupAnalyzer_FindsStartupMethods_StartupSignatures_Standard ( )
45
43
{
46
44
// Arrange
47
- var source = ReadSource ( "StartupSignatures_Standard" ) ;
45
+ var source = Read ( "StartupSignatures_Standard" ) ;
48
46
49
47
// Act
50
48
var diagnostics = await Runner . GetDiagnosticsAsync ( source . Source ) ;
@@ -60,7 +58,7 @@ public async Task StartupAnalyzer_FindsStartupMethods_StartupSignatures_Standard
60
58
public async Task StartupAnalyzer_FindsStartupMethods_StartupSignatures_MoreVariety ( )
61
59
{
62
60
// Arrange
63
- var source = ReadSource ( "StartupSignatures_MoreVariety" ) ;
61
+ var source = Read ( "StartupSignatures_MoreVariety" ) ;
64
62
65
63
// Act
66
64
var diagnostics = await Runner . GetDiagnosticsAsync ( source . Source ) ;
@@ -82,7 +80,7 @@ public async Task StartupAnalyzer_FindsStartupMethods_StartupSignatures_MoreVari
82
80
public async Task StartupAnalyzer_MvcOptionsAnalysis_UseMvc_FindsEndpointRoutingDisabled ( )
83
81
{
84
82
// Arrange
85
- var source = ReadSource ( "MvcOptions_UseMvcWithDefaultRouteAndEndpointRoutingDisabled" ) ;
83
+ var source = Read ( "MvcOptions_UseMvcWithDefaultRouteAndEndpointRoutingDisabled" ) ;
86
84
87
85
// Act
88
86
var diagnostics = await Runner . GetDiagnosticsAsync ( source . Source ) ;
@@ -102,7 +100,7 @@ public async Task StartupAnalyzer_MvcOptionsAnalysis_UseMvc_FindsEndpointRouting
102
100
public async Task StartupAnalyzer_MvcOptionsAnalysis_AddMvcOptions_FindsEndpointRoutingDisabled ( )
103
101
{
104
102
// Arrange
105
- var source = ReadSource ( "MvcOptions_UseMvcWithDefaultRouteAndAddMvcOptionsEndpointRoutingDisabled" ) ;
103
+ var source = Read ( "MvcOptions_UseMvcWithDefaultRouteAndAddMvcOptionsEndpointRoutingDisabled" ) ;
106
104
107
105
// Act
108
106
var diagnostics = await Runner . GetDiagnosticsAsync ( source . Source ) ;
@@ -125,7 +123,7 @@ public async Task StartupAnalyzer_MvcOptionsAnalysis_AddMvcOptions_FindsEndpoint
125
123
public async Task StartupAnalyzer_MvcOptionsAnalysis_FindsEndpointRoutingEnabled ( string sourceFileName , string mvcMiddlewareName )
126
124
{
127
125
// Arrange
128
- var source = ReadSource ( sourceFileName ) ;
126
+ var source = Read ( sourceFileName ) ;
129
127
130
128
// Act
131
129
var diagnostics = await Runner . GetDiagnosticsAsync ( source . Source ) ;
@@ -151,7 +149,7 @@ public async Task StartupAnalyzer_MvcOptionsAnalysis_FindsEndpointRoutingEnabled
151
149
public async Task StartupAnalyzer_MvcOptionsAnalysis_MultipleMiddleware ( )
152
150
{
153
151
// Arrange
154
- var source = ReadSource ( "MvcOptions_UseMvcWithOtherMiddleware" ) ;
152
+ var source = Read ( "MvcOptions_UseMvcWithOtherMiddleware" ) ;
155
153
156
154
// Act
157
155
var diagnostics = await Runner . GetDiagnosticsAsync ( source . Source ) ;
@@ -183,7 +181,7 @@ public async Task StartupAnalyzer_MvcOptionsAnalysis_MultipleMiddleware()
183
181
public async Task StartupAnalyzer_MvcOptionsAnalysis_MultipleUseMvc ( )
184
182
{
185
183
// Arrange
186
- var source = ReadSource ( "MvcOptions_UseMvcMultiple" ) ;
184
+ var source = Read ( "MvcOptions_UseMvcMultiple" ) ;
187
185
188
186
// Act
189
187
var diagnostics = await Runner . GetDiagnosticsAsync ( source . Source ) ;
@@ -215,7 +213,7 @@ public async Task StartupAnalyzer_MvcOptionsAnalysis_MultipleUseMvc()
215
213
public async Task StartupAnalyzer_ServicesAnalysis_CallBuildServiceProvider ( )
216
214
{
217
215
// Arrange
218
- var source = ReadSource ( "ConfigureServices_BuildServiceProvider" ) ;
216
+ var source = Read ( "ConfigureServices_BuildServiceProvider" ) ;
219
217
220
218
// Act
221
219
var diagnostics = await Runner . GetDiagnosticsAsync ( source . Source ) ;
@@ -230,10 +228,5 @@ public async Task StartupAnalyzer_ServicesAnalysis_CallBuildServiceProvider()
230
228
AnalyzerAssert . DiagnosticLocation ( source . MarkerLocations [ "MM1" ] , diagnostic . Location ) ;
231
229
} ) ;
232
230
}
233
-
234
- private TestSource ReadSource ( string fileName )
235
- {
236
- return MvcTestSource . Read ( nameof ( StartupAnalyzerTest ) , fileName ) ;
237
- }
238
231
}
239
232
}
0 commit comments