analyzer: Use Diagnostic instead of deprecated AnalysisError in tests

Change-Id: I0fdc8664f1bfd0b887dedd3c7399046ec6ccb3b5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/426901
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: srawlins

pkg/analyzer/test/error/error_listener_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -17,29 +17,29 @@ main() {
 class RecordingErrorListenerTest {
   test_orderedAsReported() {
     var listener = RecordingErrorListener();
-    listener.onError(_MockAnalysisError(expectedIndex: 0, hashCode: 1));
-    listener.onError(_MockAnalysisError(expectedIndex: 1, hashCode: 10));
-    listener.onError(_MockAnalysisError(expectedIndex: 2, hashCode: -50));
-    listener.onError(_MockAnalysisError(expectedIndex: 3, hashCode: 20));
-    listener.onError(_MockAnalysisError(expectedIndex: 4, hashCode: 1));
+    listener.onError(_MockDiagnostic(expectedIndex: 0, hashCode: 1));
+    listener.onError(_MockDiagnostic(expectedIndex: 1, hashCode: 10));
+    listener.onError(_MockDiagnostic(expectedIndex: 2, hashCode: -50));
+    listener.onError(_MockDiagnostic(expectedIndex: 3, hashCode: 20));
+    listener.onError(_MockDiagnostic(expectedIndex: 4, hashCode: 1));
 
     // Expect the errors are returned in the order they are reported, and not
     // affected by their hashcodes.
     expect(
-      listener.errors.cast<_MockAnalysisError>().map((e) => e.expectedIndex),
+      listener.errors.cast<_MockDiagnostic>().map((e) => e.expectedIndex),
       [0, 1, 2, 3, 4],
     );
   }
 }
 
-/// An [AnalysisError] that allows setting an explicit hash code.
-class _MockAnalysisError implements AnalysisError {
+/// An [Diagnostic] that allows setting an explicit hash code.
+class _MockDiagnostic implements Diagnostic {
   @override
   int hashCode;
 
   int expectedIndex;
 
-  _MockAnalysisError({required this.expectedIndex, required this.hashCode});
+  _MockDiagnostic({required this.expectedIndex, required this.hashCode});
 
   @override
   dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);

pkg/analyzer/test/generated/test_support.dart

@@ -112,7 +112,7 @@ class ExpectedError {
 
   /// Return `true` if the [error] matches this description of what it's
   /// expected to be.
-  bool matches(AnalysisError error) {
+  bool matches(Diagnostic error) {
     if (error.offset != offset ||
         error.length != length ||
         error.errorCode != code) {
@@ -151,7 +151,7 @@ class GatheringErrorListener implements AnalysisErrorListener {
   final bool checkRanges;
 
   /// A list containing the errors that were collected.
-  final List<AnalysisError> _errors = [];
+  final List<Diagnostic> _errors = [];
 
   /// A table mapping sources to the line information for the source.
   final Map<Source, LineInfo> _lineInfoMap = {};
@@ -160,14 +160,14 @@ class GatheringErrorListener implements AnalysisErrorListener {
   GatheringErrorListener({this.checkRanges = true});
 
   /// Return the errors that were collected.
-  List<AnalysisError> get errors => _errors;
+  List<Diagnostic> get errors => _errors;
 
   /// Return `true` if at least one error has been gathered.
   bool get hasErrors => _errors.isNotEmpty;
 
   /// Add the given [errors] to this listener.
-  void addAll(List<AnalysisError> errors) {
-    for (AnalysisError error in errors) {
+  void addAll(List<Diagnostic> errors) {
+    for (Diagnostic error in errors) {
       onError(error);
     }
   }
@@ -184,7 +184,7 @@ class GatheringErrorListener implements AnalysisErrorListener {
     //
     // Match actual errors to expected errors.
     //
-    List<AnalysisError> unmatchedActual = errors.toList();
+    List<Diagnostic> unmatchedActual = errors.toList();
     List<ExpectedError> unmatchedExpected = expectedErrors.toList();
     int actualIndex = 0;
     while (actualIndex < unmatchedActual.length) {
@@ -242,7 +242,7 @@ class GatheringErrorListener implements AnalysisErrorListener {
         buffer.writeln();
       }
       buffer.writeln('Found but did not expect:');
-      for (AnalysisError actual in unmatchedActual) {
+      for (Diagnostic actual in unmatchedActual) {
         buffer.write('  ');
         buffer.write(actual.errorCode);
         buffer.write(' [');
@@ -265,7 +265,7 @@ class GatheringErrorListener implements AnalysisErrorListener {
         buffer.writeln('To accept the current state, expect no errors.');
       } else {
         buffer.writeln('To accept the current state, expect:');
-        for (AnalysisError actual in errors) {
+        for (Diagnostic actual in errors) {
           List<DiagnosticMessage> contextMessages = actual.contextMessages;
           buffer.write('  error(');
           buffer.write(actual.errorCode);
@@ -328,11 +328,11 @@ class GatheringErrorListener implements AnalysisErrorListener {
     //
     // Compute the actual number of each type of error.
     //
-    Map<DiagnosticCode, List<AnalysisError>> errorsByCode =
-        <DiagnosticCode, List<AnalysisError>>{};
-    for (AnalysisError error in _errors) {
+    Map<DiagnosticCode, List<Diagnostic>> errorsByCode =
+        <DiagnosticCode, List<Diagnostic>>{};
+    for (Diagnostic error in _errors) {
       errorsByCode
-          .putIfAbsent(error.errorCode, () => <AnalysisError>[])
+          .putIfAbsent(error.errorCode, () => <Diagnostic>[])
           .add(error);
     }
     //
@@ -365,9 +365,9 @@ class GatheringErrorListener implements AnalysisErrorListener {
     //
     errorsByCode.forEach((
       DiagnosticCode code,
-      List<AnalysisError> actualErrors,
+      List<Diagnostic> actualDiagnostics,
     ) {
-      int actualCount = actualErrors.length;
+      int actualCount = actualDiagnostics.length;
       if (buffer.length == 0) {
         buffer.write("Expected ");
       } else {
@@ -378,8 +378,8 @@ class GatheringErrorListener implements AnalysisErrorListener {
       buffer.write(", found ");
       buffer.write(actualCount);
       buffer.write(" (");
-      for (int i = 0; i < actualErrors.length; i++) {
-        AnalysisError error = actualErrors[i];
+      for (int i = 0; i < actualDiagnostics.length; i++) {
+        Diagnostic error = actualDiagnostics[i];
         if (i > 0) {
           buffer.write(", ");
         }
@@ -408,7 +408,7 @@ class GatheringErrorListener implements AnalysisErrorListener {
     }
     int actualErrorCount = 0;
     int actualWarningCount = 0;
-    for (AnalysisError error in _errors) {
+    for (Diagnostic error in _errors) {
       if (error.errorCode.errorSeverity == DiagnosticSeverity.ERROR) {
         actualErrorCount++;
       } else {
@@ -436,7 +436,7 @@ class GatheringErrorListener implements AnalysisErrorListener {
   LineInfo? getLineInfo(Source source) => _lineInfoMap[source];
 
   @override
-  void onError(AnalysisError error) {
+  void onError(Diagnostic error) {
     _errors.add(error);
   }
 

pkg/analyzer/test/id_tests/constant_test.dart

@@ -11,7 +11,7 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/src/dart/analysis/experiments.dart';
 import 'package:analyzer/src/dart/analysis/testing_data.dart';
 import 'package:analyzer/src/error/codes.dart';
@@ -55,9 +55,9 @@ class ConstantsDataComputer extends DataComputer<String> {
     TestConfig config,
     TestingData testingData,
     Id id,
-    List<AnalysisError> errors,
+    List<Diagnostic> diagnostics,
   ) {
-    var errorCodes = errors
+    var errorCodes = diagnostics
         .map((e) => e.errorCode)
         .where(
           (errorCode) =>

pkg/analyzer/test/id_tests/definite_assignment_test.dart

@@ -8,7 +8,7 @@ import 'package:_fe_analyzer_shared/src/testing/id.dart' show ActualData, Id;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/src/dart/analysis/testing_data.dart';
 import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
 import 'package:analyzer/src/error/codes.dart';
@@ -49,9 +49,9 @@ class _DefiniteAssignmentDataComputer extends DataComputer<String> {
     TestConfig config,
     TestingData testingData,
     Id id,
-    List<AnalysisError> errors,
+    List<Diagnostic> diagnostics,
   ) {
-    var errorCodes = errors
+    var errorCodes = diagnostics
         .map((e) => e.errorCode)
         .where(
           (errorCode) =>

pkg/analyzer/test/id_tests/definite_unassignment_test.dart

@@ -8,7 +8,7 @@ import 'package:_fe_analyzer_shared/src/testing/id.dart' show ActualData, Id;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/src/dart/analysis/testing_data.dart';
 import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
 import 'package:analyzer/src/error/codes.dart';
@@ -49,9 +49,9 @@ class _DefiniteAssignmentDataComputer extends DataComputer<String> {
     TestConfig config,
     TestingData testingData,
     Id id,
-    List<AnalysisError> errors,
+    List<Diagnostic> diagnostics,
   ) {
-    var errorCodes = errors
+    var errorCodes = diagnostics
         .map((e) => e.errorCode)
         .where(
           (errorCode) =>

pkg/analyzer/test/id_tests/inheritance_test.dart

@@ -9,7 +9,7 @@ import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/src/dart/analysis/testing_data.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/util/ast_data_extractor.dart';
@@ -63,9 +63,9 @@ class _InheritanceDataComputer extends DataComputer<String> {
     TestConfig config,
     TestingData testingData,
     Id id,
-    List<AnalysisError> errors,
+    List<Diagnostic> diagnostics,
   ) {
-    return errors.map((e) => e.errorCode).join(',');
+    return diagnostics.map((e) => e.errorCode).join(',');
   }
 
   @override

pkg/analyzer/test/source/error_processor_test.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/analysis/analysis_options.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/source/error_processor.dart';
 import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
@@ -16,7 +17,7 @@ import '../generated/test_support.dart';
 import '../src/util/yaml_test.dart';
 
 main() {
-  AnalysisError invalid_assignment = AnalysisError.tmp(
+  Diagnostic invalid_assignment = Diagnostic.tmp(
     source: TestSource(),
     offset: 0,
     length: 1,
@@ -27,7 +28,7 @@ main() {
     ],
   );
 
-  AnalysisError assignment_of_do_not_store = AnalysisError.tmp(
+  Diagnostic assignment_of_do_not_store = Diagnostic.tmp(
     source: TestSource(),
     offset: 0,
     length: 1,
@@ -37,7 +38,7 @@ main() {
     ],
   );
 
-  AnalysisError unused_local_variable = AnalysisError.tmp(
+  Diagnostic unused_local_variable = Diagnostic.tmp(
     source: TestSource(),
     offset: 0,
     length: 1,
@@ -47,7 +48,7 @@ main() {
     ],
   );
 
-  AnalysisError use_of_void_result = AnalysisError.tmp(
+  Diagnostic use_of_void_result = Diagnostic.tmp(
     source: TestSource(),
     offset: 0,
     length: 1,
@@ -56,7 +57,7 @@ main() {
 
   // We in-line a lint code here in order to avoid adding a dependency on the
   // linter package.
-  AnalysisError annotate_overrides = AnalysisError.tmp(
+  Diagnostic annotate_overrides = Diagnostic.tmp(
     source: TestSource(),
     offset: 0,
     length: 1,
@@ -188,7 +189,7 @@ class _TestContext {
     );
   }
 
-  ErrorProcessor? getProcessor(AnalysisError error) {
-    return ErrorProcessor.getProcessor(analysisOptions, error);
+  ErrorProcessor? getProcessor(Diagnostic diagnostic) {
+    return ErrorProcessor.getProcessor(analysisOptions, diagnostic);
   }
 }

pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/error/codes.dart';
@@ -51,7 +51,7 @@ int b = a;
 ''');
 
     // `strict-cast: false`, so no errors.
-    assertErrorsInList(await _computeTestFileErrors(), []);
+    assertErrorsInList(await _computeTestFileDiagnostics(), []);
 
     // Configure `strict-casts: true`.
     await disposeAnalysisContextCollection();
@@ -60,7 +60,7 @@ int b = a;
     );
 
     // `strict-cast: true`, so has errors.
-    assertErrorsInList(await _computeTestFileErrors(), [
+    assertErrorsInList(await _computeTestFileDiagnostics(), [
       error(CompileTimeErrorCode.INVALID_ASSIGNMENT, 23, 1),
     ]);
   }
@@ -273,7 +273,7 @@ import 'package:aaa/a.dart';
 
     // We don't have a dependency on `package:aaa`, so there is a lint.
     _assertHasLintReported(
-      await _computeTestFileErrors(),
+      await _computeTestFileDiagnostics(),
       'depend_on_referenced_packages',
     );
 
@@ -290,7 +290,7 @@ import 'package:aaa/a.dart';
     );
 
     // With dependency on `package:aaa` added, no lint is reported.
-    expect(await _computeTestFileErrors(), isEmpty);
+    expect(await _computeTestFileDiagnostics(), isEmpty);
 
     // Lints don't affect summaries, nothing should be linked.
     _assertNoLinkedCycles();
@@ -343,9 +343,9 @@ void f() {
     }
   }
 
-  void _assertHasLintReported(List<AnalysisError> errors, String name) {
+  void _assertHasLintReported(List<Diagnostic> diagnostics, String name) {
     var matching =
-        errors.where((element) {
+        diagnostics.where((element) {
           var errorCode = element.errorCode;
           return errorCode is LintCode && errorCode.name == name;
         }).toList();
@@ -358,11 +358,11 @@ void f() {
 
   /// Note that we intentionally use this method, we don't want to use
   /// [resolveFile] instead. Resolving a file will force to produce its
-  /// resolved AST, and as a result to recompute the errors.
+  /// resolved AST, and as a result to recompute the diagnostics.
   ///
-  /// But this method is used to check returning errors from the cache, or
+  /// But this method is used to check returning diagnostics from the cache, or
   /// recomputing when the cache key is expected to be different.
-  Future<List<AnalysisError>> _computeTestFileErrors() async {
+  Future<List<Diagnostic>> _computeTestFileDiagnostics() async {
     var errorsResult =
         await contextFor(testFile).currentSession.getErrors(testFile.path)
             as ErrorsResult;