Skip to content

Commit fcfca3f

Browse files
refactor: handling path in test using canonicalize
1 parent c6452f7 commit fcfca3f

File tree

4 files changed

+19
-22
lines changed

4 files changed

+19
-22
lines changed

pkgs/coverage/bin/collect_coverage.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ Future<void> main(List<String> arguments) async {
2323
final defaultOptions = CoverageOptionsProvider().coverageOptions;
2424
final options = parseArgs(arguments, defaultOptions);
2525

26-
final out = options.out == null
27-
? stdout
28-
: File(options.out!).openWrite(mode: FileMode.writeOnly);
26+
final out = options.out == null ? stdout : File(options.out!).openWrite();
2927

3028
await Chain.capture(() async {
3129
final coverage = await collect(options.serviceUri, options.resume,

pkgs/coverage/test/collect_coverage_config_test.dart

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ void main() {
3333
test('test with coverage', () async {
3434
final testCoverage = await test_with_coverage.parseArgs([], defaults);
3535

36-
expect(testCoverage.packageDir.toLowerCase(),
36+
expect(path.canonicalize(testCoverage.packageDir),
3737
path.canonicalize(defaults.packageDirectory));
3838
expect(testCoverage.packageName, 'coverage');
39-
expect(testCoverage.outDir.toLowerCase(), path.canonicalize('coverage'));
39+
expect(path.canonicalize(testCoverage.outDir),
40+
path.canonicalize('coverage'));
4041
expect(testCoverage.testScript, defaults.testScript);
4142
expect(testCoverage.functionCoverage, defaults.functionCoverage);
4243
expect(testCoverage.branchCoverage, defaults.branchCoverage);
@@ -60,24 +61,20 @@ void main() {
6061
expect(collectedCoverage.scopedOutput, ['lib', 'src']);
6162
expect(collectedCoverage.functionCoverage, isTrue);
6263
expect(collectedCoverage.branchCoverage, isFalse);
63-
expect(collectedCoverage.out?.toLowerCase(),
64+
expect(path.canonicalize(collectedCoverage.out!),
6465
path.canonicalize('test/test_coverage_options/coverage/coverage.json'));
6566

6667
// Verify format coverage yaml values
67-
expect(formattedCoverage.output?.toLowerCase(),
68+
expect(path.canonicalize(formattedCoverage.output!),
6869
path.canonicalize('test/test_coverage_options/coverage/lcov.info'));
69-
expect(
70-
formattedCoverage.packagePath.toLowerCase(),
71-
path.canonicalize(
72-
path.join('test/test_coverage_options', '../test_files')));
70+
expect(path.canonicalize(formattedCoverage.packagePath),
71+
path.canonicalize('test/test_files'));
7372

7473
// Verify test with coverage yaml values
75-
expect(
76-
testCoverage.packageDir.toLowerCase(),
77-
path.canonicalize(
78-
path.join('test/test_coverage_options', '../test_files')));
74+
expect(path.canonicalize(testCoverage.packageDir),
75+
path.canonicalize('test/test_files'));
7976
expect(testCoverage.packageName, 'My Dart Package');
80-
expect(testCoverage.outDir.toLowerCase(),
77+
expect(path.canonicalize(testCoverage.outDir),
8178
path.canonicalize('test/test_coverage_options/coverage'));
8279
expect(testCoverage.testScript, 'test1');
8380
expect(testCoverage.functionCoverage, isTrue);
@@ -100,13 +97,13 @@ void main() {
10097
format_coverage.parseArgs([], configuredOptions);
10198

10299
expect(
103-
collectedCoverage.out?.toLowerCase(),
100+
path.canonicalize(collectedCoverage.out!),
104101
path.canonicalize(
105102
'test/test_coverage_options/coverage/custom_coverage/coverage.json'));
106103
expect(collectedCoverage.scopedOutput, ['lib', 'test']);
107104
expect(collectedCoverage.functionCoverage, isFalse);
108105
expect(
109-
formattedCoverage.output?.toLowerCase(),
106+
path.canonicalize(formattedCoverage.output!),
110107
path.canonicalize(
111108
'test/test_coverage_options/coverage/custom_coverage/lcov.info'));
112109
expect(testCoverage.packageName, 'Custom Dart Package');
@@ -131,21 +128,21 @@ void main() {
131128
expect(collectedCoverage.branchCoverage, isFalse);
132129
expect(collectedCoverage.functionCoverage, isTrue);
133130
expect(
134-
collectedCoverage.out?.toLowerCase(),
131+
path.canonicalize(collectedCoverage.out!),
135132
path.canonicalize(
136133
'test/test_coverage_options/coverage/custom_lcov/coverage.json'));
137134

138135
// Verify format coverage yaml values
139136
expect(
140-
formattedCoverage.output?.toLowerCase(),
137+
path.canonicalize(formattedCoverage.output!),
141138
path.canonicalize(
142139
'test/test_coverage_options/coverage/custom_lcov/lcov.info'));
143-
expect(formattedCoverage.packagePath.toLowerCase(),
140+
expect(path.canonicalize(formattedCoverage.packagePath),
144141
path.canonicalize('test/test_coverage_options'));
145142

146143
// Verify test with coverage yaml values
147144
expect(testCoverage.packageName, 'coverage');
148-
expect(testCoverage.outDir.toLowerCase(),
145+
expect(path.canonicalize(testCoverage.outDir),
149146
path.canonicalize('test/test_coverage_options/coverage/custom_lcov'));
150147
expect(testCoverage.testScript, 'custom_test');
151148
expect(testCoverage.functionCoverage, isTrue);
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: pkg1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: pkg2

0 commit comments

Comments
 (0)