Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Unified Diff: pkg/analysis_server/test/socket_server_test.dart

Issue 846723002: Make domains plugable (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/test/socket_server_test.dart
diff --git a/pkg/analysis_server/test/socket_server_test.dart b/pkg/analysis_server/test/socket_server_test.dart
index 047a1c8a59d6d39f363db089391429b030f10c64..c126bd02d0cbeef03140171a3d770d7f1ab7ce97 100644
--- a/pkg/analysis_server/test/socket_server_test.dart
+++ b/pkg/analysis_server/test/socket_server_test.dart
@@ -8,6 +8,7 @@ import 'dart:async';
import 'package:analysis_server/src/analysis_server.dart';
import 'package:analysis_server/src/constants.dart';
+import 'package:analysis_server/src/plugin/server_plugin.dart';
import 'package:analysis_server/src/protocol.dart';
import 'package:analysis_server/src/socket_server.dart';
import 'package:analyzer/instrumentation/instrumentation.dart';
@@ -15,6 +16,7 @@ import 'package:analyzer/src/generated/sdk_io.dart';
import 'package:unittest/unittest.dart';
import 'mocks.dart';
+import 'package:analysis_server/src/plugin/plugin_impl.dart';
main() {
group('SocketServer', () {
@@ -33,10 +35,7 @@ main() {
class SocketServerTest {
static void createAnalysisServer_alreadyStarted() {
- SocketServer server = new SocketServer(
- new AnalysisServerOptions(),
- DirectoryBasedDartSdk.defaultSdk,
- InstrumentationService.NULL_SERVICE);
+ SocketServer server = _createSocketServer();
MockServerChannel channel1 = new MockServerChannel();
MockServerChannel channel2 = new MockServerChannel();
server.createAnalysisServer(channel1);
@@ -61,10 +60,7 @@ class SocketServerTest {
}
static Future createAnalysisServer_successful() {
- SocketServer server = new SocketServer(
- new AnalysisServerOptions(),
- DirectoryBasedDartSdk.defaultSdk,
- InstrumentationService.NULL_SERVICE);
+ SocketServer server = _createSocketServer();
MockServerChannel channel = new MockServerChannel();
server.createAnalysisServer(channel);
channel.expectMsgCount(notificationCount: 1);
@@ -78,10 +74,7 @@ class SocketServerTest {
}
static Future requestHandler_exception() {
- SocketServer server = new SocketServer(
- new AnalysisServerOptions(),
- DirectoryBasedDartSdk.defaultSdk,
- InstrumentationService.NULL_SERVICE);
+ SocketServer server = _createSocketServer();
MockServerChannel channel = new MockServerChannel();
server.createAnalysisServer(channel);
channel.expectMsgCount(notificationCount: 1);
@@ -101,10 +94,7 @@ class SocketServerTest {
}
static Future requestHandler_futureException() {
- SocketServer server = new SocketServer(
- new AnalysisServerOptions(),
- DirectoryBasedDartSdk.defaultSdk,
- InstrumentationService.NULL_SERVICE);
+ SocketServer server = _createSocketServer();
MockServerChannel channel = new MockServerChannel();
server.createAnalysisServer(channel);
_MockRequestHandler handler = new _MockRequestHandler(true);
@@ -117,6 +107,17 @@ class SocketServerTest {
expect(channel.notificationsReceived[1].event, SERVER_ERROR);
});
}
+
+ static SocketServer _createSocketServer() {
+ ServerPlugin serverPlugin = new ServerPlugin();
+ ExtensionManager manager = new ExtensionManager();
+ manager.processPlugins([serverPlugin]);
+ return new SocketServer(
+ new AnalysisServerOptions(),
+ DirectoryBasedDartSdk.defaultSdk,
+ InstrumentationService.NULL_SERVICE,
+ serverPlugin);
+ }
}
class _MockRequestHandler implements RequestHandler {

Powered by Google App Engine
This is Rietveld 408576698