cleanup asserts (#2982)

test/rule_test_support.dart

@@ -18,6 +18,7 @@ import 'package:linter/src/rules.dart';
 import 'package:meta/meta.dart';
 import 'package:test/test.dart';
 
+export 'package:analyzer/src/dart/error/syntactic_errors.dart';
 export 'package:analyzer/src/error/codes.dart';
 export 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
 
@@ -214,32 +215,6 @@ abstract class LintRuleTest extends PubPackageResolutionTest {
       fail(buffer.toString());
     }
   }
-
-  /// todo(pq): consider migrating all calls to assertDiagnostics
-  Future<void> assertLint(String code) async {
-    addTestFile(code);
-    await resolveTestFile();
-
-    for (var error in errors) {
-      if (error.errorCode.name == lintRule) {
-        return;
-      }
-    }
-
-    fail('Expected: $lintRule, found none');
-  }
-
-  /// todo(pq): consider migrating all calls to assertDiagnostics
-  Future<void> assertNoLint(String code) async {
-    addTestFile(code);
-    await resolveTestFile();
-
-    for (var error in errors) {
-      if (error.errorCode.name == lintRule) {
-        fail(error.message);
-      }
-    }
-  }
 }
 
 class PubPackageResolutionTest extends _ContextResolutionTest {

test/rules/avoid_function_literals_in_foreach_calls.dart

@@ -18,9 +18,11 @@ class AvoidFunctionLiteralsInForeachCalls extends LintRuleTest {
   String get lintRule => 'avoid_function_literals_in_foreach_calls';
 
   test_expectedIdentifier() async {
-    // Produces an expected identifier diagnostic.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 void f(dynamic iter) => iter?.forEach(...);
-''');
+''', [
+      // No lint
+      error(ParserErrorCode.MISSING_IDENTIFIER, 38, 3),
+    ]);
   }
 }

test/rules/avoid_init_to_null.dart

@@ -18,43 +18,53 @@ class AvoidInitToNullTest extends LintRuleTest {
   String get lintRule => 'avoid_init_to_null';
 
   test_invalidAssignment_field() async {
-    // Produces an invalid_assignment compilation error.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 class X {
   int x = null;
 }
-''');
+''', [
+      // No lint
+      error(CompileTimeErrorCode.INVALID_ASSIGNMENT, 20, 4),
+    ]);
   }
 
   test_invalidAssignment_namedParameter() async {
-    // Produces an invalid_assignment compilation error.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 class X {
   X({int a: null});
 }
-''');
+''', [
+      // No lint
+      error(CompileTimeErrorCode.INVALID_ASSIGNMENT, 22, 4),
+    ]);
   }
 
   test_invalidAssignment_namedParameter_fieldFormal() async {
-    // Produces an invalid_assignment compilation error.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 class X {
   int x;
   X({this.x: null});
 }
-''');
+''', [
+      // No lint
+      error(CompileTimeErrorCode.INVALID_ASSIGNMENT, 32, 4),
+    ]);
   }
 
   test_invalidAssignment_topLevelVariable() async {
-    // Produces an invalid_assignment compilation error.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 int i = null;
-''');
+''', [
+      // No lint
+      error(CompileTimeErrorCode.INVALID_ASSIGNMENT, 8, 4),
+    ]);
   }
 
   test_nullable_topLevelVariable() async {
-    await assertLint(r'''
+    await assertDiagnostics(r'''
 int? ii = null;
-''');
+''', [
+      lint('avoid_init_to_null', 5, 9),
+    ]);
   }
 }

test/rules/overridden_fields.dart

@@ -19,25 +19,31 @@ class OverriddenFieldsTest extends LintRuleTest {
 
   /// https://github.com/dart-lang/linter/issues/2874
   test_conflictingStaticAndInstance() async {
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 class A {
   static final String field = 'value';
 }
 
 class B extends A {
   String field = 'otherValue';
 }
-''');
+''', [
+      // No lint
+    ]);
   }
 
   test_recursiveInterfaceInheritance() async {
     // Produces a recursive_interface_inheritance diagnostic.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 class A extends B {}
 class B extends A {
   int field = 0;
 }
-''');
+''', [
+      // No lint
+      error(CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE, 6, 1),
+      error(CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE, 27, 1),
+    ]);
   }
 
   test_mixinInheritsFromNotObject() async {

test/rules/prefer_asserts_in_initializer_lists.dart

@@ -18,8 +18,7 @@ class PreferAssertsInInitializerListsTest extends LintRuleTest {
   String get lintRule => 'prefer_asserts_in_initializer_lists';
 
   test_nonBoolExpression() async {
-    // Produces an non_bool_expression diagnostic.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 class A {
   bool? f;
   A() {
@@ -30,6 +29,9 @@ class A {
     });
   }
 }
-''');
+''', [
+      // No lint
+      error(CompileTimeErrorCode.NON_BOOL_EXPRESSION, 40, 50),
+    ]);
   }
 }

test/rules/prefer_const_constructors_in_immutables.dart

@@ -18,11 +18,14 @@ class PreferConstConstructorsInImmutablesTest extends LintRuleTest {
   String get lintRule => 'prefer_const_constructors_in_immutables';
 
   test_returnOfInvalidType() async {
-    // Produces an return_of_invalid_type diagnostic.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 class F {
   factory F.fc() => null;
 }
-''');
+''', [
+      // No lint
+      error(
+          CompileTimeErrorCode.RETURN_OF_INVALID_TYPE_FROM_CONSTRUCTOR, 30, 4),
+    ]);
   }
 }

test/rules/prefer_contains.dart

@@ -18,20 +18,24 @@ class PreferContainsTest extends LintRuleTest {
   String get lintRule => 'prefer_contains';
 
   test_argumentTypeNotAssignable() async {
-    // Produces an argument_type_not_assignable diagnostic.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 List<int> list = [];
 condition() {
   var next;
   while ((next = list.indexOf('{')) != -1) {}
 }
-''');
+''', [
+      // No lint
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 41, 4),
+    ]);
   }
 
   test_unnecessaryCast() async {
-    // Produces an unnecessary_cast diagnostic.
-    await assertLint(r'''
+    await assertDiagnostics(r'''
 bool le3 = ([].indexOf(1) as int) > -1;
-''');
+''', [
+      lint('prefer_contains', 11, 27),
+      error(HintCode.UNNECESSARY_CAST, 12, 20),
+    ]);
   }
 }

test/rules/prefer_spread_collections.dart

@@ -18,10 +18,13 @@ class PreferSpreadCollectionsTest extends LintRuleTest {
   String get lintRule => 'prefer_spread_collections';
 
   test_constInitializedWithNonConstantValue() async {
-    // Produces a const_initialized_with_non_constant_value diagnostic.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 const thangs = [];
 const cc = []..addAll(thangs);
-''');
+''', [
+      // No lint
+      error(CompileTimeErrorCode.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE, 30,
+          18),
+    ]);
   }
 }

test/rules/void_checks.dart

@@ -18,21 +18,25 @@ class VoidChecksTest extends LintRuleTest {
   String get lintRule => 'void_checks';
 
   test_extraPositionalArgument() async {
-    // Produces an extra_positional_arguments diagnostic.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 missing_parameter_for_argument() {
   void foo() {}
   foo(0);
 }
-''');
+''', [
+      // No lint
+      error(CompileTimeErrorCode.EXTRA_POSITIONAL_ARGUMENTS, 57, 1),
+    ]);
   }
 
   test_returnOfInvalidType() async {
-    // Produces a return_of_invalid_type diagnostic.
-    await assertNoLint(r'''
+    await assertDiagnostics(r'''
 void bug2813() {
   return 1;
 }
-''');
+''', [
+      // No lint
+      error(CompileTimeErrorCode.RETURN_OF_INVALID_TYPE_FROM_FUNCTION, 26, 1),
+    ]);
   }
 }