Update test utils to generate wrappers with new library syntax and handle

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 959 matching lines @@
     RegExp otherScriptsRegExp = const RegExp(r"// OtherScripts=(.*)");
     RegExp multiTestRegExp = const RegExp(r"/// [0-9][0-9]:(.*)");
     RegExp staticTypeRegExp =
         const RegExp(r"/// ([0-9][0-9]:){0,1}\s*static type warning");
     RegExp compileTimeRegExp =
         const RegExp(r"/// ([0-9][0-9]:){0,1}\s*compile-time error");
     RegExp staticCleanRegExp = const RegExp(r"// @static-clean");
     RegExp leadingHashRegExp = const RegExp(r"^#", multiLine: true);
     RegExp isolateStubsRegExp = const RegExp(r"// IsolateStubs=(.*)");
     RegExp domImportRegExp =
-        const RegExp(r"^#import.*(dart:(dom|html)|html\.dart).*\)",
-                     multiLine: true);
+        const RegExp(r"^[#]?import.*dart:html", multiLine: true);
     RegExp libraryDefinitionRegExp =
-        const RegExp(r"^#library\(", multiLine: true);
+        const RegExp(r"^[#]?library[\( ]", multiLine: true);
     RegExp sourceOrImportRegExp =
-        const RegExp(r"^#(source|import|resource)\(", multiLine: true);
+        const RegExp(r"^[#]?(source|part|import|resource)", multiLine: true);

[Siggi Cherem (dart-lang), 2012/11/01 21:02:04]

I think resource is gone. Also this matches more than we want (e.g. it matches
"source 'foo.dart'" and "#part('foo.dart')". 

[ahe, 2012/11/01 21:08:42]

I don't think it matters. There are good chances we can get rid of wrapping this
month.

[gram, 2012/11/01 21:20:48]

Yes, these false positives are very unlikely to happen in our tests, and once
the # directives are not supported these regexps can be cleaned up; it doesn't
seem worth getting too fussy about them. But I have cleaned them up a bit so
that it isn't necessary to have the partof Regexp.

+    RegExp partofRegExp =
+        const RegExp(r"^[ \t]*part[ \t]*of[ \t]", multiLine: true);
 
     // 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.fromPath(filePath).openSync(FileMode.READ);
     List chars = new List(file.lengthSync());
     var offset = 0;
     while (offset != chars.length) {
       offset += file.readListSync(chars, offset, chars.length - offset);
     }
@@ skipping 37 matching lines @@
     for (var match in matches) {
       otherScripts.addAll(match[1].split(' ').filter((e) => e != ''));
     }
 
     bool isMultitest = multiTestRegExp.hasMatch(contents);
     bool containsLeadingHash = leadingHashRegExp.hasMatch(contents);
     Match isolateMatch = isolateStubsRegExp.firstMatch(contents);
     String isolateStubs = isolateMatch != null ? isolateMatch[1] : '';
     bool containsDomImport = domImportRegExp.hasMatch(contents);
     bool isLibraryDefinition = libraryDefinitionRegExp.hasMatch(contents);
-    bool containsSourceOrImport = sourceOrImportRegExp.hasMatch(contents);
+    bool containsSourceOrImport = sourceOrImportRegExp.hasMatch(contents) && 
+        !partofRegExp.hasMatch(contents);

[Siggi Cherem (dart-lang), 2012/11/01 21:02:04]

alternative you could include a ['"] in the match of import/part?

     int numStaticTypeAnnotations = 0;
     for (var i in staticTypeRegExp.allMatches(contents)) {
       numStaticTypeAnnotations++;
     }
     int numCompileTimeAnnotations = 0;
     for (var i in compileTimeRegExp.allMatches(contents)) {
       numCompileTimeAnnotations++;
     }
 
     return { "vmOptions": result,
@@ skipping 432 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $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
 """;
     print(report);
    }
 }