Create summary files in MockSdk classes

Review URL: https://codereview.chromium.org/2542853003 .

pkg/analysis_server/test/analysis_server_test.dart

@@ -121,20 +121,19 @@ import "../foo/foo.dart";
     });
   }
 
-  void processRequiredPlugins() {
+  void processRequiredPlugins(ServerPlugin serverPlugin) {
     List<Plugin> plugins = <Plugin>[];
     plugins.addAll(AnalysisEngine.instance.requiredPlugins);
     plugins.add(AnalysisEngine.instance.optionsPlugin);
-    plugins.add(server.serverPlugin);
+    plugins.add(serverPlugin);
 
     ExtensionManager manager = new ExtensionManager();
     manager.processPlugins(plugins);
   }
 
   void setUp() {
-    ExtensionManager manager = new ExtensionManager();
+    ServerPlugin serverPlugin = new ServerPlugin();
-    ServerPlugin plugin = new ServerPlugin();
+    processRequiredPlugins(serverPlugin);
-    manager.processPlugins([plugin]);
     channel = new MockServerChannel();
     resourceProvider = new MemoryResourceProvider();
     // Create an SDK in the mock file system.
@@ -145,12 +144,11 @@ import "../foo/foo.dart";
         resourceProvider,
         packageMapProvider,
         null,
-        plugin,
+        serverPlugin,
         new AnalysisServerOptions(),
         new DartSdkManager('/', false),
         InstrumentationService.NULL_SERVICE,
         rethrowExceptions: true);
-    processRequiredPlugins();
   }
 
   Future test_contextDisposed() {

pkg/analysis_server/test/domain_analysis_test.dart

@@ -13,8 +13,10 @@ import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analysis_server/src/plugin/server_plugin.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
+import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:plugin/manager.dart';
+import 'package:plugin/plugin.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -33,12 +35,21 @@ main() {
   AnalysisServer server;
   AnalysisDomainHandler handler;
 
+  void processRequiredPlugins(ServerPlugin serverPlugin) {
+    List<Plugin> plugins = <Plugin>[];
+    plugins.addAll(AnalysisEngine.instance.requiredPlugins);
+    plugins.add(AnalysisEngine.instance.optionsPlugin);
+    plugins.add(serverPlugin);
+
+    ExtensionManager manager = new ExtensionManager();
+    manager.processPlugins(plugins);
+  }
+
   setUp(() {
     serverChannel = new MockServerChannel();
     resourceProvider = new MemoryResourceProvider();
-    ExtensionManager manager = new ExtensionManager();
     ServerPlugin serverPlugin = new ServerPlugin();
-    manager.processPlugins([serverPlugin]);
+    processRequiredPlugins(serverPlugin);
     // Create an SDK in the mock file system.
     new MockSdk(resourceProvider: resourceProvider);
     server = new AnalysisServer(
@@ -429,11 +440,10 @@ class AnalysisTestHelper {
   String testCode;
 
   AnalysisTestHelper() {
+    ServerPlugin serverPlugin = new ServerPlugin();
+    processRequiredPlugins(serverPlugin);
     serverChannel = new MockServerChannel();
     resourceProvider = new MemoryResourceProvider();
-    ExtensionManager manager = new ExtensionManager();
-    ServerPlugin serverPlugin = new ServerPlugin();
-    manager.processPlugins([serverPlugin]);
     // Create an SDK in the mock file system.
     new MockSdk(resourceProvider: resourceProvider);
     server = new AnalysisServer(
@@ -597,6 +607,16 @@ class AnalysisTestHelper {
     expect(response, isResponseSuccess('0'));
   }
 
+  void processRequiredPlugins(ServerPlugin serverPlugin) {
+    List<Plugin> plugins = <Plugin>[];
+    plugins.addAll(AnalysisEngine.instance.requiredPlugins);
+    plugins.add(AnalysisEngine.instance.optionsPlugin);
+    plugins.add(serverPlugin);
+
+    ExtensionManager manager = new ExtensionManager();
+    manager.processPlugins(plugins);
+  }
+
   /**
    * Send an `updateContent` request for [testFile].
    */

pkg/analysis_server/test/domain_diagnostic_test.dart

@@ -24,21 +24,20 @@ main() {
   DiagnosticDomainHandler handler;
   MemoryResourceProvider resourceProvider;
 
-  setUp(() {
+  void processRequiredPlugins(ServerPlugin serverPlugin) {
-    //
-    // Collect plugins
-    //
-    ServerPlugin serverPlugin = new ServerPlugin();
     List<Plugin> plugins = <Plugin>[];
     plugins.addAll(AnalysisEngine.instance.requiredPlugins);
     plugins.add(AnalysisEngine.instance.commandLinePlugin);
     plugins.add(AnalysisEngine.instance.optionsPlugin);
     plugins.add(serverPlugin);
-    //
+
-    // Process plugins
-    //
     ExtensionManager manager = new ExtensionManager();
     manager.processPlugins(plugins);
+  }
+
+  setUp(() {
+    ServerPlugin serverPlugin = new ServerPlugin();
+    processRequiredPlugins(serverPlugin);
     //
     // Create the server
     //

pkg/analysis_server/test/mock_sdk.dart

@@ -274,8 +274,15 @@ const Map<String, LibraryInfo> libraries = const {
     LIBRARIES.forEach((SdkLibrary library) {
       provider.newFile(library.path, (library as MockSdkLibrary).content);
     });
-    provider.newFile('/lib/_internal/sdk_library_metadata/lib/libraries.dart',
+    provider.newFile(
+        provider.convertPath(
+            '/lib/_internal/sdk_library_metadata/lib/libraries.dart'),
         librariesContent);
+    List<int> bytes = _computeLinkedBundleBytes();
+    provider.newFileWithBytes(
+        provider.convertPath('/lib/_internal/spec.sum'), bytes);
+    provider.newFileWithBytes(
+        provider.convertPath('/lib/_internal/strong.sum'), bytes);
   }
 
   @override
@@ -341,13 +348,7 @@ const Map<String, LibraryInfo> libraries = const {
   @override
   PackageBundle getLinkedBundle() {
     if (_bundle == null) {
-      List<Source> librarySources = sdkLibraries
+      _bundle = new PackageBundle.fromBuffer(_computeLinkedBundleBytes());
-          .map((SdkLibrary library) => mapDartUri(library.shortName))
-          .toList();
-      List<int> bytes = new SummaryBuilder(
-              librarySources, context, context.analysisOptions.strongMode)
-          .build();
-      _bundle = new PackageBundle.fromBuffer(bytes);
     }
     return _bundle;
   }
@@ -383,6 +384,18 @@ const Map<String, LibraryInfo> libraries = const {
     // table above.
     return null;
   }
+
+  /**
+   * Compute the bytes of the linked bundle associated with this SDK.
+   */
+  List<int> _computeLinkedBundleBytes() {
+    List<Source> librarySources = sdkLibraries
+        .map((SdkLibrary library) => mapDartUri(library.shortName))
+        .toList();
+    return new SummaryBuilder(
+            librarySources, context, context.analysisOptions.strongMode)
+        .build();
+  }
 }
 
 class MockSdkLibrary implements SdkLibrary {

pkg/analyzer/test/src/context/mock_sdk.dart

@@ -351,7 +351,9 @@ class MockSdk implements DartSdk {
   PackageBundle _bundle;
 
   MockSdk(
-      {bool dartAsync: true, resource.MemoryResourceProvider resourceProvider})
+      {bool buildSummaries: true,
+      bool dartAsync: true,
+      resource.MemoryResourceProvider resourceProvider})
       : provider = resourceProvider ?? new resource.MemoryResourceProvider(),
         sdkLibraries = dartAsync ? _LIBRARIES : [_LIB_CORE],
         uriMap = dartAsync ? FULL_URI_MAP : NO_ASYNC_URI_MAP {
@@ -365,6 +367,13 @@ class MockSdk implements DartSdk {
         provider.convertPath(
             '$sdkRoot/lib/_internal/sdk_library_metadata/lib/libraries.dart'),
         librariesContent);
+    if (buildSummaries) {
+      List<int> bytes = _computeLinkedBundleBytes();
+      provider.newFileWithBytes(
+          provider.convertPath('/lib/_internal/spec.sum'), bytes);
+      provider.newFileWithBytes(
+          provider.convertPath('/lib/_internal/strong.sum'), bytes);
+    }
   }
 
   @override
@@ -422,13 +431,7 @@ class MockSdk implements DartSdk {
   @override
   PackageBundle getLinkedBundle() {
     if (_bundle == null) {
-      List<Source> librarySources = sdkLibraries
+      _bundle = new PackageBundle.fromBuffer(_computeLinkedBundleBytes());
-          .map((SdkLibrary library) => mapDartUri(library.shortName))
-          .toList();
-      List<int> bytes = new SummaryBuilder(
-              librarySources, context, context.analysisOptions.strongMode)
-          .build();
-      _bundle = new PackageBundle.fromBuffer(bytes);
     }
     return _bundle;
   }
@@ -467,6 +470,18 @@ class MockSdk implements DartSdk {
     String newContent = updateContent(content);
     provider.updateFile(path, newContent);
   }
+
+  /**
+   * Compute the bytes of the linked bundle associated with this SDK.
+   */
+  List<int> _computeLinkedBundleBytes() {
+    List<Source> librarySources = sdkLibraries
+        .map((SdkLibrary library) => mapDartUri(library.shortName))
+        .toList();
+    return new SummaryBuilder(
+            librarySources, context, context.analysisOptions.strongMode)
+        .build();
+  }
 }
 
 class _MockSdkLibrary implements SdkLibrary {

pkg/analyzer/test/src/summary/pub_summary_test.dart

@@ -254,7 +254,8 @@ A b;
     // Use DartSdk with a different API signature.
     // Different linked bundles should be created.
     {
-      MockSdk sdk = new MockSdk(resourceProvider: resourceProvider);
+      MockSdk sdk = new MockSdk(
+          buildSummaries: false, resourceProvider: resourceProvider);
       sdk.updateUriFile('dart:math', (String content) {
         return content + '  class NewMathClass {}';
       });