Bootloader initialization cleanup.

test/driver_test.dart

 // Copyright (c) 2015, 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.
 
 @TestOn("vm")
 library analyzer_cli.test.driver;
 
 import 'dart:io';
 
 import 'package:analyzer/plugin/options.dart';
+import 'package:analyzer_cli/src/bootloader.dart';
 import 'package:analyzer_cli/src/driver.dart';
 import 'package:linter/src/plugin/linter_plugin.dart';
 import 'package:path/path.dart' as path;
 import 'package:plugin/plugin.dart';
 import 'package:test/test.dart';
 import 'package:yaml/src/yaml_node.dart';
 
 main() {
   group('Driver', () {
     group('options', () {
       test('custom processor', () {
         Driver driver = new Driver();
         TestProcessor processor = new TestProcessor();
         driver.userDefinedPlugins = [new TestPlugin(processor)];
         driver.start([
           '--options',
           'test/data/test_options.yaml',
           'test/data/test_file.dart'
         ]);
         expect(processor.options['test_plugin'], isNotNull);
         expect(processor.exception, isNull);
       });
-      group('plugin processing', () {
-        StringSink savedErrorSink;
-        setUp(() {
-          savedErrorSink = errorSink;
-          errorSink = new StringBuffer();
-        });
-        tearDown(() {
-          errorSink = savedErrorSink;
-        });
-        test('bad format', () {
-          Driver driver = new Driver();
-          driver.start([
-            '--options',
-            'test/data/bad_plugin_options.yaml',
-            'test/data/test_file.dart'
-          ]);
-          expect(
-              errorSink.toString(),
-              equals(
-                  'Plugin configuration skipped: Unrecognized plugin config format, expected `YamlMap`, got `YamlList` (line 2, column 4)\n'));
-        });
-        test('plugin config', () {
-          Driver driver = new Driver();
-          driver.start([
-            '--options',
-            'test/data/plugin_options.yaml',
-            'test/data/test_file.dart'
-          ]);
-          var plugins = driver.pluginConfig.plugins;
-          expect(plugins, hasLength(1));
-          expect(plugins.first.name, equals('my_plugin1'));
-        });
-      });
     });
 
     group('linter', () {
       test('gets analysis options', () {
         Driver driver = new Driver();
         driver.start([
           '--options',
           'test/data/linter_project/.analysis_options',
           '--lints',
           'test/data/linter_project/test_file.dart'
@@ skipping 68 matching lines @@
         new Driver().start(['--package-root', 'does/not/exist', 'test.dart']);
         String stdout = outSink.toString();
         expect(exitCode, 3);
         expect(
             stdout,
             contains(
                 'Package root directory (does/not/exist) does not exist.'));
       });
     });
   });
+  group('Bootloader', () {
+    group('plugin processing', () {
+      StringSink savedErrorSink;
+      setUp(() {
+        savedErrorSink = errorSink;
+        errorSink = new StringBuffer();
+      });
+      tearDown(() {
+        errorSink = savedErrorSink;
+      });
+      test('bad format', () {
+        BootLoader loader = new BootLoader();
+        loader.createImage([
+          '--options',
+          'test/data/bad_plugin_options.yaml',
+          'test/data/test_file.dart'
+        ]);
+        expect(
+            errorSink.toString(),
+            equals(
+                'Plugin configuration skipped: Unrecognized plugin config format, expected `YamlMap`, got `YamlList` (line 2, column 4)\n'));
+      });
+      test('plugin config', () {
+        BootLoader loader = new BootLoader();
+        Image image = loader.createImage([
+          '--options',
+          'test/data/plugin_options.yaml',
+          'test/data/test_file.dart'
+        ]);
+        var plugins = image.config.plugins;
+        expect(plugins, hasLength(1));
+        expect(plugins.first.name, equals('my_plugin1'));
+      });
+    });
+  });
 }
 
 class TestPlugin extends Plugin {
   TestProcessor processor;
   TestPlugin(this.processor);
 
   @override
   String get uniqueIdentifier => 'test_plugin.core';
 
   @override
@@ skipping 14 matching lines @@
   @override
   void onError(Exception exception) {
     this.exception = exception;
   }
 
   @override
   void optionsProcessed(Map<String, YamlNode> options) {
     this.options = options;
   }
 }