pkg/oauth2 bringing tests into 2014

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:convert';
 
 import 'package:http/http.dart' as http;
 import 'package:oauth2/oauth2.dart' as oauth2;
 import 'package:unittest/unittest.dart';
 
 import 'utils.dart';
 
 final Uri tokenEndpoint = Uri.parse('http://example.com/token');
 
-ExpectClient httpClient;
+void main() {
+  ExpectClient httpClient;

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

If you're going to move this into [main], get rid of the type annotation.

 
-void main() {
   setUp(() => httpClient = new ExpectClient());
 
   test('is not expired if no expiration exists', () {
     var credentials = new oauth2.Credentials('access token');
     expect(credentials.isExpired, isFalse);
   });
 
   test('is not expired if the expiration is in the future', () {
     var expiration = new DateTime.now().add(new Duration(hours: 1));
     var credentials = new oauth2.Credentials(
         'access token', null, null, null, expiration);
     expect(credentials.isExpired, isFalse);
   });
 
   test('is expired if the expiration is in the past', () {
     var expiration = new DateTime.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);
-    credentials.refresh('identifier', 'secret', httpClient: httpClient)
-        .catchError(expectAsync1((error) {
-          expect(error is StateError, isTrue);
-        }));
+
+    expect(credentials.refresh('identifier', 'secret', httpClient: httpClient),
+        throwsStateError);
   });
 
   test("can't refresh without a token endpoint", () {
     var credentials = new oauth2.Credentials('access token', 'refresh token');
     expect(credentials.canRefresh, false);
-    credentials.refresh('identifier', 'secret', httpClient: httpClient)
-        .catchError(expectAsync1((error) {
-          expect(error is StateError, isTrue);
-        }));
+
+    expect(credentials.refresh('identifier', 'secret', httpClient: httpClient),
+        throwsStateError);
   });
 
   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()));
@@ skipping 100 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);
     });
   });
 }