Simplify how patch files are specified to analyzer.

pkg/analyzer/test/src/dart/sdk/patch_test.dart

 // Copyright (c) 2016, 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.
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/dart/sdk/patch.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/util/fast_uri.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(SdkPatcherTest);
   });
 }
@@ skipping 423 matching lines @@
 part 'b.dart';
 int bar() => 0;
 ''',
         r'''
 import 'c.dart';
 ''');
     _assertUnitCode(unit,
         "import 'a.dart'; part 'b.dart'; import 'c.dart'; int bar() => 0;");
   }
 
-  test_fail_noSuchLibrary() {
-    expect(() {
-      _setSdkLibraries('const LIBRARIES = const {};');
-      _createSdk();
-      File file = provider.newFile(_p('/sdk/lib/test/test.dart'), '');
-      Source source = file.createSource(FastUri.parse('dart:test'));
-      CompilationUnit unit = SdkPatcher.parse(source, true, listener);
-      patcher.patch(sdk, SdkLibraryImpl.VM_PLATFORM, listener, source, unit);
-    }, throwsArgumentError);
-  }
-
   test_fail_patchFileDoesNotExist() {
     expect(() {
       _setSdkLibraries(r'''
 final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
   'test' : const LibraryInfo(
-    'test/test.dart',
-    patches: {VM_PLATFORM: ['does_not_exists.dart']}),
+    'test/test.dart'),
 };''');
       _createSdk();
+      var patchPaths = {
+        'dart:test': [_p('/sdk/lib/does_not_exist.dart')]
+      };
       File file = provider.newFile(_p('/sdk/lib/test/test.dart'), '');
       Source source = file.createSource(FastUri.parse('dart:test'));
       CompilationUnit unit = SdkPatcher.parse(source, true, listener);
-      patcher.patch(sdk, SdkLibraryImpl.VM_PLATFORM, listener, source, unit);
+      patcher.patch(provider, true, patchPaths, listener, source, unit);
     }, throwsArgumentError);
   }
 
   test_internal_allowNewPublicNames() {
     _setSdkLibraries(r'''
 final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
   '_internal' : const LibraryInfo(
-    'internal/internal.dart',
-    patches: {VM_PLATFORM: ['internal/internal_patch.dart']}),
+    'internal/internal.dart'),
 };''');
+    var patchPaths = {
+      'dart:_internal': [_p('/sdk/lib/internal/internal_patch.dart')]
+    };
     File file = provider.newFile(
         _p('/sdk/lib/internal/internal.dart'),
         r'''
 library dart._internal;
 class A {}
 class B {
   B();
 }
 ''');
     provider.newFile(
         _p('/sdk/lib/internal/internal_patch.dart'),
         r'''
 @patch
 class B {
   int newField;
   B.newConstructor();
   int newMethod() => 1;
 }
 class NewClass {}
 int newFunction() => 2;
 ''');
 
     _createSdk();
 
     Source source = file.createSource(FastUri.parse('dart:_internal'));
     CompilationUnit unit = SdkPatcher.parse(source, true, listener);
-    patcher.patch(sdk, SdkLibraryImpl.VM_PLATFORM, listener, source, unit);
+    patcher.patch(provider, true, patchPaths, listener, source, unit);
     _assertUnitCode(
         unit,
         'library dart._internal; class A {} '
         'class B {B(); int newField; B.newConstructor(); int newMethod() => 1;} '
         'class NewClass {} int newFunction() => 2;');
   }
 
   test_part() {
     String baseLibCode = r'''
 library test;
 part 'test_part.dart';
 class A {}
 ''';
     String basePartCode = r'''
 part of test;
 class B {}
 ''';
     _setSdkLibraries(r'''
 final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
   'test' : const LibraryInfo(
     'test/test.dart',
     patches: {VM_PLATFORM: ['test/test_patch.dart']}),
 };''');
+    var patchPaths = {
+      'dart:test': [_p('/sdk/lib/test/test_patch.dart')]
+    };
     File fileLib = provider.newFile(_p('/sdk/lib/test/test.dart'), baseLibCode);
     File filePart =
         provider.newFile(_p('/sdk/lib/test/test_part.dart'), basePartCode);
     provider.newFile(
         _p('/sdk/lib/test/test_patch.dart'),
         r'''
 import 'foo.dart';
 
 @patch
 class A {
   int _a() => 1;
 }
 
 @patch
 class B {
   int _b() => 1;
 }
 
 class _C {}
 ''');
 
     _createSdk();
 
     {
       Uri uri = FastUri.parse('dart:test');
       Source source = fileLib.createSource(uri);
       CompilationUnit unit = SdkPatcher.parse(source, true, listener);
-      patcher.patch(sdk, SdkLibraryImpl.VM_PLATFORM, listener, source, unit);
+      patcher.patch(provider, true, patchPaths, listener, source, unit);
       _assertUnitCode(
           unit,
           "library test; part 'test_part.dart'; import 'foo.dart'; "
           "class A {int _a() => 1;} class _C {}");
     }
 
     {
       Uri uri = FastUri.parse('dart:test/test_part.dart');
       Source source = filePart.createSource(uri);
       CompilationUnit unit = SdkPatcher.parse(source, true, listener);
-      patcher.patch(sdk, SdkLibraryImpl.VM_PLATFORM, listener, source, unit);
+      patcher.patch(provider, true, patchPaths, listener, source, unit);
       _assertUnitCode(unit, "part of test; class B {int _b() => 1;}");
     }
   }
 
   test_topLevel_class_append() {
     CompilationUnit unit = _doTopLevelPatching(
         r'''
 class A {}
 ''',
         r'''
@@ skipping 25 matching lines @@
       _doTopLevelPatching(
           r'''
 class A {}
 ''',
           r'''
 class B {}
 ''');
     }, throwsArgumentError);
   }
 
-  test_topLevel_topLevelVariable_append() {
-    CompilationUnit unit = _doTopLevelPatching(
-        r'''
-int foo() => 0;
-''',
-        r'''
-int _bar;
-''');
-    _assertUnitCode(unit, 'int foo() => 0; int _bar;');
-    FunctionDeclaration a = unit.declarations[0];
-    TopLevelVariableDeclaration b = unit.declarations[1];
-    _assertPrevNextToken(a.endToken, b.beginToken);
-  }
-
   test_topLevel_function_append() {
     CompilationUnit unit = _doTopLevelPatching(
         r'''
 int foo() => 0;
 ''',
         r'''
 int _bar1() => 1;
 int _bar2() => 2;
 ''');
     _assertUnitCode(
@@ skipping 143 matching lines @@
 external void set foo(int val);
 int bar() => 2;
 ''',
         r'''
 @patch
 void set foo(int val) {}
 ''');
     _assertUnitCode(unit, 'void set foo(int val) {} int bar() => 2;');
   }
 
+  test_topLevel_topLevelVariable_append() {
+    CompilationUnit unit = _doTopLevelPatching(
+        r'''
+int foo() => 0;
+''',
+        r'''
+int _bar;
+''');
+    _assertUnitCode(unit, 'int foo() => 0; int _bar;');
+    FunctionDeclaration a = unit.declarations[0];
+    TopLevelVariableDeclaration b = unit.declarations[1];
+    _assertPrevNextToken(a.endToken, b.beginToken);
+  }
+
   void _assertUnitCode(CompilationUnit unit, String expectedCode) {
     expect(unit.toSource(), expectedCode);
   }
 
   void _createSdk() {
     sdk = new FolderBasedDartSdk(provider, sdkFolder);
     sdk.analysisOptions = new AnalysisOptionsImpl()..strongMode = true;
   }
 
   CompilationUnit _doTopLevelPatching(String baseCode, String patchCode) {
     _setSdkLibraries(r'''
 final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
   'test' : const LibraryInfo(
-    'test/test.dart',
-    patches: {VM_PLATFORM: ['test/test_patch.dart']}),
+    'test/test.dart'),
 };''');
+    var patchPaths = {
+      'dart:test': [_p('/sdk/lib/test/test_patch.dart')]
+    };
     File file = provider.newFile(_p('/sdk/lib/test/test.dart'), baseCode);
     provider.newFile(_p('/sdk/lib/test/test_patch.dart'), patchCode);
 
     _createSdk();
 
     Source source = file.createSource(FastUri.parse('dart:test'));
     CompilationUnit unit = SdkPatcher.parse(source, true, listener);
-    patcher.patch(sdk, SdkLibraryImpl.VM_PLATFORM, listener, source, unit);
+    patcher.patch(provider, true, patchPaths, listener, source, unit);
     return unit;
   }
 
   String _p(String path) => provider.convertPath(path);
 
   void _setSdkLibraries(String code) {
     provider.newFile(
         _p('/sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart'), code);
   }
 
   static void _assertPrevNextToken(Token prev, Token next) {
     expect(prev.next, same(next));
     expect(next.previous, same(prev));
   }
 }