| Index: pkg/analysis_server/test/domain_analysis_test.dart
|
| diff --git a/pkg/analysis_server/test/domain_analysis_test.dart b/pkg/analysis_server/test/domain_analysis_test.dart
|
| index 9230d23a024f589f57ccf85b60a3d0c7ede5c46c..0a8fd1c61b3eee043a1982d4197eb8d74412567f 100644
|
| --- a/pkg/analysis_server/test/domain_analysis_test.dart
|
| +++ b/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].
|
| */
|
|
|