Skip to content

Commit 4b2b0a8

Browse files
aamCommit Queue
authored andcommitted
[gardening] Fix analysis options test on Windows.
Normalize paths for memory file system infra. Fixes #59601 Change-Id: I42fd13775d5d1e3ba0a11f505180076bcc58e190 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/397401 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Alexander Aprelev <[email protected]>
1 parent 32565d1 commit 4b2b0a8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/analyzer/test/src/options/analysis_options_test.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import 'package:analyzer/dart/analysis/analysis_options.dart';
66
import 'package:analyzer/error/error.dart';
7-
import 'package:analyzer/file_system/file_system.dart';
87
import 'package:analyzer/file_system/memory_file_system.dart';
98
import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
109
import 'package:analyzer/src/dart/analysis/analysis_options.dart';
@@ -24,14 +23,15 @@ main() {
2423
class AnalysisOptionsTest {
2524
final AnalysisOptionsProvider optionsProvider = AnalysisOptionsProvider();
2625

27-
final ResourceProvider resourceProvider = MemoryResourceProvider();
26+
final resourceProvider = MemoryResourceProvider();
2827

2928
// TODO(srawlins): Add tests that exercise
3029
// `optionsProvider.getOptionsFromString` throwing an exception.
3130
AnalysisOptionsImpl parseOptions(String content) =>
3231
AnalysisOptionsImpl.fromYaml(
3332
optionsMap: optionsProvider.getOptionsFromString(content),
34-
file: resourceProvider.getFile('/project/analysis_options.yaml'),
33+
file: resourceProvider.getFile(resourceProvider.convertPath(
34+
'/project/analysis_options.yaml')),
3535
resourceProvider: resourceProvider,
3636
);
3737

@@ -331,7 +331,7 @@ plugins:
331331
'toYaml',
332332
'''
333333
plugin_one:
334-
path: /project/foo/bar
334+
path: ${resourceProvider.convertPath('/project/foo/bar')}
335335
''',
336336
),
337337
);
@@ -354,7 +354,7 @@ plugins:
354354
'toYaml',
355355
'''
356356
plugin_one:
357-
path: /foo/baz
357+
path: ${resourceProvider.convertPath('/foo/baz')}
358358
''',
359359
),
360360
);

0 commit comments

Comments
 (0)