Skip to content

Commit 938b861

Browse files
authored
[record_use] Adopt DefinitionKind in test data (dart-lang#3118)
1 parent e2f959d commit 938b861

6 files changed

Lines changed: 57 additions & 15 deletions

File tree

‎pkgs/hooks/example/link/package_with_assets/hook/link.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import 'package:record_use/record_use.dart';
1313

1414
const someMethodDefinition = Definition(
1515
'package:package_with_assets/package_with_assets.dart',
16-
[Name('someMethod')],
16+
[Name(kind: DefinitionKind.methodKind, 'someMethod')],
1717
);
1818

1919
const someOtherMethodDefinition = Definition(
2020
'package:package_with_assets/package_with_assets.dart',
21-
[Name('someOtherMethod')],
21+
[Name(kind: DefinitionKind.methodKind, 'someOtherMethod')],
2222
);
2323

2424
final assetMapping = {

‎pkgs/hooks_runner/test/build_runner/resources_test.dart‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,12 @@ void main() async {
121121
final _pirateAdventureRecordings = Recordings(
122122
metadata: Metadata(version: Version(1, 0, 0), comment: 'Filtering test'),
123123
calls: {
124-
const Definition('package:pirate_speak/src/definitions.dart', [
125-
Name('pirateSpeak'),
124+
Definition('package:pirate_speak/src/definitions.dart', [
125+
Name(
126+
kind: DefinitionKind.methodKind,
127+
'pirateSpeak',
128+
disambiguators: {DefinitionDisambiguator.staticDisambiguator},
129+
),
126130
]): [
127131
const CallWithArguments(
128132
loadingUnit: 'root',
@@ -135,8 +139,12 @@ final _pirateAdventureRecordings = Recordings(
135139
namedArguments: {},
136140
),
137141
],
138-
const Definition('package:pirate_technology/src/definitions.dart', [
139-
Name('useCannon'),
142+
Definition('package:pirate_technology/src/definitions.dart', [
143+
Name(
144+
kind: DefinitionKind.methodKind,
145+
'useCannon',
146+
disambiguators: {DefinitionDisambiguator.staticDisambiguator},
147+
),
140148
]): [
141149
const CallWithArguments(
142150
loadingUnit: 'root',

‎pkgs/hooks_runner/test_data/pirate_speak/hook/link.dart‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,15 @@ Future<Recordings> _loadRecordings(Uri file) async {
5252
Set<String> _extractUsedPhrases(Recordings recordings) {
5353
final usages = RecordedUsages.fromJson(recordings.toJson());
5454
final usedPhrases = <String>{};
55-
const pirateSpeakDef = Definition(
55+
final pirateSpeakDef = Definition(
5656
'package:pirate_speak/src/definitions.dart',
57-
[Name('pirateSpeak')],
57+
[
58+
Name(
59+
kind: DefinitionKind.methodKind,
60+
'pirateSpeak',
61+
disambiguators: {DefinitionDisambiguator.staticDisambiguator},
62+
),
63+
],
5864
);
5965

6066
for (final call in usages.constArgumentsFor(pirateSpeakDef)) {

‎pkgs/record_use/example/api/usage_link.dart‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,28 @@ import 'dart:io';
1111
import 'package:hooks/hooks.dart';
1212
import 'package:record_use/record_use_internal.dart';
1313

14-
const methodId = Definition(
14+
final methodId = Definition(
1515
'package:pirate_speak/pirate_speak.dart',
1616
[
17-
Name('PirateTranslator'),
18-
Name(''),
17+
const Name(
18+
kind: DefinitionKind.classKind,
19+
'PirateTranslator',
20+
),
21+
Name(
22+
kind: DefinitionKind.methodKind,
23+
'speak',
24+
disambiguators: {
25+
DefinitionDisambiguator.staticDisambiguator,
26+
},
27+
),
1928
],
2029
);
2130

2231
const classId = Definition(
2332
'package:pirate_technology/pirate_technology.dart',
2433
[
2534
Name(
35+
kind: DefinitionKind.classKind,
2636
'PirateShip',
2737
),
2838
],

‎pkgs/record_use/test_data/drop_data_asset/hook/link.dart‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ void main(List<String> arguments) async {
3131
final calls = usages.constArgumentsFor(
3232
Definition(
3333
'package:${input.packageName}/src/${input.packageName}.dart',
34-
[const Name('MyMath'), Name(methodName)],
34+
[
35+
const Name(kind: DefinitionKind.classKind, 'MyMath'),
36+
Name(methodName),
37+
],
3538
),
3639
);
3740
print('Checking calls to $methodName...');
@@ -53,7 +56,7 @@ void main(List<String> arguments) async {
5356
final instances = usages.constantsOf(
5457
Definition(
5558
'package:${input.packageName}/src/${input.packageName}.dart',
56-
[Name(className)],
59+
[Name(kind: DefinitionKind.classKind, className)],
5760
),
5861
);
5962
print('Checking instances of $className...');

‎pkgs/record_use/test_data/drop_dylib_recording/hook/link.dart‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,17 @@ void main(List<String> arguments) async {
3535
final calls = usages.constArgumentsFor(
3636
Definition(
3737
'package:drop_dylib_recording/src/drop_dylib_recording.dart',
38-
[const Name('MyMath'), Name(methodName)],
38+
[
39+
const Name(
40+
kind: DefinitionKind.classKind,
41+
'MyMath',
42+
),
43+
Name(
44+
kind: DefinitionKind.methodKind,
45+
methodName,
46+
disambiguators: {DefinitionDisambiguator.staticDisambiguator},
47+
),
48+
],
3949
),
4050
);
4151
for (final call in calls) {
@@ -58,7 +68,12 @@ void main(List<String> arguments) async {
5868
final instances = usages.constantsOf(
5969
Definition(
6070
'package:drop_dylib_recording/src/drop_dylib_recording.dart',
61-
[Name(className)],
71+
[
72+
Name(
73+
kind: DefinitionKind.classKind,
74+
className,
75+
),
76+
],
6277
),
6378
);
6479
for (final instance in instances) {

0 commit comments

Comments
 (0)