Simplify how patch files are specified to analyzer.

pkg/analyzer/test/src/dart/sdk/sdk_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.sdk_test;
 
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/context/builder.dart' show EmbedderYamlLocator;
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_engine_io.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/summary/summarize_elements.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../../../embedder_tests.dart';
 import '../../../generated/test_support.dart';
 import '../../../resource_utils.dart';
 
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(EmbedderSdkTest);
     defineReflectiveTests(FolderBasedDartSdkTest);
     defineReflectiveTests(SdkExtensionFinderTest);
     defineReflectiveTests(SdkLibrariesReaderTest);
-    defineReflectiveTests(SdkLibraryImplTest);
   });
 }
 
 @reflectiveTest
 class EmbedderSdkTest extends EmbedderRelatedTest {
   void test_creation() {
     EmbedderYamlLocator locator = new EmbedderYamlLocator({
       'fox': <Folder>[pathTranslator.getResource(foxLib)]
     });
     EmbedderSdk sdk = new EmbedderSdk(resourceProvider, locator.embedderYamls);
@@ skipping 427 matching lines @@
     SdkLibrary second = libraryMap.getLibrary("dart:second");
     expect(second, isNotNull);
     expect(second.category, "Server");
     expect(second.path, "second/second.dart");
     expect(second.shortName, "dart:second");
     expect(second.isDart2JsLibrary, false);
     expect(second.isDocumented, false);
     expect(second.isImplementation, true);
     expect(second.isVmLibrary, false);
   }
-
-  void test_readFrom_patches() {
-    LibraryMap libraryMap = new SdkLibrariesReader(false).readFromFile(
-        resourceProvider.getFile('/libs.dart'),
-        r'''
-final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
-  'foo' : const LibraryInfo(
-    'foo/foo.dart',
-    patches: {
-      DART2JS_PLATFORM | VM_PLATFORM: ['a', 'b'],
-      DART2JS_PLATFORM: ['c', 'd'],
-      VM_PLATFORM: ['e']}),
-};''');
-    expect(libraryMap, isNotNull);
-    expect(libraryMap.size(), 1);
-    SdkLibrary library = libraryMap.getLibrary('dart:foo');
-    expect(library, isNotNull);
-    expect(library.path, 'foo/foo.dart');
-    expect(library.shortName, 'dart:foo');
-    expect(library.getPatches(SdkLibraryImpl.DART2JS_PLATFORM),
-        unorderedEquals(['a', 'b', 'c', 'd']));
-    expect(library.getPatches(SdkLibraryImpl.VM_PLATFORM),
-        unorderedEquals(['a', 'b', 'e']));
-  }
-
-  void test_readFrom_patches_invalid_notList() {
-    expect(() {
-      new SdkLibrariesReader(false).readFromFile(
-          resourceProvider.getFile('/libs.dart'),
-          r'''
-final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
-  'foo' : const LibraryInfo(
-    'foo/foo.dart',
-    patches: {
-      VM_PLATFORM: 'X'}),
-};''');
-    }, throwsArgumentError);
-  }
-
-  void test_readFrom_patches_invalid_notString_inList() {
-    expect(() {
-      new SdkLibrariesReader(false).readFromFile(
-          resourceProvider.getFile('/libs.dart'),
-          r'''
-final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
-  'foo' : const LibraryInfo(
-    'foo/foo.dart',
-    patches: {
-      VM_PLATFORM: [42]}),
-};''');
-    }, throwsArgumentError);
-  }
-
-  void test_readFrom_patches_invalid_path_hasDotDot() {
-    _assertPatchPathIsInvalid('foo/../bar.dart');
-    _assertPatchPathIsInvalid('../foo/bar.dart');
-    _assertPatchPathIsInvalid('foo/bar..dart');
-  }
-
-  void test_readFrom_patches_invalid_path_isAbsolute() {
-    _assertPatchPathIsInvalid('/foo.dart');
-    _assertPatchPathIsInvalid('/foo/bar.dart');
-  }
-
-  void test_readFrom_patches_invalid_path_notPosix() {
-    _assertPatchPathIsInvalid(r'foo\bar.dart');
-  }
-
-  void test_readFrom_patches_invalid_platformCombinator() {
-    expect(() {
-      new SdkLibrariesReader(false).readFromFile(
-          resourceProvider.getFile('/libs.dart'),
-          r'''
-final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
-  'foo' : const LibraryInfo(
-    'foo/foo.dart',
-    patches: {
-      DART2JS_PLATFORM + VM_PLATFORM: ['X']}),
-};''');
-    }, throwsArgumentError);
-  }
-
-  void test_readFrom_patches_invalid_unknownPlatform() {
-    expect(() {
-      new SdkLibrariesReader(false).readFromFile(
-          resourceProvider.getFile('/libs.dart'),
-          r'''
-final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
-  'foo' : const LibraryInfo(
-    'foo/foo.dart',
-    patches: {
-      MY_UNKNOWN_PLATFORM: ['foo/bar_patch.dart']}),
-};''');
-    }, throwsArgumentError);
-  }
-
-  void test_readFrom_patches_no() {
-    LibraryMap libraryMap = new SdkLibrariesReader(false).readFromFile(
-        resourceProvider.getFile('/libs.dart'),
-        r'''
-final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
-  'my' : const LibraryInfo('my/my.dart')
-};''');
-    expect(libraryMap, isNotNull);
-    expect(libraryMap.size(), 1);
-    SdkLibrary library = libraryMap.getLibrary('dart:my');
-    expect(library, isNotNull);
-    expect(library.path, 'my/my.dart');
-    expect(library.shortName, 'dart:my');
-    expect(library.getPatches(SdkLibraryImpl.VM_PLATFORM), isEmpty);
-    expect(library.getPatches(SdkLibraryImpl.DART2JS_PLATFORM), isEmpty);
-  }
-
-  void _assertPatchPathIsInvalid(String patchPath) {
-    expect(() {
-      new SdkLibrariesReader(false).readFromFile(
-          resourceProvider.getFile('/libs.dart'),
-          '''
-final Map<String, LibraryInfo> LIBRARIES = const <String, LibraryInfo> {
-  'foo' : const LibraryInfo(
-    'foo/foo.dart',
-    patches: {
-      VM_PLATFORM: [r'$patchPath']}),
-};''');
-    }, throwsArgumentError);
-  }
 }
-
-@reflectiveTest
-class SdkLibraryImplTest extends EngineTestCase {
-  void test_patches() {
-    SdkLibraryImpl library = new SdkLibraryImpl('dart:foo');
-    // Set patches.
-    library.setPatchPaths(
-        SdkLibraryImpl.DART2JS_PLATFORM | SdkLibraryImpl.VM_PLATFORM,
-        ['a', 'b']);
-    library.setPatchPaths(SdkLibraryImpl.DART2JS_PLATFORM, ['c', 'd']);
-    library.setPatchPaths(SdkLibraryImpl.VM_PLATFORM, ['e']);
-    // Get patches.
-    expect(library.getPatches(SdkLibraryImpl.DART2JS_PLATFORM),
-        unorderedEquals(['a', 'b', 'c', 'd']));
-    expect(library.getPatches(SdkLibraryImpl.VM_PLATFORM),
-        unorderedEquals(['a', 'b', 'e']));
-  }
-}