pkg/oauth2 bringing tests into 2014

pkg/oauth2/test/authorization_code_grant_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 authorization_code_grant_test;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:unittest/unittest.dart';
@@ skipping 11 matching lines @@
 void createGrant() {
   client = new ExpectClient();
   grant = new oauth2.AuthorizationCodeGrant(
       'identifier',
       'secret',
       Uri.parse('https://example.com/authorization'),
       Uri.parse('https://example.com/token'),
       httpClient: client);
 }
 
-void expectFutureThrows(future, predicate) {
-  future.catchError(expectAsync1((error) {
-    expect(predicate(error), isTrue);
-  }));
-}
-
 void main() {
   group('.getAuthorizationUrl', () {
     setUp(createGrant);
 
     test('builds the correct URL', () {
       expect(grant.getAuthorizationUrl(redirectUrl).toString(),
           equals('https://example.com/authorization'
               '?response_type=code'
               '&client_id=identifier'
               '&redirect_uri=http%3A%2F%2Fexample.com%2Fredirect'));
@@ skipping 41 matching lines @@
     test("can't be called twice", () {
       grant.getAuthorizationUrl(redirectUrl);
       expect(() => grant.getAuthorizationUrl(redirectUrl), throwsStateError);
     });
   });
 
   group('.handleAuthorizationResponse', () {
     setUp(createGrant);
 
     test("can't be called before .getAuthorizationUrl", () {
-      expectFutureThrows(grant.handleAuthorizationResponse({}),
-                         (e) => e is StateError);
+      expect(grant.handleAuthorizationResponse({}),
+                         throwsStateError);

[nweiz, 2014/03/05 22:38:08]

Indent this correctly.

[kevmoo, 2014/03/06 00:01:42]

Done.

     });
 
     test("can't be called twice", () {
       grant.getAuthorizationUrl(redirectUrl);
-      expectFutureThrows(
+      expect(
           grant.handleAuthorizationResponse({'code': 'auth code'}),
-          (e) => e is FormatException);
-      expectFutureThrows(
+          throwsFormatException);
+      expect(
           grant.handleAuthorizationResponse({'code': 'auth code'}),
-          (e) => e is StateError);
+          throwsStateError);
     });
 
     test('must have a state parameter if the authorization URL did', () {
       grant.getAuthorizationUrl(redirectUrl, state: 'state');
-      expectFutureThrows(
+      expect(
           grant.handleAuthorizationResponse({'code': 'auth code'}),
-          (e) => e is FormatException);
+          throwsFormatException);
     });
 
     test('must have the same state parameter the authorization URL did', () {
       grant.getAuthorizationUrl(redirectUrl, state: 'state');
-      expectFutureThrows(grant.handleAuthorizationResponse({
+      expect(grant.handleAuthorizationResponse({
         'code': 'auth code',
         'state': 'other state'
-      }), (e) => e is FormatException);
+      }), throwsFormatException);
     });
 
     test('must have a code parameter', () {
       grant.getAuthorizationUrl(redirectUrl);
-      expectFutureThrows(grant.handleAuthorizationResponse({}),
-                         (e) => e is FormatException);
+      expect(grant.handleAuthorizationResponse({}),
+                         throwsFormatException);

[nweiz, 2014/03/05 22:38:08]

Indent this correctly.

[kevmoo, 2014/03/06 00:01:42]

Done.

     });
 
     test('with an error parameter throws an AuthorizationException', () {
       grant.getAuthorizationUrl(redirectUrl);
-      expectFutureThrows(
+      expect(
           grant.handleAuthorizationResponse({'error': 'invalid_request'}),
-          (e) => e is oauth2.AuthorizationException);
+          throwsA((e) => e is oauth2.AuthorizationException));
     });
 
     test('sends an authorization code request', () {
       grant.getAuthorizationUrl(redirectUrl);
       client.expectRequest((request) {
         expect(request.method, equals('POST'));
         expect(request.url.toString(), equals(grant.tokenEndpoint.toString()));
         expect(request.bodyFields, equals({
           'grant_type': 'authorization_code',
           'code': 'auth code',
           'redirect_uri': redirectUrl.toString(),
           'client_id': 'identifier',
           'client_secret': 'secret'
         }));
 
         return new Future.value(new http.Response(JSON.encode({
           'access_token': 'access token',
           'token_type': 'bearer',
         }), 200, headers: {'content-type': 'application/json'}));
       });
 
-      grant.handleAuthorizationResponse({'code': 'auth code'})
-          .then(expectAsync1((client) {
+      return grant.handleAuthorizationResponse({'code': 'auth code'})
+          .then((client) {
             expect(client.credentials.accessToken, equals('access token'));
-          }));
+          });

[nweiz, 2014/03/05 22:38:08]

These days I'd write this as

    expect(grant.handleAuthorizationResponse({'code': 'auth code'})
          .then((client) => client.credentials.accessToken),
        completion(equals('access token')));

[kevmoo, 2014/03/06 00:01:42]

Done.

     });
   });
 
   group('.handleAuthorizationCode', () {
     setUp(createGrant);
 
     test("can't be called before .getAuthorizationUrl", () {
-      expectFutureThrows(
+      expect(
           grant.handleAuthorizationCode('auth code'),
-          (e) => e is StateError);
+          throwsStateError);
     });
 
     test("can't be called twice", () {
       grant.getAuthorizationUrl(redirectUrl);
-      expectFutureThrows(
+      expect(
           grant.handleAuthorizationCode('auth code'),
-          (e) => e is FormatException);
-      expectFutureThrows(grant.handleAuthorizationCode('auth code'),
-                         (e) => e is StateError);
+          throwsFormatException);
+      expect(grant.handleAuthorizationCode('auth code'),
+                         throwsStateError);

[nweiz, 2014/03/05 22:38:08]

Indent this correctly.

[kevmoo, 2014/03/06 00:01:42]

Done.

     });
 
     test('sends an authorization code request', () {
       grant.getAuthorizationUrl(redirectUrl);
       client.expectRequest((request) {
         expect(request.method, equals('POST'));
         expect(request.url.toString(), equals(grant.tokenEndpoint.toString()));
         expect(request.bodyFields, equals({
           'grant_type': 'authorization_code',
           'code': 'auth code',
           'redirect_uri': redirectUrl.toString(),
           'client_id': 'identifier',
           'client_secret': 'secret'
         }));
 
         return new Future.value(new http.Response(JSON.encode({
           'access_token': 'access token',
           'token_type': 'bearer',
         }), 200, headers: {'content-type': 'application/json'}));
       });
 
       expect(grant.handleAuthorizationCode('auth code'),
           completion(predicate((client) {
             expect(client.credentials.accessToken, equals('access token'));
             return true;
           })));
     });
   });
 }