Deprecate FileUriResolver and RelativeFileUriResolver in source_io.dart, replace the usages with Re…

pkg/analyzer/test/generated/all_the_rest_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.test.generated.all_the_rest_test;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart' hide ConstantEvaluator;
 import 'package:analyzer/src/dart/element/builder.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/java_engine_io.dart';
 import 'package:analyzer/src/generated/java_io.dart';
@@ skipping 4158 matching lines @@
 
     // '\r' -> '\n' as first, last and only character
     expect(FileBasedSource.fileReadMode('\r'), '\n');
     expect(FileBasedSource.fileReadMode('a\r'), 'a\n');
     expect(FileBasedSource.fileReadMode('\ra'), '\na');
 
     FileBasedSource.fileReadMode = (String s) => s;
   }
 
   void test_getEncoding() {
-    SourceFactory factory = new SourceFactory([new FileUriResolver()]);
+    SourceFactory factory = new SourceFactory(
+        [new ResourceUriResolver(PhysicalResourceProvider.INSTANCE)]);
     String fullPath = "/does/not/exist.dart";
     JavaFile file = FileUtilities2.createFile(fullPath);
     FileBasedSource source = new FileBasedSource(file);
     expect(factory.fromEncoding(source.encoding), source);
   }
 
   void test_getFullName() {
     String fullPath = "/does/not/exist.dart";
     JavaFile file = FileUtilities2.createFile(fullPath);
     FileBasedSource source = new FileBasedSource(file);
@@ skipping 100 matching lines @@
         new FileBasedSource(file, parseUriWithException("dart:core"));
     expect(source, isNotNull);
     expect(source.fullName, file.getAbsolutePath());
     expect(source.isInSystemLibrary, isTrue);
   }
 }
 
 @reflectiveTest
 class FileUriResolverTest {
   void test_creation() {
-    expect(new FileUriResolver(), isNotNull);
+    expect(
+        new ResourceUriResolver(PhysicalResourceProvider.INSTANCE), isNotNull);

[Brian Wilkerson, 2016/06/16 17:39:30]

This is no longer testing FileUriResolver. I think we should revert these tests.
They'll be removed when FileUriResolver is removed. (I'm assuming that all of
these tests are covered in ResourceUriResolverTest. If not, they should be
copied there.)

[jwren, 2016/06/16 18:09:56]

Done.

   }
 
   void test_resolve_file() {
-    UriResolver resolver = new FileUriResolver();
+    UriResolver resolver =
+        new ResourceUriResolver(PhysicalResourceProvider.INSTANCE);
     Source result = resolver
         .resolveAbsolute(parseUriWithException("file:/does/not/exist.dart"));
     expect(result, isNotNull);
     expect(result.fullName,
         FileUtilities2.createFile("/does/not/exist.dart").getAbsolutePath());
   }
 
   void test_resolve_nonFile() {
-    UriResolver resolver = new FileUriResolver();
+    UriResolver resolver =
+        new ResourceUriResolver(PhysicalResourceProvider.INSTANCE);
     Source result =
         resolver.resolveAbsolute(parseUriWithException("dart:core"));
     expect(result, isNull);
   }
 
   void test_restore() {
-    UriResolver resolver = new FileUriResolver();
+    UriResolver resolver =
+        new ResourceUriResolver(PhysicalResourceProvider.INSTANCE);
     Uri uri = parseUriWithException('file:///foo/bar.dart');
     Source source = resolver.resolveAbsolute(uri);
     expect(source, isNotNull);
     expect(resolver.restoreAbsolute(source), uri);
     expect(
         resolver.restoreAbsolute(
             new NonExistingSource(source.fullName, null, null)),
         uri);
   }
 }
@@ skipping 149 matching lines @@
     expect(UriKind.fromEncoding(0x70), same(UriKind.PACKAGE_URI));
     expect(UriKind.fromEncoding(0x58), same(null));
   }
 
   void test_getEncoding() {
     expect(UriKind.DART_URI.encoding, 0x64);
     expect(UriKind.FILE_URI.encoding, 0x66);
     expect(UriKind.PACKAGE_URI.encoding, 0x70);
   }
 }