Fix warnings_checker.dart handling of multitests

tools/testing/dart/multitest.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.
 
 library multitest;
 
 import "dart:async";
 import "dart:io";
 
 import "path.dart";
 import "test_suite.dart";
 import "utils.dart";
 
 // Multitests are Dart test scripts containing lines of the form
+// " [some dart code] //# [key]: [error type]"
+//
+// To support legacy multi tests we also handle lines of the form
 // " [some dart code] /// [key]: [error type]"
 //
 // For each key in the file, a new test file is made containing all
 // the normal lines of the file, and all of the multitest lines containing
 // that key, in the same order as in the source file.  The new test is expected
 // to pass if the error type listed is 'ok', or to fail if there is an error
 // type of type 'compile-time error', 'runtime error', 'static type warning', or
 // 'dynamic type error'.  The type error tests fail only in checked mode.
 // There is also a test created from only the untagged lines of the file,
 // with key "none", which is expected to pass.  This library extracts these
 // tests, writes them into a temporary directory, and passes them to the test
 // runner.  These tests may be referred to in the status files with the
 // pattern [test name]/[key].
 //
 // For example: file I_am_a_multitest.dart
 //   aaa
-//   bbb /// 02: runtime error
-//   ccc /// 02: continued
-//   ddd /// 07: static type warning
-//   eee /// 10: ok
+//   bbb //# 02: runtime error
+//   ccc //# 02: continued
+//   ddd //# 07: static type warning
+//   eee //# 10: ok
 //   fff
 //
 // should create four tests:
 // I_am_a_multitest_none.dart
 //   aaa
 //   fff
 //
 // I_am_a_multitest_02.dart
 //   aaa
-//   bbb /// 02: runtime error
-//   ccc /// 02: continued
+//   bbb //# 02: runtime error
+//   ccc //# 02: continued
 //   fff
 //
 // I_am_a_multitest_07.dart
 //   aaa
-//   ddd /// 07: static type warning
+//   ddd //# 07: static type warning
 //   fff
 //
 // and I_am_a_multitest_10.dart
 //   aaa
-//   eee /// 10: ok
+//   eee //# 10: ok
 //   fff
 //
 // Note that it is possible to indicate more than one acceptable outcome
 // in the case of dynamic and static type warnings
 //   aaa
-//   ddd /// 07: static type warning, dynamic type error
+//   ddd //# 07: static type warning, dynamic type error
 //   fff
 
+/// Until legacy multitests are ported we need to support both /// and //#
+final _multitestMarker = new RegExp(r"//[/#]");
+
 void ExtractTestsFromMultitest(Path filePath, Map<String, String> tests,
     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.
   List bytes = new File(filePath.toNativePath()).readAsBytesSync();
   String contents = decodeUtf8(bytes);
   int first_newline = contents.indexOf('\n');
-  final String line_separator = (first_newline == 0 ||
-      contents[first_newline - 1] != '\r') ? '\n' : '\r\n';
+  final String line_separator =
+      (first_newline == 0 || contents[first_newline - 1] != '\r')
+          ? '\n'
+          : '\r\n';
   List<String> lines = contents.split(line_separator);
   if (lines.last == '') lines.removeLast();
   bytes = null;
   contents = null;
   Set<String> validMultitestOutcomes = new Set<String>.from([
     'ok',
     'compile-time error',
     'runtime error',
     'static type warning',
     'dynamic type error',
@@ skipping 57 matching lines @@
   // If a key/multitest was marked for deletion, do the necessary cleanup.
   keysToDelete.forEach(outcomes.remove);
   keysToDelete.forEach(testsAsLines.remove);
 
   // Copy all the tests into the output map tests, as multiline strings.
   for (String key in testsAsLines.keys) {
     tests[key] = testsAsLines[key].join(line_separator);
   }
 }
 
-// Represents a mutlitest annotation in the special /// comment.
+// Represents a mutlitest annotation in the special //# comment.
 class _Annotation {
   String key;
   String rest;
   List<String> outcomesList;
   _Annotation() {}
   factory _Annotation.from(String line) {
     // Do an early return with "null" if this is not a valid multitest
     // annotation.
-    if (!line.contains('///')) {
+    if (!line.contains(_multitestMarker)) {
       return null;
     }
     var parts = line
-        .split('///')[1]
+        .split(_multitestMarker)[1]
         .split(':')
         .map((s) => s.trim())
         .where((s) => s.length > 0)
         .toList();
     if (parts.length <= 1) {
       return null;
     }
 
     var annotation = new _Annotation();
     annotation.key = parts[0];
@@ skipping 38 matching lines @@
           }
           foundImports.add(relativePath.toString());
           toSearch.add(libraryDir.join(relativePath));
         }
       }
     }
   }
   return foundImports;
 }
 
-Future doMultitest(
-    Path filePath,
-    String outputDir,
-    Path suiteDir,
-    CreateTest doTest,
-    bool hotReload) {
+Future doMultitest(Path filePath, String outputDir, Path suiteDir,
+    CreateTest doTest, bool hotReload) {
   void writeFile(String filepath, String content) {
     final File file = new File(filepath);
 
     if (file.existsSync()) {
       var oldContent = file.readAsStringSync();
       if (oldContent == content) {
         // Don't write to the file if the content is the same
         return;
       }
     }
@@ skipping 60 matching lines @@
   var split = suiteDir.segments();
   // co19 test suite is at tests/co19/src.
   if (split.last == 'src') {
     split.removeLast();
   }
   return split.last;
 }
 
 Path createMultitestDirectory(String outputDir, Path suiteDir, Path sourceDir) {
   Path relative = sourceDir.relativeTo(suiteDir);
-  Path path = new Path(outputDir).append('generated_tests')
-      .append(suiteNameFromPath(suiteDir)).join(relative);
+  Path path = new Path(outputDir)
+      .append('generated_tests')
+      .append(suiteNameFromPath(suiteDir))
+      .join(relative);
   TestUtils.mkdirRecursive(TestUtils.currentWorkingDirectory, path);
   return new Path(new File(path.toNativePath()).absolute.path);
 }