2
2
// for details. All rights reserved. Use of this source code is governed by a
3
3
// BSD-style license that can be found in the LICENSE file.
4
4
5
- // @dart=2.9
6
-
7
5
library dartdoc.options_test;
8
6
9
7
import 'package:analyzer/file_system/file_system.dart' ;
@@ -15,16 +13,16 @@ import 'package:test/test.dart';
15
13
import 'package:yaml/yaml.dart' ;
16
14
17
15
class ConvertedOption {
18
- final String param1;
19
- final String param2;
16
+ final String ? param1;
17
+ final String ? param2;
20
18
final String myContextPath;
21
19
22
20
ConvertedOption ._(this .param1, this .param2, this .myContextPath);
23
21
24
22
static ConvertedOption fromYamlMap (YamlMap yamlMap, String canonicalYamlPath,
25
23
ResourceProvider resourceProvider) {
26
- String p1;
27
- String p2;
24
+ String ? p1;
25
+ String ? p2;
28
26
29
27
for (var entry in yamlMap.entries) {
30
28
switch (entry.key.toString ()) {
@@ -43,20 +41,19 @@ class ConvertedOption {
43
41
void main () {
44
42
var resourceProvider = pubPackageMetaProvider.resourceProvider;
45
43
46
- DartdocOptionRoot dartdocOptionSetFiles;
47
- DartdocOptionRoot dartdocOptionSetArgs;
48
- DartdocOptionRoot dartdocOptionSetAll;
49
- DartdocOptionRoot dartdocOptionSetSynthetic;
50
- Folder tempDir;
51
- Folder firstDir;
52
- Folder secondDir;
53
- Folder secondDirFirstSub;
54
- Folder secondDirSecondSub;
55
-
56
- File dartdocOptionsOne;
57
- File dartdocOptionsTwo;
58
- File dartdocOptionsTwoFirstSub;
59
- File firstExisting;
44
+ late final DartdocOptionRoot dartdocOptionSetFiles;
45
+ late final DartdocOptionRoot dartdocOptionSetArgs;
46
+ late final DartdocOptionRoot dartdocOptionSetAll;
47
+ late final DartdocOptionRoot dartdocOptionSetSynthetic;
48
+ late final Folder tempDir;
49
+ late final Folder firstDir;
50
+ late final Folder secondDir;
51
+ late final Folder secondDirFirstSub;
52
+ late final Folder secondDirSecondSub;
53
+
54
+ late final File dartdocOptionsOne;
55
+ late final File dartdocOptionsTwo;
56
+ late final File firstExisting;
60
57
61
58
setUpAll (() {
62
59
dartdocOptionSetSynthetic = DartdocOptionRoot ('dartdoc' , resourceProvider);
@@ -98,24 +95,24 @@ void main() {
98
95
dartdocOptionSetFiles.add (DartdocOptionFileOnly <List <String >>(
99
96
'fileOptionList' , [], resourceProvider,
100
97
optionIs: OptionKind .file, mustExist: true ));
101
- dartdocOptionSetFiles.add (DartdocOptionFileOnly <String >(
98
+ dartdocOptionSetFiles.add (DartdocOptionFileOnly <String ? >(
102
99
'fileOption' , null , resourceProvider,
103
100
optionIs: OptionKind .file, mustExist: true ));
104
101
dartdocOptionSetFiles.add (DartdocOptionFileOnly <String >(
105
102
'parentOverride' , 'oops' , resourceProvider,
106
103
parentDirOverridesChild: true ));
107
- dartdocOptionSetFiles.add (DartdocOptionFileOnly <String >(
104
+ dartdocOptionSetFiles.add (DartdocOptionFileOnly <String ? >(
108
105
'nonCriticalFileOption' , null , resourceProvider,
109
106
optionIs: OptionKind .file));
110
107
dartdocOptionSetFiles.add (DartdocOptionSet ('nestedOption' , resourceProvider)
111
108
..addAll ([DartdocOptionFileOnly <bool >('flag' , false , resourceProvider)]));
112
- dartdocOptionSetFiles.add (DartdocOptionFileOnly <String >(
109
+ dartdocOptionSetFiles.add (DartdocOptionFileOnly <String ? >(
113
110
'dirOption' , null , resourceProvider,
114
111
optionIs: OptionKind .dir, mustExist: true ));
115
- dartdocOptionSetFiles.add (DartdocOptionFileOnly <String >(
112
+ dartdocOptionSetFiles.add (DartdocOptionFileOnly <String ? >(
116
113
'nonCriticalDirOption' , null , resourceProvider,
117
114
optionIs: OptionKind .dir));
118
- dartdocOptionSetFiles.add (DartdocOptionFileOnly <ConvertedOption >(
115
+ dartdocOptionSetFiles.add (DartdocOptionFileOnly <ConvertedOption ? >(
119
116
'convertThisMap' ,
120
117
null ,
121
118
resourceProvider,
@@ -166,7 +163,7 @@ void main() {
166
163
'mapOption' , {'hi' : 'there' }, resourceProvider));
167
164
dartdocOptionSetAll.add (DartdocOptionArgFile <String >(
168
165
'notInAnyFile' , 'so there' , resourceProvider));
169
- dartdocOptionSetAll.add (DartdocOptionArgFile <String >(
166
+ dartdocOptionSetAll.add (DartdocOptionArgFile <String ? >(
170
167
'fileOption' , null , resourceProvider,
171
168
optionIs: OptionKind .file, mustExist: true ));
172
169
dartdocOptionSetAll.add (DartdocOptionArgFile <List <String >>(
@@ -202,7 +199,7 @@ void main() {
202
199
.join (firstDir.path, 'dartdoc_options.yaml' ));
203
200
dartdocOptionsTwo = resourceProvider.getFile (resourceProvider.pathContext
204
201
.join (secondDir.path, 'dartdoc_options.yaml' ));
205
- dartdocOptionsTwoFirstSub = resourceProvider.getFile (resourceProvider
202
+ var dartdocOptionsTwoFirstSub = resourceProvider.getFile (resourceProvider
206
203
.pathContext
207
204
.join (secondDirFirstSub.path, 'dartdoc_options.yaml' ));
208
205
@@ -265,7 +262,7 @@ dartdoc:
265
262
dartdocOptionSetSynthetic['vegetableLoaderChecked' ].valueAt (firstDir),
266
263
orderedEquals ([path.canonicalize (firstExisting.path)]));
267
264
268
- String errorMessage;
265
+ String ? errorMessage;
269
266
try {
270
267
dartdocOptionSetSynthetic['vegetableLoaderChecked' ].valueAt (tempDir);
271
268
} on DartdocFileMissing catch (e) {
@@ -313,7 +310,7 @@ dartdoc:
313
310
() {
314
311
dartdocOptionSetAll
315
312
.parseArguments (['--file-option' , 'override-not-existing.dart' ]);
316
- String errorMessage;
313
+ String ? errorMessage;
317
314
try {
318
315
dartdocOptionSetAll['fileOption' ].valueAt (firstDir);
319
316
} on DartdocFileMissing catch (e) {
@@ -338,7 +335,7 @@ dartdoc:
338
335
339
336
test ('File errors still get passed through' , () {
340
337
dartdocOptionSetAll.parseArguments ([]);
341
- String errorMessage;
338
+ String ? errorMessage;
342
339
try {
343
340
dartdocOptionSetAll['fileOption' ].valueAt (secondDir);
344
341
} on DartdocFileMissing catch (e) {
@@ -456,7 +453,7 @@ dartdoc:
456
453
});
457
454
458
455
test ('DartdocOptionArgOnly checks file existence' , () {
459
- String errorMessage;
456
+ String ? errorMessage;
460
457
dartdocOptionSetArgs.parseArguments (['--single-file' , 'not_found.txt' ]);
461
458
try {
462
459
dartdocOptionSetArgs['singleFile' ].valueAt (tempDir);
@@ -474,7 +471,7 @@ dartdoc:
474
471
});
475
472
476
473
test ('DartdocOptionArgOnly checks file existence on multi-options' , () {
477
- String errorMessage;
474
+ String ? errorMessage;
478
475
dartdocOptionSetArgs.parseArguments ([
479
476
'--files-flag' ,
480
477
resourceProvider.pathContext.absolute (firstExisting.path),
@@ -571,7 +568,7 @@ dartdoc:
571
568
572
569
test ('DartdocOptionArgOnly throws on double type mismatch' , () {
573
570
dartdocOptionSetArgs.parseArguments (['--respawn-probability' , 'unknown' ]);
574
- String errorMessage;
571
+ String ? errorMessage;
575
572
try {
576
573
dartdocOptionSetArgs['respawnProbability' ].valueAt (tempDir);
577
574
} on DartdocOptionError catch (e) {
@@ -587,7 +584,7 @@ dartdoc:
587
584
dartdocOptionSetArgs.parseArguments (['--number-of-heads' , '3.6' ]);
588
585
expect (() => dartdocOptionSetArgs['number_of_heads' ].valueAt (tempDir),
589
586
throwsA (const TypeMatcher <DartdocOptionError >()));
590
- String errorMessage;
587
+ String ? errorMessage;
591
588
try {
592
589
dartdocOptionSetArgs['number_of_heads' ].valueAt (tempDir);
593
590
} on DartdocOptionError catch (e) {
@@ -602,7 +599,7 @@ dartdoc:
602
599
test ('DartdocOptionArgOnly throws on a map type mismatch' , () {
603
600
dartdocOptionSetArgs
604
601
.parseArguments (['--a-fancy-map-variable' , 'not a map' ]);
605
- String errorMessage;
602
+ String ? errorMessage;
606
603
try {
607
604
dartdocOptionSetArgs['aFancyMapVariable' ].valueAt (tempDir);
608
605
} on DartdocOptionError catch (e) {
@@ -628,7 +625,7 @@ dartdoc:
628
625
});
629
626
630
627
test ('DartdocOptionSetFile checks file existence when appropriate' , () {
631
- String errorMessage;
628
+ String ? errorMessage;
632
629
try {
633
630
dartdocOptionSetFiles['fileOptionList' ].valueAt (secondDir);
634
631
} on DartdocFileMissing catch (e) {
@@ -654,7 +651,7 @@ dartdoc:
654
651
test (
655
652
'DartdocOptionSetFile resolves paths for files relative to where they are declared' ,
656
653
() {
657
- String errorMessage;
654
+ String ? errorMessage;
658
655
try {
659
656
dartdocOptionSetFiles['fileOption' ].valueAt (secondDirFirstSub);
660
657
} on DartdocFileMissing catch (e) {
@@ -681,7 +678,7 @@ dartdoc:
681
678
test ('DartdocOptionSetFile checks errors for directory options' , () {
682
679
expect (dartdocOptionSetFiles['dirOption' ].valueAt (secondDir),
683
680
equals (path.canonicalize (path.join (secondDir.path, 'firstSub' ))));
684
- String errorMessage;
681
+ String ? errorMessage;
685
682
try {
686
683
dartdocOptionSetFiles['dirOption' ].valueAt (firstDir);
687
684
} on DartdocFileMissing catch (e) {
0 commit comments