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

Unified Diff: pkg/analyzer/test/generated/bazel_test.dart

Issue 2392133002: Fix BazelFileUriResolver tests (Closed)
Patch Set: clean-up 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
« no previous file with comments | « pkg/analyzer/lib/src/generated/bazel.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/test/generated/bazel_test.dart
diff --git a/pkg/analyzer/test/generated/bazel_test.dart b/pkg/analyzer/test/generated/bazel_test.dart
index 227681cb21865dae43fb1ebfc9ba8f06f218f526..2f06a7b2021c7bc25628d470774733b360af6e6e 100644
--- a/pkg/analyzer/test/generated/bazel_test.dart
+++ b/pkg/analyzer/test/generated/bazel_test.dart
@@ -27,15 +27,15 @@ class BazelFileUriResolverTest {
void setUp() {
provider = new MemoryResourceProvider();
- workspace = provider.newFolder('/workspace');
+ workspace = provider.newFolder(provider.convertPath('/workspace'));
buildDirs = [
- provider.newFolder('/workspace/one'),
- provider.newFolder('/workspace/two')
+ provider.newFolder(provider.convertPath('/workspace/one')),
+ provider.newFolder(provider.convertPath('/workspace/two'))
];
resolver = new BazelFileUriResolver(provider, workspace, buildDirs);
- provider.newFile('/workspace/test.dart', '');
- provider.newFile('/workspace/one/gen1.dart', '');
- provider.newFile('/workspace/two/gen2.dart', '');
+ provider.newFile(provider.convertPath('/workspace/test.dart'), '');
+ provider.newFile(provider.convertPath('/workspace/one/gen1.dart'), '');
+ provider.newFile(provider.convertPath('/workspace/two/gen2.dart'), '');
}
void test_creation() {
@@ -47,39 +47,43 @@ class BazelFileUriResolverTest {
}
void test_resolveAbsolute_file() {
- var uri = new Uri(scheme: 'file', path: '/workspace/test.dart');
+ var uri = provider.pathContext
+ .toUri(provider.convertPath('/workspace/test.dart'));
Source source = resolver.resolveAbsolute(uri);
expect(source, isNotNull);
expect(source.exists(), isTrue);
- expect(source.fullName, '/workspace/test.dart');
+ expect(source.fullName, provider.convertPath('/workspace/test.dart'));
}
void test_resolveAbsolute_folder() {
- var uri = new Uri(scheme: 'file', path: '/workspace');
+ var uri = provider.pathContext.toUri(provider.convertPath('/workspace'));
Source source = resolver.resolveAbsolute(uri);
expect(source, isNull);
}
void test_resolveAbsolute_generated_file_does_not_exist_three() {
- var uri = new Uri(scheme: 'file', path: '/workspace/gen3.dart');
+ var uri = provider.pathContext
+ .toUri(provider.convertPath('/workspace/gen3.dart'));
Source source = resolver.resolveAbsolute(uri);
expect(source, isNull);
}
void test_resolveAbsolute_generated_file_exists_one() {
- var uri = new Uri(scheme: 'file', path: '/workspace/gen1.dart');
+ var uri = provider.pathContext
+ .toUri(provider.convertPath('/workspace/gen1.dart'));
Source source = resolver.resolveAbsolute(uri);
expect(source, isNotNull);
expect(source.exists(), isTrue);
- expect(source.fullName, '/workspace/one/gen1.dart');
+ expect(source.fullName, provider.convertPath('/workspace/one/gen1.dart'));
}
void test_resolveAbsolute_generated_file_exists_two() {
- var uri = new Uri(scheme: 'file', path: '/workspace/gen2.dart');
+ var uri = provider.pathContext
+ .toUri(provider.convertPath('/workspace/gen2.dart'));
Source source = resolver.resolveAbsolute(uri);
expect(source, isNotNull);
expect(source.exists(), isTrue);
- expect(source.fullName, '/workspace/two/gen2.dart');
+ expect(source.fullName, provider.convertPath('/workspace/two/gen2.dart'));
}
void test_resolveAbsolute_notFile_dartUri() {
@@ -95,7 +99,8 @@ class BazelFileUriResolverTest {
}
void test_restoreAbsolute() {
- var uri = new Uri(scheme: 'file', path: '/workspace/test.dart');
+ var uri = provider.pathContext
+ .toUri(provider.convertPath('/workspace/test.dart'));
Source source = resolver.resolveAbsolute(uri);
expect(source, isNotNull);
expect(resolver.restoreAbsolute(source), uri);
« no previous file with comments | « pkg/analyzer/lib/src/generated/bazel.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698