Api-Roll 50: 2017-06-12

generated/googleapis/test/androidpublisher/v2_test.dart

 library googleapis.androidpublisher.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/androidpublisher/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 buildCounterApk = 0;
 buildApk() {
   var o = new api.Apk();
   buildCounterApk++;
   if (buildCounterApk < 3) {
     o.binary = buildApkBinary();
@@ skipping 45 matching lines @@
 
 checkApkListing(api.ApkListing o) {
   buildCounterApkListing++;
   if (buildCounterApkListing < 3) {
     unittest.expect(o.language, unittest.equals('foo'));
     unittest.expect(o.recentChanges, unittest.equals('foo'));
   }
   buildCounterApkListing--;
 }
 
-buildUnnamed2899() {
+buildUnnamed2369() {
   var o = new core.List<api.ApkListing>();
   o.add(buildApkListing());
   o.add(buildApkListing());
   return o;
 }
 
-checkUnnamed2899(core.List<api.ApkListing> o) {
+checkUnnamed2369(core.List<api.ApkListing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApkListing(o[0]);
   checkApkListing(o[1]);
 }
 
 core.int buildCounterApkListingsListResponse = 0;
 buildApkListingsListResponse() {
   var o = new api.ApkListingsListResponse();
   buildCounterApkListingsListResponse++;
   if (buildCounterApkListingsListResponse < 3) {
     o.kind = "foo";
-    o.listings = buildUnnamed2899();
+    o.listings = buildUnnamed2369();
   }
   buildCounterApkListingsListResponse--;
   return o;
 }
 
 checkApkListingsListResponse(api.ApkListingsListResponse o) {
   buildCounterApkListingsListResponse++;
   if (buildCounterApkListingsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2899(o.listings);
+    checkUnnamed2369(o.listings);
   }
   buildCounterApkListingsListResponse--;
 }
 
 core.int buildCounterApksAddExternallyHostedRequest = 0;
 buildApksAddExternallyHostedRequest() {
   var o = new api.ApksAddExternallyHostedRequest();
   buildCounterApksAddExternallyHostedRequest++;
   if (buildCounterApksAddExternallyHostedRequest < 3) {
     o.externallyHostedApk = buildExternallyHostedApk();
@@ skipping 22 matching lines @@
 }
 
 checkApksAddExternallyHostedResponse(api.ApksAddExternallyHostedResponse o) {
   buildCounterApksAddExternallyHostedResponse++;
   if (buildCounterApksAddExternallyHostedResponse < 3) {
     checkExternallyHostedApk(o.externallyHostedApk);
   }
   buildCounterApksAddExternallyHostedResponse--;
 }
 
-buildUnnamed2900() {
+buildUnnamed2370() {
   var o = new core.List<api.Apk>();
   o.add(buildApk());
   o.add(buildApk());
   return o;
 }
 
-checkUnnamed2900(core.List<api.Apk> o) {
+checkUnnamed2370(core.List<api.Apk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApk(o[0]);
   checkApk(o[1]);
 }
 
 core.int buildCounterApksListResponse = 0;
 buildApksListResponse() {
   var o = new api.ApksListResponse();
   buildCounterApksListResponse++;
   if (buildCounterApksListResponse < 3) {
-    o.apks = buildUnnamed2900();
+    o.apks = buildUnnamed2370();
     o.kind = "foo";
   }
   buildCounterApksListResponse--;
   return o;
 }
 
 checkApksListResponse(api.ApksListResponse o) {
   buildCounterApksListResponse++;
   if (buildCounterApksListResponse < 3) {
-    checkUnnamed2900(o.apks);
+    checkUnnamed2370(o.apks);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterApksListResponse--;
 }
 
 core.int buildCounterAppDetails = 0;
 buildAppDetails() {
   var o = new api.AppDetails();
   buildCounterAppDetails++;
   if (buildCounterAppDetails < 3) {
@@ skipping 175 matching lines @@
   buildCounterEntitlement++;
   if (buildCounterEntitlement < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.productId, unittest.equals('foo'));
     unittest.expect(o.productType, unittest.equals('foo'));
     unittest.expect(o.token, unittest.equals('foo'));
   }
   buildCounterEntitlement--;
 }
 
-buildUnnamed2901() {
+buildUnnamed2371() {
   var o = new core.List<api.Entitlement>();
   o.add(buildEntitlement());
   o.add(buildEntitlement());
   return o;
 }
 
-checkUnnamed2901(core.List<api.Entitlement> o) {
+checkUnnamed2371(core.List<api.Entitlement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntitlement(o[0]);
   checkEntitlement(o[1]);
 }
 
 core.int buildCounterEntitlementsListResponse = 0;
 buildEntitlementsListResponse() {
   var o = new api.EntitlementsListResponse();
   buildCounterEntitlementsListResponse++;
   if (buildCounterEntitlementsListResponse < 3) {
     o.pageInfo = buildPageInfo();
-    o.resources = buildUnnamed2901();
+    o.resources = buildUnnamed2371();
     o.tokenPagination = buildTokenPagination();
   }
   buildCounterEntitlementsListResponse--;
   return o;
 }
 
 checkEntitlementsListResponse(api.EntitlementsListResponse o) {
   buildCounterEntitlementsListResponse++;
   if (buildCounterEntitlementsListResponse < 3) {
     checkPageInfo(o.pageInfo);
-    checkUnnamed2901(o.resources);
+    checkUnnamed2371(o.resources);
     checkTokenPagination(o.tokenPagination);
   }
   buildCounterEntitlementsListResponse--;
 }
 
 core.int buildCounterExpansionFile = 0;
 buildExpansionFile() {
   var o = new api.ExpansionFile();
   buildCounterExpansionFile++;
   if (buildCounterExpansionFile < 3) {
@@ skipping 25 matching lines @@
 }
 
 checkExpansionFilesUploadResponse(api.ExpansionFilesUploadResponse o) {
   buildCounterExpansionFilesUploadResponse++;
   if (buildCounterExpansionFilesUploadResponse < 3) {
     checkExpansionFile(o.expansionFile);
   }
   buildCounterExpansionFilesUploadResponse--;
 }
 
-buildUnnamed2902() {
+buildUnnamed2372() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2902(core.List<core.String> o) {
+checkUnnamed2372(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2903() {
+buildUnnamed2373() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2903(core.List<core.String> o) {
+checkUnnamed2373(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2904() {
+buildUnnamed2374() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2904(core.List<core.String> o) {
+checkUnnamed2374(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2905() {
+buildUnnamed2375() {
   var o = new core.List<api.ExternallyHostedApkUsesPermission>();
   o.add(buildExternallyHostedApkUsesPermission());
   o.add(buildExternallyHostedApkUsesPermission());
   return o;
 }
 
-checkUnnamed2905(core.List<api.ExternallyHostedApkUsesPermission> o) {
+checkUnnamed2375(core.List<api.ExternallyHostedApkUsesPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExternallyHostedApkUsesPermission(o[0]);
   checkExternallyHostedApkUsesPermission(o[1]);
 }
 
 core.int buildCounterExternallyHostedApk = 0;
 buildExternallyHostedApk() {
   var o = new api.ExternallyHostedApk();
   buildCounterExternallyHostedApk++;
   if (buildCounterExternallyHostedApk < 3) {
     o.applicationLabel = "foo";
-    o.certificateBase64s = buildUnnamed2902();
+    o.certificateBase64s = buildUnnamed2372();
     o.externallyHostedUrl = "foo";
     o.fileSha1Base64 = "foo";
     o.fileSha256Base64 = "foo";
     o.fileSize = "foo";
     o.iconBase64 = "foo";
     o.maximumSdk = 42;
     o.minimumSdk = 42;
-    o.nativeCodes = buildUnnamed2903();
+    o.nativeCodes = buildUnnamed2373();
     o.packageName = "foo";
-    o.usesFeatures = buildUnnamed2904();
-    o.usesPermissions = buildUnnamed2905();
+    o.usesFeatures = buildUnnamed2374();
+    o.usesPermissions = buildUnnamed2375();
     o.versionCode = 42;
     o.versionName = "foo";
   }
   buildCounterExternallyHostedApk--;
   return o;
 }
 
 checkExternallyHostedApk(api.ExternallyHostedApk o) {
   buildCounterExternallyHostedApk++;
   if (buildCounterExternallyHostedApk < 3) {
     unittest.expect(o.applicationLabel, unittest.equals('foo'));
-    checkUnnamed2902(o.certificateBase64s);
+    checkUnnamed2372(o.certificateBase64s);
     unittest.expect(o.externallyHostedUrl, unittest.equals('foo'));
     unittest.expect(o.fileSha1Base64, unittest.equals('foo'));
     unittest.expect(o.fileSha256Base64, unittest.equals('foo'));
     unittest.expect(o.fileSize, unittest.equals('foo'));
     unittest.expect(o.iconBase64, unittest.equals('foo'));
     unittest.expect(o.maximumSdk, unittest.equals(42));
     unittest.expect(o.minimumSdk, unittest.equals(42));
-    checkUnnamed2903(o.nativeCodes);
+    checkUnnamed2373(o.nativeCodes);
     unittest.expect(o.packageName, unittest.equals('foo'));
-    checkUnnamed2904(o.usesFeatures);
-    checkUnnamed2905(o.usesPermissions);
+    checkUnnamed2374(o.usesFeatures);
+    checkUnnamed2375(o.usesPermissions);
     unittest.expect(o.versionCode, unittest.equals(42));
     unittest.expect(o.versionName, unittest.equals('foo'));
   }
   buildCounterExternallyHostedApk--;
 }
 
 core.int buildCounterExternallyHostedApkUsesPermission = 0;
 buildExternallyHostedApkUsesPermission() {
   var o = new api.ExternallyHostedApkUsesPermission();
   buildCounterExternallyHostedApkUsesPermission++;
@@ skipping 30 matching lines @@
 checkImage(api.Image o) {
   buildCounterImage++;
   if (buildCounterImage < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.sha1, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterImage--;
 }
 
-buildUnnamed2906() {
+buildUnnamed2376() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed2906(core.List<api.Image> o) {
+checkUnnamed2376(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
 }
 
 core.int buildCounterImagesDeleteAllResponse = 0;
 buildImagesDeleteAllResponse() {
   var o = new api.ImagesDeleteAllResponse();
   buildCounterImagesDeleteAllResponse++;
   if (buildCounterImagesDeleteAllResponse < 3) {
-    o.deleted = buildUnnamed2906();
+    o.deleted = buildUnnamed2376();
   }
   buildCounterImagesDeleteAllResponse--;
   return o;
 }
 
 checkImagesDeleteAllResponse(api.ImagesDeleteAllResponse o) {
   buildCounterImagesDeleteAllResponse++;
   if (buildCounterImagesDeleteAllResponse < 3) {
-    checkUnnamed2906(o.deleted);
+    checkUnnamed2376(o.deleted);
   }
   buildCounterImagesDeleteAllResponse--;
 }
 
-buildUnnamed2907() {
+buildUnnamed2377() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed2907(core.List<api.Image> o) {
+checkUnnamed2377(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
 }
 
 core.int buildCounterImagesListResponse = 0;
 buildImagesListResponse() {
   var o = new api.ImagesListResponse();
   buildCounterImagesListResponse++;
   if (buildCounterImagesListResponse < 3) {
-    o.images = buildUnnamed2907();
+    o.images = buildUnnamed2377();
   }
   buildCounterImagesListResponse--;
   return o;
 }
 
 checkImagesListResponse(api.ImagesListResponse o) {
   buildCounterImagesListResponse++;
   if (buildCounterImagesListResponse < 3) {
-    checkUnnamed2907(o.images);
+    checkUnnamed2377(o.images);
   }
   buildCounterImagesListResponse--;
 }
 
 core.int buildCounterImagesUploadResponse = 0;
 buildImagesUploadResponse() {
   var o = new api.ImagesUploadResponse();
   buildCounterImagesUploadResponse++;
   if (buildCounterImagesUploadResponse < 3) {
     o.image = buildImage();
   }
   buildCounterImagesUploadResponse--;
   return o;
 }
 
 checkImagesUploadResponse(api.ImagesUploadResponse o) {
   buildCounterImagesUploadResponse++;
   if (buildCounterImagesUploadResponse < 3) {
     checkImage(o.image);
   }
   buildCounterImagesUploadResponse--;
 }
 
-buildUnnamed2908() {
+buildUnnamed2378() {
   var o = new core.Map<core.String, api.InAppProductListing>();
   o["x"] = buildInAppProductListing();
   o["y"] = buildInAppProductListing();
   return o;
 }
 
-checkUnnamed2908(core.Map<core.String, api.InAppProductListing> o) {
+checkUnnamed2378(core.Map<core.String, api.InAppProductListing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInAppProductListing(o["x"]);
   checkInAppProductListing(o["y"]);
 }
 
-buildUnnamed2909() {
+buildUnnamed2379() {
   var o = new core.Map<core.String, api.Price>();
   o["x"] = buildPrice();
   o["y"] = buildPrice();
   return o;
 }
 
-checkUnnamed2909(core.Map<core.String, api.Price> o) {
+checkUnnamed2379(core.Map<core.String, api.Price> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPrice(o["x"]);
   checkPrice(o["y"]);
 }
 
 core.int buildCounterInAppProduct = 0;
 buildInAppProduct() {
   var o = new api.InAppProduct();
   buildCounterInAppProduct++;
   if (buildCounterInAppProduct < 3) {
     o.defaultLanguage = "foo";
     o.defaultPrice = buildPrice();
-    o.listings = buildUnnamed2908();
+    o.listings = buildUnnamed2378();
     o.packageName = "foo";
-    o.prices = buildUnnamed2909();
+    o.prices = buildUnnamed2379();
     o.purchaseType = "foo";
     o.season = buildSeason();
     o.sku = "foo";
     o.status = "foo";
     o.subscriptionPeriod = "foo";
     o.trialPeriod = "foo";
   }
   buildCounterInAppProduct--;
   return o;
 }
 
 checkInAppProduct(api.InAppProduct o) {
   buildCounterInAppProduct++;
   if (buildCounterInAppProduct < 3) {
     unittest.expect(o.defaultLanguage, unittest.equals('foo'));
     checkPrice(o.defaultPrice);
-    checkUnnamed2908(o.listings);
+    checkUnnamed2378(o.listings);
     unittest.expect(o.packageName, unittest.equals('foo'));
-    checkUnnamed2909(o.prices);
+    checkUnnamed2379(o.prices);
     unittest.expect(o.purchaseType, unittest.equals('foo'));
     checkSeason(o.season);
     unittest.expect(o.sku, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.subscriptionPeriod, unittest.equals('foo'));
     unittest.expect(o.trialPeriod, unittest.equals('foo'));
   }
   buildCounterInAppProduct--;
 }
 
@@ skipping 11 matching lines @@
 
 checkInAppProductListing(api.InAppProductListing o) {
   buildCounterInAppProductListing++;
   if (buildCounterInAppProductListing < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterInAppProductListing--;
 }
 
-buildUnnamed2910() {
+buildUnnamed2380() {
   var o = new core.List<api.InappproductsBatchRequestEntry>();
   o.add(buildInappproductsBatchRequestEntry());
   o.add(buildInappproductsBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2910(core.List<api.InappproductsBatchRequestEntry> o) {
+checkUnnamed2380(core.List<api.InappproductsBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInappproductsBatchRequestEntry(o[0]);
   checkInappproductsBatchRequestEntry(o[1]);
 }
 
 core.int buildCounterInappproductsBatchRequest = 0;
 buildInappproductsBatchRequest() {
   var o = new api.InappproductsBatchRequest();
   buildCounterInappproductsBatchRequest++;
   if (buildCounterInappproductsBatchRequest < 3) {
-    o.entrys = buildUnnamed2910();
+    o.entrys = buildUnnamed2380();
   }
   buildCounterInappproductsBatchRequest--;
   return o;
 }
 
 checkInappproductsBatchRequest(api.InappproductsBatchRequest o) {
   buildCounterInappproductsBatchRequest++;
   if (buildCounterInappproductsBatchRequest < 3) {
-    checkUnnamed2910(o.entrys);
+    checkUnnamed2380(o.entrys);
   }
   buildCounterInappproductsBatchRequest--;
 }
 
 core.int buildCounterInappproductsBatchRequestEntry = 0;
 buildInappproductsBatchRequestEntry() {
   var o = new api.InappproductsBatchRequestEntry();
   buildCounterInappproductsBatchRequestEntry++;
   if (buildCounterInappproductsBatchRequestEntry < 3) {
     o.batchId = 42;
     o.inappproductsinsertrequest = buildInappproductsInsertRequest();
     o.inappproductsupdaterequest = buildInappproductsUpdateRequest();
     o.methodName = "foo";
   }
   buildCounterInappproductsBatchRequestEntry--;
   return o;
 }
 
 checkInappproductsBatchRequestEntry(api.InappproductsBatchRequestEntry o) {
   buildCounterInappproductsBatchRequestEntry++;
   if (buildCounterInappproductsBatchRequestEntry < 3) {
     unittest.expect(o.batchId, unittest.equals(42));
     checkInappproductsInsertRequest(o.inappproductsinsertrequest);
     checkInappproductsUpdateRequest(o.inappproductsupdaterequest);
     unittest.expect(o.methodName, unittest.equals('foo'));
   }
   buildCounterInappproductsBatchRequestEntry--;
 }
 
-buildUnnamed2911() {
+buildUnnamed2381() {
   var o = new core.List<api.InappproductsBatchResponseEntry>();
   o.add(buildInappproductsBatchResponseEntry());
   o.add(buildInappproductsBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2911(core.List<api.InappproductsBatchResponseEntry> o) {
+checkUnnamed2381(core.List<api.InappproductsBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInappproductsBatchResponseEntry(o[0]);
   checkInappproductsBatchResponseEntry(o[1]);
 }
 
 core.int buildCounterInappproductsBatchResponse = 0;
 buildInappproductsBatchResponse() {
   var o = new api.InappproductsBatchResponse();
   buildCounterInappproductsBatchResponse++;
   if (buildCounterInappproductsBatchResponse < 3) {
-    o.entrys = buildUnnamed2911();
+    o.entrys = buildUnnamed2381();
     o.kind = "foo";
   }
   buildCounterInappproductsBatchResponse--;
   return o;
 }
 
 checkInappproductsBatchResponse(api.InappproductsBatchResponse o) {
   buildCounterInappproductsBatchResponse++;
   if (buildCounterInappproductsBatchResponse < 3) {
-    checkUnnamed2911(o.entrys);
+    checkUnnamed2381(o.entrys);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterInappproductsBatchResponse--;
 }
 
 core.int buildCounterInappproductsBatchResponseEntry = 0;
 buildInappproductsBatchResponseEntry() {
   var o = new api.InappproductsBatchResponseEntry();
   buildCounterInappproductsBatchResponseEntry++;
   if (buildCounterInappproductsBatchResponseEntry < 3) {
@@ skipping 46 matching lines @@
 }
 
 checkInappproductsInsertResponse(api.InappproductsInsertResponse o) {
   buildCounterInappproductsInsertResponse++;
   if (buildCounterInappproductsInsertResponse < 3) {
     checkInAppProduct(o.inappproduct);
   }
   buildCounterInappproductsInsertResponse--;
 }
 
-buildUnnamed2912() {
+buildUnnamed2382() {
   var o = new core.List<api.InAppProduct>();
   o.add(buildInAppProduct());
   o.add(buildInAppProduct());
   return o;
 }
 
-checkUnnamed2912(core.List<api.InAppProduct> o) {
+checkUnnamed2382(core.List<api.InAppProduct> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInAppProduct(o[0]);
   checkInAppProduct(o[1]);
 }
 
 core.int buildCounterInappproductsListResponse = 0;
 buildInappproductsListResponse() {
   var o = new api.InappproductsListResponse();
   buildCounterInappproductsListResponse++;
   if (buildCounterInappproductsListResponse < 3) {
-    o.inappproduct = buildUnnamed2912();
+    o.inappproduct = buildUnnamed2382();
     o.kind = "foo";
     o.pageInfo = buildPageInfo();
     o.tokenPagination = buildTokenPagination();
   }
   buildCounterInappproductsListResponse--;
   return o;
 }
 
 checkInappproductsListResponse(api.InappproductsListResponse o) {
   buildCounterInappproductsListResponse++;
   if (buildCounterInappproductsListResponse < 3) {
-    checkUnnamed2912(o.inappproduct);
+    checkUnnamed2382(o.inappproduct);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
     checkTokenPagination(o.tokenPagination);
   }
   buildCounterInappproductsListResponse--;
 }
 
 core.int buildCounterInappproductsUpdateRequest = 0;
 buildInappproductsUpdateRequest() {
   var o = new api.InappproductsUpdateRequest();
@@ skipping 52 matching lines @@
   if (buildCounterListing < 3) {
     unittest.expect(o.fullDescription, unittest.equals('foo'));
     unittest.expect(o.language, unittest.equals('foo'));
     unittest.expect(o.shortDescription, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.video, unittest.equals('foo'));
   }
   buildCounterListing--;
 }
 
-buildUnnamed2913() {
+buildUnnamed2383() {
   var o = new core.List<api.Listing>();
   o.add(buildListing());
   o.add(buildListing());
   return o;
 }
 
-checkUnnamed2913(core.List<api.Listing> o) {
+checkUnnamed2383(core.List<api.Listing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListing(o[0]);
   checkListing(o[1]);
 }
 
 core.int buildCounterListingsListResponse = 0;
 buildListingsListResponse() {
   var o = new api.ListingsListResponse();
   buildCounterListingsListResponse++;
   if (buildCounterListingsListResponse < 3) {
     o.kind = "foo";
-    o.listings = buildUnnamed2913();
+    o.listings = buildUnnamed2383();
   }
   buildCounterListingsListResponse--;
   return o;
 }
 
 checkListingsListResponse(api.ListingsListResponse o) {
   buildCounterListingsListResponse++;
   if (buildCounterListingsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2913(o.listings);
+    checkUnnamed2383(o.listings);
   }
   buildCounterListingsListResponse--;
 }
 
 core.int buildCounterMonthDay = 0;
 buildMonthDay() {
   var o = new api.MonthDay();
   buildCounterMonthDay++;
   if (buildCounterMonthDay < 3) {
     o.day = 42;
@@ skipping 97 matching lines @@
 
 checkProrate(api.Prorate o) {
   buildCounterProrate++;
   if (buildCounterProrate < 3) {
     checkPrice(o.defaultPrice);
     checkMonthDay(o.start);
   }
   buildCounterProrate--;
 }
 
-buildUnnamed2914() {
+buildUnnamed2384() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed2914(core.List<api.Comment> o) {
+checkUnnamed2384(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
 }
 
 core.int buildCounterReview = 0;
 buildReview() {
   var o = new api.Review();
   buildCounterReview++;
   if (buildCounterReview < 3) {
     o.authorName = "foo";
-    o.comments = buildUnnamed2914();
+    o.comments = buildUnnamed2384();
     o.reviewId = "foo";
   }
   buildCounterReview--;
   return o;
 }
 
 checkReview(api.Review o) {
   buildCounterReview++;
   if (buildCounterReview < 3) {
     unittest.expect(o.authorName, unittest.equals('foo'));
-    checkUnnamed2914(o.comments);
+    checkUnnamed2384(o.comments);
     unittest.expect(o.reviewId, unittest.equals('foo'));
   }
   buildCounterReview--;
 }
 
 core.int buildCounterReviewReplyResult = 0;
 buildReviewReplyResult() {
   var o = new api.ReviewReplyResult();
   buildCounterReviewReplyResult++;
   if (buildCounterReviewReplyResult < 3) {
     o.lastEdited = buildTimestamp();
     o.replyText = "foo";
   }
   buildCounterReviewReplyResult--;
   return o;
 }
 
 checkReviewReplyResult(api.ReviewReplyResult o) {
   buildCounterReviewReplyResult++;
   if (buildCounterReviewReplyResult < 3) {
     checkTimestamp(o.lastEdited);
     unittest.expect(o.replyText, unittest.equals('foo'));
   }
   buildCounterReviewReplyResult--;
 }
 
-buildUnnamed2915() {
+buildUnnamed2385() {
   var o = new core.List<api.Review>();
   o.add(buildReview());
   o.add(buildReview());
   return o;
 }
 
-checkUnnamed2915(core.List<api.Review> o) {
+checkUnnamed2385(core.List<api.Review> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReview(o[0]);
   checkReview(o[1]);
 }
 
 core.int buildCounterReviewsListResponse = 0;
 buildReviewsListResponse() {
   var o = new api.ReviewsListResponse();
   buildCounterReviewsListResponse++;
   if (buildCounterReviewsListResponse < 3) {
     o.pageInfo = buildPageInfo();
-    o.reviews = buildUnnamed2915();
+    o.reviews = buildUnnamed2385();
     o.tokenPagination = buildTokenPagination();
   }
   buildCounterReviewsListResponse--;
   return o;
 }
 
 checkReviewsListResponse(api.ReviewsListResponse o) {
   buildCounterReviewsListResponse++;
   if (buildCounterReviewsListResponse < 3) {
     checkPageInfo(o.pageInfo);
-    checkUnnamed2915(o.reviews);
+    checkUnnamed2385(o.reviews);
     checkTokenPagination(o.tokenPagination);
   }
   buildCounterReviewsListResponse--;
 }
 
 core.int buildCounterReviewsReplyRequest = 0;
 buildReviewsReplyRequest() {
   var o = new api.ReviewsReplyRequest();
   buildCounterReviewsReplyRequest++;
   if (buildCounterReviewsReplyRequest < 3) {
@@ skipping 23 matching lines @@
 }
 
 checkReviewsReplyResponse(api.ReviewsReplyResponse o) {
   buildCounterReviewsReplyResponse++;
   if (buildCounterReviewsReplyResponse < 3) {
     checkReviewReplyResult(o.result);
   }
   buildCounterReviewsReplyResponse--;
 }
 
-buildUnnamed2916() {
+buildUnnamed2386() {
   var o = new core.List<api.Prorate>();
   o.add(buildProrate());
   o.add(buildProrate());
   return o;
 }
 
-checkUnnamed2916(core.List<api.Prorate> o) {
+checkUnnamed2386(core.List<api.Prorate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProrate(o[0]);
   checkProrate(o[1]);
 }
 
 core.int buildCounterSeason = 0;
 buildSeason() {
   var o = new api.Season();
   buildCounterSeason++;
   if (buildCounterSeason < 3) {
     o.end = buildMonthDay();
-    o.prorations = buildUnnamed2916();
+    o.prorations = buildUnnamed2386();
     o.start = buildMonthDay();
   }
   buildCounterSeason--;
   return o;
 }
 
 checkSeason(api.Season o) {
   buildCounterSeason++;
   if (buildCounterSeason < 3) {
     checkMonthDay(o.end);
-    checkUnnamed2916(o.prorations);
+    checkUnnamed2386(o.prorations);
     checkMonthDay(o.start);
   }
   buildCounterSeason--;
 }
 
 core.int buildCounterSubscriptionDeferralInfo = 0;
 buildSubscriptionDeferralInfo() {
   var o = new api.SubscriptionDeferralInfo();
   buildCounterSubscriptionDeferralInfo++;
   if (buildCounterSubscriptionDeferralInfo < 3) {
@@ skipping 83 matching lines @@
 }
 
 checkSubscriptionPurchasesDeferResponse(api.SubscriptionPurchasesDeferResponse o) {
   buildCounterSubscriptionPurchasesDeferResponse++;
   if (buildCounterSubscriptionPurchasesDeferResponse < 3) {
     unittest.expect(o.newExpiryTimeMillis, unittest.equals('foo'));
   }
   buildCounterSubscriptionPurchasesDeferResponse--;
 }
 
-buildUnnamed2917() {
+buildUnnamed2387() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2917(core.List<core.String> o) {
+checkUnnamed2387(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2918() {
+buildUnnamed2388() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2918(core.List<core.String> o) {
+checkUnnamed2388(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
 core.int buildCounterTesters = 0;
 buildTesters() {
   var o = new api.Testers();
   buildCounterTesters++;
   if (buildCounterTesters < 3) {
-    o.googleGroups = buildUnnamed2917();
-    o.googlePlusCommunities = buildUnnamed2918();
+    o.googleGroups = buildUnnamed2387();
+    o.googlePlusCommunities = buildUnnamed2388();
   }
   buildCounterTesters--;
   return o;
 }
 
 checkTesters(api.Testers o) {
   buildCounterTesters++;
   if (buildCounterTesters < 3) {
-    checkUnnamed2917(o.googleGroups);
-    checkUnnamed2918(o.googlePlusCommunities);
+    checkUnnamed2387(o.googleGroups);
+    checkUnnamed2388(o.googlePlusCommunities);
   }
   buildCounterTesters--;
 }
 
 core.int buildCounterTimestamp = 0;
 buildTimestamp() {
   var o = new api.Timestamp();
   buildCounterTimestamp++;
   if (buildCounterTimestamp < 3) {
     o.nanos = 42;
@@ skipping 26 matching lines @@
 
 checkTokenPagination(api.TokenPagination o) {
   buildCounterTokenPagination++;
   if (buildCounterTokenPagination < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.previousPageToken, unittest.equals('foo'));
   }
   buildCounterTokenPagination--;
 }
 
-buildUnnamed2919() {
+buildUnnamed2389() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2919(core.List<core.int> o) {
+checkUnnamed2389(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
 core.int buildCounterTrack = 0;
 buildTrack() {
   var o = new api.Track();
   buildCounterTrack++;
   if (buildCounterTrack < 3) {
     o.track = "foo";
     o.userFraction = 42.0;
-    o.versionCodes = buildUnnamed2919();
+    o.versionCodes = buildUnnamed2389();
   }
   buildCounterTrack--;
   return o;
 }
 
 checkTrack(api.Track o) {
   buildCounterTrack++;
   if (buildCounterTrack < 3) {
     unittest.expect(o.track, unittest.equals('foo'));
     unittest.expect(o.userFraction, unittest.equals(42.0));
-    checkUnnamed2919(o.versionCodes);
+    checkUnnamed2389(o.versionCodes);
   }
   buildCounterTrack--;
 }
 
-buildUnnamed2920() {
+buildUnnamed2390() {
   var o = new core.List<api.Track>();
   o.add(buildTrack());
   o.add(buildTrack());
   return o;
 }
 
-checkUnnamed2920(core.List<api.Track> o) {
+checkUnnamed2390(core.List<api.Track> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrack(o[0]);
   checkTrack(o[1]);
 }
 
 core.int buildCounterTracksListResponse = 0;
 buildTracksListResponse() {
   var o = new api.TracksListResponse();
   buildCounterTracksListResponse++;
   if (buildCounterTracksListResponse < 3) {
     o.kind = "foo";
-    o.tracks = buildUnnamed2920();
+    o.tracks = buildUnnamed2390();
   }
   buildCounterTracksListResponse--;
   return o;
 }
 
 checkTracksListResponse(api.TracksListResponse o) {
   buildCounterTracksListResponse++;
   if (buildCounterTracksListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2920(o.tracks);
+    checkUnnamed2390(o.tracks);
   }
   buildCounterTracksListResponse--;
 }
 
 core.int buildCounterUserComment = 0;
 buildUserComment() {
   var o = new api.UserComment();
   buildCounterUserComment++;
   if (buildCounterUserComment < 3) {
     o.androidOsVersion = 42;
@@ skipping 50 matching lines @@
   buildCounterVoidedPurchase++;
   if (buildCounterVoidedPurchase < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.purchaseTimeMillis, unittest.equals('foo'));
     unittest.expect(o.purchaseToken, unittest.equals('foo'));
     unittest.expect(o.voidedTimeMillis, unittest.equals('foo'));
   }
   buildCounterVoidedPurchase--;
 }
 
-buildUnnamed2921() {
+buildUnnamed2391() {
   var o = new core.List<api.VoidedPurchase>();
   o.add(buildVoidedPurchase());
   o.add(buildVoidedPurchase());
   return o;
 }
 
-checkUnnamed2921(core.List<api.VoidedPurchase> o) {
+checkUnnamed2391(core.List<api.VoidedPurchase> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVoidedPurchase(o[0]);
   checkVoidedPurchase(o[1]);
 }
 
 core.int buildCounterVoidedPurchasesListResponse = 0;
 buildVoidedPurchasesListResponse() {
   var o = new api.VoidedPurchasesListResponse();
   buildCounterVoidedPurchasesListResponse++;
   if (buildCounterVoidedPurchasesListResponse < 3) {
     o.pageInfo = buildPageInfo();
     o.tokenPagination = buildTokenPagination();
-    o.voidedPurchases = buildUnnamed2921();
+    o.voidedPurchases = buildUnnamed2391();
   }
   buildCounterVoidedPurchasesListResponse--;
   return o;
 }
 
 checkVoidedPurchasesListResponse(api.VoidedPurchasesListResponse o) {
   buildCounterVoidedPurchasesListResponse++;
   if (buildCounterVoidedPurchasesListResponse < 3) {
     checkPageInfo(o.pageInfo);
     checkTokenPagination(o.tokenPagination);
-    checkUnnamed2921(o.voidedPurchases);
+    checkUnnamed2391(o.voidedPurchases);
   }
   buildCounterVoidedPurchasesListResponse--;
 }
 
 
 main() {
   unittest.group("obj-schema-Apk", () {
     unittest.test("to-json--from-json", () {
       var o = buildApk();
       var od = new api.Apk.fromJson(o.toJson());
@@ skipping 533 matching lines @@
   });
 
 
   unittest.group("resource-EditsResourceApi", () {
     unittest.test("method--commit", () {
 
       var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppEdit());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.commit(arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppEdit response) {
+      res.commit(arg_packageName, arg_editId).then(unittest.expectAsync1(((api.AppEdit response) {
         checkAppEdit(response);
       })));
     });
 
     unittest.test("method--delete", () {
 
       var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.delete(arg_packageName, arg_editId).then(unittest.expectAsync((_) {}));
+      res.delete(arg_packageName, arg_editId).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppEdit());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppEdit response) {
+      res.get(arg_packageName, arg_editId).then(unittest.expectAsync1(((api.AppEdit response) {
         checkAppEdit(response);
       })));
     });
 
     unittest.test("method--insert", () {
 
       var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_request = buildAppEdit();
       var arg_packageName = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.AppEdit.fromJson(json);
         checkAppEdit(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppEdit());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.insert(arg_request, arg_packageName).then(unittest.expectAsync(((api.AppEdit response) {
+      res.insert(arg_request, arg_packageName).then(unittest.expectAsync1(((api.AppEdit response) {
         checkAppEdit(response);
       })));
     });
 
     unittest.test("method--validate", () {
 
       var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppEdit());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.validate(arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppEdit response) {
+      res.validate(arg_packageName, arg_editId).then(unittest.expectAsync1(((api.AppEdit response) {
         checkAppEdit(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EditsApklistingsResourceApi", () {
     unittest.test("method--delete", () {
 
       var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
       var arg_language = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.delete(arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync((_) {}));
+      res.delete(arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--deleteall", () {
 
       var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
-      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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.deleteall(arg_packageName, arg_editId, arg_apkVersionCode).then(unittest.expectAsync((_) {}));
+      res.deleteall(arg_packageName, arg_editId, arg_apkVersionCode).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
       var arg_language = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApkListing());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync(((api.ApkListing response) {
+      res.get(arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync1(((api.ApkListing response) {
         checkApkListing(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
-      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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApkListingsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_packageName, arg_editId, arg_apkVersionCode).then(unittest.expectAsync(((api.ApkListingsListResponse response) {
+      res.list(arg_packageName, arg_editId, arg_apkVersionCode).then(unittest.expectAsync1(((api.ApkListingsListResponse response) {
         checkApkListingsListResponse(response);
       })));
     });
 
     unittest.test("method--patch", () {
 
       var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_request = buildApkListing();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
       var arg_language = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.ApkListing.fromJson(json);
         checkApkListing(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApkListing());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync(((api.ApkListing response) {
+      res.patch(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync1(((api.ApkListing response) {
         checkApkListing(response);
       })));
     });
 
     unittest.test("method--update", () {
 
       var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_request = buildApkListing();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
       var arg_language = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.ApkListing.fromJson(json);
         checkApkListing(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApkListing());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync(((api.ApkListing response) {
+      res.update(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync1(((api.ApkListing response) {
         checkApkListing(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EditsApksResourceApi", () {
     unittest.test("method--addexternallyhosted", () {
 
       var mock = new HttpServerMock();
       api.EditsApksResourceApi res = new api.AndroidpublisherApi(mock).edits.apks;
       var arg_request = buildApksAddExternallyHostedRequest();
       var arg_packageName = "foo";
       var arg_editId = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.ApksAddExternallyHostedRequest.fromJson(json);
         checkApksAddExternallyHostedRequest(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApksAddExternallyHostedResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.addexternallyhosted(arg_request, arg_packageName, arg_editId).then(unittest.expectAsync(((api.ApksAddExternallyHostedResponse response) {
+      res.addexternallyhosted(arg_request, arg_packageName, arg_editId).then(unittest.expectAsync1(((api.ApksAddExternallyHostedResponse response) {
         checkApksAddExternallyHostedResponse(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.EditsApksResourceApi res = new api.AndroidpublisherApi(mock).edits.apks;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApksListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_packageName, arg_editId).then(unittest.expectAsync(((api.ApksListResponse response) {
+      res.list(arg_packageName, arg_editId).then(unittest.expectAsync1(((api.ApksListResponse response) {
         checkApksListResponse(response);
       })));
     });
 
     unittest.test("method--upload", () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
       var mock = new HttpServerMock();
       api.EditsApksResourceApi res = new api.AndroidpublisherApi(mock).edits.apks;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApk());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.upload(arg_packageName, arg_editId).then(unittest.expectAsync(((api.Apk response) {
+      res.upload(arg_packageName, arg_editId).then(unittest.expectAsync1(((api.Apk response) {
         checkApk(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EditsDeobfuscationfilesResourceApi", () {
     unittest.test("method--upload", () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
       var mock = new HttpServerMock();
       api.EditsDeobfuscationfilesResourceApi res = new api.AndroidpublisherApi(mock).edits.deobfuscationfiles;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
       var arg_deobfuscationFileType = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDeobfuscationFilesUploadResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.upload(arg_packageName, arg_editId, arg_apkVersionCode, arg_deobfuscationFileType).then(unittest.expectAsync(((api.DeobfuscationFilesUploadResponse response) {
+      res.upload(arg_packageName, arg_editId, arg_apkVersionCode, arg_deobfuscationFileType).then(unittest.expectAsync1(((api.DeobfuscationFilesUploadResponse response) {
         checkDeobfuscationFilesUploadResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EditsDetailsResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.EditsDetailsResourceApi res = new api.AndroidpublisherApi(mock).edits.details;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppDetails());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppDetails response) {
+      res.get(arg_packageName, arg_editId).then(unittest.expectAsync1(((api.AppDetails response) {
         checkAppDetails(response);
       })));
     });
 
     unittest.test("method--patch", () {
 
       var mock = new HttpServerMock();
       api.EditsDetailsResourceApi res = new api.AndroidpublisherApi(mock).edits.details;
       var arg_request = buildAppDetails();
       var arg_packageName = "foo";
       var arg_editId = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.AppDetails.fromJson(json);
         checkAppDetails(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppDetails());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppDetails response) {
+      res.patch(arg_request, arg_packageName, arg_editId).then(unittest.expectAsync1(((api.AppDetails response) {
         checkAppDetails(response);
       })));
     });
 
     unittest.test("method--update", () {
 
       var mock = new HttpServerMock();
       api.EditsDetailsResourceApi res = new api.AndroidpublisherApi(mock).edits.details;
       var arg_request = buildAppDetails();
       var arg_packageName = "foo";
       var arg_editId = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.AppDetails.fromJson(json);
         checkAppDetails(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppDetails());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppDetails response) {
+      res.update(arg_request, arg_packageName, arg_editId).then(unittest.expectAsync1(((api.AppDetails response) {
         checkAppDetails(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EditsExpansionfilesResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.EditsExpansionfilesResourceApi res = new api.AndroidpublisherApi(mock).edits.expansionfiles;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
       var arg_expansionFileType = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExpansionFile());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync(((api.ExpansionFile response) {
+      res.get(arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync1(((api.ExpansionFile response) {
         checkExpansionFile(response);
       })));
     });
 
     unittest.test("method--patch", () {
 
       var mock = new HttpServerMock();
       api.EditsExpansionfilesResourceApi res = new api.AndroidpublisherApi(mock).edits.expansionfiles;
       var arg_request = buildExpansionFile();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
       var arg_expansionFileType = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.ExpansionFile.fromJson(json);
         checkExpansionFile(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExpansionFile());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync(((api.ExpansionFile response) {
+      res.patch(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync1(((api.ExpansionFile response) {
         checkExpansionFile(response);
       })));
     });
 
     unittest.test("method--update", () {
 
       var mock = new HttpServerMock();
       api.EditsExpansionfilesResourceApi res = new api.AndroidpublisherApi(mock).edits.expansionfiles;
       var arg_request = buildExpansionFile();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
       var arg_expansionFileType = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.ExpansionFile.fromJson(json);
         checkExpansionFile(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExpansionFile());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync(((api.ExpansionFile response) {
+      res.update(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync1(((api.ExpansionFile response) {
         checkExpansionFile(response);
       })));
     });
 
     unittest.test("method--upload", () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
       var mock = new HttpServerMock();
       api.EditsExpansionfilesResourceApi res = new api.AndroidpublisherApi(mock).edits.expansionfiles;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_apkVersionCode = 42;
       var arg_expansionFileType = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExpansionFilesUploadResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.upload(arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync(((api.ExpansionFilesUploadResponse response) {
+      res.upload(arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync1(((api.ExpansionFilesUploadResponse response) {
         checkExpansionFilesUploadResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EditsImagesResourceApi", () {
     unittest.test("method--delete", () {
 
       var mock = new HttpServerMock();
       api.EditsImagesResourceApi res = new api.AndroidpublisherApi(mock).edits.images;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_language = "foo";
       var arg_imageType = "foo";
       var arg_imageId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.delete(arg_packageName, arg_editId, arg_language, arg_imageType, arg_imageId).then(unittest.expectAsync((_) {}));
+      res.delete(arg_packageName, arg_editId, arg_language, arg_imageType, arg_imageId).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--deleteall", () {
 
       var mock = new HttpServerMock();
       api.EditsImagesResourceApi res = new api.AndroidpublisherApi(mock).edits.images;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_language = "foo";
       var arg_imageType = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImagesDeleteAllResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.deleteall(arg_packageName, arg_editId, arg_language, arg_imageType).then(unittest.expectAsync(((api.ImagesDeleteAllResponse response) {
+      res.deleteall(arg_packageName, arg_editId, arg_language, arg_imageType).then(unittest.expectAsync1(((api.ImagesDeleteAllResponse response) {
         checkImagesDeleteAllResponse(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.EditsImagesResourceApi res = new api.AndroidpublisherApi(mock).edits.images;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_language = "foo";
       var arg_imageType = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImagesListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_packageName, arg_editId, arg_language, arg_imageType).then(unittest.expectAsync(((api.ImagesListResponse response) {
+      res.list(arg_packageName, arg_editId, arg_language, arg_imageType).then(unittest.expectAsync1(((api.ImagesListResponse response) {
         checkImagesListResponse(response);
       })));
     });
 
     unittest.test("method--upload", () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
       var mock = new HttpServerMock();
       api.EditsImagesResourceApi res = new api.AndroidpublisherApi(mock).edits.images;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_language = "foo";
       var arg_imageType = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImagesUploadResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.upload(arg_packageName, arg_editId, arg_language, arg_imageType).then(unittest.expectAsync(((api.ImagesUploadResponse response) {
+      res.upload(arg_packageName, arg_editId, arg_language, arg_imageType).then(unittest.expectAsync1(((api.ImagesUploadResponse response) {
         checkImagesUploadResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EditsListingsResourceApi", () {
     unittest.test("method--delete", () {
 
       var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_language = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.delete(arg_packageName, arg_editId, arg_language).then(unittest.expectAsync((_) {}));
+      res.delete(arg_packageName, arg_editId, arg_language).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--deleteall", () {
 
       var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.deleteall(arg_packageName, arg_editId).then(unittest.expectAsync((_) {}));
+      res.deleteall(arg_packageName, arg_editId).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_language = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListing());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_editId, arg_language).then(unittest.expectAsync(((api.Listing response) {
+      res.get(arg_packageName, arg_editId, arg_language).then(unittest.expectAsync1(((api.Listing response) {
         checkListing(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListingsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_packageName, arg_editId).then(unittest.expectAsync(((api.ListingsListResponse response) {
+      res.list(arg_packageName, arg_editId).then(unittest.expectAsync1(((api.ListingsListResponse response) {
         checkListingsListResponse(response);
       })));
     });
 
     unittest.test("method--patch", () {
 
       var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_request = buildListing();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_language = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Listing.fromJson(json);
         checkListing(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListing());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_packageName, arg_editId, arg_language).then(unittest.expectAsync(((api.Listing response) {
+      res.patch(arg_request, arg_packageName, arg_editId, arg_language).then(unittest.expectAsync1(((api.Listing response) {
         checkListing(response);
       })));
     });
 
     unittest.test("method--update", () {
 
       var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_request = buildListing();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_language = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Listing.fromJson(json);
         checkListing(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListing());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_packageName, arg_editId, arg_language).then(unittest.expectAsync(((api.Listing response) {
+      res.update(arg_request, arg_packageName, arg_editId, arg_language).then(unittest.expectAsync1(((api.Listing response) {
         checkListing(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EditsTestersResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.EditsTestersResourceApi res = new api.AndroidpublisherApi(mock).edits.testers;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_track = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTesters());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Testers response) {
+      res.get(arg_packageName, arg_editId, arg_track).then(unittest.expectAsync1(((api.Testers response) {
         checkTesters(response);
       })));
     });
 
     unittest.test("method--patch", () {
 
       var mock = new HttpServerMock();
       api.EditsTestersResourceApi res = new api.AndroidpublisherApi(mock).edits.testers;
       var arg_request = buildTesters();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_track = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Testers.fromJson(json);
         checkTesters(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTesters());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Testers response) {
+      res.patch(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync1(((api.Testers response) {
         checkTesters(response);
       })));
     });
 
     unittest.test("method--update", () {
 
       var mock = new HttpServerMock();
       api.EditsTestersResourceApi res = new api.AndroidpublisherApi(mock).edits.testers;
       var arg_request = buildTesters();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_track = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Testers.fromJson(json);
         checkTesters(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTesters());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Testers response) {
+      res.update(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync1(((api.Testers response) {
         checkTesters(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EditsTracksResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.EditsTracksResourceApi res = new api.AndroidpublisherApi(mock).edits.tracks;
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_track = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTrack());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Track response) {
+      res.get(arg_packageName, arg_editId, arg_track).then(unittest.expectAsync1(((api.Track response) {
         checkTrack(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.EditsTracksResourceApi res = new api.AndroidpublisherApi(mock).edits.tracks;
       var arg_packageName = "foo";
       var arg_editId = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTracksListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_packageName, arg_editId).then(unittest.expectAsync(((api.TracksListResponse response) {
+      res.list(arg_packageName, arg_editId).then(unittest.expectAsync1(((api.TracksListResponse response) {
         checkTracksListResponse(response);
       })));
     });
 
     unittest.test("method--patch", () {
 
       var mock = new HttpServerMock();
       api.EditsTracksResourceApi res = new api.AndroidpublisherApi(mock).edits.tracks;
       var arg_request = buildTrack();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_track = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Track.fromJson(json);
         checkTrack(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTrack());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Track response) {
+      res.patch(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync1(((api.Track response) {
         checkTrack(response);
       })));
     });
 
     unittest.test("method--update", () {
 
       var mock = new HttpServerMock();
       api.EditsTracksResourceApi res = new api.AndroidpublisherApi(mock).edits.tracks;
       var arg_request = buildTrack();
       var arg_packageName = "foo";
       var arg_editId = "foo";
       var arg_track = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Track.fromJson(json);
         checkTrack(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTrack());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Track response) {
+      res.update(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync1(((api.Track response) {
         checkTrack(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EntitlementsResourceApi", () {
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.EntitlementsResourceApi res = new api.AndroidpublisherApi(mock).entitlements;
       var arg_packageName = "foo";
       var arg_maxResults = 42;
       var arg_productId = "foo";
       var arg_startIndex = 42;
       var arg_token = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 15 matching lines @@
         unittest.expect(core.int.parse(queryMap["startIndex"].first), unittest.equals(arg_startIndex));
         unittest.expect(queryMap["token"].first, unittest.equals(arg_token));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntitlementsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_packageName, maxResults: arg_maxResults, productId: arg_productId, startIndex: arg_startIndex, token: arg_token).then(unittest.expectAsync(((api.EntitlementsListResponse response) {
+      res.list(arg_packageName, maxResults: arg_maxResults, productId: arg_productId, startIndex: arg_startIndex, token: arg_token).then(unittest.expectAsync1(((api.EntitlementsListResponse response) {
         checkEntitlementsListResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-InappproductsResourceApi", () {
     unittest.test("method--batch", () {
 
       var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_request = buildInappproductsBatchRequest();
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.InappproductsBatchRequest.fromJson(json);
         checkInappproductsBatchRequest(obj);
 
         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 + 33), unittest.equals("androidpublisher/v2/applications/"));
@@ skipping 18 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInappproductsBatchResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batch(arg_request).then(unittest.expectAsync(((api.InappproductsBatchResponse response) {
+      res.batch(arg_request).then(unittest.expectAsync1(((api.InappproductsBatchResponse response) {
         checkInappproductsBatchResponse(response);
       })));
     });
 
     unittest.test("method--delete", () {
 
       var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_packageName = "foo";
       var arg_sku = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.delete(arg_packageName, arg_sku).then(unittest.expectAsync((_) {}));
+      res.delete(arg_packageName, arg_sku).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_packageName = "foo";
       var arg_sku = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInAppProduct());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_sku).then(unittest.expectAsync(((api.InAppProduct response) {
+      res.get(arg_packageName, arg_sku).then(unittest.expectAsync1(((api.InAppProduct response) {
         checkInAppProduct(response);
       })));
     });
 
     unittest.test("method--insert", () {
 
       var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_request = buildInAppProduct();
       var arg_packageName = "foo";
       var arg_autoConvertMissingPrices = true;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.InAppProduct.fromJson(json);
         checkInAppProduct(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 15 matching lines @@
         }
         unittest.expect(queryMap["autoConvertMissingPrices"].first, unittest.equals("$arg_autoConvertMissingPrices"));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInAppProduct());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.insert(arg_request, arg_packageName, autoConvertMissingPrices: arg_autoConvertMissingPrices).then(unittest.expectAsync(((api.InAppProduct response) {
+      res.insert(arg_request, arg_packageName, autoConvertMissingPrices: arg_autoConvertMissingPrices).then(unittest.expectAsync1(((api.InAppProduct response) {
         checkInAppProduct(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_packageName = "foo";
       var arg_maxResults = 42;
       var arg_startIndex = 42;
       var arg_token = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 14 matching lines @@
         unittest.expect(core.int.parse(queryMap["startIndex"].first), unittest.equals(arg_startIndex));
         unittest.expect(queryMap["token"].first, unittest.equals(arg_token));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInappproductsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_packageName, maxResults: arg_maxResults, startIndex: arg_startIndex, token: arg_token).then(unittest.expectAsync(((api.InappproductsListResponse response) {
+      res.list(arg_packageName, maxResults: arg_maxResults, startIndex: arg_startIndex, token: arg_token).then(unittest.expectAsync1(((api.InappproductsListResponse response) {
         checkInappproductsListResponse(response);
       })));
     });
 
     unittest.test("method--patch", () {
 
       var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_request = buildInAppProduct();
       var arg_packageName = "foo";
       var arg_sku = "foo";
       var arg_autoConvertMissingPrices = true;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.InAppProduct.fromJson(json);
         checkInAppProduct(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 15 matching lines @@
         }
         unittest.expect(queryMap["autoConvertMissingPrices"].first, unittest.equals("$arg_autoConvertMissingPrices"));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInAppProduct());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_packageName, arg_sku, autoConvertMissingPrices: arg_autoConvertMissingPrices).then(unittest.expectAsync(((api.InAppProduct response) {
+      res.patch(arg_request, arg_packageName, arg_sku, autoConvertMissingPrices: arg_autoConvertMissingPrices).then(unittest.expectAsync1(((api.InAppProduct response) {
         checkInAppProduct(response);
       })));
     });
 
     unittest.test("method--update", () {
 
       var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_request = buildInAppProduct();
       var arg_packageName = "foo";
       var arg_sku = "foo";
       var arg_autoConvertMissingPrices = true;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.InAppProduct.fromJson(json);
         checkInAppProduct(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 15 matching lines @@
         }
         unittest.expect(queryMap["autoConvertMissingPrices"].first, unittest.equals("$arg_autoConvertMissingPrices"));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInAppProduct());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_packageName, arg_sku, autoConvertMissingPrices: arg_autoConvertMissingPrices).then(unittest.expectAsync(((api.InAppProduct response) {
+      res.update(arg_request, arg_packageName, arg_sku, autoConvertMissingPrices: arg_autoConvertMissingPrices).then(unittest.expectAsync1(((api.InAppProduct response) {
         checkInAppProduct(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-PurchasesProductsResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.PurchasesProductsResourceApi res = new api.AndroidpublisherApi(mock).purchases.products;
       var arg_packageName = "foo";
       var arg_productId = "foo";
       var arg_token = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProductPurchase());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_productId, arg_token).then(unittest.expectAsync(((api.ProductPurchase response) {
+      res.get(arg_packageName, arg_productId, arg_token).then(unittest.expectAsync1(((api.ProductPurchase response) {
         checkProductPurchase(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-PurchasesSubscriptionsResourceApi", () {
     unittest.test("method--cancel", () {
 
       var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_packageName = "foo";
       var arg_subscriptionId = "foo";
       var arg_token = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.cancel(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync((_) {}));
+      res.cancel(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--defer", () {
 
       var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_request = buildSubscriptionPurchasesDeferRequest();
       var arg_packageName = "foo";
       var arg_subscriptionId = "foo";
       var arg_token = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.SubscriptionPurchasesDeferRequest.fromJson(json);
         checkSubscriptionPurchasesDeferRequest(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscriptionPurchasesDeferResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.defer(arg_request, arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync(((api.SubscriptionPurchasesDeferResponse response) {
+      res.defer(arg_request, arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync1(((api.SubscriptionPurchasesDeferResponse response) {
         checkSubscriptionPurchasesDeferResponse(response);
       })));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_packageName = "foo";
       var arg_subscriptionId = "foo";
       var arg_token = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscriptionPurchase());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync(((api.SubscriptionPurchase response) {
+      res.get(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync1(((api.SubscriptionPurchase response) {
         checkSubscriptionPurchase(response);
       })));
     });
 
     unittest.test("method--refund", () {
 
       var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_packageName = "foo";
       var arg_subscriptionId = "foo";
       var arg_token = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.refund(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync((_) {}));
+      res.refund(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--revoke", () {
 
       var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_packageName = "foo";
       var arg_subscriptionId = "foo";
       var arg_token = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 11 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.revoke(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync((_) {}));
+      res.revoke(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync1((_) {}));
     });
 
   });
 
 
   unittest.group("resource-PurchasesVoidedpurchasesResourceApi", () {
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.PurchasesVoidedpurchasesResourceApi res = new api.AndroidpublisherApi(mock).purchases.voidedpurchases;
       var arg_packageName = "foo";
       var arg_endTime = "foo";
       var arg_maxResults = 42;
       var arg_startIndex = 42;
       var arg_startTime = "foo";
       var arg_token = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 16 matching lines @@
         unittest.expect(queryMap["startTime"].first, unittest.equals(arg_startTime));
         unittest.expect(queryMap["token"].first, unittest.equals(arg_token));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVoidedPurchasesListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_packageName, endTime: arg_endTime, maxResults: arg_maxResults, startIndex: arg_startIndex, startTime: arg_startTime, token: arg_token).then(unittest.expectAsync(((api.VoidedPurchasesListResponse response) {
+      res.list(arg_packageName, endTime: arg_endTime, maxResults: arg_maxResults, startIndex: arg_startIndex, startTime: arg_startTime, token: arg_token).then(unittest.expectAsync1(((api.VoidedPurchasesListResponse response) {
         checkVoidedPurchasesListResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ReviewsResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.ReviewsResourceApi res = new api.AndroidpublisherApi(mock).reviews;
       var arg_packageName = "foo";
       var arg_reviewId = "foo";
       var arg_translationLanguage = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 12 matching lines @@
         }
         unittest.expect(queryMap["translationLanguage"].first, unittest.equals(arg_translationLanguage));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReview());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_packageName, arg_reviewId, translationLanguage: arg_translationLanguage).then(unittest.expectAsync(((api.Review response) {
+      res.get(arg_packageName, arg_reviewId, translationLanguage: arg_translationLanguage).then(unittest.expectAsync1(((api.Review response) {
         checkReview(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.ReviewsResourceApi res = new api.AndroidpublisherApi(mock).reviews;
       var arg_packageName = "foo";
       var arg_maxResults = 42;
       var arg_startIndex = 42;
       var arg_token = "foo";
       var arg_translationLanguage = "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;
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
@@ skipping 15 matching lines @@
         unittest.expect(queryMap["token"].first, unittest.equals(arg_token));
         unittest.expect(queryMap["translationLanguage"].first, unittest.equals(arg_translationLanguage));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReviewsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_packageName, maxResults: arg_maxResults, startIndex: arg_startIndex, token: arg_token, translationLanguage: arg_translationLanguage).then(unittest.expectAsync(((api.ReviewsListResponse response) {
+      res.list(arg_packageName, maxResults: arg_maxResults, startIndex: arg_startIndex, token: arg_token, translationLanguage: arg_translationLanguage).then(unittest.expectAsync1(((api.ReviewsListResponse response) {
         checkReviewsListResponse(response);
       })));
     });
 
     unittest.test("method--reply", () {
 
       var mock = new HttpServerMock();
       api.ReviewsResourceApi res = new api.AndroidpublisherApi(mock).reviews;
       var arg_request = buildReviewsReplyRequest();
       var arg_packageName = "foo";
       var arg_reviewId = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.ReviewsReplyRequest.fromJson(json);
         checkReviewsReplyRequest(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReviewsReplyResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.reply(arg_request, arg_packageName, arg_reviewId).then(unittest.expectAsync(((api.ReviewsReplyResponse response) {
+      res.reply(arg_request, arg_packageName, arg_reviewId).then(unittest.expectAsync1(((api.ReviewsReplyResponse response) {
         checkReviewsReplyResponse(response);
       })));
     });
 
   });
 
 
 }