Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2104)

Unified Diff: pkg/analyzer/test/source/package_map_resolver_test.dart

Issue 2398113002: Fix more tests on windows bots (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analyzer/test/source/package_map_resolver_test.dart
diff --git a/pkg/analyzer/test/source/package_map_resolver_test.dart b/pkg/analyzer/test/source/package_map_resolver_test.dart
index bcdd5be8e7020223638153c87e9c23de1da121c0..ba69887eb8ec129c8b1dac59ebcdb3d08bc4dbce 100644
--- a/pkg/analyzer/test/source/package_map_resolver_test.dart
+++ b/pkg/analyzer/test/source/package_map_resolver_test.dart
@@ -56,15 +56,15 @@ class _PackageMapUriResolverTest {
}
void test_resolve_multiple_folders() {
- const pkgFileA = '/part1/lib/libA.dart';
- const pkgFileB = '/part2/lib/libB.dart';
+ String pkgFileA = provider.convertPath('/part1/lib/libA.dart');
+ String pkgFileB = provider.convertPath('/part2/lib/libB.dart');
provider.newFile(pkgFileA, 'library lib_a');
provider.newFile(pkgFileB, 'library lib_b');
PackageMapUriResolver resolver =
new PackageMapUriResolver(provider, <String, List<Folder>>{
'pkg': <Folder>[
- provider.getResource('/part1/lib/'),
- provider.getResource('/part2/lib/')
+ provider.getResource(provider.convertPath('/part1/lib/')),
+ provider.getResource(provider.convertPath('/part2/lib/'))
]
});
{
@@ -93,14 +93,16 @@ class _PackageMapUriResolverTest {
}
void test_resolve_OK() {
- const pkgFileA = '/pkgA/lib/libA.dart';
- const pkgFileB = '/pkgB/lib/libB.dart';
+ String pkgFileA = provider.convertPath('/pkgA/lib/libA.dart');
+ String pkgFileB = provider.convertPath('/pkgB/lib/libB.dart');
provider.newFile(pkgFileA, 'library lib_a;');
provider.newFile(pkgFileB, 'library lib_b;');
PackageMapUriResolver resolver =
new PackageMapUriResolver(provider, <String, List<Folder>>{
- 'pkgA': <Folder>[provider.getResource('/pkgA/lib/')],
- 'pkgB': <Folder>[provider.getResource('/pkgB/lib/')]
+ 'pkgA': <Folder>[
+ provider.getResource(provider.convertPath('/pkgA/lib/'))
+ ],
+ 'pkgB': <Folder>[provider.getResource(provider.convertPath('/pkgB/lib/'))]
});
{
Uri uri = Uri.parse('package:pkgA/libA.dart');
@@ -152,23 +154,27 @@ class _PackageMapUriResolverTest {
}
void test_restoreAbsolute() {
- const pkgFileA = '/pkgA/lib/libA.dart';
- const pkgFileB = '/pkgB/lib/src/libB.dart';
+ String pkgFileA = provider.convertPath('/pkgA/lib/libA.dart');
+ String pkgFileB = provider.convertPath('/pkgB/lib/src/libB.dart');
provider.newFile(pkgFileA, 'library lib_a;');
provider.newFile(pkgFileB, 'library lib_b;');
PackageMapUriResolver resolver =
new PackageMapUriResolver(provider, <String, List<Folder>>{
- 'pkgA': <Folder>[provider.getResource('/pkgA/lib/')],
- 'pkgB': <Folder>[provider.getResource('/pkgB/lib/')]
+ 'pkgA': <Folder>[
+ provider.getResource(provider.convertPath('/pkgA/lib/'))
+ ],
+ 'pkgB': <Folder>[provider.getResource(provider.convertPath('/pkgB/lib/'))]
});
{
- Source source = _createFileSource('/pkgA/lib/libA.dart');
+ Source source =
+ _createFileSource(provider.convertPath('/pkgA/lib/libA.dart'));
Uri uri = resolver.restoreAbsolute(source);
expect(uri, isNotNull);
expect(uri.toString(), 'package:pkgA/libA.dart');
}
{
- Source source = _createFileSource('/pkgB/lib/src/libB.dart');
+ Source source =
+ _createFileSource(provider.convertPath('/pkgB/lib/src/libB.dart'));
Uri uri = resolver.restoreAbsolute(source);
expect(uri, isNotNull);
expect(uri.toString(), 'package:pkgB/src/libB.dart');
@@ -181,15 +187,15 @@ class _PackageMapUriResolverTest {
}
void test_restoreAbsolute_ambiguous() {
- const file1 = '/foo1/lib/bar.dart';
- const file2 = '/foo2/lib/bar.dart';
+ String file1 = provider.convertPath('/foo1/lib/bar.dart');
+ String file2 = provider.convertPath('/foo2/lib/bar.dart');
provider.newFile(file1, 'library bar');
provider.newFile(file2, 'library bar');
PackageMapUriResolver resolver =
new PackageMapUriResolver(provider, <String, List<Folder>>{
'foo': <Folder>[
- provider.getResource('/foo1/lib'),
- provider.getResource('/foo2/lib')
+ provider.getResource(provider.convertPath('/foo1/lib')),
+ provider.getResource(provider.convertPath('/foo2/lib'))
]
});
// Restoring file1 should yield a package URI, and that package URI should
@@ -205,19 +211,19 @@ class _PackageMapUriResolverTest {
}
void test_restoreAbsolute_longestMatch() {
- const file1 = '/foo1/bar1/lib.dart';
- const file2 = '/foo2/bar2/lib.dart';
+ String file1 = provider.convertPath('/foo1/bar1/lib.dart');
+ String file2 = provider.convertPath('/foo2/bar2/lib.dart');
provider.newFile(file1, 'library lib');
provider.newFile(file2, 'library lib');
PackageMapUriResolver resolver =
new PackageMapUriResolver(provider, <String, List<Folder>>{
'pkg1': <Folder>[
- provider.getResource('/foo1'),
- provider.getResource('/foo2/bar2')
+ provider.getResource(provider.convertPath('/foo1')),
+ provider.getResource(provider.convertPath('/foo2/bar2'))
],
'pkg2': <Folder>[
- provider.getResource('/foo1/bar1'),
- provider.getResource('/foo2')
+ provider.getResource(provider.convertPath('/foo1/bar1')),
+ provider.getResource(provider.convertPath('/foo2'))
]
});
// Restoring file1 should yield a package URI for pkg2, since pkg2's match

Powered by Google App Engine
This is Rietveld 408576698