From 34092249233b840dd2c8c30fc116dcfda89209de Mon Sep 17 00:00:00 2001
From: Konstantin Shcheglov <scheglov@google.com>
Date: Fri, 1 May 2026 08:18:53 -0700
Subject: [PATCH] CQ. Use actual diagnostics in analyzer_cli OptionsTest.

Change-Id: I94c2f1b77ad948a6ac612626c7264b6d1cfa901c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/499664
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>
---
 .../analysis_options.yaml                     |  2 +-
 .../data/options_tests_project/test_file.dart |  7 ++-
 pkg/analyzer_cli/test/driver_test.dart        | 58 +++----------------
 3 files changed, 14 insertions(+), 53 deletions(-)

diff --git a/pkg/analyzer_cli/test/data/options_tests_project/analysis_options.yaml b/pkg/analyzer_cli/test/data/options_tests_project/analysis_options.yaml
index 9bed1c4cfa4..a23c612ddba 100644
--- a/pkg/analyzer_cli/test/data/options_tests_project/analysis_options.yaml
+++ b/pkg/analyzer_cli/test/data/options_tests_project/analysis_options.yaml
@@ -2,7 +2,7 @@ analyzer:
   strong-mode: true
   errors:
     unused_local_variable: ignore
-    assignment_of_do_not_store: error
+    dead_code: error
     undefined_function: warning
   language:
     enableSuperMixins: true
diff --git a/pkg/analyzer_cli/test/data/options_tests_project/test_file.dart b/pkg/analyzer_cli/test/data/options_tests_project/test_file.dart
index 1160fe12ecd..e319aaacf1f 100644
--- a/pkg/analyzer_cli/test/data/options_tests_project/test_file.dart
+++ b/pkg/analyzer_cli/test/data/options_tests_project/test_file.dart
@@ -5,7 +5,8 @@
 library analyzer_cli.test.data.options_test_project.test_file;
 
 int foo() {
-  baz(); // Undefined function.
-
-  // Missing return
+  int x = 0; // Unused local variable.
+  bar(); // Undefined function.
+  return 0;
+  print('dead'); // Dead code.
 }
diff --git a/pkg/analyzer_cli/test/driver_test.dart b/pkg/analyzer_cli/test/driver_test.dart
index 66e48755e85..649a5fc8d0a 100644
--- a/pkg/analyzer_cli/test/driver_test.dart
+++ b/pkg/analyzer_cli/test/driver_test.dart
@@ -4,13 +4,8 @@
 
 import 'dart:io';
 
-import 'package:analyzer/diagnostic/diagnostic.dart';
-import 'package:analyzer/error/error.dart';
-import 'package:analyzer/source/error_processor.dart';
-import 'package:analyzer/source/source.dart';
 import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
 import 'package:analyzer/src/context/source.dart';
-import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 import 'package:analyzer/src/util/sdk.dart';
@@ -357,11 +352,6 @@ flutter:
 class OptionsTest extends BaseTest {
   String get analysisOptionsYaml => file_paths.analysisOptionsYaml;
 
-  List<ErrorProcessor> get processors => analysisOptions.errorProcessors;
-
-  ErrorProcessor processorFor(Diagnostic diagnostic) =>
-      processors.firstWhere((p) => p.appliesTo(diagnostic));
-
   /// If a file is specified explicitly, it should be analyzed, even if
   /// it is excluded. Excludes work when an including directory is specified.
   Future<void> test_analysisOptions_excluded_requested() async {
@@ -426,38 +416,18 @@ class OptionsTest extends BaseTest {
 
   Future<void> test_basic_filters() async {
     await _driveBasic();
-    expect(processors, hasLength(3));
+
+    var stdout = bulletToDash(outSink);
 
     // unused_local_variable: ignore
-    var unused_local_variable = Diagnostic.tmp(
-      source: TestSource(),
-      offset: 0,
-      length: 1,
-      diagnosticCode: diag.unusedLocalVariable,
-      arguments: [
-        ['x'],
-      ],
-    );
-    expect(processorFor(unused_local_variable).severity, isNull);
+    expect(stdout, isNot(contains('Unused local variable')));
+
+    // dead_code: error
+    expect(stdout, contains('error - Dead code'));
+
+    // undefined_function: warning
+    expect(stdout, contains("warning - The function 'bar' isn't defined."));
 
-    // assignment_of_do_not_store: error
-    var assignment_of_do_not_store = Diagnostic.tmp(
-      source: TestSource(),
-      offset: 0,
-      length: 1,
-      diagnosticCode: diag.assignmentOfDoNotStore,
-      arguments: [
-        ['x'],
-      ],
-    );
-    expect(
-      processorFor(assignment_of_do_not_store).severity,
-      DiagnosticSeverity.ERROR,
-    );
-    expect(
-      bulletToDash(outSink),
-      contains('error - The body might complete normally'),
-    );
     expect(outSink.toString(), contains('1 error and 1 warning found.'));
   }
 
@@ -501,13 +471,3 @@ class OptionsTest extends BaseTest {
     expect(outSink.toString(), contains('1 error found.'));
   }
 }
-
-class TestSource implements Source {
-  TestSource();
-
-  @override
-  String get fullName => '/package/lib/test.dart';
-
-  @override
-  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
-}