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 0260f8b4f856e63e07fe0e9cef79aaf13f00ab83..cb2434278e144d160807869ab6569b07410f2804 100644 |
--- a/pkg/analysis_server/test/analysis_server_test.dart |
+++ b/pkg/analysis_server/test/analysis_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/domain_server.dart'; |
import 'package:analysis_server/src/plugin/server_plugin.dart'; |
import 'package:analyzer/file_system/file_system.dart'; |
@@ -136,7 +136,7 @@ class AnalysisServerTest { |
expect(notifications, isNotEmpty); |
// expect at least one notification indicating analysis is in progress |
expect(notifications.any((Notification notification) { |
- if (notification.event == SERVER_STATUS) { |
+ if (notification.event == SERVER_NOTIFICATION_STATUS) { |
var params = new ServerStatusParams.fromNotification(notification); |
if (params.analysis != null) { |
return params.analysis.isAnalyzing; |
@@ -168,7 +168,7 @@ analyzer: |
// the file is excluded, so no navigation notification |
await server.onAnalysisComplete; |
expect(channel.notificationsReceived.any((notification) { |
- return notification.event == ANALYSIS_NAVIGATION; |
+ return notification.event == ANALYSIS_NOTIFICATION_NAVIGATION; |
}), isFalse); |
} |
@@ -189,13 +189,13 @@ analyzer: |
// the file is excluded, so no navigation notification |
await server.onAnalysisComplete; |
expect(channel.notificationsReceived.any((notification) { |
- return notification.event == ANALYSIS_NAVIGATION; |
+ return notification.event == ANALYSIS_NOTIFICATION_NAVIGATION; |
}), isFalse); |
} |
Future test_shutdown() { |
server.handlers = [new ServerDomainHandler(server)]; |
- var request = new Request('my28', SERVER_SHUTDOWN); |
+ var request = new Request('my28', SERVER_REQUEST_SHUTDOWN); |
return channel.sendRequest(request).then((Response response) { |
expect(response.id, equals('my28')); |
expect(response.error, isNull); |