Big merge from experimental to bleeding edge.

pkg/oauth2/test/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 client_test;
 
 import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
 
@@ skipping 45 matching lines @@
 
       httpClient.expectRequest((request) {
         expect(request.method, equals('GET'));
         expect(request.url.toString(), equals(requestUri.toString()));
         expect(request.headers['authorization'],
             equals('Bearer new access token'));
 
         return new Future.immediate(new http.Response('good job', 200));
       });
 
-      expect(client.read(requestUri).transform((_) {
+      expect(client.read(requestUri).then((_) {
         expect(client.credentials.accessToken, equals('new access token'));
       }), completes);
     });
   });
 
   group('with valid credentials', () {
     setUp(createHttpClient);
 
     test("sends a request with bearer authorization", () {
       var credentials = new oauth2.Credentials('access token');
@@ skipping 20 matching lines @@
 
       httpClient.expectRequest((request) {
         expect(request.method, equals('POST'));
         expect(request.url.toString(), equals(tokenEndpoint.toString()));
         return new Future.immediate(new http.Response(JSON.stringify({
           'access_token': 'new access token',
           'token_type': 'bearer'
         }), 200, headers: {'content-type': 'application/json'}));
       });
 
-      expect(client.refreshCredentials().transform((_) {
+      expect(client.refreshCredentials().then((_) {
         expect(client.credentials.accessToken, equals('new access token'));
       }), completes);
     });
 
     test("without a refresh token can't manually refresh the credentials", () {
       var credentials = new oauth2.Credentials('access token');
       var client = new oauth2.Client('identifier', 'secret', credentials,
           httpClient: httpClient);
 
       expect(client.refreshCredentials(), throwsStateError);
@@ skipping 31 matching lines @@
       httpClient.expectRequest((request) {
         expect(request.method, equals('GET'));
         expect(request.url.toString(), equals(requestUri.toString()));
         expect(request.headers['authorization'],
             equals('Bearer access token'));
 
         return new Future.immediate(new http.Response('bad job', 401));
       });
 
       expect(
-          client.get(requestUri).transform((response) => response.statusCode),
+          client.get(requestUri).then((response) => response.statusCode),
           completion(equals(401)));
     });
 
     test('passes through a 401 response with invalid www-authenticate', () {
       var credentials = new oauth2.Credentials('access token');
       var client = new oauth2.Client('identifier', 'secret', credentials,
           httpClient: httpClient);
 
       httpClient.expectRequest((request) {
         expect(request.method, equals('GET'));
         expect(request.url.toString(), equals(requestUri.toString()));
         expect(request.headers['authorization'],
             equals('Bearer access token'));
 
         var authenticate = 'Bearer error="invalid_token", error_description='
           '"Something is terribly wrong.", ';
         return new Future.immediate(new http.Response('bad job', 401,
                 headers: {'www-authenticate': authenticate}));
       });
 
       expect(
-          client.get(requestUri).transform((response) => response.statusCode),
+          client.get(requestUri).then((response) => response.statusCode),
           completion(equals(401)));
     });
 
     test('passes through a 401 response with non-bearer www-authenticate', () {
       var credentials = new oauth2.Credentials('access token');
       var client = new oauth2.Client('identifier', 'secret', credentials,
           httpClient: httpClient);
 
       httpClient.expectRequest((request) {
         expect(request.method, equals('GET'));
         expect(request.url.toString(), equals(requestUri.toString()));
         expect(request.headers['authorization'],
             equals('Bearer access token'));
 
         return new Future.immediate(new http.Response('bad job', 401,
                 headers: {'www-authenticate': 'Digest'}));
       });
 
       expect(
-          client.get(requestUri).transform((response) => response.statusCode),
+          client.get(requestUri).then((response) => response.statusCode),
           completion(equals(401)));
     });
 
     test('passes through a 401 response with non-OAuth2 www-authenticate', () {
       var credentials = new oauth2.Credentials('access token');
       var client = new oauth2.Client('identifier', 'secret', credentials,
           httpClient: httpClient);
 
       httpClient.expectRequest((request) {
         expect(request.method, equals('GET'));
         expect(request.url.toString(), equals(requestUri.toString()));
         expect(request.headers['authorization'],
             equals('Bearer access token'));
 
         return new Future.immediate(new http.Response('bad job', 401,
                 headers: {'www-authenticate': 'Bearer'}));
       });
 
       expect(
-          client.get(requestUri).transform((response) => response.statusCode),
+          client.get(requestUri).then((response) => response.statusCode),
           completion(equals(401)));
     });
   });
 }