commit 89f37416fecfe6eadbb928ad708b19b585acfb6b
author Mike Fairhurst <mfairhurst@google.com> Thu May 24 06:57:51 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Thu May 24 06:57:51 2018 +0000
tree 0af7b07214117d73a80f47d624bc30de37abc855
parent 9b44fc39c86551a584baded931f3dce183592134

Fix windows bot breakage for package:build tests.

Change-Id: If7c049d0c4db396c8c7ae2fd05005538c1dd1933
Reviewed-on: https://dart-review.googlesource.com/56293
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Mike Fairhurst <mfairhurst@google.com>

pkg/analyzer/test/generated/package_build_test.dart

diff --git a/pkg/analyzer/test/generated/package_build_test.dart b/pkg/analyzer/test/generated/package_build_test.dart
index 1b2dedd..a731844 100644
--- a/pkg/analyzer/test/generated/package_build_test.dart
+++ b/pkg/analyzer/test/generated/package_build_test.dart
@@ -116,8 +116,9 @@
 
   Uri addPackageSource(String path, String uriStr, {bool create: true}) {
     Uri uri = Uri.parse(uriStr);
-    final File file =
-        create ? provider.newFile(_p(path), '') : provider.getResource(path);
+    final File file = create
+        ? provider.newFile(_p(path), '')
+        : provider.getResource(_p(path));
     final Source source = file.createSource(uri);
     when(packageUriResolver.resolveAbsolute(uri)).thenReturn(source);
     return uri;
@@ -226,7 +227,7 @@
 
     final libFile = provider.newFile(
         _p('/workspace/.dart_tool/build/generated/project/lib/file.dart'), '');
-    expect(workspace.builtFile('lib/file.dart', 'project'), libFile);
+    expect(workspace.builtFile(_p('lib/file.dart'), 'project'), libFile);
   }
 
   void test_builtFile_importedPackage() {
@@ -238,7 +239,7 @@
 
     final libFile = provider.newFile(
         _p('/workspace/.dart_tool/build/generated/foo/lib/file.dart'), '');
-    expect(workspace.builtFile('lib/file.dart', 'foo'), libFile);
+    expect(workspace.builtFile(_p('lib/file.dart'), 'foo'), libFile);
   }
 
   void test_builtFile_notInPackagesGetsHidden() {
@@ -382,7 +383,7 @@
         _createWorkspace('/workspace', ['project']);
 
     final binFile = provider.newFile(_p('/workspace/bin/file.dart'), '');
-    expect(workspace.findFile('/workspace/bin/file.dart'), binFile);
+    expect(workspace.findFile(_p('/workspace/bin/file.dart')), binFile);
   }
 
   void test_findFile_binGenerated() {
@@ -394,7 +395,7 @@
 
     final binFile = provider.newFile(
         _p('/workspace/.dart_tool/build/generated/project/bin/file.dart'), '');
-    expect(workspace.findFile('/workspace/bin/file.dart'), binFile);
+    expect(workspace.findFile(_p('/workspace/bin/file.dart')), binFile);
   }
 
   void test_findFile_libGenerated() {
@@ -406,7 +407,7 @@
 
     final libFile = provider.newFile(
         _p('/workspace/.dart_tool/build/generated/project/lib/file.dart'), '');
-    expect(workspace.findFile('/workspace/lib/file.dart'), libFile);
+    expect(workspace.findFile(_p('/workspace/lib/file.dart')), libFile);
   }
 
   void test_findFile_test() {
@@ -418,7 +419,7 @@
         _createWorkspace('/workspace', ['project']);
 
     final testFile = provider.newFile(_p('/workspace/test/file.dart'), '');
-    expect(workspace.findFile('/workspace/test/file.dart'), testFile);
+    expect(workspace.findFile(_p('/workspace/test/file.dart')), testFile);
   }
 
   void test_findFile_testGenerated() {
@@ -431,7 +432,7 @@
 
     final testFile = provider.newFile(
         _p('/workspace/.dart_tool/build/generated/project/test/file.dart'), '');
-    expect(workspace.findFile('/workspace/test/file.dart'), testFile);
+    expect(workspace.findFile(_p('/workspace/test/file.dart')), testFile);
   }
 
   void test_findFile_web() {
@@ -442,7 +443,7 @@
         _createWorkspace('/workspace', ['project']);
 
     final webFile = provider.newFile(_p('/workspace/web/file.dart'), '');
-    expect(workspace.findFile('/workspace/web/file.dart'), webFile);
+    expect(workspace.findFile(_p('/workspace/web/file.dart')), webFile);
   }
 
   void test_findFile_webGenerated() {
@@ -454,7 +455,7 @@
 
     final webFile = provider.newFile(
         _p('/workspace/.dart_tool/build/generated/project/web/file.dart'), '');
-    expect(workspace.findFile('/workspace/web/file.dart'), webFile);
+    expect(workspace.findFile(_p('/workspace/web/file.dart')), webFile);
   }
 
   PackageBuildWorkspace _createWorkspace(