Big merge from experimental to bleeding edge.

pkg/http/test/request_test.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.
 
 library request_test;
 
 import 'dart:io';
 
 import 'package:unittest/unittest.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/src/utils.dart';
 import 'utils.dart';
 
 void main() {
   test('.send', () {
     startServer();
 
     var request = new http.Request('POST', serverUrl);
     request.body = "hello";
-    var future = request.send().chain((response) {
+    var future = request.send().then((response) {
       expect(response.statusCode, equals(200));
       return consumeInputStream(response.stream);
-    }).transform((bytes) => new String.fromCharCodes(bytes));
-    future.onComplete(expectAsync1((_) {
+    }).then((bytes) => new String.fromCharCodes(bytes));
+    future.catchError((_) {}).then(expectAsync1((_) {
       stopServer();
     }));
 
     expect(future, completion(parse(equals({
       'method': 'POST',
       'path': '/',
       'headers': {
         'content-type': ['text/plain; charset=UTF-8'],
         'content-length': ['5']
       },
@@ skipping 150 matching lines @@
 
   test('#followRedirects', () {
     print("This test is known to be flaky, please ignore "
           "(debug prints below added by sgjesse@)");
     print("#followRedirects test starting server...");
     startServer();
     print("#followRedirects test server running");
 
     var request = new http.Request('POST', serverUrl.resolve('/redirect'))
         ..followRedirects = false;
-    var future = request.send().transform((response) {
+    var future = request.send().then((response) {
       print("#followRedirects test response received");
       expect(response.statusCode, equals(302));
     });
-    future.onComplete(expectAsync1((_) {
+    future.catchError((_) {}).then(expectAsync1((_) {
       print("#followRedirects test stopping server...");
       stopServer();
       print("#followRedirects test server stopped");
     }));
 
     expect(future, completes);
     print("#followRedirects test started");
   });
 
   test('#maxRedirects', () {
     print("This test is known to be flaky, please ignore "
           "(debug prints below added by sgjesse@)");
     print("#maxRedirects test starting server...");
     startServer();
     print("#maxRedirects test server running");
 
     var request = new http.Request('POST', serverUrl.resolve('/loop?1'))
       ..maxRedirects = 2;
-    var future = request.send().transformException((e) {
+    var future = request.send().catchError((AsyncError e) {
       print("#maxRedirects test exception received");
-      expect(e, isRedirectLimitExceededException);
-      expect(e.redirects.length, equals(2));
+      expect(e.error, isRedirectLimitExceededException);
+      expect(e.error.redirects.length, equals(2));
     });
-    future.onComplete(expectAsync1((_) {
+    future.catchError((_) {}).then(expectAsync1((_) {
       print("#maxRedirects test stopping server...");
       stopServer();
       print("#maxRedirects test server stopped");
     }));
 
     expect(future, completes);
     print("#maxRedirects test started");
   });
 
   group('content-type header', () {
@@ skipping 77 matching lines @@
           equals('application/json; charset=iso-8859-1'));
     });
   });
 
   group('#finalize', () {
     test('returns a stream that emits the request body', () {
       var request = new http.Request('POST', dummyUrl);
       request.body = "Hello, world!";
       expect(
           consumeInputStream(request.finalize())
-              .transform((bytes) => new String.fromCharCodes(bytes)),
+              .then((bytes) => new String.fromCharCodes(bytes)),
           completion(equals("Hello, world!")));
     });
 
     test('freezes #persistentConnection', () {
       var request = new http.Request('POST', dummyUrl);
       request.finalize();
 
       expect(request.persistentConnection, isTrue);
       expect(() => request.persistentConnection = false, throwsStateError);
     });
@@ skipping 57 matching lines @@
   });
 
   group('#toString()', () {
     test('includes the method and URL', () {
       var request = new http.Request('POST', dummyUrl);
       expect(request.toString(), 'POST $dummyUrl');
     });
   });
 }