Fix strong_mode_test after moving driver_test fields into class.

pkg/analyzer_cli/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.
 
 library analyzer_cli.test.driver;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:analyzer/error/error.dart';
@@ skipping 17 matching lines @@
 
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(BuildModeTest);
     defineReflectiveTests(ExitCodesTest);
     defineReflectiveTests(LinterTest);
     defineReflectiveTests(OptionsTest);
   }, name: 'Driver');
 }
 
+class BaseTest {
+  static const emptyOptionsFile = 'data/empty_options.yaml';
+
+  StringSink _savedOutSink, _savedErrorSink;
+  int _savedExitCode;
+  ExitHandler _savedExitHandler;
+
+  Driver driver;
+
+  /// Normalize text with bullets.
+  String bulletToDash(item) => '$item'.replaceAll('•', '-');
+
+  /// Start a driver for the given [source], optionally providing additional
+  /// [args] and an [options] file path.  The value of [options] defaults to
+  /// an empty options file to avoid unwanted configuration from an otherwise
+  /// discovered options file.
+  Future<Null> drive(String source,
+      {String options: emptyOptionsFile,
+      List<String> args: const <String>[]}) async {
+    driver = new Driver(isTesting: true);
+    var cmd = [
+      '--options',
+      path.join(testDirectory, options),
+      _adjustFileSpec(source)
+    ]..addAll(args);
+    await driver.start(cmd);
+  }
+
+  void setUp() {
+    ansi.runningTests = true;
+    _savedOutSink = outSink;
+    _savedErrorSink = errorSink;
+    _savedExitHandler = exitHandler;
+    _savedExitCode = exitCode;
+    exitHandler = (code) => exitCode = code;
+    outSink = new StringBuffer();
+    errorSink = new StringBuffer();
+  }
+
+  void tearDown() {
+    outSink = _savedOutSink;
+    errorSink = _savedErrorSink;
+    exitCode = _savedExitCode;
+    exitHandler = _savedExitHandler;
+    ansi.runningTests = false;
+  }
+
+  /// Convert a file specification from a relative path to an absolute path.
+  /// Handles the case where the file specification is of the form "$uri|$path".
+  String _adjustFileSpec(String fileSpec) {
+    int uriPrefixLength = fileSpec.indexOf('|') + 1;
+    String uriPrefix = fileSpec.substring(0, uriPrefixLength);
+    String relativePath = fileSpec.substring(uriPrefixLength);
+    return '$uriPrefix${path.join(testDirectory, relativePath)}';
+  }
+}
+
 @reflectiveTest
-class BuildModeTest extends _BaseTest {
+class BuildModeTest extends BaseTest {
   test_buildLinked() async {
     await withTempDirAsync((tempDir) async {
       var outputPath = path.join(tempDir, 'test_file.dart.sum');
       await _doDrive(path.join('data', 'test_file.dart'), additionalArgs: [
         '--build-summary-only',
         '--build-summary-output=$outputPath'
       ]);
       var output = new File(outputPath);
       expect(output.existsSync(), isTrue);
       PackageBundle bundle =
@@ skipping 238 matching lines @@
           }
         }
       }
     }
     throw new Exception('Could not find an SDK directory containing summaries.'
         '  Tried: ${triedDirectories.toList()}');
   }
 }
 
 @reflectiveTest
-class ExitCodesTest extends _BaseTest {
+class ExitCodesTest extends BaseTest {
   test_bazelWorkspace_relativePath() async {
     // Copy to temp dir so that existing analysis options
     // in the test directory hierarchy do not interfere
     await withTempDirAsync((String tempDirPath) async {
       String dartSdkPath = path.absolute(getSdkPath());
       await recursiveCopy(
           new Directory(path.join(testDirectory, 'data', 'bazel')),
           tempDirPath);
       Directory origWorkingDir = Directory.current;
       try {
@@ skipping 80 matching lines @@
     await driver.start([
       path.join(testDirectory, 'data/library_and_parts/lib.dart'),
       path.join(testDirectory, 'data/library_and_parts/part1.dart'),
       path.join(testDirectory, 'data/library_and_parts/part2.dart')
     ]);
     expect(exitCode, 3);
   }
 }
 
 @reflectiveTest
-class LinterTest extends _BaseTest {
+class LinterTest extends BaseTest {
   String get optionsFileName => AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE;
 
   test_containsLintRuleEntry() async {
     Map<String, YamlNode> options;
     options = _parseOptions('''
 linter:
   rules:
     - foo
         ''');
     expect(containsLintRuleEntry(options), true);
     options = _parseOptions('''
         ''');
     expect(containsLintRuleEntry(options), false);
     options = _parseOptions('''
 linter:
   rules:
     # - foo
         ''');
     expect(containsLintRuleEntry(options), true);
     options = _parseOptions('''
 linter:
  # rules:
     # - foo
         ''');
     expect(containsLintRuleEntry(options), false);
   }
 
   test_defaultLints_generatedLints() async {
     await _runLinter_defaultLints();
-    expect(_bulletToDash(outSink),
+    expect(bulletToDash(outSink),
         contains('lint - Name types using UpperCamelCase'));
   }
 
   test_defaultLints_getsDefaultLints() async {
     await _runLinter_defaultLints();
 
     /// Lints should be enabled.
     expect(driver.context.analysisOptions.lint, isTrue);
 
     /// Default list should include camel_case_types.
     var lintNames = getLints(driver.context).map((r) => r.name);
     expect(lintNames, contains('camel_case_types'));
   }
 
   test_lintsInOptions_generatedLints() async {
     await _runLinter_lintsInOptions();
-    expect(_bulletToDash(outSink),
+    expect(bulletToDash(outSink),
         contains('lint - Name types using UpperCamelCase'));
   }
 
   test_lintsInOptions_getAnalysisOptions() async {
     await _runLinter_lintsInOptions();
 
     /// Lints should be enabled.
     expect(driver.context.analysisOptions.lint, isTrue);
 
     /// The analysis options file only specifies 'camel_case_types'.
@@ skipping 29 matching lines @@
         options: 'data/linter_project/$optionsFileName', args: ['--lints']);
   }
 
   Future<Null> _runLinter_noLintsFlag() async {
     await drive('data/no_lints_project/test_file.dart',
         options: 'data/no_lints_project/$optionsFileName');
   }
 }
 
 @reflectiveTest
-class OptionsTest extends _BaseTest {
+class OptionsTest extends BaseTest {
   String get optionsFileName => AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE;
 
   List<ErrorProcessor> get processors =>
       driver.context.analysisOptions.errorProcessors;
 
   ErrorProcessor processorFor(AnalysisError error) =>
       processors.firstWhere((p) => p.appliesTo(error));
 
   test_basic_filters() async {
     await _driveBasic();
     expect(processors, hasLength(3));
 
     // unused_local_variable: ignore
     var unused_local_variable = new AnalysisError(
         new TestSource(), 0, 1, HintCode.UNUSED_LOCAL_VARIABLE, [
       ['x']
     ]);
     expect(processorFor(unused_local_variable).severity, isNull);
 
     // missing_return: error
     var missing_return =
         new AnalysisError(new TestSource(), 0, 1, HintCode.MISSING_RETURN, [
       ['x']
     ]);
     expect(processorFor(missing_return).severity, ErrorSeverity.ERROR);
-    expect(_bulletToDash(outSink),
+    expect(bulletToDash(outSink),
         contains("error - This function declares a return type of 'int'"));
     expect(outSink.toString(), contains("1 error and 1 warning found."));
   }
 
   test_basic_language() async {
     await _driveBasic();
     expect(driver.context.analysisOptions.enableSuperMixins, isTrue);
   }
 
   test_basic_strongMode() async {
@@ skipping 41 matching lines @@
         args: ['--fatal-warnings'],
         options: 'data/options_tests_project/$optionsFileName');
 
     // missing_return: error
     var undefined_function = new AnalysisError(
         new TestSource(), 0, 1, StaticTypeWarningCode.UNDEFINED_FUNCTION, [
       ['x']
     ]);
     expect(processorFor(undefined_function).severity, ErrorSeverity.WARNING);
     // Should not be made fatal by `--fatal-warnings`.
-    expect(_bulletToDash(outSink),
+    expect(bulletToDash(outSink),
         contains("warning - The function 'baz' isn't defined"));
     expect(outSink.toString(), contains("1 error and 1 warning found."));
   }
 
   Future<Null> _driveBasic() async {
     await drive('data/options_tests_project/test_file.dart',
         options: 'data/options_tests_project/$optionsFileName');
   }
 }
 
 class TestSource implements Source {
   TestSource();
 
   @override
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
-
-class _BaseTest {
-  static const emptyOptionsFile = 'data/empty_options.yaml';
-
-  StringSink _savedOutSink, _savedErrorSink;
-  int _savedExitCode;
-  ExitHandler _savedExitHandler;
-
-  Driver driver;
-
-  /// Start a driver for the given [source], optionally providing additional
-  /// [args] and an [options] file path.  The value of [options] defaults to
-  /// an empty options file to avoid unwanted configuration from an otherwise
-  /// discovered options file.
-  Future<Null> drive(String source,
-      {String options: emptyOptionsFile,
-      List<String> args: const <String>[]}) async {
-    driver = new Driver(isTesting: true);
-    var cmd = [
-      '--options',
-      path.join(testDirectory, options),
-      _adjustFileSpec(source)
-    ]..addAll(args);
-    await driver.start(cmd);
-  }
-
-  void setUp() {
-    ansi.runningTests = true;
-    _savedOutSink = outSink;
-    _savedErrorSink = errorSink;
-    _savedExitHandler = exitHandler;
-    _savedExitCode = exitCode;
-    exitHandler = (code) => exitCode = code;
-    outSink = new StringBuffer();
-    errorSink = new StringBuffer();
-  }
-
-  void tearDown() {
-    outSink = _savedOutSink;
-    errorSink = _savedErrorSink;
-    exitCode = _savedExitCode;
-    exitHandler = _savedExitHandler;
-    ansi.runningTests = false;
-  }
-
-  /// Convert a file specification from a relative path to an absolute path.
-  /// Handles the case where the file specification is of the form "$uri|$path".
-  String _adjustFileSpec(String fileSpec) {
-    int uriPrefixLength = fileSpec.indexOf('|') + 1;
-    String uriPrefix = fileSpec.substring(0, uriPrefixLength);
-    String relativePath = fileSpec.substring(uriPrefixLength);
-    return '$uriPrefix${path.join(testDirectory, relativePath)}';
-  }
-
-  /// Normalize text with bullets.
-  String _bulletToDash(item) => '$item'.replaceAll('•', '-');
-}