From cf44f0c780c36ccf0be88f0453822993c74f0b8a Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Wed, 22 Nov 2023 01:24:11 +0000 Subject: [PATCH] Analyzer: unregister test rules in tearDown Change-Id: I8aae2ce4d75af0e47b900a149ff73dcb6064a26e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/337613 Commit-Queue: Samuel Rawlins Reviewed-by: Konstantin Shcheglov --- .../completion/yaml/analysis_options_generator_test.dart | 2 +- .../fix/analysis_options/remove_lint_test.dart | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/analysis_server/test/src/services/completion/yaml/analysis_options_generator_test.dart b/pkg/analysis_server/test/src/services/completion/yaml/analysis_options_generator_test.dart index 91c7348b538..38e2d8a71d6 100644 --- a/pkg/analysis_server/test/src/services/completion/yaml/analysis_options_generator_test.dart +++ b/pkg/analysis_server/test/src/services/completion/yaml/analysis_options_generator_test.dart @@ -19,7 +19,7 @@ void main() { @reflectiveTest class AnalysisOptionsGeneratorTest extends YamlGeneratorTest { - // Keep track of any added rules so they can be unregistered at tearDown + // Keep track of any added rules so they can be unregistered in `tearDown`. var addedRules = []; @override diff --git a/pkg/analysis_server/test/src/services/correction/fix/analysis_options/remove_lint_test.dart b/pkg/analysis_server/test/src/services/correction/fix/analysis_options/remove_lint_test.dart index 5dda0542553..459b7336d14 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/analysis_options/remove_lint_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/analysis_options/remove_lint_test.dart @@ -28,9 +28,16 @@ class DeprecatedRule extends LintRule { @reflectiveTest class RemoveLintTest extends AnalysisOptionsFixTest { + // Keep track of this rule so it can be unregistered in `tearDown`. + var deprecatedRule = DeprecatedRule(); + void setUp() { registerLintRules(); - Registry.ruleRegistry.register(DeprecatedRule()); + Registry.ruleRegistry.register(deprecatedRule); + } + + void tearDown() { + Registry.ruleRegistry.unregister(deprecatedRule); } Future test_deprecated() async {