@@ -79,7 +79,7 @@ private void TestHelper(out int value)
7979 }
8080}" ;
8181
82- await VerifyDiagnostic ( test , DiagnosticId . AvoidVariableNamedUnderscore ) . ConfigureAwait ( false ) ;
82+ await VerifyDiagnostic ( test , DiagnosticId . AvoidUnnecessaryTypedDiscard ) . ConfigureAwait ( false ) ;
8383 }
8484
8585 [ TestMethod ]
@@ -303,23 +303,9 @@ private bool TryParseHelper(string input, out int result)
303303 }
304304}" ;
305305
306- DiagnosticResult [ ] expected = new [ ]
307- {
308- new DiagnosticResult ( )
309- {
310- Id = DiagnosticId . AvoidUnnecessaryTypedDiscard . ToId ( ) ,
311- Location = new DiagnosticResultLocation ( "Test0.cs" , 9 , 23 ) ,
312- Message = new System . Text . RegularExpressions . Regex ( ".*" ) ,
313- Severity = DiagnosticSeverity . Error ,
314- } ,
315- new DiagnosticResult ( )
316- {
317- Id = DiagnosticId . AvoidUnnecessaryTypedDiscard . ToId ( ) ,
318- Location = new DiagnosticResultLocation ( "Test0.cs" , 10 , 33 ) ,
319- Message = new System . Text . RegularExpressions . Regex ( ".*" ) ,
320- Severity = DiagnosticSeverity . Error ,
321- }
322- } ;
306+ DiagnosticResult [ ] expected = CreateTypedDiscardDiagnostics (
307+ ( 9 , 23 ) , ( 10 , 33 )
308+ ) ;
323309
324310 await VerifyDiagnostic ( test , expected ) . ConfigureAwait ( false ) ;
325311 }
@@ -384,23 +370,9 @@ private bool TryParseInt(string input, out int result)
384370 }
385371}" ;
386372
387- DiagnosticResult [ ] expected = new [ ]
388- {
389- new DiagnosticResult ( )
390- {
391- Id = DiagnosticId . AvoidUnnecessaryTypedDiscard . ToId ( ) ,
392- Location = new DiagnosticResultLocation ( "Test0.cs" , 9 , 36 ) ,
393- Message = new System . Text . RegularExpressions . Regex ( ".*" ) ,
394- Severity = DiagnosticSeverity . Error ,
395- } ,
396- new DiagnosticResult ( )
397- {
398- Id = DiagnosticId . AvoidUnnecessaryTypedDiscard . ToId ( ) ,
399- Location = new DiagnosticResultLocation ( "Test0.cs" , 10 , 46 ) ,
400- Message = new System . Text . RegularExpressions . Regex ( ".*" ) ,
401- Severity = DiagnosticSeverity . Error ,
402- }
403- } ;
373+ DiagnosticResult [ ] expected = CreateTypedDiscardDiagnostics (
374+ ( 9 , 36 ) , ( 10 , 45 )
375+ ) ;
404376
405377 await VerifyDiagnostic ( test , expected ) . ConfigureAwait ( false ) ;
406378 }
@@ -436,5 +408,21 @@ private bool Parse(string input, out string result)
436408
437409 await VerifySuccessfulCompilation ( test ) . ConfigureAwait ( false ) ;
438410 }
411+
412+ private static DiagnosticResult [ ] CreateTypedDiscardDiagnostics ( params ( int line , int column ) [ ] locations )
413+ {
414+ var results = new DiagnosticResult [ locations . Length ] ;
415+ for ( var i = 0 ; i < locations . Length ; i ++ )
416+ {
417+ results [ i ] = new DiagnosticResult ( )
418+ {
419+ Id = DiagnosticId . AvoidUnnecessaryTypedDiscard . ToId ( ) ,
420+ Location = new DiagnosticResultLocation ( "Test0.cs" , locations [ i ] . line , locations [ i ] . column ) ,
421+ Message = new System . Text . RegularExpressions . Regex ( ".*" ) ,
422+ Severity = DiagnosticSeverity . Error ,
423+ } ;
424+ }
425+ return results ;
426+ }
439427 }
440428}
0 commit comments