pkg/unittest: Add a server for serving test assets to browsers.

lib/src/runner/browser/static/host.dart.js

Index: lib/src/runner/browser/static/host.dart.js
diff --git a/lib/src/runner/browser/static/host.dart.js b/lib/src/runner/browser/static/host.dart.js
index 7e5f8a72e17e9b987660c8c0515a23e4eb8a6f4a..7d0cea13d38425c02096290beb08549ee75086d1 100644
--- a/lib/src/runner/browser/static/host.dart.js
+++ b/lib/src/runner/browser/static/host.dart.js
@@ -2896,6 +2896,16 @@ var dart = [
     }
     return $arguments;
   },
+  checkSubtype: function(object, isField, checks, asField) {
+    var $arguments, interceptor;
+    if (object == null)
+      return false;
+    $arguments = H.getRuntimeTypeInfo(object);
+    interceptor = J.getInterceptor(object);
+    if (interceptor[isField] == null)
+      return false;
+    return H.areSubtypes(H.substitute(interceptor[asField], $arguments), checks);
+  },
   areSubtypes: function(s, t) {
     var len, i;
     if (s == null || t == null)
@@ -9334,66 +9344,6 @@ var dart = [
         output.push("");
       return C.JSArray_methods.join$1(output, "/");
     },
-    resolveUri$1: function(reference) {
-      var targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, t1, fragment;
-      targetScheme = reference.scheme;
-      if (targetScheme.length !== 0) {
-        if (reference._host != null) {
-          targetUserInfo = reference._userInfo;
-          targetHost = reference.get$host(reference);
-          targetPort = reference._port != null ? reference.get$port(reference) : null;
-        } else {
-          targetUserInfo = "";
-          targetHost = null;
-          targetPort = null;
-        }
-        targetPath = this._removeDotSegments$1(reference._path);
-        targetQuery = reference._query;
-        if (targetQuery != null)
-          ;
-        else
-          targetQuery = null;
-      } else {
-        targetScheme = this.scheme;
-        if (reference._host != null) {
-          targetUserInfo = reference._userInfo;
-          targetHost = reference.get$host(reference);
-          targetPort = P.Uri__makePort(reference._port != null ? reference.get$port(reference) : null, targetScheme);
-          targetPath = this._removeDotSegments$1(reference._path);
-          targetQuery = reference._query;
-          if (targetQuery != null)
-            ;
-          else
-            targetQuery = null;
-        } else {
-          t1 = reference._path;
-          if (t1 === "") {
-            targetPath = this._path;
-            targetQuery = reference._query;
-            if (targetQuery != null)
-              ;
-            else
-              targetQuery = this._query;
-          } else {
-            targetPath = C.JSString_methods.startsWith$1(t1, "/") ? this._removeDotSegments$1(t1) : this._removeDotSegments$1(this._merge$2(this._path, t1));
-            targetQuery = reference._query;
-            if (targetQuery != null)
-              ;
-            else
-              targetQuery = null;
-          }
-          targetUserInfo = this._userInfo;
-          targetHost = this._host;
-          targetPort = this._port;
-        }
-      }
-      fragment = reference._fragment;
-      if (fragment != null)
-        ;
-      else
-        fragment = null;
-      return new P.Uri(targetHost, targetPort, targetPath, targetScheme, targetUserInfo, targetQuery, fragment, null, null);
-    },
     get$origin: function(_) {
       var t1, t2;
       t1 = this.scheme;
@@ -10476,7 +10426,20 @@ var dart = [
 ["dart.dom.html", "dart:html", , W, {
   "^": "",
   WebSocket_WebSocket: function(url, protocol_OR_protocols) {
-    return new WebSocket(url);
+    var t1, t2;
+    t1 = typeof url !== "string";
+    if ((!t1 || url == null) && true)
+      return new WebSocket(url);
+    t2 = !t1 || url == null;
+    if (t2)
+      return new WebSocket(url, protocol_OR_protocols);
+    t2 = H.checkSubtype(protocol_OR_protocols, "$isList", [P.String], "$asList");
+    if (!t2)
+      ;
+    t1 = !t1 || url == null;
+    if (t1)
+      return new WebSocket(url, protocol_OR_protocols);
+    throw H.wrapException(P.ArgumentError$("Incorrect number or type of arguments"));
   },
   _JenkinsSmiHash_combine: function(hash, value) {
     hash = 536870911 & hash + value;
@@ -11978,13 +11941,70 @@ var dart = [
 ["path", "package:path/path.dart", , B, {
   "^": "",
   current: function() {
-    var uri, t1, t2, path;
+    var uri, t1, t2, targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, fragment, path;
     uri = P.Uri_base();
     t1 = $.get$Style_platform();
     t2 = $.get$Style_url();
-    if (t1 == null ? t2 == null : t1 === t2)
-      return uri.resolveUri$1(P.Uri_parse(".")).toString$0(0);
-    else {
+    if (t1 == null ? t2 == null : t1 === t2) {
+      t1 = P.Uri_parse(".");
+      targetScheme = t1.scheme;
+      if (targetScheme.length !== 0) {
+        if (t1._host != null) {
+          targetUserInfo = t1._userInfo;
+          targetHost = t1.get$host(t1);
+          targetPort = t1._port != null ? t1.get$port(t1) : null;
+        } else {
+          targetUserInfo = "";
+          targetHost = null;
+          targetPort = null;
+        }
+        targetPath = uri._removeDotSegments$1(t1._path);
+        targetQuery = t1._query;
+        if (targetQuery != null)
+          ;
+        else
+          targetQuery = null;
+      } else {
+        targetScheme = uri.scheme;
+        if (t1._host != null) {
+          targetUserInfo = t1._userInfo;
+          targetHost = t1.get$host(t1);
+          targetPort = P.Uri__makePort(t1._port != null ? t1.get$port(t1) : null, targetScheme);
+          targetPath = uri._removeDotSegments$1(t1._path);
+          targetQuery = t1._query;
+          if (targetQuery != null)
+            ;
+          else
+            targetQuery = null;
+        } else {
+          t2 = t1._path;
+          if (t2 === "") {
+            targetPath = uri._path;
+            targetQuery = t1._query;
+            if (targetQuery != null)
+              ;
+            else
+              targetQuery = uri._query;
+          } else {
+            targetPath = C.JSString_methods.startsWith$1(t2, "/") ? uri._removeDotSegments$1(t2) : uri._removeDotSegments$1(uri._merge$2(uri._path, t2));
+            targetQuery = t1._query;
+            if (targetQuery != null)
+              ;
+            else
+              targetQuery = null;
+          }
+          targetUserInfo = uri._userInfo;
+          targetHost = uri._host;
+          targetPort = uri._port;
+        }
+      }
+      fragment = t1._fragment;
+      if (fragment != null)
+        ;
+      else
+        fragment = null;
+      return new P.Uri(targetHost, targetPort, targetPath, targetScheme, targetUserInfo, targetQuery, fragment, null, null).toString$0(0);
+    } else {
       path = uri.toFilePath$0();
       return C.JSString_methods.substring$2(path, 0, path.length - 1);
     }
@@ -12920,7 +12940,7 @@ var dart = [
 ["unittest.multi_channel", "package:unittest/src/util/multi_channel.dart", , K, {
   "^": "",
   _MultiChannel: {
-    "^": "Object;_innerStream,_innerSink,_innerStreamSubscription,_streamController,_sinkController,_streamControllers,_sinkControllers,_nextId",
+    "^": "StreamChannelMixin;_innerStream,_innerSink,_innerStreamSubscription,_streamController,_sinkController,_streamControllers,_sinkControllers,_nextId",
     virtualChannel$1: function(id) {
       var t1, t2, inputId, t3, streamController, sinkController;
       t1 = {};
@@ -13042,7 +13062,7 @@ var dart = [
     }
   },
   VirtualChannel: {
-    "^": "Object;_parent,id,stream,sink"
+    "^": "StreamChannelMixin;_parent,id,stream,sink"
   }
 }],
 ["unittest.runner.browser.host", "host.dart", , O, {
@@ -13051,7 +13071,7 @@ var dart = [
     P.runZoned(new O.main_closure(), new O.main_closure0(), null, null);
   }, "call$0", "main$closure", 0, 0, 1],
   _connectToServer: function() {
-    var currentUrl, t1, scheme, isFile, userInfo, port, host, path, t2, query, fragment, webSocket, inputController, outputController;
+    var currentUrl, t1, webSocket, inputController, outputController;
     currentUrl = P.Uri_parse(window.location.href);
     t1 = currentUrl._queryParameters;
     if (t1 == null) {
@@ -13059,33 +13079,7 @@ var dart = [
       t1 = H.setRuntimeTypeInfo(new P.UnmodifiableMapView(P.Uri_splitQueryString(t1 == null ? "" : t1, C.Utf8Codec_false)), [null, null]);
       currentUrl._queryParameters = t1;
     }
-    t1 = currentUrl.resolveUri$1(P.Uri_parse(J.$index$asx(t1._collection$_map, "managerUrl")));
-    scheme = P.Uri__makeScheme("ws", 2);
-    isFile = scheme === "file";
-    userInfo = t1._userInfo;
-    port = P.Uri__makePort(t1._port, scheme);
-    if (t1._host != null)
-      host = t1.get$host(t1);
-    else
-      host = userInfo.length !== 0 || port != null || isFile ? "" : null;
-    path = t1._path;
-    if (!isFile)
-      t2 = host != null && path.length !== 0;
-    else
-      t2 = true;
-    if (t2 && !C.JSString_methods.startsWith$1(path, "/"))
-      path = "/" + path;
-    query = t1._query;
-    if (query != null)
-      ;
-    else
-      query = null;
-    fragment = t1._fragment;
-    if (fragment != null)
-      ;
-    else
-      fragment = null;
-    webSocket = W.WebSocket_WebSocket(new P.Uri(host, port, path, scheme, userInfo, query, fragment, null, null).toString$0(0), null);
+    webSocket = W.WebSocket_WebSocket(J.$index$asx(t1._collection$_map, "managerUrl"), null);
     inputController = P.StreamController_StreamController(null, null, null, null, true, null);
     t1 = H.setRuntimeTypeInfo(new W._EventStream(webSocket, "message", false), [null]);
     H.setRuntimeTypeInfo(new W._EventStreamSubscription(0, t1._html$_target, t1._eventType, W._wrapZone(new O._connectToServer_closure(inputController)), t1._useCapture), [H.getTypeArgumentByIndex(t1, 0)])._tryResume$0();
@@ -13103,7 +13097,7 @@ var dart = [
     outputController = P.StreamController_StreamController(null, null, null, null, true, null);
     t1 = t1.get$onLoad(iframe);
     t1.get$first(t1).then$1(new O._connectToIframe_closure(iframe, inputController, outputController));
-    return new X.StreamChannel(H.setRuntimeTypeInfo(new P._ControllerStream(inputController), [null]), H.setRuntimeTypeInfo(new P._StreamSinkWrapper(outputController), [H.getRuntimeTypeArgument(outputController, "_StreamController", 0)]));
+    return H.setRuntimeTypeInfo(new X._StreamChannel(H.setRuntimeTypeInfo(new P._ControllerStream(inputController), [null]), H.setRuntimeTypeInfo(new P._StreamSinkWrapper(outputController), [H.getRuntimeTypeArgument(outputController, "_StreamController", 0)])), [null]);
   },
   main_closure: {
     "^": "Closure:0;",
@@ -13119,8 +13113,8 @@ var dart = [
       t1 = J.getInterceptor$asx(message);
       suiteChannel = this.serverChannel_0.virtualChannel$1(t1.$index(message, "channel"));
       iframeChannel = O._connectToIframe(t1.$index(message, "url"));
-      iframeChannel.stream.pipe$1(suiteChannel.sink);
       suiteChannel.stream.pipe$1(iframeChannel.sink);
+      iframeChannel.stream.pipe$1(suiteChannel.sink);
     }
   },
   main_closure0: {
@@ -13185,8 +13179,11 @@ var dart = [
 1],
 ["unittest.stream_channel", "package:unittest/src/util/stream_channel.dart", , X, {
   "^": "",
-  StreamChannel: {
-    "^": "Object;stream,sink"
+  _StreamChannel: {
+    "^": "StreamChannelMixin;stream,sink"
+  },
+  StreamChannelMixin: {
+    "^": "Object;"
   }
 }],
 ];