Skip to content

Commit 0b0a637

Browse files
srawlinsCommit Queue
authored andcommitted
analyzer_testing: deprecate PubPackageResolutionTest.addKernelPackageDep
This shared mock did not carry its weight. It should have more use cases in order to support as a pre-made mock package. We can instead make a simple custom mock package in the one test that used it. Change-Id: I9877b114918bc42f5b72616b91085adecf6c194b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/460500 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 2fea3c0 commit 0b0a637

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

pkg/analyzer_testing/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
analysis options file used in testing specifies a `true` value for
55
`propagate-linter-exceptions`. This ensures that when tests are run,
66
exceptions that occur while processing lint rules will cause the test to fail.
7+
- Deprecate `PubPackageResolutionTest.addKernelPackageDep`. A mock kernel
8+
package can still be written with `PubPackageResolutionTest.newPackage`.
79

810
## 0.1.7
911

pkg/analyzer_testing/lib/src/analysis_rule/pub_package_resolution.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@ class PubPackageResolutionTest with MockPackagesMixin, ResourceProviderMixin {
235235
/// Adds the 'kernel' package as a dependency to the package-under-test.
236236
///
237237
/// This allows various `package:kernel/` imports to resolve.
238+
@Deprecated(
239+
'The mock kernel package is deprecated; use '
240+
'`PubPackageResolutionTest.newPackage` to make a custom mock',
241+
)
238242
bool get addKernelPackageDep => false;
239243

240244
/// Adds the 'meta' package as a dependency to the package-under-test.

pkg/linter/test/rules/erase_dart_type_extension_types_test.dart

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,21 @@ void main() {
1515
@reflectiveTest
1616
class EraseDartTypeExtensionTypesTest extends LintRuleTest {
1717
@override
18-
bool get addKernelPackageDep => true;
18+
String get lintRule => LintNames.erase_dart_type_extension_types;
1919

2020
@override
21-
String get lintRule => LintNames.erase_dart_type_extension_types;
21+
void setUp() {
22+
newPackage('kernel').addFile('lib/ast.dart', r'''
23+
library kernel.ast;
24+
25+
abstract class Node {}
26+
27+
class DartType extends Node {}
28+
29+
class InterfaceType extends DartType {}
30+
''');
31+
super.setUp();
32+
}
2233

2334
test_isDartType() async {
2435
await assertDiagnostics(

0 commit comments

Comments
 (0)