Add DartSdk.getLinkedBundle() and use it in PubSummaryManager.

pkg/analyzer/test/src/summary/pub_summary_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/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
-import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/pub_summary.dart';
 import 'package:analyzer/src/summary/summarize_elements.dart';
 import 'package:analyzer/src/util/fast_uri.dart';
 import 'package:path/path.dart' as pathos;
 import 'package:unittest/unittest.dart' hide ERROR;
 
 import '../../reflective_tests.dart';
 import '../../utils.dart';
 import '../context/abstract_context.dart';
 
 main() {
   initializeTestEnvironment();
   runReflectiveTests(PubSummaryManagerTest);
 }
 
 @reflectiveTest
 class PubSummaryManagerTest extends AbstractContextTest {
   static const String CACHE = '/home/.pub-cache/hosted/pub.dartlang.org';
 
-  static Map<DartSdk, PackageBundle> sdkBundleMap = <DartSdk, PackageBundle>{};
-
   PubSummaryManager manager;
 
   void setUp() {
     super.setUp();
     manager = new PubSummaryManager(resourceProvider, '_.temp');
   }
 
   test_computeSdkExtension() async {
     // Create package files.
     resourceProvider.newFile(
@@ skipping 43 matching lines @@
     Folder libFolderB = resourceProvider.newFolder('$CACHE/bbb/lib');
     context.sourceFactory = new SourceFactory(<UriResolver>[
       sdkResolver,
       resourceResolver,
       new PackageMapUriResolver(resourceProvider, {
         'aaa': [libFolderA],
         'bbb': [libFolderB],
       })
     ]);
 
-    PackageBundle sdkBundle = getSdkBundle(sdk);
+    PackageBundle sdkBundle = sdk.getLinkedBundle();
     PackageBundle bundle = manager.computeSdkExtension(context, sdkBundle);
     expect(bundle, isNotNull);
     expect(bundle.linkedLibraryUris, ['dart:aaa.internal']);
     expect(bundle.unlinkedUnitUris, [
       'dart:aaa.internal',
       'dart:aaa.internal/src/p1.dart',
       'dart:aaa.internal/src/p2.dart'
     ]);
     expect(bundle.unlinkedUnits, hasLength(3));
     expect(bundle.unlinkedUnits[0].classes.map((c) => c.name), ['ExtA']);
@@ skipping 89 matching lines @@
         'ccc': [libFolderC],
         'ddd': [libFolderD],
       })
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Now we should be able to get linked bundles.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, hasLength(4));
 
     // package:aaa
     {
       LinkedPubPackage linkedPackage = linkedPackages
           .singleWhere((linkedPackage) => linkedPackage.package.name == 'aaa');
       expect(linkedPackage.linked.linkedLibraryUris, ['package:aaa/a.dart']);
       _assertHasLinkedVariable(linkedPackage, 'a1', 'int', 'dart:core');
       _assertHasLinkedVariable(linkedPackage, 'a2', 'B', 'package:bbb/b.dart');
     }
@@ skipping 48 matching lines @@
         'bbb': [libFolderB],
       })
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Try to link.
     // Only 'aaa' can be linked, because 'bbb' references not available 'ccc'.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, hasLength(1));
 
     // package:aaa
     {
       LinkedPubPackage linkedPackage = linkedPackages
           .singleWhere((linkedPackage) => linkedPackage.package.name == 'aaa');
       _assertHasLinkedVariable(linkedPackage, 'a', 'int', 'dart:core');
     }
   }
 
@@ skipping 23 matching lines @@
       })
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Try to link.
     // No linked libraries, because 'aaa' needs 'bbb', and 'bbb' needs 'ccc'.
     // But 'ccc' is not available, so the whole chain cannot be linked.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, isEmpty);
   }
 
   test_getLinkedBundles_missingLibrary() async {
     resourceProvider.newFile(
         '$CACHE/aaa/lib/a.dart',
         '''
 import 'package:bbb/b2.dart';
 int a;
 ''');
@@ skipping 16 matching lines @@
       })
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Try to link.
     // Only 'bbb', because 'aaa' references 'package:bbb/b2.dart', which does
     // not exist in the bundle 'bbb'.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, hasLength(1));
 
     // package:bbb
     {
       LinkedPubPackage linkedPackage = linkedPackages
           .singleWhere((linkedPackage) => linkedPackage.package.name == 'bbb');
       _assertHasLinkedVariable(linkedPackage, 'b', 'int', 'dart:core');
     }
   }
 
@@ skipping 34 matching lines @@
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Try to link.
     // Only 'ccc' is linked.
     // The 'aaa' + 'bbb' cycle cannot be linked because 'bbb' references
     // 'package:ccc/c2.dart', which does not exist in the bundle 'ccc'.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, hasLength(1));
 
     // package:ccc
     {
       LinkedPubPackage linkedPackage = linkedPackages
           .singleWhere((linkedPackage) => linkedPackage.package.name == 'ccc');
       _assertHasLinkedVariable(linkedPackage, 'c', 'int', 'dart:core');
     }
   }
 
@@ skipping 21 matching lines @@
         'aaa': [libFolderA],
         'bbb': [libFolderB],
       })
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Now we should be able to get linked bundles.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, hasLength(2));
 
     // package:aaa
     {
       LinkedPubPackage linkedPackage = linkedPackages
           .singleWhere((linkedPackage) => linkedPackage.package.name == 'aaa');
       _assertHasLinkedVariable(linkedPackage, 'a', 'int', 'dart:core');
     }
 
     // package:bbb
@@ skipping 25 matching lines @@
       new PackageMapUriResolver(resourceProvider, {
         'aaa': [libFolderA],
       })
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Link.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, hasLength(1));
 
     // package:aaa
     {
       LinkedPubPackage linkedPackage = linkedPackages
           .singleWhere((linkedPackage) => linkedPackage.package.name == 'aaa');
       _assertHasLinkedVariable(linkedPackage, 'a', 'A', 'src/a2.dart');
     }
   }
 
@@ skipping 27 matching lines @@
         'bbb': [libFolderB],
         'ccc': [libFolderC],
       })
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Now we should be able to get linked bundles.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, hasLength(3));
 
     // package:aaa
     {
       LinkedPubPackage linkedPackage = linkedPackages
           .singleWhere((linkedPackage) => linkedPackage.package.name == 'aaa');
       _assertHasLinkedVariable(linkedPackage, 'a', 'C', 'package:ccc/c.dart');
     }
   }
 
@@ skipping 33 matching lines @@
         'aaa': [libFolderA],
         'bbb': [libFolderB],
       })
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Now we should be able to get linked bundles.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, hasLength(2));
 
     // package:aaa
     {
       LinkedPubPackage linkedPackage = linkedPackages
           .singleWhere((linkedPackage) => linkedPackage.package.name == 'aaa');
       _assertHasLinkedVariable(linkedPackage, 'a', 'ExtB', 'dart:bbb');
     }
 
     // package:bbb
@@ skipping 22 matching lines @@
       })
     ]);
 
     // Ensure unlinked bundles.
     manager.getUnlinkedBundles(context);
     await manager.onUnlinkedComplete;
 
     // Try to link.
     // The package 'aaa' cannot be linked because it uses not 'dart' or
     // 'package' import URI scheme.
-    PackageBundle sdkBundle = getSdkBundle(sdk);
-    List<LinkedPubPackage> linkedPackages =
-        manager.getLinkedBundles(context, sdkBundle);
+    List<LinkedPubPackage> linkedPackages = manager.getLinkedBundles(context);
     expect(linkedPackages, hasLength(0));
   }
 
   test_getPackageName() {
     String getPackageName(String uriStr) {
       return PubSummaryManager.getPackageName(uriStr);
     }
     expect(getPackageName('package:foo/bar.dart'), 'foo');
     expect(getPackageName('package:foo/bar/baz.dart'), 'foo');
     expect(getPackageName('wrong:foo/bar.dart'), isNull);
@@ skipping 259 matching lines @@
               return;
             }
           }
           fail('Cannot find linked unit for $variableName in $linkedPackage');
         }
       }
     }
     fail('Cannot find variable $variableName in $linkedPackage');
   }
 
-  /**
-   * Compute element based summary bundle for the given [sdk].
-   */
-  static PackageBundle getSdkBundle(DartSdk sdk) {
-    return sdkBundleMap.putIfAbsent(sdk, () {
-      PackageBundleAssembler assembler = new PackageBundleAssembler();
-      for (SdkLibrary sdkLibrary in sdk.sdkLibraries) {
-        String uriStr = sdkLibrary.shortName;
-        Source source = sdk.mapDartUri(uriStr);
-        LibraryElement libraryElement =
-            sdk.context.computeLibraryElement(source);
-        assembler.serializeLibraryElement(libraryElement);
-      }
-      List<int> bytes = assembler.assemble().toBuffer();
-      return new PackageBundle.fromBuffer(bytes);
-    });
-  }
-
   static PackageBundle _getBundleByPackageName(
       Map<PubPackage, PackageBundle> bundles, String name) {
     PubPackage package =
         bundles.keys.singleWhere((package) => package.name == name);
     return bundles[package];
   }
 }