Change the URL-space exposed by the browser server.

lib/src/runner/loader.dart

 // Copyright (c) 2015, 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 test.runner.loader;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 
@@ skipping 14 matching lines @@
 import 'vm/isolate_test.dart';
 
 /// A class for finding test files and loading them into a runnable form.
 class Loader {
   /// All platforms for which tests should be loaded.
   final List<TestPlatform> _platforms;
 
   /// Whether to enable colors for Dart compilation.
   final bool _color;
 
+  /// The root directory that will be served for browser tests.
+  final String _root;
+
   /// The package root to use for loading tests, or `null` to use the automatic
   /// root.
   final String _packageRoot;
 
   /// The URL for the `pub serve` instance to use to load tests.
   ///
   /// This is `null` if tests should be loaded from the filesystem.
   final Uri _pubServeUrl;
 
   /// All isolates that have been spun up by the loader.
   final _isolates = new Set<Isolate>();
 
   /// The server that serves browser test pages.
   ///
   /// This is lazily initialized the first time it's accessed.
   Future<BrowserServer> get _browserServer {
     if (_browserServerCompleter == null) {
       _browserServerCompleter = new Completer();
       BrowserServer.start(
+              root: _root,
               packageRoot: _packageRoot,
               pubServeUrl: _pubServeUrl,
               color: _color)
           .then(_browserServerCompleter.complete)
           .catchError(_browserServerCompleter.completeError);
     }
     return _browserServerCompleter.future;
   }
   Completer<BrowserServer> _browserServerCompleter;
 
   /// Creates a new loader.
   ///
+  /// [root] is the root directory that will be served for browser tests. It
+  /// defaults to the working directory.
+  ///
   /// If [packageRoot] is passed, it's used as the package root for all loaded
   /// tests. Otherwise, the `packages/` directories next to the test entrypoints
   /// will be used.
   ///
   /// If [pubServeUrl] is passed, tests will be loaded from the `pub serve`
   /// instance at that URL rather than from the filesystem.
   ///
   /// If [color] is true, console colors will be used when compiling Dart.
-  Loader(Iterable<TestPlatform> platforms, {String packageRoot,
+  Loader(Iterable<TestPlatform> platforms, {String root, String packageRoot,
         Uri pubServeUrl, bool color: false})
       : _platforms = platforms.toList(),
         _pubServeUrl = pubServeUrl,
+        _root = root == null ? p.current : root,
         _packageRoot = packageRoot,
         _color = color;
 
   /// Loads all test suites in [dir].
   ///
   /// This will load tests from files that end in "_test.dart". Any tests that
   /// fail to load will be emitted as [LoadException]s.
   Stream<Suite> loadDir(String dir) {
     return mergeStreams(new Directory(dir).listSync(recursive: true)
         .map((entry) {
@@ skipping 59 matching lines @@
           browserServer.loadSuite(path, platform));
 
   /// Load the test suite at [path] in VM isolate.
   Future<Suite> _loadVmFile(String path) {
     var packageRoot = packageRootFor(path, _packageRoot);
     var receivePort = new ReceivePort();
 
     return new Future.sync(() {
       if (_pubServeUrl != null) {
         var url = _pubServeUrl.resolve(
-            p.withoutExtension(p.relative(path, from: 'test')) +
-                '.vm_test.dart');
+            p.relative(path, from: 'test') + '.vm_test.dart');
         return Isolate.spawnUri(url, [], {'reply': receivePort.sendPort})
             .then((isolate) => new IsolateWrapper(isolate, () {}))
             .catchError((error, stackTrace) {
           if (error is! IsolateSpawnException) throw error;
 
           if (error.message.contains("OS Error: Connection refused")) {
             throw new LoadException(path,
                 "Error getting $url: Connection refused\n"
                 'Make sure "pub serve" is running.');
           } else if (error.message.contains("404 Not Found")) {
@@ skipping 46 matching lines @@
   Future close() {
     for (var isolate in _isolates) {
       isolate.kill();
     }
     _isolates.clear();
 
     if (_browserServerCompleter == null) return new Future.value();
     return _browserServer.then((browserServer) => browserServer.close());
   }
 }