Api-Roll 50: 2017-06-12

generated/googleapis/test/oauth2/v2_test.dart

 library googleapis.oauth2.v2.test;
 
 import "dart:core" as core;
 import "dart:collection" as collection;
 import "dart:async" as async;
 import "dart:convert" as convert;
 
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
-import 'package:unittest/unittest.dart' as unittest;
+import 'package:test/test.dart' as unittest;
 
 import 'package:googleapis/oauth2/v2.dart' as api;
 
 class HttpServerMock extends http.BaseClient {
   core.Function _callback;
   core.bool _expectJson;
 
   void register(core.Function callback, core.bool expectJson) {
     _callback = callback;
     _expectJson = expectJson;
@@ skipping 18 matching lines @@
       } else {
         return stream.toBytes().then((data) {
           return _callback(request, data);
         });
       }
     }
   }
 }
 
 http.StreamedResponse stringResponse(
-    core.int status, core.Map headers, core.String body) {
+    core.int status, core.Map<core.String, core.String> headers, core.String body) {
   var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
 core.int buildCounterJwkKeys = 0;
 buildJwkKeys() {
   var o = new api.JwkKeys();
   buildCounterJwkKeys++;
   if (buildCounterJwkKeys < 3) {
     o.alg = "foo";
@@ skipping 13 matching lines @@
     unittest.expect(o.alg, unittest.equals('foo'));
     unittest.expect(o.e, unittest.equals('foo'));
     unittest.expect(o.kid, unittest.equals('foo'));
     unittest.expect(o.kty, unittest.equals('foo'));
     unittest.expect(o.n, unittest.equals('foo'));
     unittest.expect(o.use, unittest.equals('foo'));
   }
   buildCounterJwkKeys--;
 }
 
-buildUnnamed2889() {
+buildUnnamed2359() {
   var o = new core.List<api.JwkKeys>();
   o.add(buildJwkKeys());
   o.add(buildJwkKeys());
   return o;
 }
 
-checkUnnamed2889(core.List<api.JwkKeys> o) {
+checkUnnamed2359(core.List<api.JwkKeys> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJwkKeys(o[0]);
   checkJwkKeys(o[1]);
 }
 
 core.int buildCounterJwk = 0;
 buildJwk() {
   var o = new api.Jwk();
   buildCounterJwk++;
   if (buildCounterJwk < 3) {
-    o.keys = buildUnnamed2889();
+    o.keys = buildUnnamed2359();
   }
   buildCounterJwk--;
   return o;
 }
 
 checkJwk(api.Jwk o) {
   buildCounterJwk++;
   if (buildCounterJwk < 3) {
-    checkUnnamed2889(o.keys);
+    checkUnnamed2359(o.keys);
   }
   buildCounterJwk--;
 }
 
 core.int buildCounterTokeninfo = 0;
 buildTokeninfo() {
   var o = new api.Tokeninfo();
   buildCounterTokeninfo++;
   if (buildCounterTokeninfo < 3) {
     o.accessType = "foo";
@@ skipping 101 matching lines @@
       checkUserinfoplus(od);
     });
   });
 
 
   unittest.group("resource-Oauth2Api", () {
     unittest.test("method--getCertForOpenIdConnect", () {
 
       var mock = new HttpServerMock();
       api.Oauth2Api res = new api.Oauth2Api(mock);
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("oauth2/v2/certs"));
         pathOffset += 15;
 
         var query = (req.url).query;
@@ skipping 13 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJwk());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getCertForOpenIdConnect().then(unittest.expectAsync(((api.Jwk response) {
+      res.getCertForOpenIdConnect().then(unittest.expectAsync1(((api.Jwk response) {
         checkJwk(response);
       })));
     });
 
     unittest.test("method--tokeninfo", () {
 
       var mock = new HttpServerMock();
       api.Oauth2Api res = new api.Oauth2Api(mock);
       var arg_accessToken = "foo";
       var arg_idToken = "foo";
       var arg_tokenHandle = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 19), unittest.equals("oauth2/v2/tokeninfo"));
         pathOffset += 19;
 
         var query = (req.url).query;
@@ skipping 16 matching lines @@
         unittest.expect(queryMap["id_token"].first, unittest.equals(arg_idToken));
         unittest.expect(queryMap["token_handle"].first, unittest.equals(arg_tokenHandle));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTokeninfo());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.tokeninfo(accessToken: arg_accessToken, idToken: arg_idToken, tokenHandle: arg_tokenHandle).then(unittest.expectAsync(((api.Tokeninfo response) {
+      res.tokeninfo(accessToken: arg_accessToken, idToken: arg_idToken, tokenHandle: arg_tokenHandle).then(unittest.expectAsync1(((api.Tokeninfo response) {
         checkTokeninfo(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-UserinfoResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.UserinfoResourceApi res = new api.Oauth2Api(mock).userinfo;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 18), unittest.equals("oauth2/v2/userinfo"));
         pathOffset += 18;
 
         var query = (req.url).query;
@@ skipping 13 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserinfoplus());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get().then(unittest.expectAsync(((api.Userinfoplus response) {
+      res.get().then(unittest.expectAsync1(((api.Userinfoplus response) {
         checkUserinfoplus(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-UserinfoV2MeResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.UserinfoV2MeResourceApi res = new api.Oauth2Api(mock).userinfo.v2.me;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("userinfo/v2/me"));
         pathOffset += 14;
 
         var query = (req.url).query;
@@ skipping 13 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserinfoplus());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get().then(unittest.expectAsync(((api.Userinfoplus response) {
+      res.get().then(unittest.expectAsync1(((api.Userinfoplus response) {
         checkUserinfoplus(response);
       })));
     });
 
   });
 
 
 }