Enable co19 test suite on dart test scripts.

tests/co19/test_config.dart

 // Copyright (c) 2011, 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("corelib_test_config");
+#library("co19_test_config");
 
 #import("../../tools/testing/dart/test_runner.dart");
 #import("../../tools/testing/dart/status_file_parser.dart");
 
-class CorelibTestSuite {
-  String directoryPath = "tests/corelib/src";
-  final String statusFilePath = "tests/corelib/corelib.status";
+class Co19TestSuite {
+  String directoryPath = "tests/co19/src";
   Function doTest;
   Function doDone;
   String shellPath;
   String pathSeparator;
   Map configuration;
-  TestExpectationsMap testExpectationsMap;
+  TestExpectations testExpectations;
+  RegExp testRegExp;
 
-  CorelibTestSuite(Map this.configuration) {
+  Co19TestSuite(Map this.configuration) {
     shellPath = getDartShellFileName(configuration) ;
     pathSeparator = new Platform().pathSeparator();
+    testRegExp = new RegExp(@"t[0-9]{2}.dart$");
   }
 
   void forEachTest(Function onTest, [Function onDone = null]) {
     doTest = onTest;
     doDone = (ignore) => onDone();
 
     // Read test expectations from status file.
-    testExpectationsMap = ReadTestExpectations(statusFilePath, configuration);
+    testExpectations = new TestExpectations(complexMatching: true);
+    ReadTestExpectationsInto(testExpectations,
+                             "tests/co19/co19-compiler.status",
+                             configuration);
+    ReadTestExpectationsInto(testExpectations,
+                             "tests/co19/co19-frog.status",
+                             configuration);
+    ReadTestExpectationsInto(testExpectations,
+                             "tests/co19/co19-runtime.status",
+                             configuration);
 
-    processDirectory();
+    processDirectory(directoryPath);
   }
 
-  void processDirectory() {
-    directoryPath = getDirname(directoryPath);
-    Directory dir = new Directory(directoryPath);
+  void processDirectory(String path) {
+    path = getDirname(path);
+    Directory dir = new Directory(path);
     dir.errorHandler = (s) {
       throw s;
     };
     dir.fileHandler = processFile;
     dir.doneHandler = doDone;
-    dir.list(false);
+    dir.list(recursive: true);
   }
 
   void processFile(String filename) {
-    if (!filename.endsWith("Test.dart")) return;
+    if (!testRegExp.hasMatch(filename)) return;
 
     // If patterns are given only list the files that match one of the
     // patterns.
     var patterns = configuration['patterns'];
     if (!patterns.isEmpty() &&
         !patterns.some((re) => re.hasMatch(filename))) {
       return;
     }
 
-    int start = filename.lastIndexOf(pathSeparator);
-    String testName = filename.substring(start + 1, filename.length - 5);
-    Set<String> expectations = testExpectationsMap.expectations(testName);
+    int start = filename.lastIndexOf('src' + pathSeparator);
+    String testName = filename.substring(start + 4, filename.length - 5);
+    Set<String> expectations = testExpectations.expectations(testName);
 
-    // TODO(whesse): Skip files with internal directives, and multipart files,
-    //               until they are handled correctly.
     if (expectations.contains(SKIP)) return;
 
     List args = ["--ignore-unrecognized-flags"];
     if (configuration["checked"]) {
       args.add("--enable_type_checks");
     }
     if (configuration["component"] == "leg") {
       args.add("--enable_leg");
     }
 
     var optionsFromFile = testOptions(filename);
     List<List<String>> optionsList = optionsFromFile["vmOptions"];
     List<String> dartOptions = optionsFromFile["dartOptions"];
     args.addAll(dartOptions == null ? [filename] : dartOptions);
+    if (optionsFromFile["isNegative"]) negateExpectations(expectations);
 
     if (optionsList.isEmpty()) {
       doTest(new TestCase(testName,
                           shellPath,
                           args,
                           configuration["timeout"],
                           completeHandler,

[Bill Hesse, 2011/11/16 11:44:27]

Insert "isNegative" argument to constructor, and pass
optionsFromFile["isNegative"] here.

                           expectations));
     } else {
       for (var options in optionsList) {
         options.addAll(args);
         doTest(new TestCase(testName,
                             shellPath,
                             options,
                             configuration["timeout"],
                             completeHandler,
                             expectations));
-      }        
+      }
     }
   }
 
+

[Bill Hesse, 2011/11/16 11:44:27]

We have handling for this in the test runner already.  You should set a negative
flag in the TestCase, so that TestCase.isNegative (a getter) returns true.  This
way, the counts of "Fail" are not artificially increased.

[Mads Ager (google), 2011/11/16 12:26:38]

Good point. Done.

+  void negateExpectations(Set<String> expectations) {
+    if (expectations.remove(PASS)) {
+      expectations.add(FAIL);
+    } else if (expectations.remove(FAIL)) {
+      expectations.add(PASS);
+    }
+  }
+
+
   Map testOptions(String filename) {
     RegExp testOptionsRegExp = const RegExp(@"// VMOptions=(.*)");
     RegExp dartOptionsRegExp = const RegExp(@"// DartOptions=(.*)");
     File file = new File(filename);
     FileInputStream fileStream = file.openInputStream();
     StringInputStream lines = new StringInputStream(fileStream);
 
     List<List> result = new List<List>();
     List<String> dartOptions;
+    bool isNegative = false;
     String line;
     while ((line = lines.readLine()) != null) {
       Match match = testOptionsRegExp.firstMatch(line);
       if (match != null) {
         result.add(match[1].split(' ').filter((e) => e != ''));
       }
 
       match = dartOptionsRegExp.firstMatch(line);
       if (match != null) {
         if (dartOptions != null) {
           throw new Exception(
               'More than one "// DartOptions=" line in test $filename');
         }
         dartOptions = match[1].split(' ').filter((e) => e != '');
       }
+
+      if (line.contains("@compile-error") || line.contains("@runtime-error")) {
+        isNegative = true;
+      } else if (line.contains("@dynamic-type-error") &&
+                 configuration['checked']) {
+        isNegative = true;
+      }
     }
-    return {"vmOptions": result, "dartOptions": dartOptions};
+    return {"vmOptions": result,
+            "dartOptions": dartOptions,
+            "isNegative" : isNegative };
   }
-  
+
   void completeHandler(TestCase testCase) {
   }
 }