Parameterize uri resolution and parsing of options, use package:path

test/file_generator_test.dart

 #!/usr/bin/env dart
 // Copyright (c) 2013, 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 file_generator_test;
 
-import 'package:protoc-plugin/src/descriptor.pb.dart';
-import 'package:protoc-plugin/src/plugin.pb.dart';
-import 'package:protoc-plugin/protoc.dart';
+import 'package:protoc_plugin/src/descriptor.pb.dart';
+import 'package:protoc_plugin/src/plugin.pb.dart';
+import 'package:protoc_plugin/protoc.dart';
 import 'package:unittest/unittest.dart';
 
 
 FileDescriptorProto buildFileDescriptor({topLevelEnum: false}) {
   EnumDescriptorProto ed;
   if (topLevelEnum) {
     ed = new EnumDescriptorProto()
       ..name = 'PhoneType'
       ..value.addAll([
           new EnumValueDescriptorProto()
@@ skipping 82 matching lines @@
   String get name => getField(3);
   void set name(String v) { setField(3, v); }
   bool hasName() => hasField(3);
   void clearName() => clearField(3);
 }
 
 ''';
     FileDescriptorProto fd = buildFileDescriptor();
     MemoryWriter buffer = new MemoryWriter();
     IndentingWriter writer = new IndentingWriter('  ', buffer);
-    var options =
-        new GenerationOptions(
-            new CodeGeneratorRequest(), new CodeGeneratorResponse());
-    FileGenerator fg =
-        new FileGenerator(fd, null, new GenerationContext(options));
+    var options = parseGenerationOptions(
+        new CodeGeneratorRequest(), new CodeGeneratorResponse());
+    FileGenerator fg = new FileGenerator(fd, null,
+        new GenerationContext(options, new DefaultOutputConfiguration()));
     fg.generate(writer);
     expect(buffer.toString(), expected);
   });
 
   test('testMessageGeneratorTopLevelEmun', () {
     // NOTE: Below > 80 cols because it is matching generated code > 80 cols.
     String expected = r'''
 ///
 //  Generated code. Do not modify.
 ///
@@ skipping 47 matching lines @@
   String get name => getField(3);
   void set name(String v) { setField(3, v); }
   bool hasName() => hasField(3);
   void clearName() => clearField(3);
 }
 
 ''';
     FileDescriptorProto fd = buildFileDescriptor(topLevelEnum: true);
     MemoryWriter buffer = new MemoryWriter();
     IndentingWriter writer = new IndentingWriter('  ', buffer);
-    var options =
-        new GenerationOptions(
-            new CodeGeneratorRequest(), new CodeGeneratorResponse());
-    FileGenerator fg =
-        new FileGenerator(fd, null, new GenerationContext(options));
+    var options = parseGenerationOptions(
+        new CodeGeneratorRequest(), new CodeGeneratorResponse());
+    FileGenerator fg = new FileGenerator(fd, null,
+        new GenerationContext(options, new DefaultOutputConfiguration()));
     fg.generate(writer);
     expect(buffer.toString(), expected);
   });
 
   test('testMessageGeneratorPackage', () {
     // NOTE: Below > 80 cols because it is matching generated code > 80 cols.
     String expected = r'''
 ///
 //  Generated code. Do not modify.
 ///
@@ skipping 29 matching lines @@
   void set name(String v) { setField(3, v); }
   bool hasName() => hasField(3);
   void clearName() => clearField(3);
 }
 
 ''';
     FileDescriptorProto fd = buildFileDescriptor();
     fd.package = "pb_library";
     MemoryWriter buffer = new MemoryWriter();
     IndentingWriter writer = new IndentingWriter('  ', buffer);
-    var options =
-        new GenerationOptions(
-            new CodeGeneratorRequest(), new CodeGeneratorResponse());
-    FileGenerator fg =
-        new FileGenerator(fd, null, new GenerationContext(options));
+    var options = parseGenerationOptions(
+        new CodeGeneratorRequest(), new CodeGeneratorResponse());
+    FileGenerator fg = new FileGenerator(fd, null,
+        new GenerationContext(options, new DefaultOutputConfiguration()));
     fg.generate(writer);
     expect(buffer.toString(), expected);
   });
 
   test('testMessageGeneratorFieldNameOption', () {
     // NOTE: Below > 80 cols because it is matching generated code > 80 cols.
     String expected = r'''
 ///
 //  Generated code. Do not modify.
 ///
@@ skipping 32 matching lines @@
 }
 
 ''';
     FileDescriptorProto fd = buildFileDescriptor();
     MemoryWriter buffer = new MemoryWriter();
     IndentingWriter writer = new IndentingWriter('  ', buffer);
     var request = new CodeGeneratorRequest();
     request.parameter = 'field_name=PhoneNumber.number|No,'
                         'field_name=PhoneNumber.name|Name_,'
                         'field_name=PhoneNumber.type|The_type';
-    var options =
-        new GenerationOptions(
-            request, new CodeGeneratorResponse());
-    FileGenerator fg =
-        new FileGenerator(
-            fd, null, new GenerationContext(options));
+    var options = parseGenerationOptions(
+        request, new CodeGeneratorResponse());
+    FileGenerator fg = new FileGenerator(fd, null,
+        new GenerationContext(options, new DefaultOutputConfiguration()));
     fg.generate(writer);
     expect(buffer.toString(), expected);
   });
 
   test('testMessageGeneratorFieldNameOption', () {
     // NOTE: Below > 80 cols because it is matching generated code > 80 cols.
     String expected = r'''
 ///
 //  Generated code. Do not modify.
 ///
@@ skipping 124 matching lines @@
                 ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
                 ..typeName = ".p2.M",
             ]);
     FileDescriptorProto fd = new FileDescriptorProto()
         ..name = 'test.proto'
         ..messageType.add(md);
     fd.dependency.addAll(['package1.proto', 'package2.proto']);
     MemoryWriter buffer = new MemoryWriter();
     IndentingWriter writer = new IndentingWriter('  ', buffer);
     var request = new CodeGeneratorRequest();
-    var options = new GenerationOptions(request, new CodeGeneratorResponse());
-    var context = new GenerationContext(options);
+    var response = new CodeGeneratorResponse();
+    var options = parseGenerationOptions(request, response);
+    var context = new GenerationContext(options,
+        new DefaultOutputConfiguration());
     new FileGenerator(fd1, null, context);
     new FileGenerator(fd2, null, context);
     FileGenerator fg = new FileGenerator(fd, null, context);
     fg.generate(writer);
     expect(buffer.toString(), expected);
   });
 }