Big merge from experimental to bleeding edge.

pkg/oauth2/test/credentials_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 credentials_test;
 
+import 'dart:async';
 import 'dart:io';
-import 'dart:json';
+import 'dart:json' as JSON;
 import 'dart:uri';
 
 import '../../unittest/lib/unittest.dart';
 import '../../http/lib/http.dart' as http;
 import '../lib/oauth2.dart' as oauth2;
 import 'utils.dart';
 
 final Uri tokenEndpoint = new Uri.fromString('http://example.com/token');
 
 ExpectClient httpClient;
@@ skipping 17 matching lines @@
     var expiration = new Date.now().subtract(new Duration(hours: 1));
     var credentials = new oauth2.Credentials(
         'access token', null, null, null, expiration);
     expect(credentials.isExpired, isTrue);
   });
 
   test("can't refresh without a refresh token", () {
     var credentials = new oauth2.Credentials(
         'access token', null, tokenEndpoint);
     expect(credentials.canRefresh, false);
-    expect(credentials.refresh('identifier', 'secret', httpClient: httpClient),
-        throwsStateError);
+    credentials.refresh('identifier', 'secret', httpClient: httpClient)
+        .catchError(expectAsync1((e) {
+          expect(e.error is StateError, isTrue);
+        }));
   });
 
   test("can't refresh without a token endpoint", () {
     var credentials = new oauth2.Credentials('access token', 'refresh token');
     expect(credentials.canRefresh, false);
-    expect(credentials.refresh('identifier', 'secret', httpClient: httpClient),
-        throwsStateError);
+    credentials.refresh('identifier', 'secret', httpClient: httpClient)
+        .catchError(expectAsync1((e) {
+          expect(e.error is StateError, isTrue);
+        }));
   });
 
   test("can refresh with a refresh token and a token endpoint", () {
     var credentials = new oauth2.Credentials(
         'access token', 'refresh token', tokenEndpoint, ['scope1', 'scope2']);
     expect(credentials.canRefresh, true);
 
     httpClient.expectRequest((request) {
       expect(request.method, equals('POST'));
       expect(request.url.toString(), equals(tokenEndpoint.toString()));
       expect(request.bodyFields, equals({
         "grant_type": "refresh_token",
         "refresh_token": "refresh token",
         "scope": "scope1 scope2",
         "client_id": "identifier",
         "client_secret": "secret"
       }));
 
       return new Future.immediate(new http.Response(JSON.stringify({
         'access_token': 'new access token',
         'token_type': 'bearer',
         'refresh_token': 'new refresh token'
       }), 200, headers: {'content-type': 'application/json'}));
     });
 
     
     expect(credentials.refresh('identifier', 'secret', httpClient: httpClient)
-        .transform((credentials) {
+        .then((credentials) {
       expect(credentials.accessToken, equals('new access token'));
       expect(credentials.refreshToken, equals('new refresh token'));
     }), completes);
   });
 
   test("uses the old refresh token if a new one isn't provided", () {
     var credentials = new oauth2.Credentials(
         'access token', 'refresh token', tokenEndpoint);
     expect(credentials.canRefresh, true);
 
     httpClient.expectRequest((request) {
       expect(request.method, equals('POST'));
       expect(request.url.toString(), equals(tokenEndpoint.toString()));
       expect(request.bodyFields, equals({
         "grant_type": "refresh_token",
         "refresh_token": "refresh token",
         "client_id": "identifier",
         "client_secret": "secret"
       }));
 
       return new Future.immediate(new http.Response(JSON.stringify({
         'access_token': 'new access token',
         'token_type': 'bearer'
       }), 200, headers: {'content-type': 'application/json'}));
     });
 
     
     expect(credentials.refresh('identifier', 'secret', httpClient: httpClient)
-        .transform((credentials) {
+        .then((credentials) {
       expect(credentials.accessToken, equals('new access token'));
       expect(credentials.refreshToken, equals('refresh token'));
     }), completes);
   });
 
   group("fromJson", () {
     oauth2.Credentials fromMap(Map map) =>
       new oauth2.Credentials.fromJson(JSON.stringify(map));
 
     test("should load the same credentials from toJson", () {
@@ skipping 43 matching lines @@
       expect(() => fromMap({"accessToken": "foo", "scopes": 12}),
           throwsFormatException);
     });
 
     test("should throw a FormatException if expiration is not an int", () {
       expect(() => fromMap({"accessToken": "foo", "expiration": "12"}),
           throwsFormatException);
     });
   });
 }