Async-ify.

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:async';
 import 'dart:convert';
 
 import 'package:http/http.dart' as http;
@@ skipping 21 matching lines @@
       var credentials = new oauth2.Credentials(
           'access token', null, null, [], expiration);
       var client = new oauth2.Client('identifier', 'secret', credentials,
           httpClient: httpClient);
 
       expect(client.get(requestUri),
           throwsA(new isInstanceOf<oauth2.ExpirationException>()));
     });
 
     test("that can be refreshed refreshes the credentials and sends the "
-        "request", () {
+        "request", () async {
       var expiration = new DateTime.now().subtract(new Duration(hours: 1));
       var credentials = new oauth2.Credentials(
           'access token', 'refresh token', tokenEndpoint, [], expiration);
       var client = new oauth2.Client('identifier', 'secret', credentials,
           httpClient: httpClient);
 
       httpClient.expectRequest((request) {
         expect(request.method, equals('POST'));
         expect(request.url.toString(), equals(tokenEndpoint.toString()));
         return new Future.value(new http.Response(JSON.encode({
           'access_token': 'new access token',
           'token_type': 'bearer'
         }), 200, headers: {'content-type': 'application/json'}));
       });
 
       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.value(new http.Response('good job', 200));
       });
 
-      expect(client.read(requestUri).then((_) {
-        expect(client.credentials.accessToken, equals('new access token'));
-      }), completes);
+      await client.read(requestUri);
+      expect(client.credentials.accessToken, equals('new access token'));
     });
   });
 
   group('with valid credentials', () {
     setUp(createHttpClient);
 
     test("sends a request with bearer authorization", () {
       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.value(new http.Response('good job', 200));
       });
 
       expect(client.read(requestUri), completion(equals('good job')));
     });
 
-    test("can manually refresh the credentials", () {
+    test("can manually refresh the credentials", () async {
       var credentials = new oauth2.Credentials(
           'access token', 'refresh token', tokenEndpoint);
       var client = new oauth2.Client('identifier', 'secret', credentials,
           httpClient: httpClient);
 
       httpClient.expectRequest((request) {
         expect(request.method, equals('POST'));
         expect(request.url.toString(), equals(tokenEndpoint.toString()));
         return new Future.value(new http.Response(JSON.encode({
           'access_token': 'new access token',
           'token_type': 'bearer'
         }), 200, headers: {'content-type': 'application/json'}));
       });
 
-      expect(client.refreshCredentials().then((_) {
-        expect(client.credentials.accessToken, equals('new access token'));
-      }), completes);
+      await client.refreshCredentials();
+      expect(client.credentials.accessToken, equals('new access token'));
     });
 
     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(), throwsA(isStateError));
     });
   });
@@ skipping 14 matching lines @@
         var authenticate = 'Bearer error="invalid_token", error_description='
             '"Something is terribly wrong."';
         return new Future.value(new http.Response('bad job', 401,
                 headers: {'www-authenticate': authenticate}));
       });
 
       expect(client.read(requestUri),
           throwsA(new isInstanceOf<oauth2.AuthorizationException>()));
     });
 
-    test('passes through a 401 response without www-authenticate', () {
+    test('passes through a 401 response without www-authenticate', () async {
       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.value(new http.Response('bad job', 401));
       });
 
-      expect(
-          client.get(requestUri).then((response) => response.statusCode),
-          completion(equals(401)));
+      expect((await client.get(requestUri)).statusCode, equals(401));
     });
 
-    test('passes through a 401 response with invalid www-authenticate', () {
+    test('passes through a 401 response with invalid www-authenticate',
+        () async {
       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.value(new http.Response('bad job', 401,
                 headers: {'www-authenticate': authenticate}));
       });
 
-      expect(
-          client.get(requestUri).then((response) => response.statusCode),
-          completion(equals(401)));
+      expect((await client.get(requestUri)).statusCode, equals(401));
     });
 
-    test('passes through a 401 response with non-bearer www-authenticate', () {
+    test('passes through a 401 response with non-bearer www-authenticate',
+        () async {
       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.value(new http.Response('bad job', 401,
                 headers: {'www-authenticate': 'Digest'}));
       });
 
-      expect(
-          client.get(requestUri).then((response) => response.statusCode),
-          completion(equals(401)));
+      expect((await client.get(requestUri)).statusCode, equals(401));
     });
 
-    test('passes through a 401 response with non-OAuth2 www-authenticate', () {
+    test('passes through a 401 response with non-OAuth2 www-authenticate',
+        () async {
       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.value(new http.Response('bad job', 401,
                 headers: {'www-authenticate': 'Bearer'}));
       });
 
-      expect(
-          client.get(requestUri).then((response) => response.statusCode),
-          completion(equals(401)));
+      expect((await client.get(requestUri)).statusCode, equals(401));
     });
   });
 }