Add an echo server for testing

pubspec.yaml

@@ -8,6 +8,6 @@ dependencies:
   path: ">=0.9.0 <2.0.0"
   stack_trace: ">=0.9.1 <2.0.0"
 dev_dependencies:
-  unittest: ">=0.9.0 <0.12.0"
+  test: ">=0.12.0 <0.13.0"
 environment:
   sdk: ">=1.9.0 <2.0.0"

test/echo.dart

@@ -0,0 +1,29 @@
+// 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.
+
+import 'dart:io'
+    show
+        HttpServer,
+        HttpRequest,
+        ServerSocket,
+        SecurityContext,
+        InternetAddress;
+
+import 'utils.dart' show echoPort;
+
+/// Simple HTTP server that listens for requests and echoes the request body
+/// in the response. It is used for testing the http package.
+main() async {
+  final httpServer = await HttpServer.bind(InternetAddress.ANY_IP_V6, echoPort);
+  print('Echo server listening on port ${httpServer.port} (http)');
+  _serve(httpServer);
+}
+
+_serve(HttpServer httpServer) async {
+  await for (HttpRequest request in httpServer) {
+    final response = request.response;
+    response.headers.add('Access-Control-Allow-Origin', '*');
+    request.pipe(response);
+  }
+}

test/html/client_test.dart

@@ -2,9 +2,10 @@
 // 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.
 
+@TestOn("browser")
 import 'package:http/http.dart' as http;
 import 'package:http/browser_client.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/html/streamed_request_test.dart

@@ -2,9 +2,10 @@
 // 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.
 
+@TestOn("browser")
 import 'package:http/http.dart' as http;
 import 'package:http/browser_client.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/html/utils.dart

@@ -4,8 +4,12 @@
 
 import 'dart:html';
 
+import '../utils.dart' show echoPort;
 export '../utils.dart';
 
-/// The test server's echo URL.
-Uri get echoUrl => Uri.parse(
-    '${window.location.protocol}//${window.location.host}/echo');
+/// The echo server's URL.
+Uri get echoUrl {
+  var protocol = 'http';
+  var host = window.location.host.split(':')[0];
+  return Uri.parse('$protocol://$host:$echoPort');
+}

test/io/client_test.dart

@@ -2,10 +2,11 @@
 // 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.
 
+@TestOn("vm")
 import 'dart:io';
 
 import 'package:http/http.dart' as http;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/io/http_test.dart

@@ -2,8 +2,9 @@
 // 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.
 
+@TestOn("vm")
 import 'package:http/http.dart' as http;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/io/multipart_test.dart

@@ -2,12 +2,13 @@
 // 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.
 
+@TestOn("vm")
 import 'dart:async';
 import 'dart:io';
 
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as path;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/io/request_test.dart

@@ -2,8 +2,9 @@
 // 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.
 
+@TestOn("vm")
 import 'package:http/http.dart' as http;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/io/streamed_request_test.dart

@@ -2,10 +2,11 @@
 // 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.
 
+@TestOn("vm")
 import 'dart:convert';
 
 import 'package:http/http.dart' as http;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/io/utils.dart

@@ -8,7 +8,7 @@ import 'dart:io';
 
 import 'package:http/http.dart';
 import 'package:http/src/utils.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 export '../utils.dart';
 

test/mock_client_test.dart

@@ -8,7 +8,7 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:http/src/utils.dart';
 import 'package:http/testing.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/multipart_test.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:http/http.dart' as http;
 import 'package:http_parser/http_parser.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/request_test.dart

@@ -5,7 +5,7 @@
 import 'dart:convert';
 
 import 'package:http/http.dart' as http;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/response_test.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:http/http.dart' as http;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('()', () {

test/streamed_request_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:http/http.dart' as http;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 

test/utils.dart

@@ -6,7 +6,10 @@ import 'dart:convert';
 
 import 'package:http/http.dart' as http;
 import 'package:http_parser/http_parser.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
+
+/// Port for an Echo http server
+const echoPort = 8395;
 
 /// A dummy URL for constructing requests that won't be sent.
 Uri get dummyUrl => Uri.parse('http://dartlang.org/');