improve analysis server notifications

pkg/analysis_server/test/analysis_server_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library test.analysis_server;
 
 import 'dart:async';
 
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source_io.dart';
@@ skipping 47 matching lines @@
     MockAnalysisContext context = new MockAnalysisContext();
     server.addContextToWorkQueue(context);
     // Pump the event queue to make sure the server doesn't try to do any
     // analysis.
     return pumpEventQueue();
   }
 
   static Future addContextToWorkQueue_whenRunning() {
     MockAnalysisContext context = new MockAnalysisContext();
     server.addContextToWorkQueue(context);
+    server.contextIdMap[context] = 'context-27';
     MockSource source = new MockSource();
     source.when(callsTo('get encoding')).alwaysReturn('foo.dart');
     ChangeNoticeImpl changeNoticeImpl = new ChangeNoticeImpl(source);
     LineInfo lineInfo = new LineInfo([0]);
     AnalysisError analysisError = new AnalysisError.con1(source,
         CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_CONST_SUPER, ['Foo']);
     changeNoticeImpl.setErrors([analysisError], lineInfo);
     context.when(callsTo('performAnalysisTask')).thenReturn(
         new AnalysisResult([changeNoticeImpl], 0, 'myClass', 0));
     context.when(callsTo('performAnalysisTask')).thenReturn(
         new AnalysisResult(null, 0, null, 0));
     return pumpEventQueue().then((_) {
       context.getLogs(callsTo('performAnalysisTask')).verify(happenedExactly(2));
-      expect(channel.notificationsReceived, hasLength(2));
-      expect(channel.notificationsReceived[0].event, equals('server.connected')
-          );
-      expect(channel.notificationsReceived[1].event, equals('context.errors'));
-      expect(channel.notificationsReceived[1].params['source'], equals(
-          'foo.dart'));
-      List<AnalysisError> errors =
-          channel.notificationsReceived[1].params['errors'];
+      var notifications = channel.notificationsReceived;
+      expect(notifications, hasLength(2));
+      expect(notifications[0].event, equals('server.connected'));
+      expect(notifications[1].event, equals('context.errors'));
+      expect(notifications[1].params['source'], equals('foo.dart'));
+      expect(notifications[1].params['contextId'], equals('context-27'));
+      List<AnalysisError> errors = notifications[1].params['errors'];
       expect(errors, hasLength(1));
       expect(errors[0], equals(AnalysisServer.errorToJson(analysisError)));
     });
   }
 
   static Future addContextToWorkQueue_twice() {
     // The context should only be asked to perform its analysis task once.
     MockAnalysisContext context = new MockAnalysisContext();
     server.addContextToWorkQueue(context);
     server.addContextToWorkQueue(context);
@@ skipping 107 matching lines @@
   @override
   Response handleRequest(Request request) {
     if (request.method == 'echo') {
       var response = new Response(request.id);
       response.setResult('echo', true);
       return response;
     }
     return null;
   }
 }