Big merge from experimental to bleeding edge.

utils/tests/pub/curl_client_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 curl_client_test;
 
 import 'dart:io';
 import 'dart:isolate';
 import 'dart:json';
 import 'dart:uri';
@@ skipping 197 matching lines @@
     item is RedirectLimitExceededException;
 }
 
 // ----------------------------------------------------------------------------
 
 void main() {
   setUp(startServer);
   tearDown(stopServer);
 
   test('head', () {
-    expect(new CurlClient().head(serverUrl).transform((response) {
+    expect(new CurlClient().head(serverUrl).then((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, equals(''));
     }), completes);
   });
 
   test('get', () {
     expect(new CurlClient().get(serverUrl, headers: {
       'X-Random-Header': 'Value',
       'X-Other-Header': 'Other Value'
-    }).transform((response) {
+    }).then((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, parse(equals({
         'method': 'GET',
         'path': '/',
         'headers': {
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         },
       })));
     }), completes);
   });
 
   test('post', () {
     expect(new CurlClient().post(serverUrl, headers: {
       'X-Random-Header': 'Value',
       'X-Other-Header': 'Other Value'
     }, fields: {
       'some-field': 'value',
       'other-field': 'other value'
-    }).transform((response) {
+    }).then((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, parse(equals({
         'method': 'POST',
         'path': '/',
         'headers': {
           'content-type': [
             'application/x-www-form-urlencoded; charset=UTF-8'
           ],
           'content-length': ['40'],
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         },
         'body': 'some-field=value&other-field=other+value'
       })));
     }), completes);
   });
 
   test('post without fields', () {
     expect(new CurlClient().post(serverUrl, headers: {
       'X-Random-Header': 'Value',
       'X-Other-Header': 'Other Value',
       'Content-Type': 'text/plain'
-    }).transform((response) {
+    }).then((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, parse(equals({
         'method': 'POST',
         'path': '/',
         'headers': {
           'content-type': ['text/plain'],
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         }
       })));
     }), completes);
   });
 
   test('put', () {
     expect(new CurlClient().put(serverUrl, headers: {
       'X-Random-Header': 'Value',
       'X-Other-Header': 'Other Value'
     }, fields: {
       'some-field': 'value',
       'other-field': 'other value'
-    }).transform((response) {
+    }).then((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, parse(equals({
         'method': 'PUT',
         'path': '/',
         'headers': {
           'content-type': [
             'application/x-www-form-urlencoded; charset=UTF-8'
           ],
           'content-length': ['40'],
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         },
         'body': 'some-field=value&other-field=other+value'
       })));
     }), completes);
   });
 
   test('put without fields', () {
     expect(new CurlClient().put(serverUrl, headers: {
       'X-Random-Header': 'Value',
       'X-Other-Header': 'Other Value',
       'Content-Type': 'text/plain'
-    }).transform((response) {
+    }).then((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, parse(equals({
         'method': 'PUT',
         'path': '/',
         'headers': {
           'content-type': ['text/plain'],
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         }
       })));
     }), completes);
   });
 
   test('delete', () {
     expect(new CurlClient().delete(serverUrl, headers: {
       'X-Random-Header': 'Value',
       'X-Other-Header': 'Other Value'
-    }).transform((response) {
+    }).then((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, parse(equals({
         'method': 'DELETE',
         'path': '/',
         'headers': {
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         }
       })));
     }), completes);
@@ skipping 15 matching lines @@
 
   test('read throws an error for a 4** status code', () {
     expect(new CurlClient().read(serverUrl.resolve('/error')),
         throwsHttpException);
   });
 
   test('readBytes', () {
     var future = new CurlClient().readBytes(serverUrl, headers: {
       'X-Random-Header': 'Value',
       'X-Other-Header': 'Other Value'
-    }).transform((bytes) => new String.fromCharCodes(bytes));
+    }).then((bytes) => new String.fromCharCodes(bytes));
 
     expect(future, completion(parse(equals({
       'method': 'GET',
       'path': '/',
       'headers': {
         'x-random-header': ['Value'],
         'x-other-header': ['Other Value']
       },
     }))));
   });
 
   test('readBytes throws an error for a 4** status code', () {
     expect(new CurlClient().readBytes(serverUrl.resolve('/error')),
         throwsHttpException);
   });
 
   test('#send a StreamedRequest', () {
     var client = new CurlClient();
     var request = new http.StreamedRequest("POST", serverUrl);
     request.headers[HttpHeaders.CONTENT_TYPE] =
       'application/json; charset=utf-8';
 
-    var future = client.send(request).chain((response) {
+    var future = client.send(request).then((response) {
       expect(response.statusCode, equals(200));
       return consumeInputStream(response.stream);
-    }).transform((bytes) => new String.fromCharCodes(bytes));
-    future.onComplete((_) => client.close());
+    }).then((bytes) => new String.fromCharCodes(bytes));
+    future.catchError((_) {}).then((_) => client.close());
 
     expect(future, completion(parse(equals({
       'method': 'POST',
       'path': '/',
       'headers': {
         'content-type': ['application/json; charset=utf-8'],
         'transfer-encoding': ['chunked']
       },
       'body': '{"hello": "world"}'
     }))));
 
     request.stream.writeString('{"hello": "world"}');
     request.stream.close();
   });
 
   test('with one redirect', () {
     var url = serverUrl.resolve('/redirect');
-    expect(new CurlClient().get(url).transform((response) {
+    expect(new CurlClient().get(url).then((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, parse(equals({
         'method': 'GET',
         'path': '/',
         'headers': {}
       })));
     }), completes);
   });
 
   test('with too many redirects', () {
     expect(new CurlClient().get(serverUrl.resolve('/loop?1')),
         throwsRedirectLimitExceededException);
   });
 
   test('with a generic failure', () {
     expect(new CurlClient().get('url fail'),
         throwsHttpException);
   });
 
   test('with one redirect via HEAD', () {
     var url = serverUrl.resolve('/redirect');
-    expect(new CurlClient().head(url).transform((response) {
+    expect(new CurlClient().head(url).then((response) {
       expect(response.statusCode, equals(200));
     }), completes);
   });
 
   test('with too many redirects via HEAD', () {
     expect(new CurlClient().head(serverUrl.resolve('/loop?1')),
         throwsRedirectLimitExceededException);
   });
 
   test('with a generic failure via HEAD', () {
     expect(new CurlClient().head('url fail'),
         throwsHttpException);
   });
 
   test('without following redirects', () {
     var request = new http.Request('GET', serverUrl.resolve('/redirect'));
     request.followRedirects = false;
-    expect(new CurlClient().send(request).chain(http.Response.fromStream)
-        .transform((response) {
+    expect(new CurlClient().send(request).then(http.Response.fromStream)
+        .then((response) {
       expect(response.statusCode, equals(302));
       expect(response.isRedirect, true);
     }), completes);
   });
 }