Revert "Refactor and clean up the status file parsing code."

tools/testing/dart/test_progress.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 test_progress;
 
 import "dart:convert" show JSON;
 import "dart:io";
 
-import "expectation.dart";
 import "path.dart";
+import "status_file_parser.dart";
 import "summary_report.dart";
 import "test_runner.dart";
 import "test_suite.dart";
 import "utils.dart";
 
 /// Controls how message strings are processed before being displayed.
 class Formatter {
   /// Messages are left as-is.
   static const normal = const Formatter._();
 
@@ skipping 38 matching lines @@
     }
   }
 }
 
 class IgnoredTestMonitor extends EventListener {
   static final int maxIgnored = 10;
 
   int countIgnored = 0;
 
   void done(TestCase test) {
-    if (test.lastCommandOutput.result(test) == Expectation.ignore) {
+    if (test.lastCommandOutput.result(test) == Expectation.IGNORE) {
       countIgnored++;
       if (countIgnored > maxIgnored) {
         print("/nMore than $maxIgnored tests were ignored due to flakes in");
         print("the test infrastructure. Notify whesse@google.com.");
         print("Output of the last ignored test was:");
         print(_buildFailureOutput(test));
         exit(1);
       }
     }
   }
 
   void allDone() {
     if (countIgnored > 0) {
       print("Ignored $countIgnored tests due to flaky infrastructure");
     }
   }
 }
 
 class FlakyLogWriter extends EventListener {
   void done(TestCase test) {
-    if (test.isFlaky && test.result != Expectation.pass) {
+    if (test.isFlaky && test.result != Expectation.PASS) {
       var buf = new StringBuffer();
       for (var l in _buildFailureOutput(test)) {
         buf.write("$l\n");
       }
       _appendToFlakyFile(buf.toString());
     }
   }
 
   void _appendToFlakyFile(String msg) {
     var file = new File(TestUtils.flakyFileName);
@@ skipping 98 matching lines @@
     }
     _sink.write("${JSON.encode(record)}\n");
   }
 }
 
 class UnexpectedCrashLogger extends EventListener {
   final archivedBinaries = <String, String>{};
 
   void done(TestCase test) {
     if (test.unexpectedOutput &&
-        test.result == Expectation.crash &&
+        test.result == Expectation.CRASH &&
         test.lastCommandExecuted is ProcessCommand) {
       final pid = "${test.lastCommandOutput.pid}";
       final lastCommand = test.lastCommandExecuted as ProcessCommand;
 
       // We might have a coredump for the process. This coredump will be
       // archived by CoreDumpArchiver (see tools/utils.py).
       //
       // For debugging purposes we need to archive the crashed binary as well.
       //
       // To simplify the archiving code we simply copy binaries into current
@@ skipping 452 matching lines @@
 }
 
 String _buildSummaryEnd(int failedTests) {
   if (failedTests == 0) {
     return '\n===\n=== All tests succeeded\n===\n';
   } else {
     var pluralSuffix = failedTests != 1 ? 's' : '';
     return '\n===\n=== ${failedTests} test$pluralSuffix failed\n===\n';
   }
 }