Added convenience function for reading status file expectations

dart/tools/testing/dart/test_suite.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 enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 338 matching lines @@
  * The executable lists its tests when run with the --list command line flag.
  * Individual tests are run by specifying them on the command line.
  */
 class CCTestSuite extends TestSuite {
   final String testPrefix;
   String targetRunnerPath;
   String hostRunnerPath;
   final String dartDir;
   List<String> statusFilePaths;
   VoidFunction doDone;
-  TestExpectations testExpectations;
 
   CCTestSuite(Map configuration,
               String suiteName,
               String runnerName,
-              List<String> this.statusFilePaths,
+              this.statusFilePaths,
               {this.testPrefix: ''})
       : super(configuration, suiteName),
         dartDir = TestUtils.dartDir().toNativePath() {
     // For running the tests we use the given '$runnerName' binary
     targetRunnerPath = '$buildDir/$runnerName';
 
     // For listing the tests we use the '$runnerName.host' binary if it exists
     // and use '$runnerName' if it doesn't.
     var binarySuffix = Platform.operatingSystem == 'windows' ? '.exe' : '';
     var hostBinary = '$targetRunnerPath.host$binarySuffix';
     if (new File(hostBinary).existsSync()) {
       hostRunnerPath = hostBinary;
     } else {
       hostRunnerPath = targetRunnerPath;
     }
   }
 
-  void testNameHandler(String testName) {
+  void testNameHandler(TestExpectations testExpectations, String testName) {
     // Only run the tests that match the pattern. Use the name
     // "suiteName/testName" for cc tests.
     String constructedName = '$suiteName/$testPrefix$testName';
 
     var expectations = testExpectations.expectations(
         '$testPrefix$testName');
 
     var args = TestUtils.standardOptions(configuration);
     args.add(testName);
 
     var command = CommandBuilder.instance.getProcessCommand(
         'run_vm_unittest', targetRunnerPath, args, environmentOverrides);
     enqueueNewTestCase(
         new TestCase(constructedName, [command], configuration, expectations));
   }
 
   void forEachTest(Function onTest, Map testCache, [VoidFunction onDone]) {
     doTest = onTest;
     doDone = onDone;
 
-    var filesRead = 0;
-    void statusFileRead() {
-      filesRead++;
-      if (filesRead == statusFilePaths.length) {
-        ccTestLister(hostRunnerPath).then((Iterable<String> names) {
-          names.forEach(testNameHandler);
-          onDone();
-        }).catchError((error) {
-          print("Fatal error occured: $error");
-          exit(1);
-        });
-      }
-    }
+    var statusFiles =
+        statusFilePaths.map((statusFile) => "$dartDir/$statusFile").toList();
 
-    testExpectations = new TestExpectations();
-    for (var statusFilePath in statusFilePaths) {
-      ReadTestExpectationsInto(testExpectations,
-                               '$dartDir/$statusFilePath',
-                               configuration,
-                               statusFileRead);
-    }
+    ReadTestExpectations(statusFiles, configuration)
+        .then((TestExpectations expectations) {
+      ccTestLister(hostRunnerPath).then((Iterable<String> names) {
+        names.forEach((testName) => testNameHandler(expectations, testName));
+        onDone();
+      }).catchError((error) {
+        print("Fatal error occured: $error");
+        exit(1);
+      });
+    });
   }
 }
 
 
 class TestInformation {
   Path originTestPath;
   Path filePath;
   Map optionsFromFile;
   bool hasCompileError;
   bool hasRuntimeError;
@@ skipping 143 matching lines @@
     assert(updater.isActive);
     updater.onUpdated.add(() => completer.complete(null));
 
     return completer.future;
   }
 
   /**
    * Reads the status files and completes with the parsed expectations.
    */
   Future<TestExpectations> readExpectations() {
-    var completer = new Completer();
-    var expectations = new TestExpectations();
+    var statusFiles = statusFilePaths
+        .where((String statusFilePath) {

[ricow1, 2014/01/06 13:25:19]

move where up and indent 2

[kustermann, 2014/01/06 13:56:32]

Done.

+          // [forDirectory] adds name_$compiler.status for all tests suites.
+          // Use it if it exists, but otherwise skip it and don't fail.
+          if (statusFilePath.endsWith('_dart2js.status') ||
+              statusFilePath.endsWith('_analyzer.status') ||
+              statusFilePath.endsWith('_analyzer2.status')) {
+            var file = new File(dartDir.append(statusFilePath).toNativePath());
+            return file.existsSync();
+          }
+          return true;
+        }).map((statusFilePath) {
+          return dartDir.append(statusFilePath).toNativePath();
+        }).toList();
 
-    var filesRead = 0;
-    void statusFileRead() {
-      filesRead++;
-      if (filesRead == statusFilePaths.length) {
-        completer.complete(expectations);
-      }
-    }
-
-    for (var statusFilePath in statusFilePaths) {
-      // [forDirectory] adds name_$compiler.status for all tests suites. Use it
-      // if it exists, but otherwise skip it and don't fail.
-      if (statusFilePath.endsWith('_dart2js.status') ||
-          statusFilePath.endsWith('_analyzer.status') ||
-          statusFilePath.endsWith('_analyzer2.status')) {
-        var file = new File(dartDir.append(statusFilePath).toNativePath());
-        if (!file.existsSync()) {
-          filesRead++;
-          continue;
-        }
-      }
-
-      ReadTestExpectationsInto(expectations,
-                               dartDir.append(statusFilePath).toNativePath(),
-                               configuration, statusFileRead);
-    }
-
-    return completer.future;
+    return ReadTestExpectations(statusFiles, configuration);
   }
 
   Future enqueueTests() {
     Directory dir = new Directory(suiteDir.toNativePath());
     return dir.exists().then((exists) {
       if (!exists) {
         print('Directory containing tests missing: ${suiteDir.toNativePath()}');
         return new Future.value(null);
       } else {
         var group = new FutureGroup();
@@ skipping 1252 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }