Change integration test send...() methods to return structured objects.

pkg/analysis_server/tool/spec/codegen_inttest_methods.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.
 
 /**
  * Code generation for the file "integration_test_methods.dart".
  */
 library codegenInttestMethods;
 
 import 'dart:convert';
@@ skipping 135 matching lines @@
     }
     if (optionalArgs.isNotEmpty) {
       args.add('{${optionalArgs.join(', ')}}');
     }
     writeln();
     docComment(toHtmlVisitor.collectHtml(() {
       toHtmlVisitor.translateHtml(request.html);
       toHtmlVisitor.describePayload(request.params, 'Parameters');
       toHtmlVisitor.describePayload(request.result, 'Returns');
     }));
-    writeln('Future $methodName(${args.join(', ')}) {');
+    String resultClass;
+    String futureClass;
+    if (request.result == null) {
+      futureClass = 'Future';
+    } else {
+      resultClass =
+          camelJoin([request.domainName, request.method, 'result'], doCapitalize: true);
+      futureClass = 'Future<$resultClass>';
+    }
+    writeln('$futureClass $methodName(${args.join(', ')}) {');
     indent(() {
       String requestClass =
           camelJoin([request.domainName, request.method, 'params'], doCapitalize: true);
-      String resultValidator =
-          camelJoin(['is', request.domainName, request.method, 'result']);
       String paramsVar = 'null';
       if (request.params != null) {
         paramsVar = 'params';
         List<String> args = <String>[];
         List<String> optionalArgs = <String>[];
         for (TypeObjectField field in request.params.fields) {
           if (field.optional) {
             optionalArgs.add('${field.name}: ${field.name}');
           } else {
             args.add(field.name);
           }
         }
         args.addAll(optionalArgs);
         writeln('var params = new $requestClass(${args.join(', ')}).toJson();');
       }
       writeln(
           'return server.send(${JSON.encode(request.longMethod)}, $paramsVar)');
       indent(() {
         writeln('  .then((result) {');
-        writeln('expect(result, $resultValidator);');
-        writeln('return result;');
+        if (request.result != null) {
+          String kind = 'null';
+          if (requestClass == 'EditGetRefactoringParams') {
+            kind = 'kind';
+          }
+          writeln('ResponseDecoder decoder = new ResponseDecoder($kind);');
+          writeln(
+              "return new $resultClass.fromJson(decoder, 'result', result);");
+        } else {
+          writeln('expect(result, isNull);');
+          writeln('return null;');
+        }
       });
       writeln('});');
     });
     writeln('}');
   }
 
   /**
    * Generate a function argument for the given parameter field.
    */
   String formatArgument(TypeObjectField field) =>
@@ skipping 39 matching lines @@
       new CodegenInttestMethodsVisitor(readApi());
   return visitor.collectCode(visitor.visitApi);
 });
 
 /**
  * Translate spec_input.html into protocol_matchers.dart.
  */
 main() {
   target.generate();
 }