Allow an analysis server response to have both "error" and "result" fields.

pkg/analysis_server/test/integration/integration_tests.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.integration.analysis;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
@@ skipping 128 matching lines @@
   }
 }
 
 // Matchers for data types defined in the analysis server API
 // ==========================================================
 // TODO(paulberry): add more matchers.
 
 // Matchers common to all domains
 // ------------------------------
 
-const Matcher isResultResponse = const MatchesJsonObject('result response',
+const Matcher isResponse = const MatchesJsonObject('response',
     const {
   'id': isString
 }, optionalFields: const {
-  'result': anything
+  'result': anything,
+  'error': isError
 });
 
 const Matcher isError = const MatchesJsonObject('Error', const {
   // TODO(paulberry): once we decide what the set of permitted error codes are,
   // add validation for 'code'.
   'code': anything,
   'message': isString
 }, optionalFields: const {
   // TODO(paulberry): API spec says that 'data' is required, but sometimes we
   // don't see it (example: error "Expected parameter subscriptions to be a
   // string list map" in response to a malformed "analysis.setSubscriptions"
   // command).
   'data': anything
 });
 
-const Matcher isErrorResponse = const MatchesJsonObject('error response', const
-    {
-  'id': isString,
-  'error': isError
-});
-
 const Matcher isNotification = const MatchesJsonObject('notification', const {
   'event': isString
 }, optionalFields: const {
   'params': isMap
 });
 
 // Matchers for specific responses and notifications
 // -------------------------------------------------
 
 // server.getVersion
@@ skipping 337 matching lines @@
           Completer completer = server._pendingCommands[id];
           if (completer == null) {
             fail('Unexpected response from server: id=$id');
           } else {
             server._pendingCommands.remove(id);
           }
           if (messageAsMap.containsKey('error')) {
             // TODO(paulberry): propagate the error info to the completer.
             completer.completeError(new UnimplementedError(
                 'Server responded with an error'));
-            // Check that the message is well-formed.  We do this after calling
-            // completer.completeError() so that we don't stall the test in the
-            // event of an error.
-            expect(message, isErrorResponse);
           } else {
             completer.complete(messageAsMap['result']);
-            // Check that the message is well-formed.  We do this after calling
-            // completer.complete() so that we don't stall the test in the
-            // event of an error.
-            expect(message, isResultResponse);
           }
+          // Check that the message is well-formed.  We do this after calling
+          // completer.complete() or completer.completeError() so that we don't
+          // stall the test in the event of an error.
+          expect(message, isResponse);
         } else {
           // Message is a notification.  It should have an event and possibly
           // params.
           expect(messageAsMap, contains('event'));
           expect(messageAsMap['event'], isString);
           String event = messageAsMap['event'];
           StreamController notificationController =
               server._notificationControllers[event];
           if (notificationController != null) {
             notificationController.add(messageAsMap['params']);
@@ skipping 62 matching lines @@
    * Record a message that was exchanged with the server, and print it out if
    * [debugStdio] has been called.
    */
   void _recordStdio(String line) {
     if (_debuggingStdio) {
       print(line);
     }
     _recordedStdio.add(line);
   }
 }