Skip to content

Commit 7faf496

Browse files
scheglovCommit Queue
authored andcommitted
Simplify RemovedLintUseTest and ReplacedLintUseTest tearDown().
We unregister all lint rules in `ContextResolutionTest`, so no need to do this manually in individual tests. Change-Id: I7856c7cec5e077b7dd764c75a88c40623884a5cc Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/463980 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 388a92b commit 7faf496

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

pkg/analyzer/test/src/diagnostics/removed_lint_use_test.dart

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
6-
import 'package:analyzer/src/lint/registry.dart';
76
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
8-
import 'package:linter/src/rules.dart' as linter;
97
import 'package:test_reflective_loader/test_reflective_loader.dart';
108

119
import '../dart/resolution/context_collection_resolution.dart';
@@ -22,7 +20,6 @@ class RemovedLintUseTest extends PubPackageResolutionTest
2220
@override
2321
void setUp() {
2422
super.setUp();
25-
linter.registerLintRules();
2623

2724
// TODO(paulberry): remove as part of fixing
2825
// https://github.com/dart-lang/sdk/issues/62040.
@@ -33,14 +30,6 @@ linter:
3330
''');
3431
}
3532

36-
@override
37-
Future<void> tearDown() {
38-
for (var rule in Registry.ruleRegistry.rules) {
39-
Registry.ruleRegistry.unregisterLintRule(rule);
40-
}
41-
return super.tearDown();
42-
}
43-
4433
test_file() async {
4534
await assertErrorsInCode(
4635
r'''

pkg/analyzer/test/src/diagnostics/replaced_lint_use_test.dart

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import 'package:analyzer/analysis_rule/rule_state.dart';
77
import 'package:analyzer/src/diagnostic/diagnostic.dart'
88
as diag
99
hide removedLint;
10-
import 'package:analyzer/src/lint/registry.dart';
1110
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
12-
import 'package:linter/src/rules.dart' as linter;
1311
import 'package:test_reflective_loader/test_reflective_loader.dart';
1412

1513
import '../dart/resolution/context_collection_resolution.dart';
@@ -26,7 +24,6 @@ class ReplacedLintUseTest extends PubPackageResolutionTest
2624
@override
2725
void setUp() {
2826
super.setUp();
29-
linter.registerLintRules();
3027

3128
// TODO(paulberry): remove as part of fixing
3229
// https://github.com/dart-lang/sdk/issues/62040.
@@ -53,15 +50,6 @@ linter:
5350
);
5451
}
5552

56-
@override
57-
Future<void> tearDown() {
58-
unregisterLintRules();
59-
for (var rule in Registry.ruleRegistry.rules) {
60-
Registry.ruleRegistry.unregisterLintRule(rule);
61-
}
62-
return super.tearDown();
63-
}
64-
6553
test_file() async {
6654
await assertErrorsInCode(
6755
r'''

0 commit comments

Comments
 (0)