Simplify CommandOutput and friends.

tools/testing/dart/test_runner.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Classes and methods for executing tests.
  *
  * This module includes:
  * - Managing parallel execution of tests, including timeout checks.
  * - Evaluating the output of each test as pass/fail/crash/timeout.
@@ skipping 11 matching lines @@
 import 'command.dart';
 import 'command_output.dart';
 import 'configuration.dart';
 import 'dependency_graph.dart' as dgraph;
 import 'expectation.dart';
 import 'runtime_configuration.dart';
 import 'test_progress.dart';
 import 'test_suite.dart';
 import 'utils.dart';
 
-const int CRASHING_BROWSER_EXITCODE = -10;
-const int SLOW_TIMEOUT_MULTIPLIER = 4;
-const int NON_UTF_FAKE_EXITCODE = 0xFFFD;
+const int browserCrashExitCode = -10;
+const int slowTimeoutMultiplier = 4;
+const int nonUtfFakeExitCode = 0xFFFD;
 
-const MESSAGE_CANNOT_OPEN_DISPLAY = 'Gtk-WARNING **: cannot open display';
-const MESSAGE_FAILED_TO_RUN_COMMAND = 'Failed to run command. return code=1';
+const cannotOpenDisplayMessage = 'Gtk-WARNING **: cannot open display';
+const failedToRunCommandMessage = 'Failed to run command. return code=1';
 
 typedef void TestCaseEvent(TestCase testCase);
 typedef void ExitCodeEvent(int exitCode);
 typedef void EnqueueMoreWork(ProcessQueue queue);
 typedef void Action();
 typedef Future<AdbCommandResult> StepFunction();
 
-// Some IO tests use these variables and get confused if the host environment
-// variables are inherited so they are excluded.
-const EXCLUDED_ENVIRONMENT_VARIABLES = const [
+/// Some IO tests use these variables and get confused if the host environment
+/// variables are inherited so they are excluded.
+const _excludedEnvironmentVariables = const [
   'http_proxy',
   'https_proxy',
   'no_proxy',
   'HTTP_PROXY',
   'HTTPS_PROXY',
   'NO_PROXY'
 ];
 
 /**
  * TestCase contains all the information needed to run a test and evaluate
@@ skipping 101 matching lines @@
       throw new Exception("CommandOutputs is empty, maybe no command was run? ("
           "displayName: '$displayName', "
           "configurationString: '$configurationString')");
     }
     return commands[commandOutputs.length - 1];
   }
 
   int get timeout {
     var result = configuration.timeout;
     if (expectedOutcomes.contains(Expectation.slow)) {
-      result *= SLOW_TIMEOUT_MULTIPLIER;
+      result *= slowTimeoutMultiplier;
     }
     return result;
   }
 
   String get configurationString {
     var compiler = configuration.compiler.name;
     var runtime = configuration.runtime.name;
     var mode = configuration.mode.name;
     var arch = configuration.architecture.name;
     var checked = configuration.isChecked ? '-checked' : '';
@@ skipping 356 matching lines @@
     completer.complete(commandOutput);
   }
 
   CommandOutput _createCommandOutput(ProcessCommand command, int exitCode) {
     List<int> stdoutData = stdout.toList();
     List<int> stderrData = stderr.toList();
     if (stdout.hasNonUtf8 || stderr.hasNonUtf8) {
       // If the output contained non-utf8 formatted data, then make the exit
       // code non-zero if it isn't already.
       if (exitCode == 0) {
-        exitCode = NON_UTF_FAKE_EXITCODE;
+        exitCode = nonUtfFakeExitCode;
       }
     }
     var commandOutput = createCommandOutput(
         command,
         exitCode,
         timedOut,
         stdoutData,
         stderrData,
         new DateTime.now().difference(startTime),
         compilationSkipped,
         pid);
     commandOutput.diagnostics.addAll(diagnostics);
     return commandOutput;
   }
 
   StreamSubscription _drainStream(
       Stream<List<int>> source, OutputLog destination) {
     return source.listen(destination.add);
   }
 
   Map<String, String> _createProcessEnvironment() {
     var environment = new Map<String, String>.from(io.Platform.environment);
 
     if (command.environmentOverrides != null) {
       for (var key in command.environmentOverrides.keys) {
         environment[key] = command.environmentOverrides[key];
       }
     }
-    for (var excludedEnvironmentVariable in EXCLUDED_ENVIRONMENT_VARIABLES) {
+    for (var excludedEnvironmentVariable in _excludedEnvironmentVariables) {
       environment.remove(excludedEnvironmentVariable);
     }
 
     // TODO(terry): Needed for roll 50?
     environment["GLIBCPP_FORCE_NEW"] = "1";
     environment["GLIBCXX_FORCE_NEW"] = "1";
 
     return environment;
   }
 }
@@ skipping 87 matching lines @@
   String _createArgumentsLine(List<String> arguments, int timeout) {
     return arguments.join(' ') + '\n';
   }
 
   void _reportResult() {
     if (!_currentlyRunning) return;
     // _status == '>>> TEST {PASS, FAIL, OK, CRASH, FAIL, TIMEOUT}'
 
     var outcome = _status.split(" ")[2];
     var exitCode = 0;
-    if (outcome == "CRASH") exitCode = CRASHING_BROWSER_EXITCODE;
+    if (outcome == "CRASH") exitCode = browserCrashExitCode;
     if (outcome == "FAIL" || outcome == "TIMEOUT") exitCode = 1;
     var output = createCommandOutput(
         _command,
         exitCode,
         (outcome == "TIMEOUT"),
         _testStdout.toList(),
         _testStderr.toList(),
         new DateTime.now().difference(_startTime),
         false);
     assert(_completer != null);
@@ skipping 597 matching lines @@
       if (!runner._currentlyRunning) return runner;
     }
     throw new Exception('Unable to find inactive batch runner.');
   }
 
   Future<CommandOutput> _startBrowserControllerTest(
       BrowserTestCommand browserCommand, int timeout) {
     var completer = new Completer<CommandOutput>();
 
     var callback = (BrowserTestOutput output) {
-      completer.complete(new BrowserCommandOutputImpl(browserCommand, output));
+      completer.complete(new BrowserCommandOutput(browserCommand, output));
     };
 
     BrowserTest browserTest;
     if (browserCommand is BrowserHtmlTestCommand) {
       browserTest = new HtmlTest(browserCommand.url, callback, timeout,
           browserCommand.expectedMessages);
     } else {
       browserTest = new BrowserTest(browserCommand.url, callback, timeout);
     }
     _getBrowserTestRunner(browserCommand.configuration).then((testRunner) {
@@ skipping 60 matching lines @@
     // See http://dartbug.com/29655 .
     if (command is ContentShellCommand) {
       return true;
     }
 
     if (io.Platform.operatingSystem == 'linux') {
       decodeOutput();
       // No matter which command we ran: If we get failures due to the
       // "xvfb-run" issue 7564, try re-running the test.
       bool containsFailureMsg(String line) {
-        return line.contains(MESSAGE_CANNOT_OPEN_DISPLAY) ||
-            line.contains(MESSAGE_FAILED_TO_RUN_COMMAND);
+        return line.contains(cannotOpenDisplayMessage) ||
+            line.contains(failedToRunCommandMessage);
       }
 
       if (stdout.any(containsFailureMsg) || stderr.any(containsFailureMsg)) {
         return true;
       }
     }
   }
   return false;
 }
 
@@ skipping 269 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
     _allDone();
   }
 }