@@ -67,21 +67,20 @@ void main() {
67
67
setUpAll (() async {
68
68
constructorTearoffs = (await _testPackageGraphGinormous)
69
69
.libraries
70
- .firstWhere ((l) => l.name == 'constructor_tearoffs' );
71
- A = constructorTearoffs.classes.firstWhere ((c) => c.name == 'A' );
72
- B = constructorTearoffs.classes.firstWhere ((c) => c.name == 'B' );
73
- C = constructorTearoffs.classes.firstWhere ((c) => c.name == 'C' );
74
- D = constructorTearoffs.classes.firstWhere ((c) => c.name == 'D' );
75
- E = constructorTearoffs.classes.firstWhere ((c) => c.name == 'E' );
76
- F = constructorTearoffs.classes.firstWhere ((c) => c.name == 'F' );
77
- M = constructorTearoffs.mixins.firstWhere ((m) => m.name == 'M' );
78
- At = constructorTearoffs.typedefs.firstWhere ((t) => t.name == 'At' );
79
- Bt = constructorTearoffs.typedefs.firstWhere ((t) => t.name == 'Bt' );
80
- Ct = constructorTearoffs.typedefs.firstWhere ((t) => t.name == 'Ct' );
81
- Et = constructorTearoffs.typedefs.firstWhere ((t) => t.name == 'Et' );
82
- Ft = constructorTearoffs.typedefs.firstWhere ((t) => t.name == 'Ft' );
83
- NotAClass =
84
- constructorTearoffs.typedefs.firstWhere ((t) => t.name == 'NotAClass' );
70
+ .named ('constructor_tearoffs' );
71
+ A = constructorTearoffs.classes.named ('A' );
72
+ B = constructorTearoffs.classes.named ('B' );
73
+ C = constructorTearoffs.classes.named ('C' );
74
+ D = constructorTearoffs.classes.named ('D' );
75
+ E = constructorTearoffs.classes.named ('E' );
76
+ F = constructorTearoffs.classes.named ('F' );
77
+ M = constructorTearoffs.mixins.named ('M' );
78
+ At = constructorTearoffs.typedefs.named ('At' );
79
+ Bt = constructorTearoffs.typedefs.named ('Bt' );
80
+ Ct = constructorTearoffs.typedefs.named ('Ct' );
81
+ Et = constructorTearoffs.typedefs.named ('Et' );
82
+ Ft = constructorTearoffs.typedefs.named ('Ft' );
83
+ NotAClass = constructorTearoffs.typedefs.named ('NotAClass' );
85
84
Anew = A .constructors.firstWhere ((c) => c.isUnnamedConstructor);
86
85
Bnew = B .constructors.firstWhere ((c) => c.isUnnamedConstructor);
87
86
Cnew = C .constructors.firstWhere ((c) => c.isUnnamedConstructor);
@@ -201,14 +200,11 @@ void main() {
201
200
additionalArguments: ['--sanitize-html' ],
202
201
);
203
202
204
- exLibrary = packageGraph.libraries.firstWhere ((lib) => lib.name == 'ex' );
203
+ exLibrary = packageGraph.libraries.named ( 'ex' );
205
204
206
- classWithHtml =
207
- exLibrary.classes.firstWhere ((c) => c.name == 'SanitizableHtml' );
208
- blockHtml = classWithHtml.instanceMethods
209
- .firstWhere ((m) => m.name == 'blockHtml' );
210
- inlineHtml = classWithHtml.instanceMethods
211
- .firstWhere ((m) => m.name == 'inlineHtml' );
205
+ classWithHtml = exLibrary.classes.named ('SanitizableHtml' );
206
+ blockHtml = classWithHtml.instanceMethods.named ('blockHtml' );
207
+ inlineHtml = classWithHtml.instanceMethods.named ('inlineHtml' );
212
208
for (var modelElement in packageGraph.allLocalModelElements) {
213
209
modelElement.documentation;
214
210
}
@@ -267,15 +263,13 @@ void main() {
267
263
excludeLibraries: ['css' , 'code_in_comments' , 'excluded' ],
268
264
additionalArguments: ['--inject-html' ]);
269
265
270
- injectionExLibrary =
271
- injectionPackageGraph.libraries.firstWhere ((lib) => lib.name == 'ex' );
266
+ injectionExLibrary = injectionPackageGraph.libraries.named ('ex' );
272
267
273
- htmlInjection = injectionExLibrary.classes
274
- .firstWhere ((c) => c.name == 'HtmlInjection' );
275
- injectSimpleHtml = htmlInjection.instanceMethods
276
- .firstWhere ((m) => m.name == 'injectSimpleHtml' );
277
- injectHtmlFromTool = htmlInjection.instanceMethods
278
- .firstWhere ((m) => m.name == 'injectHtmlFromTool' );
268
+ htmlInjection = injectionExLibrary.classes.named ('HtmlInjection' );
269
+ injectSimpleHtml =
270
+ htmlInjection.instanceMethods.named ('injectSimpleHtml' );
271
+ injectHtmlFromTool =
272
+ htmlInjection.instanceMethods.named ('injectHtmlFromTool' );
279
273
for (var modelElement in injectionPackageGraph.allLocalModelElements) {
280
274
modelElement.documentation;
281
275
}
@@ -306,14 +300,12 @@ void main() {
306
300
isNot (contains ('{@end-inject-html}' )));
307
301
});
308
302
test ('tool outputs a macro which outputs injected HTML' , () {
309
- var ToolPrintingMacroWhichInjectsHtml = injectionExLibrary.classes
310
- .firstWhere ((c) => c.name == 'ToolPrintingMacroWhichInjectsHtml' );
311
- var a = ToolPrintingMacroWhichInjectsHtml .instanceFields
312
- .firstWhere ((m) => m.name == 'a' );
303
+ var ToolPrintingMacroWhichInjectsHtml =
304
+ injectionExLibrary.classes.named ('ToolPrintingMacroWhichInjectsHtml' );
305
+ var a = ToolPrintingMacroWhichInjectsHtml .instanceFields.named ('a' );
313
306
expect (a.documentationAsHtml,
314
307
contains ('<p>Text.</p>\n <p><div class="title">Title</div></p>' ));
315
- var b = ToolPrintingMacroWhichInjectsHtml .instanceFields
316
- .firstWhere ((m) => m.name == 'b' );
308
+ var b = ToolPrintingMacroWhichInjectsHtml .instanceFields.named ('b' );
317
309
expect (b.documentationAsHtml,
318
310
contains ('<p>Text.</p>\n <p><div class="title">Title</div></p>' ));
319
311
});
@@ -360,13 +352,13 @@ void main() {
360
352
'Verify auto-included dependencies do not use default package category definitions' ,
361
353
() {
362
354
var IAmAClassWithCategories = ginormousPackageGraph.localPackages
363
- .firstWhere ((Package p) => p.name == 'test_package_imported' )
355
+ .firstWhere ((p) => p.name == 'test_package_imported' )
364
356
.libraries
365
357
.wherePublic
366
- .firstWhere (( Library l) => l.name == 'categoriesExported' )
358
+ .named ( 'categoriesExported' )
367
359
.classes
368
360
.wherePublic
369
- .firstWhere (( Class c) => c.name == 'IAmAClassWithCategories' );
361
+ .named ( 'IAmAClassWithCategories' );
370
362
expect (IAmAClassWithCategories .hasCategoryNames, isTrue);
371
363
expect (IAmAClassWithCategories .categories, hasLength (1 ));
372
364
expect (
@@ -378,13 +370,13 @@ void main() {
378
370
// they are exposed in.
379
371
test ('Verify that reexported classes pick up categories' , () {
380
372
var IAmAClassWithCategoriesReexport = ginormousPackageGraph.localPackages
381
- .firstWhere ((Package p) => p.name == 'test_package' )
373
+ .firstWhere ((p) => p.name == 'test_package' )
382
374
.libraries
383
375
.wherePublic
384
- .firstWhere (( Library l) => l.name == 'fake' )
376
+ .named ( 'fake' )
385
377
.classes
386
378
.wherePublic
387
- .firstWhere (( Class c) => c.name == 'IAmAClassWithCategories' );
379
+ .named ( 'IAmAClassWithCategories' );
388
380
expect (IAmAClassWithCategoriesReexport .hasCategoryNames, isTrue);
389
381
expect (IAmAClassWithCategoriesReexport .categories, hasLength (1 ));
390
382
expect (IAmAClassWithCategoriesReexport .categories.first.name,
@@ -397,14 +389,14 @@ void main() {
397
389
398
390
test ('Verify that multiple categories work correctly' , () {
399
391
var fakeLibrary = ginormousPackageGraph.localPackages
400
- .firstWhere ((Package p) => p.name == 'test_package' )
392
+ .firstWhere ((p) => p.name == 'test_package' )
401
393
.libraries
402
394
.wherePublic
403
- .firstWhere (( Library l) => l.name == 'fake' );
404
- var BaseForDocComments = fakeLibrary.classes.wherePublic
405
- . firstWhere (( Class c) => c.name == 'BaseForDocComments' );
406
- var SubForDocComments = fakeLibrary.classes.wherePublic
407
- . firstWhere (( Class c) => c.name == 'SubForDocComments' );
395
+ .named ( 'fake' );
396
+ var BaseForDocComments =
397
+ fakeLibrary.classes.wherePublic. named ( 'BaseForDocComments' );
398
+ var SubForDocComments =
399
+ fakeLibrary.classes.wherePublic. named ( 'SubForDocComments' );
408
400
expect (BaseForDocComments .hasCategoryNames, isTrue);
409
401
// Display both, with the correct order and display name.
410
402
expect (BaseForDocComments .displayedCategories, hasLength (2 ));
0 commit comments