Multitest annotations now accept multiple annotations on one line.

tools/testing/dart/multitest.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("multitest");
 
 #import("dart:io");
 #import("test_suite.dart");
 
 // Multitests are Dart test scripts containing lines of the form
@@ skipping 26 matching lines @@
 // I_am_a_multitest_02.dart
 //   aaa
 //   bbb /// 02: runtime error
 //   ccc /// 02: continued
 //   eee
 //
 // and I_am_a_multitest_07.dart
 //   aaa
 //   ddd /// 07: static type error
 //   eee
+//
+// Note that it is possible to indicate more than one acceptable outcome
+// in the case of dynamic and static type errors
+//   aaa
+//   ddd /// 07: static type error, dynamic type error
+//   eee
 
 void ExtractTestsFromMultitest(String filename,
                                Map<String, String> tests,
-                               Map<String, String> outcomes) {
+                               Map<String, Set<String>> outcomes) {
   // Read the entire file into a byte buffer and transform it to a
   // String. This will treat the file as ascii but the only parts
   // we are interested in will be ascii in any case.
   RandomAccessFile file = (new File(filename)).openSync();
   List chars = new List(file.lengthSync());
   int offset = 0;
   while (offset != chars.length) {
     offset += file.readListSync(chars, offset, chars.length - offset);
   }
   file.closeSync();
@@ skipping 21 matching lines @@
   for (String line in lines) {
     lineCount++;
     if (line.contains('///')) {
       var parts = line.split('///')[1].split(':');
       var key = parts[0].trim();
       var rest = parts[1].trim();
       if (testsAsLines.containsKey(key)) {
         Expect.equals('continued', rest);
         testsAsLines[key].add(line);
       } else {
+        // TODO(zundel): parse a list here
         (testsAsLines[key] = new List<String>.from(testTemplate)).add(line);
-        outcomes[key] = rest;
-        if (!validMultitestOutcomes.contains(rest)) {
-          Expect.fail("Invalid test directive on line ${lineCount}: $rest ");
+        List<String> outcomesList = rest.split(',');
+        for (String nextOutcome in outcomesList) {
+          nextOutcome = nextOutcome.trim();
+          if (outcomes[key] == null) {
+            outcomes[key] = new Set<String>();
+          }
+          outcomes[key].add(nextOutcome.trim());  

[Bill Hesse, 2012/03/08 10:21:49]

This can be replaced by:
outcomes.putIfAbsent(key, ()=> new Set<String>())
     .add(nextOutcome)

You trimmed already.

[zundel, 2012/03/08 13:18:00]

nice
done.

+          if (!validMultitestOutcomes.contains(nextOutcome)) {
+            Expect.fail(
+              "Invalid test directive '$nextOutcome' on line ${lineCount}: $rest ");
+          }
         }
       }
     } else {
       testTemplate.add(line);
       for (var test in testsAsLines.getValues()) test.add(line);
     }
   }
   // Add the template, with no multitest lines, as a test with key 'none'.
   testsAsLines['none'] = testTemplate;
-  outcomes['none'] = '';
+  outcomes['none'] = new Set<String>();
 

[Bill Hesse, 2012/03/08 10:21:49]

Either the no-error case is an empty set, or it is a set containing ''.  You
create the empty set here, and the set containing '' above, and test for '' in
the place where this is used.

[zundel, 2012/03/08 13:18:00]

I'm going with the empty set.

   // Copy all the tests into the output map tests, as multiline strings.
   for (String key in testsAsLines.getKeys()) {
     tests[key] =
         Strings.join(testsAsLines[key], line_separator) + line_separator;
   }
 }
 
 // Find all relative imports and copy them into the dir that contains
 // the generated tests.
 Set<String> _findAllRelativeImports(String topLibrary) {
@@ skipping 41 matching lines @@
                  // with the 'multitestOutcome' field?
                  Function doTest(String filename,
                                  bool isNegative,
                                  [bool isNegativeIfChecked,
                                   bool hasFatalTypeErrors,
                                   bool hasRuntimeErrors,
                                   String multitestOutcome]),
                  Function multitestDone) {
   // Each new test is a single String value in the Map tests.
   Map<String, String> tests = new Map<String, String>();
-  Map<String, String> outcomes = new Map<String, String>();
+  Map<String, Set<String>> outcomes = new Map<String, Set<String>>();
   ExtractTestsFromMultitest(filename, tests, outcomes);
 
   String directory = CreateMultitestDirectory(outputDir, testDir);
   Expect.isNotNull(directory);
   String pathSep = new Platform().pathSeparator();
   int start = filename.lastIndexOf(pathSep) + 1;
   int end = filename.indexOf('.dart', start);
   String baseFilename = filename.substring(start, end);
   String sourceDirectory = filename.substring(0, start - 1);
   Set<String> importsToCopy = _findAllRelativeImports(filename);
@@ skipping 11 matching lines @@
   }
   for (String key in tests.getKeys()) {
     final String filename = '$directory/${baseFilename}_$key.dart';
     final File file = new File(filename);
 
     file.createSync();
     RandomAccessFile openedFile = file.openSync(FileMode.WRITE);
     var bytes = tests[key].charCodes();
     openedFile.writeListSync(bytes, 0, bytes.length);
     openedFile.closeSync();
-    var outcome = outcomes[key];
+    Set<String> outcome = outcomes[key];
     bool enableFatalTypeErrors = outcome.contains('static type error');
     bool hasRuntimeErrors = outcome.contains('runtime error');
     bool isNegative = hasRuntimeErrors
         || outcome.contains('compile-time error');
     bool isNegativeIfChecked = outcome.contains('dynamic type error');
     doTest(filename,
            isNegative,
            isNegativeIfChecked,
            enableFatalTypeErrors,
            hasRuntimeErrors,
@@ skipping 15 matching lines @@
   var split = testDir.split('/');
   var lastComponent = split.removeLast();
   Expect.isTrue(lastComponent == 'src');
   String path = '${generatedTestDir.path}/${split.last()}';
   Directory dir = new Directory(path);
   if (!dir.existsSync()) {
     dir.createSync();
   }
   return path;
 }