Revert 24086 Update checked in binary to version 0.5.19.0

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,
  *   and creating [TestCase]s for those files that meet the relevant criteria.
  * - Preparing tests, including copying files and frameworks to temporary
  *   directories, and computing the command line and arguments to be run.
  */
 library test_suite;
 
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
+import "dart:uri";
 import "drt_updater.dart";
 import "multitest.dart";
 import "status_file_parser.dart";
 import "test_runner.dart";
 import "utils.dart";
 import "http_server.dart" show PREFIX_BUILDDIR, PREFIX_DARTDIR;
 
 part "browser_test.dart";
 
 
@@ skipping 11 matching lines @@
                          Set<String> multitestOutcome});
 
 typedef void VoidFunction();
 
 /**
  * Calls [function] asynchronously. Returns a future that completes with the
  * result of the function. If the function is `null`, returns a future that
  * completes immediately with `null`.
  */
 Future asynchronously(function()) {
-  if (function == null) return new Future.value(null);
+  if (function == null) return new Future.immediate(null);
 
   var completer = new Completer();
   Timer.run(() => completer.complete(function()));
 
   return completer.future;
 }
 
 /** A completer that waits until all added [Future]s complete. */
 // TODO(rnystrom): Copied from web_components. Remove from here when it gets
 // added to dart:core. (See #6626.)
@@ skipping 420 matching lines @@
         isTestFilePredicate: (filename) => filename.endsWith('_test.dart'),
         recursive: true);
   }
 
   List<Uri> get dart2JsBootstrapDependencies {
     if (!useSdk) return [];
 
     var snapshotPath = TestUtils.absolutePath(new Path(buildDir).join(
         new Path('dart-sdk/bin/snapshots/'
                  'utils_wrapper.dart.snapshot'))).toString();
-    return [new Uri(scheme: 'file', path: snapshotPath)];
+    return [new Uri.fromComponents(scheme: 'file', path: snapshotPath)];
   }
 
   /**
    * The default implementation assumes a file is a test if
    * it ends in "Test.dart".
    */
   bool isTestFile(String filename) {
     // Use the specified predicate, if provided.
     if (isTestFilePredicate != null) return isTestFilePredicate(filename);
 
@@ skipping 29 matching lines @@
   }
 
   /**
    * If Content shell/Dartium is required, and not yet updated, waits for
    * the update then completes. Otherwise completes immediately.
    */
   Future updateDartium() {
     var completer = new Completer();
     var updater = runtimeUpdater(configuration);
     if (updater == null || updater.updated) {
-      return new Future.value(null);
+      return new Future.immediate(null);
     }
 
     assert(updater.isActive);
     updater.onUpdated.add(() => completer.complete(null));
 
     return completer.future;
   }
 
   /**
    * Reads the status files and completes with the parsed expectations.
@@ skipping 29 matching lines @@
     }
 
     return completer.future;
   }
 
   Future enqueueTests() {
     Directory dir = new Directory.fromPath(suiteDir);
     return dir.exists().then((exists) {
       if (!exists) {
         print('Directory containing tests missing: ${suiteDir.toNativePath()}');
-        return new Future.value(null);
+        return new Future.immediate(null);
       } else {
         var group = new FutureGroup();
         enqueueDirectory(dir, group);
         return group.future;
       }
     });
   }
 
   void enqueueDirectory(Directory dir, FutureGroup group) {
     var listCompleter = new Completer();
@@ skipping 272 matching lines @@
     var url= 'http://$local_ip:$serverPort$pathComponent'
         '?crossOriginPort=$crossOriginPort';
     if (info.optionsFromFile['isMultiHtmlTest'] && subtestNames.length > 0) {
       url= '${url}&group=${subtestNames[subtestIndex]}';
     }
     return url;
   }
 
   void _createWrapperFile(String dartWrapperFilename, dartLibraryFilename) {
     File file = new File(dartWrapperFilename);
-    RandomAccessFile dartWrapper = file.openSync(mode: FileMode.WRITE);
+    RandomAccessFile dartWrapper = file.openSync(FileMode.WRITE);
 
     var usePackageImport = dartLibraryFilename.segments().contains("pkg");
     var libraryPathComponent = _createUrlPathFromFile(dartLibraryFilename);
     dartWrapper.writeStringSync(dartTestWrapper(usePackageImport,
                                                 libraryPathComponent));
     dartWrapper.closeSync();
   }
 
 
   /**
@@ skipping 42 matching lines @@
         // test.dart will import the dart test.
         _createWrapperFile(dartWrapperFilename, filePath);
       } else {
         dartWrapperFilename = filename;
       }
       String scriptPath = (compiler == 'none') ?
           dartWrapperFilename : compiledDartWrapperFilename;
       scriptPath = _createUrlPathFromFile(new Path(scriptPath));
 
       // Create the HTML file for the test.
-      RandomAccessFile htmlTest =
-          new File(htmlPath).openSync(mode: FileMode.WRITE);
+      RandomAccessFile htmlTest = new File(htmlPath).openSync(FileMode.WRITE);
       String content = null;
       Path dir = filePath.directoryPath;
       String nameNoExt = filePath.filenameWithoutExtension;
       Path pngPath = dir.append('$nameNoExt.png');
       Path txtPath = dir.append('$nameNoExt.txt');
       Path expectedOutput = null;
       if (new File.fromPath(pngPath).existsSync()) {
         expectedOutput = pngPath;
         content = getHtmlLayoutContents(scriptType, new Path("$scriptPath"));
       } else if (new File.fromPath(txtPath).existsSync()) {
@@ skipping 762 matching lines @@
 class TestUtils {
   /**
    * The libraries in this directory relies on finding various files
    * relative to the 'test.dart' script in '.../dart/tools/test.dart'. If
    * the main script using 'test_suite.dart' is not there, the main
    * script must set this to '.../dart/tools/test.dart'.
    */
   static String testScriptPath = new Options().script;
   static LastModifiedCache lastModifiedCache = new LastModifiedCache();
   static Path currentWorkingDirectory =
-      new Path(Directory.current.path);
+      new Path(new Directory.current().path);
   /**
    * Creates a directory using a [relativePath] to an existing
    * [base] directory if that [relativePath] does not already exist.
    */
   static Directory mkdirRecursive(Path base, Path relativePath) {
     if (relativePath.isAbsolute) {
       base = new Path('/');
     }
     Directory dir = new Directory.fromPath(base);
     assert(dir.existsSync());
@@ skipping 222 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);
    }
 }