| 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 461620548c324ef08e773d9b3e37007b5dbb3f33..f25ef4499594d24e248c46f4c0c6af391d0fee5b 100644
|
| --- a/pkg/analysis_server/test/socket_server_test.dart
|
| +++ b/pkg/analysis_server/test/socket_server_test.dart
|
| @@ -5,9 +5,9 @@
|
| import 'dart:async';
|
|
|
| import 'package:analysis_server/protocol/protocol.dart';
|
| +import 'package:analysis_server/protocol/protocol_constants.dart';
|
| import 'package:analysis_server/protocol/protocol_generated.dart';
|
| 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/socket_server.dart';
|
| import 'package:analyzer/file_system/physical_file_system.dart';
|
| @@ -37,7 +37,8 @@ class SocketServerTest {
|
| MockServerChannel channel1 = new MockServerChannel();
|
| MockServerChannel channel2 = new MockServerChannel();
|
| server.createAnalysisServer(channel1);
|
| - expect(channel1.notificationsReceived[0].event, SERVER_CONNECTED);
|
| + expect(
|
| + channel1.notificationsReceived[0].event, SERVER_NOTIFICATION_CONNECTED);
|
| server.createAnalysisServer(channel2);
|
| channel1.expectMsgCount(notificationCount: 1);
|
| channel2.expectMsgCount(responseCount: 1);
|
| @@ -61,7 +62,8 @@ class SocketServerTest {
|
| MockServerChannel channel = new MockServerChannel();
|
| server.createAnalysisServer(channel);
|
| channel.expectMsgCount(notificationCount: 1);
|
| - expect(channel.notificationsReceived[0].event, SERVER_CONNECTED);
|
| + expect(
|
| + channel.notificationsReceived[0].event, SERVER_NOTIFICATION_CONNECTED);
|
| return channel
|
| .sendRequest(new ServerShutdownParams().toRequest('0'))
|
| .then((Response response) {
|
| @@ -76,7 +78,8 @@ class SocketServerTest {
|
| MockServerChannel channel = new MockServerChannel();
|
| server.createAnalysisServer(channel);
|
| channel.expectMsgCount(notificationCount: 1);
|
| - expect(channel.notificationsReceived[0].event, SERVER_CONNECTED);
|
| + expect(
|
| + channel.notificationsReceived[0].event, SERVER_NOTIFICATION_CONNECTED);
|
| _MockRequestHandler handler = new _MockRequestHandler(false);
|
| server.analysisServer.handlers = [handler];
|
| var request = new ServerGetVersionParams().toRequest('0');
|
| @@ -102,7 +105,7 @@ class SocketServerTest {
|
| expect(response.id, equals('0'));
|
| expect(response.error, isNull);
|
| channel.expectMsgCount(responseCount: 1, notificationCount: 2);
|
| - expect(channel.notificationsReceived[1].event, SERVER_ERROR);
|
| + expect(channel.notificationsReceived[1].event, SERVER_NOTIFICATION_ERROR);
|
| });
|
| }
|
|
|
|
|