Index: pkg/analysis_server/test/analysis_server_test.dart |
diff --git a/pkg/analysis_server/test/analysis_server_test.dart b/pkg/analysis_server/test/analysis_server_test.dart |
index a76d57bc6a137614ea34b1eda7c8cefe26595b50..b6a9475b00e59c7994abe082345d1ef310766089 100644 |
--- a/pkg/analysis_server/test/analysis_server_test.dart |
+++ b/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 plugin = new ServerPlugin(); |
- manager.processPlugins([plugin]); |
+ ServerPlugin serverPlugin = new ServerPlugin(); |
+ processRequiredPlugins(serverPlugin); |
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() { |