Unify the server and plugin versions of the generators

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';
 
 import 'package:analyzer/src/codegen/tools.dart';
 import 'package:front_end/src/codegen/tools.dart';
+import 'package:path/path.dart' as path;
 
 import 'api.dart';
 import 'codegen_dart.dart';
 import 'from_html.dart';
 import 'to_html.dart';
 
 final GeneratedFile target = new GeneratedFile(
-    'test/integration/integration_test_methods.dart', (String pkgPath) {
-  CodegenInttestMethodsVisitor visitor =
-      new CodegenInttestMethodsVisitor(readApi(pkgPath));
+    'test/integration/support/integration_test_methods.dart', (String pkgPath) {
+  CodegenInttestMethodsVisitor visitor = new CodegenInttestMethodsVisitor(
+      path.basename(pkgPath), readApi(pkgPath));
   return visitor.collectCode(visitor.visitApi);
 });
 
 /**
  * Visitor that generates the code for integration_test_methods.dart
  */
 class CodegenInttestMethodsVisitor extends DartCodegenVisitor
     with CodeGenerator {
   /**
+   * The name of the package into which code is being generated.
+   */
+  final String packageName;
+
+  /**
    * Visitor used to produce doc comments.
    */
   final ToHtmlVisitor toHtmlVisitor;
 
   /**
    * Code snippets concatenated to initialize all of the class fields.
    */
   List<String> fieldInitializationCode = <String>[];
 
   /**
    * Code snippets concatenated to produce the contents of the switch statement
    * for dispatching notifications.
    */
   List<String> notificationSwitchContents = <String>[];
 
-  CodegenInttestMethodsVisitor(Api api)
+  CodegenInttestMethodsVisitor(this.packageName, Api api)
       : toHtmlVisitor = new ToHtmlVisitor(api),
         super(api) {
     codeGeneratorSettings.commentLineLength = 79;
     codeGeneratorSettings.languageName = 'dart';
   }
 
   /**
    * Generate a function argument for the given parameter field.
    */
   String formatArgument(TypeObjectField field) =>
@@ skipping 27 matching lines @@
       }
     } else if (type is TypeUnion) {
       return 'Object';
     } else {
       throw new Exception('Unexpected kind of TypeDecl');
     }
   }
 
   @override
   visitApi() {
-    outputHeader();
+    outputHeader(year: '2017');
     writeln();
     writeln('/**');
     writeln(' * Convenience methods for running integration tests');
     writeln(' */');
-    writeln('library test.integration.methods;');
-    writeln();
     writeln("import 'dart:async';");
     writeln();
-    writeln("import 'package:analysis_server/plugin/protocol/protocol.dart';");
+    writeln("import 'package:$packageName/protocol/protocol_generated.dart';");
     writeln(
-        "import 'package:analysis_server/src/protocol/protocol_internal.dart';");
+        "import 'package:$packageName/src/protocol/protocol_internal.dart';");
     writeln("import 'package:test/test.dart';");
     writeln();
     writeln("import 'integration_tests.dart';");
     writeln("import 'protocol_matchers.dart';");
     writeln();
-    writeln();
     writeln('/**');
     writeln(' * Convenience methods for running integration tests');
     writeln(' */');
     writeln('abstract class IntegrationTestMixin {');
     indent(() {
       writeln('Server get server;');
       super.visitApi();
       writeln();
       docComment(toHtmlVisitor.collectHtml(() {
         toHtmlVisitor.writeln('Initialize the fields in InttestMixin, and');
@@ skipping 135 matching lines @@
         writeln('ResponseDecoder decoder = new ResponseDecoder($kind);');
         writeln("return new $resultClass.fromJson(decoder, 'result', result);");
       } else {
         writeln('outOfTestExpect(result, isNull);');
         writeln('return null;');
       }
     });
     writeln('}');
   }
 }