Refactor and clean up the status file parsing code. - Make the parser less error tolerant. The expr…

tests/standalone/io/test_runner_test.dart

Index: tests/standalone/io/test_runner_test.dart
diff --git a/tests/standalone/io/test_runner_test.dart b/tests/standalone/io/test_runner_test.dart
index 7468e9edb23db216407745384a85c647f67ccafc..af37fb4a9ae318446dbb87797725ed9e10b503dd 100644
--- a/tests/standalone/io/test_runner_test.dart
+++ b/tests/standalone/io/test_runner_test.dart
@@ -5,10 +5,11 @@
 import "dart:io";
 import "dart:isolate";
 import "dart:async";
+import "../../../tools/testing/dart/expectation.dart";
+import "../../../tools/testing/dart/status_file.dart";
 import "../../../tools/testing/dart/test_runner.dart";
 import "../../../tools/testing/dart/test_suite.dart";
 import "../../../tools/testing/dart/test_progress.dart" as progress;
-import "../../../tools/testing/dart/status_file_parser.dart";
 import "../../../tools/testing/dart/test_options.dart";
 import "process_test_util.dart";
 
@@ -74,12 +75,12 @@ class CustomTestSuite extends TestSuite {
       onTest(testCase);
     }
 
-    var testCaseCrash = _makeCrashTestCase("crash", [Expectation.CRASH]);
-    var testCasePass = _makeNormalTestCase("pass", [Expectation.PASS]);
-    var testCaseFail = _makeNormalTestCase("fail", [Expectation.FAIL]);
-    var testCaseTimeout = _makeNormalTestCase("timeout", [Expectation.TIMEOUT]);
+    var testCaseCrash = _makeCrashTestCase("crash", [Expectation.crash]);
+    var testCasePass = _makeNormalTestCase("pass", [Expectation.pass]);
+    var testCaseFail = _makeNormalTestCase("fail", [Expectation.fail]);
+    var testCaseTimeout = _makeNormalTestCase("timeout", [Expectation.timeout]);
     var testCaseFailUnexpected =
-        _makeNormalTestCase("fail-unexpected", [Expectation.PASS]);
+        _makeNormalTestCase("fail-unexpected", [Expectation.pass]);
 
     enqueueTestCase(testCaseCrash);
     enqueueTestCase(testCasePass);