commit 10317357072aaede1e57195b2aee3a03be2ca53d
author Konstantin Shcheglov <scheglov@google.com> Wed Jun 06 18:10:04 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Wed Jun 06 18:10:04 2018 +0000
tree f6a37aa05055d6934d503e15ca3658607c4fefbd
parent 4d23db795c478d0352704e6d5837e882ee147e04

Fix DriverBasedUriConverterTest on Windows.

R=brianwilkerson@google.com

Change-Id: I58de679d86f9e210dad629aa1614027df3b8f6c6
Reviewed-on: https://dart-review.googlesource.com/58803
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

pkg/analyzer/test/src/dart/analysis/uri_converter_test.dart

diff --git a/pkg/analyzer/test/src/dart/analysis/uri_converter_test.dart b/pkg/analyzer/test/src/dart/analysis/uri_converter_test.dart
index 45fad90..f400cee 100644
--- a/pkg/analyzer/test/src/dart/analysis/uri_converter_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/uri_converter_test.dart
@@ -9,6 +9,7 @@
 import 'package:analyzer/src/dart/analysis/uri_converter.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/source/package_map_resolver.dart';
+import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -21,24 +22,25 @@
 }
 
 @reflectiveTest
-class DriverBasedUriConverterTest {
-  MemoryResourceProvider resourceProvider;
+class DriverBasedUriConverterTest extends Object with ResourceProviderMixin {
   DriverBasedUriConverter uriConverter;
 
   void setUp() {
     resourceProvider = new MemoryResourceProvider();
-    Folder packageFolder = resourceProvider.newFolder('/packages/bar/lib');
+
+    Folder barFolder = newFolder('/packages/bar/lib');
+    Folder fooFolder = newFolder('/packages/foo/lib');
 
     SourceFactory sourceFactory = new SourceFactory([
       new DartUriResolver(new MockSdk(resourceProvider: resourceProvider)),
       new PackageMapUriResolver(resourceProvider, {
-        'foo': [resourceProvider.newFolder('/packages/foo/lib')],
-        'bar': [packageFolder],
+        'foo': [fooFolder],
+        'bar': [barFolder],
       }),
       new ResourceUriResolver(resourceProvider),
     ], null, resourceProvider);
 
-    ContextRoot contextRoot = new ContextRoot(packageFolder.path, [],
+    ContextRoot contextRoot = new ContextRoot(barFolder.path, [],
         pathContext: resourceProvider.pathContext);
 
     MockAnalysisDriver driver = new MockAnalysisDriver();
@@ -50,45 +52,37 @@
   }
 
   test_pathToUri_dart() {
-    expect(
-        uriConverter
-            .pathToUri(resourceProvider.convertPath('/sdk/lib/core/core.dart')),
+    expect(uriConverter.pathToUri(convertPath('/sdk/lib/core/core.dart')),
         Uri.parse('dart:core'));
   }
 
   test_pathToUri_notRelative() {
     expect(
-        uriConverter.pathToUri(
-            resourceProvider.convertPath('/packages/foo/lib/foo.dart'),
-            containingPath:
-                resourceProvider.convertPath('/packages/bar/lib/bar.dart')),
+        uriConverter.pathToUri(convertPath('/packages/foo/lib/foo.dart'),
+            containingPath: convertPath('/packages/bar/lib/bar.dart')),
         Uri.parse('package:foo/foo.dart'));
   }
 
   test_pathToUri_package() {
-    expect(
-        uriConverter.pathToUri(
-            resourceProvider.convertPath('/packages/foo/lib/foo.dart')),
+    expect(uriConverter.pathToUri(convertPath('/packages/foo/lib/foo.dart')),
         Uri.parse('package:foo/foo.dart'));
   }
 
   test_pathToUri_relative() {
     expect(
-        uriConverter.pathToUri(
-            resourceProvider.convertPath('/packages/bar/lib/src/baz.dart'),
-            containingPath:
-                resourceProvider.convertPath('/packages/bar/lib/bar.dart')),
+        uriConverter.pathToUri(convertPath('/packages/bar/lib/src/baz.dart'),
+            containingPath: convertPath('/packages/bar/lib/bar.dart')),
         Uri.parse('src/baz.dart'));
   }
 
   test_uriToPath_dart() {
     expect(uriConverter.uriToPath(Uri.parse('dart:core')),
-        resourceProvider.convertPath('/sdk/lib/core/core.dart'));
+        convertPath('/sdk/lib/core/core.dart'));
   }
 
   test_uriToPath_package() {
     expect(uriConverter.uriToPath(Uri.parse('package:foo/foo.dart')),
-        resourceProvider.convertPath('/packages/foo/lib/foo.dart'));
+        convertPath('/packages/foo/lib/foo.dart'));
   }
 }