Api-Roll 50: 2017-06-12

generated/googleapis/test/games/v1_test.dart

 library googleapis.games.v1.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/games/v1.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 buildCounterAchievementDefinition = 0;
 buildAchievementDefinition() {
   var o = new api.AchievementDefinition();
   buildCounterAchievementDefinition++;
   if (buildCounterAchievementDefinition < 3) {
     o.achievementType = "foo";
@@ skipping 27 matching lines @@
     unittest.expect(o.isUnlockedIconUrlDefault, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.revealedIconUrl, unittest.equals('foo'));
     unittest.expect(o.totalSteps, unittest.equals(42));
     unittest.expect(o.unlockedIconUrl, unittest.equals('foo'));
   }
   buildCounterAchievementDefinition--;
 }
 
-buildUnnamed52() {
+buildUnnamed54() {
   var o = new core.List<api.AchievementDefinition>();
   o.add(buildAchievementDefinition());
   o.add(buildAchievementDefinition());
   return o;
 }
 
-checkUnnamed52(core.List<api.AchievementDefinition> o) {
+checkUnnamed54(core.List<api.AchievementDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementDefinition(o[0]);
   checkAchievementDefinition(o[1]);
 }
 
 core.int buildCounterAchievementDefinitionsListResponse = 0;
 buildAchievementDefinitionsListResponse() {
   var o = new api.AchievementDefinitionsListResponse();
   buildCounterAchievementDefinitionsListResponse++;
   if (buildCounterAchievementDefinitionsListResponse < 3) {
-    o.items = buildUnnamed52();
+    o.items = buildUnnamed54();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterAchievementDefinitionsListResponse--;
   return o;
 }
 
 checkAchievementDefinitionsListResponse(api.AchievementDefinitionsListResponse o) {
   buildCounterAchievementDefinitionsListResponse++;
   if (buildCounterAchievementDefinitionsListResponse < 3) {
-    checkUnnamed52(o.items);
+    checkUnnamed54(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAchievementDefinitionsListResponse--;
 }
 
 core.int buildCounterAchievementIncrementResponse = 0;
 buildAchievementIncrementResponse() {
   var o = new api.AchievementIncrementResponse();
   buildCounterAchievementIncrementResponse++;
@@ skipping 74 matching lines @@
 
 checkAchievementUnlockResponse(api.AchievementUnlockResponse o) {
   buildCounterAchievementUnlockResponse++;
   if (buildCounterAchievementUnlockResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.newlyUnlocked, unittest.isTrue);
   }
   buildCounterAchievementUnlockResponse--;
 }
 
-buildUnnamed53() {
+buildUnnamed55() {
   var o = new core.List<api.AchievementUpdateRequest>();
   o.add(buildAchievementUpdateRequest());
   o.add(buildAchievementUpdateRequest());
   return o;
 }
 
-checkUnnamed53(core.List<api.AchievementUpdateRequest> o) {
+checkUnnamed55(core.List<api.AchievementUpdateRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementUpdateRequest(o[0]);
   checkAchievementUpdateRequest(o[1]);
 }
 
 core.int buildCounterAchievementUpdateMultipleRequest = 0;
 buildAchievementUpdateMultipleRequest() {
   var o = new api.AchievementUpdateMultipleRequest();
   buildCounterAchievementUpdateMultipleRequest++;
   if (buildCounterAchievementUpdateMultipleRequest < 3) {
     o.kind = "foo";
-    o.updates = buildUnnamed53();
+    o.updates = buildUnnamed55();
   }
   buildCounterAchievementUpdateMultipleRequest--;
   return o;
 }
 
 checkAchievementUpdateMultipleRequest(api.AchievementUpdateMultipleRequest o) {
   buildCounterAchievementUpdateMultipleRequest++;
   if (buildCounterAchievementUpdateMultipleRequest < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed53(o.updates);
+    checkUnnamed55(o.updates);
   }
   buildCounterAchievementUpdateMultipleRequest--;
 }
 
-buildUnnamed54() {
+buildUnnamed56() {
   var o = new core.List<api.AchievementUpdateResponse>();
   o.add(buildAchievementUpdateResponse());
   o.add(buildAchievementUpdateResponse());
   return o;
 }
 
-checkUnnamed54(core.List<api.AchievementUpdateResponse> o) {
+checkUnnamed56(core.List<api.AchievementUpdateResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementUpdateResponse(o[0]);
   checkAchievementUpdateResponse(o[1]);
 }
 
 core.int buildCounterAchievementUpdateMultipleResponse = 0;
 buildAchievementUpdateMultipleResponse() {
   var o = new api.AchievementUpdateMultipleResponse();
   buildCounterAchievementUpdateMultipleResponse++;
   if (buildCounterAchievementUpdateMultipleResponse < 3) {
     o.kind = "foo";
-    o.updatedAchievements = buildUnnamed54();
+    o.updatedAchievements = buildUnnamed56();
   }
   buildCounterAchievementUpdateMultipleResponse--;
   return o;
 }
 
 checkAchievementUpdateMultipleResponse(api.AchievementUpdateMultipleResponse o) {
   buildCounterAchievementUpdateMultipleResponse++;
   if (buildCounterAchievementUpdateMultipleResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed54(o.updatedAchievements);
+    checkUnnamed56(o.updatedAchievements);
   }
   buildCounterAchievementUpdateMultipleResponse--;
 }
 
 core.int buildCounterAchievementUpdateRequest = 0;
 buildAchievementUpdateRequest() {
   var o = new api.AchievementUpdateRequest();
   buildCounterAchievementUpdateRequest++;
   if (buildCounterAchievementUpdateRequest < 3) {
     o.achievementId = "foo";
@@ skipping 90 matching lines @@
 checkAnonymousPlayer(api.AnonymousPlayer o) {
   buildCounterAnonymousPlayer++;
   if (buildCounterAnonymousPlayer < 3) {
     unittest.expect(o.avatarImageUrl, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAnonymousPlayer--;
 }
 
-buildUnnamed55() {
+buildUnnamed57() {
   var o = new core.List<api.ImageAsset>();
   o.add(buildImageAsset());
   o.add(buildImageAsset());
   return o;
 }
 
-checkUnnamed55(core.List<api.ImageAsset> o) {
+checkUnnamed57(core.List<api.ImageAsset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImageAsset(o[0]);
   checkImageAsset(o[1]);
 }
 
-buildUnnamed56() {
+buildUnnamed58() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed56(core.List<core.String> o) {
+checkUnnamed58(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'));
 }
 
-buildUnnamed57() {
+buildUnnamed59() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed57(core.List<api.Instance> o) {
+checkUnnamed59(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
 }
 
 core.int buildCounterApplication = 0;
 buildApplication() {
   var o = new api.Application();
   buildCounterApplication++;
   if (buildCounterApplication < 3) {
     o.achievementCount = 42;
-    o.assets = buildUnnamed55();
+    o.assets = buildUnnamed57();
     o.author = "foo";
     o.category = buildApplicationCategory();
     o.description = "foo";
-    o.enabledFeatures = buildUnnamed56();
+    o.enabledFeatures = buildUnnamed58();
     o.id = "foo";
-    o.instances = buildUnnamed57();
+    o.instances = buildUnnamed59();
     o.kind = "foo";
     o.lastUpdatedTimestamp = "foo";
     o.leaderboardCount = 42;
     o.name = "foo";
     o.themeColor = "foo";
   }
   buildCounterApplication--;
   return o;
 }
 
 checkApplication(api.Application o) {
   buildCounterApplication++;
   if (buildCounterApplication < 3) {
     unittest.expect(o.achievementCount, unittest.equals(42));
-    checkUnnamed55(o.assets);
+    checkUnnamed57(o.assets);
     unittest.expect(o.author, unittest.equals('foo'));
     checkApplicationCategory(o.category);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed56(o.enabledFeatures);
+    checkUnnamed58(o.enabledFeatures);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed57(o.instances);
+    checkUnnamed59(o.instances);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdatedTimestamp, unittest.equals('foo'));
     unittest.expect(o.leaderboardCount, unittest.equals(42));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.themeColor, unittest.equals('foo'));
   }
   buildCounterApplication--;
 }
 
 core.int buildCounterApplicationCategory = 0;
@@ skipping 58 matching lines @@
 checkCategory(api.Category o) {
   buildCounterCategory++;
   if (buildCounterCategory < 3) {
     unittest.expect(o.category, unittest.equals('foo'));
     unittest.expect(o.experiencePoints, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCategory--;
 }
 
-buildUnnamed58() {
+buildUnnamed60() {
   var o = new core.List<api.Category>();
   o.add(buildCategory());
   o.add(buildCategory());
   return o;
 }
 
-checkUnnamed58(core.List<api.Category> o) {
+checkUnnamed60(core.List<api.Category> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCategory(o[0]);
   checkCategory(o[1]);
 }
 
 core.int buildCounterCategoryListResponse = 0;
 buildCategoryListResponse() {
   var o = new api.CategoryListResponse();
   buildCounterCategoryListResponse++;
   if (buildCounterCategoryListResponse < 3) {
-    o.items = buildUnnamed58();
+    o.items = buildUnnamed60();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterCategoryListResponse--;
   return o;
 }
 
 checkCategoryListResponse(api.CategoryListResponse o) {
   buildCounterCategoryListResponse++;
   if (buildCounterCategoryListResponse < 3) {
-    checkUnnamed58(o.items);
+    checkUnnamed60(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCategoryListResponse--;
 }
 
 core.int buildCounterEventBatchRecordFailure = 0;
 buildEventBatchRecordFailure() {
   var o = new api.EventBatchRecordFailure();
   buildCounterEventBatchRecordFailure++;
@@ skipping 30 matching lines @@
 
 checkEventChild(api.EventChild o) {
   buildCounterEventChild++;
   if (buildCounterEventChild < 3) {
     unittest.expect(o.childId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterEventChild--;
 }
 
-buildUnnamed59() {
+buildUnnamed61() {
   var o = new core.List<api.EventChild>();
   o.add(buildEventChild());
   o.add(buildEventChild());
   return o;
 }
 
-checkUnnamed59(core.List<api.EventChild> o) {
+checkUnnamed61(core.List<api.EventChild> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventChild(o[0]);
   checkEventChild(o[1]);
 }
 
 core.int buildCounterEventDefinition = 0;
 buildEventDefinition() {
   var o = new api.EventDefinition();
   buildCounterEventDefinition++;
   if (buildCounterEventDefinition < 3) {
-    o.childEvents = buildUnnamed59();
+    o.childEvents = buildUnnamed61();
     o.description = "foo";
     o.displayName = "foo";
     o.id = "foo";
     o.imageUrl = "foo";
     o.isDefaultImageUrl = true;
     o.kind = "foo";
     o.visibility = "foo";
   }
   buildCounterEventDefinition--;
   return o;
 }
 
 checkEventDefinition(api.EventDefinition o) {
   buildCounterEventDefinition++;
   if (buildCounterEventDefinition < 3) {
-    checkUnnamed59(o.childEvents);
+    checkUnnamed61(o.childEvents);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.imageUrl, unittest.equals('foo'));
     unittest.expect(o.isDefaultImageUrl, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visibility, unittest.equals('foo'));
   }
   buildCounterEventDefinition--;
 }
 
-buildUnnamed60() {
+buildUnnamed62() {
   var o = new core.List<api.EventDefinition>();
   o.add(buildEventDefinition());
   o.add(buildEventDefinition());
   return o;
 }
 
-checkUnnamed60(core.List<api.EventDefinition> o) {
+checkUnnamed62(core.List<api.EventDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventDefinition(o[0]);
   checkEventDefinition(o[1]);
 }
 
 core.int buildCounterEventDefinitionListResponse = 0;
 buildEventDefinitionListResponse() {
   var o = new api.EventDefinitionListResponse();
   buildCounterEventDefinitionListResponse++;
   if (buildCounterEventDefinitionListResponse < 3) {
-    o.items = buildUnnamed60();
+    o.items = buildUnnamed62();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterEventDefinitionListResponse--;
   return o;
 }
 
 checkEventDefinitionListResponse(api.EventDefinitionListResponse o) {
   buildCounterEventDefinitionListResponse++;
   if (buildCounterEventDefinitionListResponse < 3) {
-    checkUnnamed60(o.items);
+    checkUnnamed62(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterEventDefinitionListResponse--;
 }
 
 core.int buildCounterEventPeriodRange = 0;
 buildEventPeriodRange() {
   var o = new api.EventPeriodRange();
   buildCounterEventPeriodRange++;
   if (buildCounterEventPeriodRange < 3) {
     o.kind = "foo";
     o.periodEndMillis = "foo";
     o.periodStartMillis = "foo";
   }
   buildCounterEventPeriodRange--;
   return o;
 }
 
 checkEventPeriodRange(api.EventPeriodRange o) {
   buildCounterEventPeriodRange++;
   if (buildCounterEventPeriodRange < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.periodEndMillis, unittest.equals('foo'));
     unittest.expect(o.periodStartMillis, unittest.equals('foo'));
   }
   buildCounterEventPeriodRange--;
 }
 
-buildUnnamed61() {
+buildUnnamed63() {
   var o = new core.List<api.EventUpdateRequest>();
   o.add(buildEventUpdateRequest());
   o.add(buildEventUpdateRequest());
   return o;
 }
 
-checkUnnamed61(core.List<api.EventUpdateRequest> o) {
+checkUnnamed63(core.List<api.EventUpdateRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventUpdateRequest(o[0]);
   checkEventUpdateRequest(o[1]);
 }
 
 core.int buildCounterEventPeriodUpdate = 0;
 buildEventPeriodUpdate() {
   var o = new api.EventPeriodUpdate();
   buildCounterEventPeriodUpdate++;
   if (buildCounterEventPeriodUpdate < 3) {
     o.kind = "foo";
     o.timePeriod = buildEventPeriodRange();
-    o.updates = buildUnnamed61();
+    o.updates = buildUnnamed63();
   }
   buildCounterEventPeriodUpdate--;
   return o;
 }
 
 checkEventPeriodUpdate(api.EventPeriodUpdate o) {
   buildCounterEventPeriodUpdate++;
   if (buildCounterEventPeriodUpdate < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     checkEventPeriodRange(o.timePeriod);
-    checkUnnamed61(o.updates);
+    checkUnnamed63(o.updates);
   }
   buildCounterEventPeriodUpdate--;
 }
 
 core.int buildCounterEventRecordFailure = 0;
 buildEventRecordFailure() {
   var o = new api.EventRecordFailure();
   buildCounterEventRecordFailure++;
   if (buildCounterEventRecordFailure < 3) {
     o.eventId = "foo";
     o.failureCause = "foo";
     o.kind = "foo";
   }
   buildCounterEventRecordFailure--;
   return o;
 }
 
 checkEventRecordFailure(api.EventRecordFailure o) {
   buildCounterEventRecordFailure++;
   if (buildCounterEventRecordFailure < 3) {
     unittest.expect(o.eventId, unittest.equals('foo'));
     unittest.expect(o.failureCause, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterEventRecordFailure--;
 }
 
-buildUnnamed62() {
+buildUnnamed64() {
   var o = new core.List<api.EventPeriodUpdate>();
   o.add(buildEventPeriodUpdate());
   o.add(buildEventPeriodUpdate());
   return o;
 }
 
-checkUnnamed62(core.List<api.EventPeriodUpdate> o) {
+checkUnnamed64(core.List<api.EventPeriodUpdate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventPeriodUpdate(o[0]);
   checkEventPeriodUpdate(o[1]);
 }
 
 core.int buildCounterEventRecordRequest = 0;
 buildEventRecordRequest() {
   var o = new api.EventRecordRequest();
   buildCounterEventRecordRequest++;
   if (buildCounterEventRecordRequest < 3) {
     o.currentTimeMillis = "foo";
     o.kind = "foo";
     o.requestId = "foo";
-    o.timePeriods = buildUnnamed62();
+    o.timePeriods = buildUnnamed64();
   }
   buildCounterEventRecordRequest--;
   return o;
 }
 
 checkEventRecordRequest(api.EventRecordRequest o) {
   buildCounterEventRecordRequest++;
   if (buildCounterEventRecordRequest < 3) {
     unittest.expect(o.currentTimeMillis, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.requestId, unittest.equals('foo'));
-    checkUnnamed62(o.timePeriods);
+    checkUnnamed64(o.timePeriods);
   }
   buildCounterEventRecordRequest--;
 }
 
 core.int buildCounterEventUpdateRequest = 0;
 buildEventUpdateRequest() {
   var o = new api.EventUpdateRequest();
   buildCounterEventUpdateRequest++;
   if (buildCounterEventUpdateRequest < 3) {
     o.definitionId = "foo";
     o.kind = "foo";
     o.updateCount = "foo";
   }
   buildCounterEventUpdateRequest--;
   return o;
 }
 
 checkEventUpdateRequest(api.EventUpdateRequest o) {
   buildCounterEventUpdateRequest++;
   if (buildCounterEventUpdateRequest < 3) {
     unittest.expect(o.definitionId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.updateCount, unittest.equals('foo'));
   }
   buildCounterEventUpdateRequest--;
 }
 
-buildUnnamed63() {
+buildUnnamed65() {
   var o = new core.List<api.EventBatchRecordFailure>();
   o.add(buildEventBatchRecordFailure());
   o.add(buildEventBatchRecordFailure());
   return o;
 }
 
-checkUnnamed63(core.List<api.EventBatchRecordFailure> o) {
+checkUnnamed65(core.List<api.EventBatchRecordFailure> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventBatchRecordFailure(o[0]);
   checkEventBatchRecordFailure(o[1]);
 }
 
-buildUnnamed64() {
+buildUnnamed66() {
   var o = new core.List<api.EventRecordFailure>();
   o.add(buildEventRecordFailure());
   o.add(buildEventRecordFailure());
   return o;
 }
 
-checkUnnamed64(core.List<api.EventRecordFailure> o) {
+checkUnnamed66(core.List<api.EventRecordFailure> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventRecordFailure(o[0]);
   checkEventRecordFailure(o[1]);
 }
 
-buildUnnamed65() {
+buildUnnamed67() {
   var o = new core.List<api.PlayerEvent>();
   o.add(buildPlayerEvent());
   o.add(buildPlayerEvent());
   return o;
 }
 
-checkUnnamed65(core.List<api.PlayerEvent> o) {
+checkUnnamed67(core.List<api.PlayerEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerEvent(o[0]);
   checkPlayerEvent(o[1]);
 }
 
 core.int buildCounterEventUpdateResponse = 0;
 buildEventUpdateResponse() {
   var o = new api.EventUpdateResponse();
   buildCounterEventUpdateResponse++;
   if (buildCounterEventUpdateResponse < 3) {
-    o.batchFailures = buildUnnamed63();
-    o.eventFailures = buildUnnamed64();
+    o.batchFailures = buildUnnamed65();
+    o.eventFailures = buildUnnamed66();
     o.kind = "foo";
-    o.playerEvents = buildUnnamed65();
+    o.playerEvents = buildUnnamed67();
   }
   buildCounterEventUpdateResponse--;
   return o;
 }
 
 checkEventUpdateResponse(api.EventUpdateResponse o) {
   buildCounterEventUpdateResponse++;
   if (buildCounterEventUpdateResponse < 3) {
-    checkUnnamed63(o.batchFailures);
-    checkUnnamed64(o.eventFailures);
+    checkUnnamed65(o.batchFailures);
+    checkUnnamed66(o.eventFailures);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed65(o.playerEvents);
+    checkUnnamed67(o.playerEvents);
   }
   buildCounterEventUpdateResponse--;
 }
 
 core.int buildCounterGamesAchievementIncrement = 0;
 buildGamesAchievementIncrement() {
   var o = new api.GamesAchievementIncrement();
   buildCounterGamesAchievementIncrement++;
   if (buildCounterGamesAchievementIncrement < 3) {
     o.kind = "foo";
@@ skipping 233 matching lines @@
     checkPlayer(o.player);
     unittest.expect(o.scoreRank, unittest.equals('foo'));
     unittest.expect(o.scoreTag, unittest.equals('foo'));
     unittest.expect(o.scoreValue, unittest.equals('foo'));
     unittest.expect(o.timeSpan, unittest.equals('foo'));
     unittest.expect(o.writeTimestampMillis, unittest.equals('foo'));
   }
   buildCounterLeaderboardEntry--;
 }
 
-buildUnnamed66() {
+buildUnnamed68() {
   var o = new core.List<api.Leaderboard>();
   o.add(buildLeaderboard());
   o.add(buildLeaderboard());
   return o;
 }
 
-checkUnnamed66(core.List<api.Leaderboard> o) {
+checkUnnamed68(core.List<api.Leaderboard> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLeaderboard(o[0]);
   checkLeaderboard(o[1]);
 }
 
 core.int buildCounterLeaderboardListResponse = 0;
 buildLeaderboardListResponse() {
   var o = new api.LeaderboardListResponse();
   buildCounterLeaderboardListResponse++;
   if (buildCounterLeaderboardListResponse < 3) {
-    o.items = buildUnnamed66();
+    o.items = buildUnnamed68();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterLeaderboardListResponse--;
   return o;
 }
 
 checkLeaderboardListResponse(api.LeaderboardListResponse o) {
   buildCounterLeaderboardListResponse++;
   if (buildCounterLeaderboardListResponse < 3) {
-    checkUnnamed66(o.items);
+    checkUnnamed68(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterLeaderboardListResponse--;
 }
 
 core.int buildCounterLeaderboardScoreRank = 0;
 buildLeaderboardScoreRank() {
   var o = new api.LeaderboardScoreRank();
   buildCounterLeaderboardScoreRank++;
@@ skipping 13 matching lines @@
   if (buildCounterLeaderboardScoreRank < 3) {
     unittest.expect(o.formattedNumScores, unittest.equals('foo'));
     unittest.expect(o.formattedRank, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.numScores, unittest.equals('foo'));
     unittest.expect(o.rank, unittest.equals('foo'));
   }
   buildCounterLeaderboardScoreRank--;
 }
 
-buildUnnamed67() {
+buildUnnamed69() {
   var o = new core.List<api.LeaderboardEntry>();
   o.add(buildLeaderboardEntry());
   o.add(buildLeaderboardEntry());
   return o;
 }
 
-checkUnnamed67(core.List<api.LeaderboardEntry> o) {
+checkUnnamed69(core.List<api.LeaderboardEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLeaderboardEntry(o[0]);
   checkLeaderboardEntry(o[1]);
 }
 
 core.int buildCounterLeaderboardScores = 0;
 buildLeaderboardScores() {
   var o = new api.LeaderboardScores();
   buildCounterLeaderboardScores++;
   if (buildCounterLeaderboardScores < 3) {
-    o.items = buildUnnamed67();
+    o.items = buildUnnamed69();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.numScores = "foo";
     o.playerScore = buildLeaderboardEntry();
     o.prevPageToken = "foo";
   }
   buildCounterLeaderboardScores--;
   return o;
 }
 
 checkLeaderboardScores(api.LeaderboardScores o) {
   buildCounterLeaderboardScores++;
   if (buildCounterLeaderboardScores < 3) {
-    checkUnnamed67(o.items);
+    checkUnnamed69(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.numScores, unittest.equals('foo'));
     checkLeaderboardEntry(o.playerScore);
     unittest.expect(o.prevPageToken, unittest.equals('foo'));
   }
   buildCounterLeaderboardScores--;
 }
 
-buildUnnamed68() {
+buildUnnamed70() {
   var o = new core.List<api.PlayerLevel>();
   o.add(buildPlayerLevel());
   o.add(buildPlayerLevel());
   return o;
 }
 
-checkUnnamed68(core.List<api.PlayerLevel> o) {
+checkUnnamed70(core.List<api.PlayerLevel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerLevel(o[0]);
   checkPlayerLevel(o[1]);
 }
 
 core.int buildCounterMetagameConfig = 0;
 buildMetagameConfig() {
   var o = new api.MetagameConfig();
   buildCounterMetagameConfig++;
   if (buildCounterMetagameConfig < 3) {
     o.currentVersion = 42;
     o.kind = "foo";
-    o.playerLevels = buildUnnamed68();
+    o.playerLevels = buildUnnamed70();
   }
   buildCounterMetagameConfig--;
   return o;
 }
 
 checkMetagameConfig(api.MetagameConfig o) {
   buildCounterMetagameConfig++;
   if (buildCounterMetagameConfig < 3) {
     unittest.expect(o.currentVersion, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed68(o.playerLevels);
+    checkUnnamed70(o.playerLevels);
   }
   buildCounterMetagameConfig--;
 }
 
 core.int buildCounterNetworkDiagnostics = 0;
 buildNetworkDiagnostics() {
   var o = new api.NetworkDiagnostics();
   buildCounterNetworkDiagnostics++;
   if (buildCounterNetworkDiagnostics < 3) {
     o.androidNetworkSubtype = 42;
@@ skipping 216 matching lines @@
     unittest.expect(o.currentSteps, unittest.equals(42));
     unittest.expect(o.experiencePoints, unittest.equals('foo'));
     unittest.expect(o.formattedCurrentStepsString, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdatedTimestamp, unittest.equals('foo'));
   }
   buildCounterPlayerAchievement--;
 }
 
-buildUnnamed69() {
+buildUnnamed71() {
   var o = new core.List<api.PlayerAchievement>();
   o.add(buildPlayerAchievement());
   o.add(buildPlayerAchievement());
   return o;
 }
 
-checkUnnamed69(core.List<api.PlayerAchievement> o) {
+checkUnnamed71(core.List<api.PlayerAchievement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerAchievement(o[0]);
   checkPlayerAchievement(o[1]);
 }
 
 core.int buildCounterPlayerAchievementListResponse = 0;
 buildPlayerAchievementListResponse() {
   var o = new api.PlayerAchievementListResponse();
   buildCounterPlayerAchievementListResponse++;
   if (buildCounterPlayerAchievementListResponse < 3) {
-    o.items = buildUnnamed69();
+    o.items = buildUnnamed71();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterPlayerAchievementListResponse--;
   return o;
 }
 
 checkPlayerAchievementListResponse(api.PlayerAchievementListResponse o) {
   buildCounterPlayerAchievementListResponse++;
   if (buildCounterPlayerAchievementListResponse < 3) {
-    checkUnnamed69(o.items);
+    checkUnnamed71(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterPlayerAchievementListResponse--;
 }
 
 core.int buildCounterPlayerEvent = 0;
 buildPlayerEvent() {
   var o = new api.PlayerEvent();
   buildCounterPlayerEvent++;
@@ skipping 13 matching lines @@
   if (buildCounterPlayerEvent < 3) {
     unittest.expect(o.definitionId, unittest.equals('foo'));
     unittest.expect(o.formattedNumEvents, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.numEvents, unittest.equals('foo'));
     unittest.expect(o.playerId, unittest.equals('foo'));
   }
   buildCounterPlayerEvent--;
 }
 
-buildUnnamed70() {
+buildUnnamed72() {
   var o = new core.List<api.PlayerEvent>();
   o.add(buildPlayerEvent());
   o.add(buildPlayerEvent());
   return o;
 }
 
-checkUnnamed70(core.List<api.PlayerEvent> o) {
+checkUnnamed72(core.List<api.PlayerEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerEvent(o[0]);
   checkPlayerEvent(o[1]);
 }
 
 core.int buildCounterPlayerEventListResponse = 0;
 buildPlayerEventListResponse() {
   var o = new api.PlayerEventListResponse();
   buildCounterPlayerEventListResponse++;
   if (buildCounterPlayerEventListResponse < 3) {
-    o.items = buildUnnamed70();
+    o.items = buildUnnamed72();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterPlayerEventListResponse--;
   return o;
 }
 
 checkPlayerEventListResponse(api.PlayerEventListResponse o) {
   buildCounterPlayerEventListResponse++;
   if (buildCounterPlayerEventListResponse < 3) {
-    checkUnnamed70(o.items);
+    checkUnnamed72(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterPlayerEventListResponse--;
 }
 
 core.int buildCounterPlayerExperienceInfo = 0;
 buildPlayerExperienceInfo() {
   var o = new api.PlayerExperienceInfo();
   buildCounterPlayerExperienceInfo++;
@@ skipping 48 matching lines @@
     unittest.expect(o.scoreString, unittest.equals('foo'));
     unittest.expect(o.scoreTag, unittest.equals('foo'));
     unittest.expect(o.scoreValue, unittest.equals('foo'));
     checkLeaderboardScoreRank(o.socialRank);
     unittest.expect(o.timeSpan, unittest.equals('foo'));
     unittest.expect(o.writeTimestamp, unittest.equals('foo'));
   }
   buildCounterPlayerLeaderboardScore--;
 }
 
-buildUnnamed71() {
+buildUnnamed73() {
   var o = new core.List<api.PlayerLeaderboardScore>();
   o.add(buildPlayerLeaderboardScore());
   o.add(buildPlayerLeaderboardScore());
   return o;
 }
 
-checkUnnamed71(core.List<api.PlayerLeaderboardScore> o) {
+checkUnnamed73(core.List<api.PlayerLeaderboardScore> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerLeaderboardScore(o[0]);
   checkPlayerLeaderboardScore(o[1]);
 }
 
 core.int buildCounterPlayerLeaderboardScoreListResponse = 0;
 buildPlayerLeaderboardScoreListResponse() {
   var o = new api.PlayerLeaderboardScoreListResponse();
   buildCounterPlayerLeaderboardScoreListResponse++;
   if (buildCounterPlayerLeaderboardScoreListResponse < 3) {
-    o.items = buildUnnamed71();
+    o.items = buildUnnamed73();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.player = buildPlayer();
   }
   buildCounterPlayerLeaderboardScoreListResponse--;
   return o;
 }
 
 checkPlayerLeaderboardScoreListResponse(api.PlayerLeaderboardScoreListResponse o) {
   buildCounterPlayerLeaderboardScoreListResponse++;
   if (buildCounterPlayerLeaderboardScoreListResponse < 3) {
-    checkUnnamed71(o.items);
+    checkUnnamed73(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPlayer(o.player);
   }
   buildCounterPlayerLeaderboardScoreListResponse--;
 }
 
 core.int buildCounterPlayerLevel = 0;
 buildPlayerLevel() {
   var o = new api.PlayerLevel();
@@ skipping 12 matching lines @@
   buildCounterPlayerLevel++;
   if (buildCounterPlayerLevel < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.level, unittest.equals(42));
     unittest.expect(o.maxExperiencePoints, unittest.equals('foo'));
     unittest.expect(o.minExperiencePoints, unittest.equals('foo'));
   }
   buildCounterPlayerLevel--;
 }
 
-buildUnnamed72() {
+buildUnnamed74() {
   var o = new core.List<api.Player>();
   o.add(buildPlayer());
   o.add(buildPlayer());
   return o;
 }
 
-checkUnnamed72(core.List<api.Player> o) {
+checkUnnamed74(core.List<api.Player> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayer(o[0]);
   checkPlayer(o[1]);
 }
 
 core.int buildCounterPlayerListResponse = 0;
 buildPlayerListResponse() {
   var o = new api.PlayerListResponse();
   buildCounterPlayerListResponse++;
   if (buildCounterPlayerListResponse < 3) {
-    o.items = buildUnnamed72();
+    o.items = buildUnnamed74();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterPlayerListResponse--;
   return o;
 }
 
 checkPlayerListResponse(api.PlayerListResponse o) {
   buildCounterPlayerListResponse++;
   if (buildCounterPlayerListResponse < 3) {
-    checkUnnamed72(o.items);
+    checkUnnamed74(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterPlayerListResponse--;
 }
 
 core.int buildCounterPlayerScore = 0;
 buildPlayerScore() {
   var o = new api.PlayerScore();
   buildCounterPlayerScore++;
@@ skipping 13 matching lines @@
   if (buildCounterPlayerScore < 3) {
     unittest.expect(o.formattedScore, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.score, unittest.equals('foo'));
     unittest.expect(o.scoreTag, unittest.equals('foo'));
     unittest.expect(o.timeSpan, unittest.equals('foo'));
   }
   buildCounterPlayerScore--;
 }
 
-buildUnnamed73() {
+buildUnnamed75() {
   var o = new core.List<api.PlayerScoreResponse>();
   o.add(buildPlayerScoreResponse());
   o.add(buildPlayerScoreResponse());
   return o;
 }
 
-checkUnnamed73(core.List<api.PlayerScoreResponse> o) {
+checkUnnamed75(core.List<api.PlayerScoreResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerScoreResponse(o[0]);
   checkPlayerScoreResponse(o[1]);
 }
 
 core.int buildCounterPlayerScoreListResponse = 0;
 buildPlayerScoreListResponse() {
   var o = new api.PlayerScoreListResponse();
   buildCounterPlayerScoreListResponse++;
   if (buildCounterPlayerScoreListResponse < 3) {
     o.kind = "foo";
-    o.submittedScores = buildUnnamed73();
+    o.submittedScores = buildUnnamed75();
   }
   buildCounterPlayerScoreListResponse--;
   return o;
 }
 
 checkPlayerScoreListResponse(api.PlayerScoreListResponse o) {
   buildCounterPlayerScoreListResponse++;
   if (buildCounterPlayerScoreListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed73(o.submittedScores);
+    checkUnnamed75(o.submittedScores);
   }
   buildCounterPlayerScoreListResponse--;
 }
 
-buildUnnamed74() {
+buildUnnamed76() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed74(core.List<core.String> o) {
+checkUnnamed76(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'));
 }
 
-buildUnnamed75() {
+buildUnnamed77() {
   var o = new core.List<api.PlayerScore>();
   o.add(buildPlayerScore());
   o.add(buildPlayerScore());
   return o;
 }
 
-checkUnnamed75(core.List<api.PlayerScore> o) {
+checkUnnamed77(core.List<api.PlayerScore> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerScore(o[0]);
   checkPlayerScore(o[1]);
 }
 
 core.int buildCounterPlayerScoreResponse = 0;
 buildPlayerScoreResponse() {
   var o = new api.PlayerScoreResponse();
   buildCounterPlayerScoreResponse++;
   if (buildCounterPlayerScoreResponse < 3) {
-    o.beatenScoreTimeSpans = buildUnnamed74();
+    o.beatenScoreTimeSpans = buildUnnamed76();
     o.formattedScore = "foo";
     o.kind = "foo";
     o.leaderboardId = "foo";
     o.scoreTag = "foo";
-    o.unbeatenScores = buildUnnamed75();
+    o.unbeatenScores = buildUnnamed77();
   }
   buildCounterPlayerScoreResponse--;
   return o;
 }
 
 checkPlayerScoreResponse(api.PlayerScoreResponse o) {
   buildCounterPlayerScoreResponse++;
   if (buildCounterPlayerScoreResponse < 3) {
-    checkUnnamed74(o.beatenScoreTimeSpans);
+    checkUnnamed76(o.beatenScoreTimeSpans);
     unittest.expect(o.formattedScore, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.leaderboardId, unittest.equals('foo'));
     unittest.expect(o.scoreTag, unittest.equals('foo'));
-    checkUnnamed75(o.unbeatenScores);
+    checkUnnamed77(o.unbeatenScores);
   }
   buildCounterPlayerScoreResponse--;
 }
 
-buildUnnamed76() {
+buildUnnamed78() {
   var o = new core.List<api.ScoreSubmission>();
   o.add(buildScoreSubmission());
   o.add(buildScoreSubmission());
   return o;
 }
 
-checkUnnamed76(core.List<api.ScoreSubmission> o) {
+checkUnnamed78(core.List<api.ScoreSubmission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkScoreSubmission(o[0]);
   checkScoreSubmission(o[1]);
 }
 
 core.int buildCounterPlayerScoreSubmissionList = 0;
 buildPlayerScoreSubmissionList() {
   var o = new api.PlayerScoreSubmissionList();
   buildCounterPlayerScoreSubmissionList++;
   if (buildCounterPlayerScoreSubmissionList < 3) {
     o.kind = "foo";
-    o.scores = buildUnnamed76();
+    o.scores = buildUnnamed78();
   }
   buildCounterPlayerScoreSubmissionList--;
   return o;
 }
 
 checkPlayerScoreSubmissionList(api.PlayerScoreSubmissionList o) {
   buildCounterPlayerScoreSubmissionList++;
   if (buildCounterPlayerScoreSubmissionList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed76(o.scores);
+    checkUnnamed78(o.scores);
   }
   buildCounterPlayerScoreSubmissionList--;
 }
 
 core.int buildCounterProfileSettings = 0;
 buildProfileSettings() {
   var o = new api.ProfileSettings();
   buildCounterProfileSettings++;
   if (buildCounterProfileSettings < 3) {
     o.kind = "foo";
@@ skipping 72 matching lines @@
 
 checkPushTokenId(api.PushTokenId o) {
   buildCounterPushTokenId++;
   if (buildCounterPushTokenId < 3) {
     checkPushTokenIdIos(o.ios);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPushTokenId--;
 }
 
-buildUnnamed77() {
+buildUnnamed79() {
   var o = new core.List<api.QuestMilestone>();
   o.add(buildQuestMilestone());
   o.add(buildQuestMilestone());
   return o;
 }
 
-checkUnnamed77(core.List<api.QuestMilestone> o) {
+checkUnnamed79(core.List<api.QuestMilestone> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuestMilestone(o[0]);
   checkQuestMilestone(o[1]);
 }
 
 core.int buildCounterQuest = 0;
 buildQuest() {
   var o = new api.Quest();
   buildCounterQuest++;
   if (buildCounterQuest < 3) {
     o.acceptedTimestampMillis = "foo";
     o.applicationId = "foo";
     o.bannerUrl = "foo";
     o.description = "foo";
     o.endTimestampMillis = "foo";
     o.iconUrl = "foo";
     o.id = "foo";
     o.isDefaultBannerUrl = true;
     o.isDefaultIconUrl = true;
     o.kind = "foo";
     o.lastUpdatedTimestampMillis = "foo";
-    o.milestones = buildUnnamed77();
+    o.milestones = buildUnnamed79();
     o.name = "foo";
     o.notifyTimestampMillis = "foo";
     o.startTimestampMillis = "foo";
     o.state = "foo";
   }
   buildCounterQuest--;
   return o;
 }
 
 checkQuest(api.Quest o) {
   buildCounterQuest++;
   if (buildCounterQuest < 3) {
     unittest.expect(o.acceptedTimestampMillis, unittest.equals('foo'));
     unittest.expect(o.applicationId, unittest.equals('foo'));
     unittest.expect(o.bannerUrl, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.endTimestampMillis, unittest.equals('foo'));
     unittest.expect(o.iconUrl, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.isDefaultBannerUrl, unittest.isTrue);
     unittest.expect(o.isDefaultIconUrl, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdatedTimestampMillis, unittest.equals('foo'));
-    checkUnnamed77(o.milestones);
+    checkUnnamed79(o.milestones);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notifyTimestampMillis, unittest.equals('foo'));
     unittest.expect(o.startTimestampMillis, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
   }
   buildCounterQuest--;
 }
 
 core.int buildCounterQuestContribution = 0;
 buildQuestContribution() {
@@ skipping 38 matching lines @@
   if (buildCounterQuestCriterion < 3) {
     checkQuestContribution(o.completionContribution);
     checkQuestContribution(o.currentContribution);
     unittest.expect(o.eventId, unittest.equals('foo'));
     checkQuestContribution(o.initialPlayerProgress);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterQuestCriterion--;
 }
 
-buildUnnamed78() {
+buildUnnamed80() {
   var o = new core.List<api.Quest>();
   o.add(buildQuest());
   o.add(buildQuest());
   return o;
 }
 
-checkUnnamed78(core.List<api.Quest> o) {
+checkUnnamed80(core.List<api.Quest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuest(o[0]);
   checkQuest(o[1]);
 }
 
 core.int buildCounterQuestListResponse = 0;
 buildQuestListResponse() {
   var o = new api.QuestListResponse();
   buildCounterQuestListResponse++;
   if (buildCounterQuestListResponse < 3) {
-    o.items = buildUnnamed78();
+    o.items = buildUnnamed80();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterQuestListResponse--;
   return o;
 }
 
 checkQuestListResponse(api.QuestListResponse o) {
   buildCounterQuestListResponse++;
   if (buildCounterQuestListResponse < 3) {
-    checkUnnamed78(o.items);
+    checkUnnamed80(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterQuestListResponse--;
 }
 
-buildUnnamed79() {
+buildUnnamed81() {
   var o = new core.List<api.QuestCriterion>();
   o.add(buildQuestCriterion());
   o.add(buildQuestCriterion());
   return o;
 }
 
-checkUnnamed79(core.List<api.QuestCriterion> o) {
+checkUnnamed81(core.List<api.QuestCriterion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuestCriterion(o[0]);
   checkQuestCriterion(o[1]);
 }
 
 core.int buildCounterQuestMilestone = 0;
 buildQuestMilestone() {
   var o = new api.QuestMilestone();
   buildCounterQuestMilestone++;
   if (buildCounterQuestMilestone < 3) {
     o.completionRewardData = "foo";
-    o.criteria = buildUnnamed79();
+    o.criteria = buildUnnamed81();
     o.id = "foo";
     o.kind = "foo";
     o.state = "foo";
   }
   buildCounterQuestMilestone--;
   return o;
 }
 
 checkQuestMilestone(api.QuestMilestone o) {
   buildCounterQuestMilestone++;
   if (buildCounterQuestMilestone < 3) {
     unittest.expect(o.completionRewardData, unittest.equals('foo'));
-    checkUnnamed79(o.criteria);
+    checkUnnamed81(o.criteria);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
   }
   buildCounterQuestMilestone--;
 }
 
 core.int buildCounterRevisionCheckResponse = 0;
 buildRevisionCheckResponse() {
   var o = new api.RevisionCheckResponse();
@@ skipping 10 matching lines @@
 checkRevisionCheckResponse(api.RevisionCheckResponse o) {
   buildCounterRevisionCheckResponse++;
   if (buildCounterRevisionCheckResponse < 3) {
     unittest.expect(o.apiVersion, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.revisionStatus, unittest.equals('foo'));
   }
   buildCounterRevisionCheckResponse--;
 }
 
-buildUnnamed80() {
+buildUnnamed82() {
   var o = new core.List<api.RoomParticipant>();
   o.add(buildRoomParticipant());
   o.add(buildRoomParticipant());
   return o;
 }
 
-checkUnnamed80(core.List<api.RoomParticipant> o) {
+checkUnnamed82(core.List<api.RoomParticipant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoomParticipant(o[0]);
   checkRoomParticipant(o[1]);
 }
 
 core.int buildCounterRoom = 0;
 buildRoom() {
   var o = new api.Room();
   buildCounterRoom++;
   if (buildCounterRoom < 3) {
     o.applicationId = "foo";
     o.autoMatchingCriteria = buildRoomAutoMatchingCriteria();
     o.autoMatchingStatus = buildRoomAutoMatchStatus();
     o.creationDetails = buildRoomModification();
     o.description = "foo";
     o.inviterId = "foo";
     o.kind = "foo";
     o.lastUpdateDetails = buildRoomModification();
-    o.participants = buildUnnamed80();
+    o.participants = buildUnnamed82();
     o.roomId = "foo";
     o.roomStatusVersion = 42;
     o.status = "foo";
     o.variant = 42;
   }
   buildCounterRoom--;
   return o;
 }
 
 checkRoom(api.Room o) {
   buildCounterRoom++;
   if (buildCounterRoom < 3) {
     unittest.expect(o.applicationId, unittest.equals('foo'));
     checkRoomAutoMatchingCriteria(o.autoMatchingCriteria);
     checkRoomAutoMatchStatus(o.autoMatchingStatus);
     checkRoomModification(o.creationDetails);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.inviterId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkRoomModification(o.lastUpdateDetails);
-    checkUnnamed80(o.participants);
+    checkUnnamed82(o.participants);
     unittest.expect(o.roomId, unittest.equals('foo'));
     unittest.expect(o.roomStatusVersion, unittest.equals(42));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.variant, unittest.equals(42));
   }
   buildCounterRoom--;
 }
 
 core.int buildCounterRoomAutoMatchStatus = 0;
 buildRoomAutoMatchStatus() {
@@ skipping 55 matching lines @@
 
 checkRoomClientAddress(api.RoomClientAddress o) {
   buildCounterRoomClientAddress++;
   if (buildCounterRoomClientAddress < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.xmppAddress, unittest.equals('foo'));
   }
   buildCounterRoomClientAddress--;
 }
 
-buildUnnamed81() {
+buildUnnamed83() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed81(core.List<core.String> o) {
+checkUnnamed83(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'));
 }
 
-buildUnnamed82() {
+buildUnnamed84() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed82(core.List<core.String> o) {
+checkUnnamed84(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 buildCounterRoomCreateRequest = 0;
 buildRoomCreateRequest() {
   var o = new api.RoomCreateRequest();
   buildCounterRoomCreateRequest++;
   if (buildCounterRoomCreateRequest < 3) {
     o.autoMatchingCriteria = buildRoomAutoMatchingCriteria();
-    o.capabilities = buildUnnamed81();
+    o.capabilities = buildUnnamed83();
     o.clientAddress = buildRoomClientAddress();
-    o.invitedPlayerIds = buildUnnamed82();
+    o.invitedPlayerIds = buildUnnamed84();
     o.kind = "foo";
     o.networkDiagnostics = buildNetworkDiagnostics();
     o.requestId = "foo";
     o.variant = 42;
   }
   buildCounterRoomCreateRequest--;
   return o;
 }
 
 checkRoomCreateRequest(api.RoomCreateRequest o) {
   buildCounterRoomCreateRequest++;
   if (buildCounterRoomCreateRequest < 3) {
     checkRoomAutoMatchingCriteria(o.autoMatchingCriteria);
-    checkUnnamed81(o.capabilities);
+    checkUnnamed83(o.capabilities);
     checkRoomClientAddress(o.clientAddress);
-    checkUnnamed82(o.invitedPlayerIds);
+    checkUnnamed84(o.invitedPlayerIds);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkNetworkDiagnostics(o.networkDiagnostics);
     unittest.expect(o.requestId, unittest.equals('foo'));
     unittest.expect(o.variant, unittest.equals(42));
   }
   buildCounterRoomCreateRequest--;
 }
 
-buildUnnamed83() {
+buildUnnamed85() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed83(core.List<core.String> o) {
+checkUnnamed85(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 buildCounterRoomJoinRequest = 0;
 buildRoomJoinRequest() {
   var o = new api.RoomJoinRequest();
   buildCounterRoomJoinRequest++;
   if (buildCounterRoomJoinRequest < 3) {
-    o.capabilities = buildUnnamed83();
+    o.capabilities = buildUnnamed85();
     o.clientAddress = buildRoomClientAddress();
     o.kind = "foo";
     o.networkDiagnostics = buildNetworkDiagnostics();
   }
   buildCounterRoomJoinRequest--;
   return o;
 }
 
 checkRoomJoinRequest(api.RoomJoinRequest o) {
   buildCounterRoomJoinRequest++;
   if (buildCounterRoomJoinRequest < 3) {
-    checkUnnamed83(o.capabilities);
+    checkUnnamed85(o.capabilities);
     checkRoomClientAddress(o.clientAddress);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkNetworkDiagnostics(o.networkDiagnostics);
   }
   buildCounterRoomJoinRequest--;
 }
 
-buildUnnamed84() {
+buildUnnamed86() {
   var o = new core.List<api.PeerSessionDiagnostics>();
   o.add(buildPeerSessionDiagnostics());
   o.add(buildPeerSessionDiagnostics());
   return o;
 }
 
-checkUnnamed84(core.List<api.PeerSessionDiagnostics> o) {
+checkUnnamed86(core.List<api.PeerSessionDiagnostics> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPeerSessionDiagnostics(o[0]);
   checkPeerSessionDiagnostics(o[1]);
 }
 
 core.int buildCounterRoomLeaveDiagnostics = 0;
 buildRoomLeaveDiagnostics() {
   var o = new api.RoomLeaveDiagnostics();
   buildCounterRoomLeaveDiagnostics++;
   if (buildCounterRoomLeaveDiagnostics < 3) {
     o.androidNetworkSubtype = 42;
     o.androidNetworkType = 42;
     o.iosNetworkType = 42;
     o.kind = "foo";
     o.networkOperatorCode = "foo";
     o.networkOperatorName = "foo";
-    o.peerSession = buildUnnamed84();
+    o.peerSession = buildUnnamed86();
     o.socketsUsed = true;
   }
   buildCounterRoomLeaveDiagnostics--;
   return o;
 }
 
 checkRoomLeaveDiagnostics(api.RoomLeaveDiagnostics o) {
   buildCounterRoomLeaveDiagnostics++;
   if (buildCounterRoomLeaveDiagnostics < 3) {
     unittest.expect(o.androidNetworkSubtype, unittest.equals(42));
     unittest.expect(o.androidNetworkType, unittest.equals(42));
     unittest.expect(o.iosNetworkType, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.networkOperatorCode, unittest.equals('foo'));
     unittest.expect(o.networkOperatorName, unittest.equals('foo'));
-    checkUnnamed84(o.peerSession);
+    checkUnnamed86(o.peerSession);
     unittest.expect(o.socketsUsed, unittest.isTrue);
   }
   buildCounterRoomLeaveDiagnostics--;
 }
 
 core.int buildCounterRoomLeaveRequest = 0;
 buildRoomLeaveRequest() {
   var o = new api.RoomLeaveRequest();
   buildCounterRoomLeaveRequest++;
   if (buildCounterRoomLeaveRequest < 3) {
     o.kind = "foo";
     o.leaveDiagnostics = buildRoomLeaveDiagnostics();
     o.reason = "foo";
   }
   buildCounterRoomLeaveRequest--;
   return o;
 }
 
 checkRoomLeaveRequest(api.RoomLeaveRequest o) {
   buildCounterRoomLeaveRequest++;
   if (buildCounterRoomLeaveRequest < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     checkRoomLeaveDiagnostics(o.leaveDiagnostics);
     unittest.expect(o.reason, unittest.equals('foo'));
   }
   buildCounterRoomLeaveRequest--;
 }
 
-buildUnnamed85() {
+buildUnnamed87() {
   var o = new core.List<api.Room>();
   o.add(buildRoom());
   o.add(buildRoom());
   return o;
 }
 
-checkUnnamed85(core.List<api.Room> o) {
+checkUnnamed87(core.List<api.Room> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoom(o[0]);
   checkRoom(o[1]);
 }
 
 core.int buildCounterRoomList = 0;
 buildRoomList() {
   var o = new api.RoomList();
   buildCounterRoomList++;
   if (buildCounterRoomList < 3) {
-    o.items = buildUnnamed85();
+    o.items = buildUnnamed87();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterRoomList--;
   return o;
 }
 
 checkRoomList(api.RoomList o) {
   buildCounterRoomList++;
   if (buildCounterRoomList < 3) {
-    checkUnnamed85(o.items);
+    checkUnnamed87(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterRoomList--;
 }
 
 core.int buildCounterRoomModification = 0;
 buildRoomModification() {
   var o = new api.RoomModification();
   buildCounterRoomModification++;
@@ skipping 40 matching lines @@
     unittest.expect(o.error, unittest.equals('foo'));
     unittest.expect(o.errorReason, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.participantId, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.unreliableRoundtripLatencyMillis, unittest.equals(42));
   }
   buildCounterRoomP2PStatus--;
 }
 
-buildUnnamed86() {
+buildUnnamed88() {
   var o = new core.List<api.RoomP2PStatus>();
   o.add(buildRoomP2PStatus());
   o.add(buildRoomP2PStatus());
   return o;
 }
 
-checkUnnamed86(core.List<api.RoomP2PStatus> o) {
+checkUnnamed88(core.List<api.RoomP2PStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoomP2PStatus(o[0]);
   checkRoomP2PStatus(o[1]);
 }
 
 core.int buildCounterRoomP2PStatuses = 0;
 buildRoomP2PStatuses() {
   var o = new api.RoomP2PStatuses();
   buildCounterRoomP2PStatuses++;
   if (buildCounterRoomP2PStatuses < 3) {
     o.kind = "foo";
-    o.updates = buildUnnamed86();
+    o.updates = buildUnnamed88();
   }
   buildCounterRoomP2PStatuses--;
   return o;
 }
 
 checkRoomP2PStatuses(api.RoomP2PStatuses o) {
   buildCounterRoomP2PStatuses++;
   if (buildCounterRoomP2PStatuses < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed86(o.updates);
+    checkUnnamed88(o.updates);
   }
   buildCounterRoomP2PStatuses--;
 }
 
-buildUnnamed87() {
+buildUnnamed89() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed87(core.List<core.String> o) {
+checkUnnamed89(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 buildCounterRoomParticipant = 0;
 buildRoomParticipant() {
   var o = new api.RoomParticipant();
   buildCounterRoomParticipant++;
   if (buildCounterRoomParticipant < 3) {
     o.autoMatched = true;
     o.autoMatchedPlayer = buildAnonymousPlayer();
-    o.capabilities = buildUnnamed87();
+    o.capabilities = buildUnnamed89();
     o.clientAddress = buildRoomClientAddress();
     o.connected = true;
     o.id = "foo";
     o.kind = "foo";
     o.leaveReason = "foo";
     o.player = buildPlayer();
     o.status = "foo";
   }
   buildCounterRoomParticipant--;
   return o;
 }
 
 checkRoomParticipant(api.RoomParticipant o) {
   buildCounterRoomParticipant++;
   if (buildCounterRoomParticipant < 3) {
     unittest.expect(o.autoMatched, unittest.isTrue);
     checkAnonymousPlayer(o.autoMatchedPlayer);
-    checkUnnamed87(o.capabilities);
+    checkUnnamed89(o.capabilities);
     checkRoomClientAddress(o.clientAddress);
     unittest.expect(o.connected, unittest.isTrue);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.leaveReason, unittest.equals('foo'));
     checkPlayer(o.player);
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterRoomParticipant--;
 }
 
-buildUnnamed88() {
+buildUnnamed90() {
   var o = new core.List<api.RoomParticipant>();
   o.add(buildRoomParticipant());
   o.add(buildRoomParticipant());
   return o;
 }
 
-checkUnnamed88(core.List<api.RoomParticipant> o) {
+checkUnnamed90(core.List<api.RoomParticipant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoomParticipant(o[0]);
   checkRoomParticipant(o[1]);
 }
 
 core.int buildCounterRoomStatus = 0;
 buildRoomStatus() {
   var o = new api.RoomStatus();
   buildCounterRoomStatus++;
   if (buildCounterRoomStatus < 3) {
     o.autoMatchingStatus = buildRoomAutoMatchStatus();
     o.kind = "foo";
-    o.participants = buildUnnamed88();
+    o.participants = buildUnnamed90();
     o.roomId = "foo";
     o.status = "foo";
     o.statusVersion = 42;
   }
   buildCounterRoomStatus--;
   return o;
 }
 
 checkRoomStatus(api.RoomStatus o) {
   buildCounterRoomStatus++;
   if (buildCounterRoomStatus < 3) {
     checkRoomAutoMatchStatus(o.autoMatchingStatus);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed88(o.participants);
+    checkUnnamed90(o.participants);
     unittest.expect(o.roomId, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.statusVersion, unittest.equals(42));
   }
   buildCounterRoomStatus--;
 }
 
 core.int buildCounterScoreSubmission = 0;
 buildScoreSubmission() {
   var o = new api.ScoreSubmission();
@@ skipping 80 matching lines @@
   if (buildCounterSnapshotImage < 3) {
     unittest.expect(o.height, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.mimeType, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
     unittest.expect(o.width, unittest.equals(42));
   }
   buildCounterSnapshotImage--;
 }
 
-buildUnnamed89() {
+buildUnnamed91() {
   var o = new core.List<api.Snapshot>();
   o.add(buildSnapshot());
   o.add(buildSnapshot());
   return o;
 }
 
-checkUnnamed89(core.List<api.Snapshot> o) {
+checkUnnamed91(core.List<api.Snapshot> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSnapshot(o[0]);
   checkSnapshot(o[1]);
 }
 
 core.int buildCounterSnapshotListResponse = 0;
 buildSnapshotListResponse() {
   var o = new api.SnapshotListResponse();
   buildCounterSnapshotListResponse++;
   if (buildCounterSnapshotListResponse < 3) {
-    o.items = buildUnnamed89();
+    o.items = buildUnnamed91();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterSnapshotListResponse--;
   return o;
 }
 
 checkSnapshotListResponse(api.SnapshotListResponse o) {
   buildCounterSnapshotListResponse++;
   if (buildCounterSnapshotListResponse < 3) {
-    checkUnnamed89(o.items);
+    checkUnnamed91(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterSnapshotListResponse--;
 }
 
 core.int buildCounterTurnBasedAutoMatchingCriteria = 0;
 buildTurnBasedAutoMatchingCriteria() {
   var o = new api.TurnBasedAutoMatchingCriteria();
   buildCounterTurnBasedAutoMatchingCriteria++;
@@ skipping 11 matching lines @@
   buildCounterTurnBasedAutoMatchingCriteria++;
   if (buildCounterTurnBasedAutoMatchingCriteria < 3) {
     unittest.expect(o.exclusiveBitmask, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.maxAutoMatchingPlayers, unittest.equals(42));
     unittest.expect(o.minAutoMatchingPlayers, unittest.equals(42));
   }
   buildCounterTurnBasedAutoMatchingCriteria--;
 }
 
-buildUnnamed90() {
+buildUnnamed92() {
   var o = new core.List<api.TurnBasedMatchParticipant>();
   o.add(buildTurnBasedMatchParticipant());
   o.add(buildTurnBasedMatchParticipant());
   return o;
 }
 
-checkUnnamed90(core.List<api.TurnBasedMatchParticipant> o) {
+checkUnnamed92(core.List<api.TurnBasedMatchParticipant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTurnBasedMatchParticipant(o[0]);
   checkTurnBasedMatchParticipant(o[1]);
 }
 
-buildUnnamed91() {
+buildUnnamed93() {
   var o = new core.List<api.ParticipantResult>();
   o.add(buildParticipantResult());
   o.add(buildParticipantResult());
   return o;
 }
 
-checkUnnamed91(core.List<api.ParticipantResult> o) {
+checkUnnamed93(core.List<api.ParticipantResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParticipantResult(o[0]);
   checkParticipantResult(o[1]);
 }
 
 core.int buildCounterTurnBasedMatch = 0;
 buildTurnBasedMatch() {
   var o = new api.TurnBasedMatch();
   buildCounterTurnBasedMatch++;
   if (buildCounterTurnBasedMatch < 3) {
     o.applicationId = "foo";
     o.autoMatchingCriteria = buildTurnBasedAutoMatchingCriteria();
     o.creationDetails = buildTurnBasedMatchModification();
     o.data = buildTurnBasedMatchData();
     o.description = "foo";
     o.inviterId = "foo";
     o.kind = "foo";
     o.lastUpdateDetails = buildTurnBasedMatchModification();
     o.matchId = "foo";
     o.matchNumber = 42;
     o.matchVersion = 42;
-    o.participants = buildUnnamed90();
+    o.participants = buildUnnamed92();
     o.pendingParticipantId = "foo";
     o.previousMatchData = buildTurnBasedMatchData();
     o.rematchId = "foo";
-    o.results = buildUnnamed91();
+    o.results = buildUnnamed93();
     o.status = "foo";
     o.userMatchStatus = "foo";
     o.variant = 42;
     o.withParticipantId = "foo";
   }
   buildCounterTurnBasedMatch--;
   return o;
 }
 
 checkTurnBasedMatch(api.TurnBasedMatch o) {
   buildCounterTurnBasedMatch++;
   if (buildCounterTurnBasedMatch < 3) {
     unittest.expect(o.applicationId, unittest.equals('foo'));
     checkTurnBasedAutoMatchingCriteria(o.autoMatchingCriteria);
     checkTurnBasedMatchModification(o.creationDetails);
     checkTurnBasedMatchData(o.data);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.inviterId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkTurnBasedMatchModification(o.lastUpdateDetails);
     unittest.expect(o.matchId, unittest.equals('foo'));
     unittest.expect(o.matchNumber, unittest.equals(42));
     unittest.expect(o.matchVersion, unittest.equals(42));
-    checkUnnamed90(o.participants);
+    checkUnnamed92(o.participants);
     unittest.expect(o.pendingParticipantId, unittest.equals('foo'));
     checkTurnBasedMatchData(o.previousMatchData);
     unittest.expect(o.rematchId, unittest.equals('foo'));
-    checkUnnamed91(o.results);
+    checkUnnamed93(o.results);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.userMatchStatus, unittest.equals('foo'));
     unittest.expect(o.variant, unittest.equals(42));
     unittest.expect(o.withParticipantId, unittest.equals('foo'));
   }
   buildCounterTurnBasedMatch--;
 }
 
-buildUnnamed92() {
+buildUnnamed94() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed92(core.List<core.String> o) {
+checkUnnamed94(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 buildCounterTurnBasedMatchCreateRequest = 0;
 buildTurnBasedMatchCreateRequest() {
   var o = new api.TurnBasedMatchCreateRequest();
   buildCounterTurnBasedMatchCreateRequest++;
   if (buildCounterTurnBasedMatchCreateRequest < 3) {
     o.autoMatchingCriteria = buildTurnBasedAutoMatchingCriteria();
-    o.invitedPlayerIds = buildUnnamed92();
+    o.invitedPlayerIds = buildUnnamed94();
     o.kind = "foo";
     o.requestId = "foo";
     o.variant = 42;
   }
   buildCounterTurnBasedMatchCreateRequest--;
   return o;
 }
 
 checkTurnBasedMatchCreateRequest(api.TurnBasedMatchCreateRequest o) {
   buildCounterTurnBasedMatchCreateRequest++;
   if (buildCounterTurnBasedMatchCreateRequest < 3) {
     checkTurnBasedAutoMatchingCriteria(o.autoMatchingCriteria);
-    checkUnnamed92(o.invitedPlayerIds);
+    checkUnnamed94(o.invitedPlayerIds);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.requestId, unittest.equals('foo'));
     unittest.expect(o.variant, unittest.equals(42));
   }
   buildCounterTurnBasedMatchCreateRequest--;
 }
 
 core.int buildCounterTurnBasedMatchData = 0;
 buildTurnBasedMatchData() {
   var o = new api.TurnBasedMatchData();
@@ skipping 31 matching lines @@
 
 checkTurnBasedMatchDataRequest(api.TurnBasedMatchDataRequest o) {
   buildCounterTurnBasedMatchDataRequest++;
   if (buildCounterTurnBasedMatchDataRequest < 3) {
     unittest.expect(o.data, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTurnBasedMatchDataRequest--;
 }
 
-buildUnnamed93() {
+buildUnnamed95() {
   var o = new core.List<api.TurnBasedMatch>();
   o.add(buildTurnBasedMatch());
   o.add(buildTurnBasedMatch());
   return o;
 }
 
-checkUnnamed93(core.List<api.TurnBasedMatch> o) {
+checkUnnamed95(core.List<api.TurnBasedMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTurnBasedMatch(o[0]);
   checkTurnBasedMatch(o[1]);
 }
 
 core.int buildCounterTurnBasedMatchList = 0;
 buildTurnBasedMatchList() {
   var o = new api.TurnBasedMatchList();
   buildCounterTurnBasedMatchList++;
   if (buildCounterTurnBasedMatchList < 3) {
-    o.items = buildUnnamed93();
+    o.items = buildUnnamed95();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
   buildCounterTurnBasedMatchList--;
   return o;
 }
 
 checkTurnBasedMatchList(api.TurnBasedMatchList o) {
   buildCounterTurnBasedMatchList++;
   if (buildCounterTurnBasedMatchList < 3) {
-    checkUnnamed93(o.items);
+    checkUnnamed95(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterTurnBasedMatchList--;
 }
 
 core.int buildCounterTurnBasedMatchModification = 0;
 buildTurnBasedMatchModification() {
   var o = new api.TurnBasedMatchModification();
   buildCounterTurnBasedMatchModification++;
@@ skipping 61 matching lines @@
 checkTurnBasedMatchRematch(api.TurnBasedMatchRematch o) {
   buildCounterTurnBasedMatchRematch++;
   if (buildCounterTurnBasedMatchRematch < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     checkTurnBasedMatch(o.previousMatch);
     checkTurnBasedMatch(o.rematch);
   }
   buildCounterTurnBasedMatchRematch--;
 }
 
-buildUnnamed94() {
+buildUnnamed96() {
   var o = new core.List<api.ParticipantResult>();
   o.add(buildParticipantResult());
   o.add(buildParticipantResult());
   return o;
 }
 
-checkUnnamed94(core.List<api.ParticipantResult> o) {
+checkUnnamed96(core.List<api.ParticipantResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParticipantResult(o[0]);
   checkParticipantResult(o[1]);
 }
 
 core.int buildCounterTurnBasedMatchResults = 0;
 buildTurnBasedMatchResults() {
   var o = new api.TurnBasedMatchResults();
   buildCounterTurnBasedMatchResults++;
   if (buildCounterTurnBasedMatchResults < 3) {
     o.data = buildTurnBasedMatchDataRequest();
     o.kind = "foo";
     o.matchVersion = 42;
-    o.results = buildUnnamed94();
+    o.results = buildUnnamed96();
   }
   buildCounterTurnBasedMatchResults--;
   return o;
 }
 
 checkTurnBasedMatchResults(api.TurnBasedMatchResults o) {
   buildCounterTurnBasedMatchResults++;
   if (buildCounterTurnBasedMatchResults < 3) {
     checkTurnBasedMatchDataRequest(o.data);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.matchVersion, unittest.equals(42));
-    checkUnnamed94(o.results);
+    checkUnnamed96(o.results);
   }
   buildCounterTurnBasedMatchResults--;
 }
 
-buildUnnamed95() {
+buildUnnamed97() {
   var o = new core.List<api.TurnBasedMatch>();
   o.add(buildTurnBasedMatch());
   o.add(buildTurnBasedMatch());
   return o;
 }
 
-checkUnnamed95(core.List<api.TurnBasedMatch> o) {
+checkUnnamed97(core.List<api.TurnBasedMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTurnBasedMatch(o[0]);
   checkTurnBasedMatch(o[1]);
 }
 
 core.int buildCounterTurnBasedMatchSync = 0;
 buildTurnBasedMatchSync() {
   var o = new api.TurnBasedMatchSync();
   buildCounterTurnBasedMatchSync++;
   if (buildCounterTurnBasedMatchSync < 3) {
-    o.items = buildUnnamed95();
+    o.items = buildUnnamed97();
     o.kind = "foo";
     o.moreAvailable = true;
     o.nextPageToken = "foo";
   }
   buildCounterTurnBasedMatchSync--;
   return o;
 }
 
 checkTurnBasedMatchSync(api.TurnBasedMatchSync o) {
   buildCounterTurnBasedMatchSync++;
   if (buildCounterTurnBasedMatchSync < 3) {
-    checkUnnamed95(o.items);
+    checkUnnamed97(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.moreAvailable, unittest.isTrue);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterTurnBasedMatchSync--;
 }
 
-buildUnnamed96() {
+buildUnnamed98() {
   var o = new core.List<api.ParticipantResult>();
   o.add(buildParticipantResult());
   o.add(buildParticipantResult());
   return o;
 }
 
-checkUnnamed96(core.List<api.ParticipantResult> o) {
+checkUnnamed98(core.List<api.ParticipantResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParticipantResult(o[0]);
   checkParticipantResult(o[1]);
 }
 
 core.int buildCounterTurnBasedMatchTurn = 0;
 buildTurnBasedMatchTurn() {
   var o = new api.TurnBasedMatchTurn();
   buildCounterTurnBasedMatchTurn++;
   if (buildCounterTurnBasedMatchTurn < 3) {
     o.data = buildTurnBasedMatchDataRequest();
     o.kind = "foo";
     o.matchVersion = 42;
     o.pendingParticipantId = "foo";
-    o.results = buildUnnamed96();
+    o.results = buildUnnamed98();
   }
   buildCounterTurnBasedMatchTurn--;
   return o;
 }
 
 checkTurnBasedMatchTurn(api.TurnBasedMatchTurn o) {
   buildCounterTurnBasedMatchTurn++;
   if (buildCounterTurnBasedMatchTurn < 3) {
     checkTurnBasedMatchDataRequest(o.data);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.matchVersion, unittest.equals(42));
     unittest.expect(o.pendingParticipantId, unittest.equals('foo'));
-    checkUnnamed96(o.results);
+    checkUnnamed98(o.results);
   }
   buildCounterTurnBasedMatchTurn--;
 }
 
 
 main() {
   unittest.group("obj-schema-AchievementDefinition", () {
     unittest.test("to-json--from-json", () {
       var o = buildAchievementDefinition();
       var od = new api.AchievementDefinition.fromJson(o.toJson());
@@ skipping 895 matching lines @@
 
   unittest.group("resource-AchievementDefinitionsResourceApi", () {
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.AchievementDefinitionsResourceApi res = new api.GamesApi(mock).achievementDefinitions;
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("achievements"));
         pathOffset += 12;
@@ skipping 19 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementDefinitionsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AchievementDefinitionsListResponse response) {
+      res.list(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.AchievementDefinitionsListResponse response) {
         checkAchievementDefinitionsListResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-AchievementsResourceApi", () {
     unittest.test("method--increment", () {
 
       var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_achievementId = "foo";
       var arg_stepsToIncrement = 42;
       var arg_consistencyToken = "foo";
       var arg_requestId = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("achievements/"));
         pathOffset += 13;
@@ skipping 25 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["requestId"].first, unittest.equals(arg_requestId));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementIncrementResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.increment(arg_achievementId, arg_stepsToIncrement, consistencyToken: arg_consistencyToken, requestId: arg_requestId).then(unittest.expectAsync(((api.AchievementIncrementResponse response) {
+      res.increment(arg_achievementId, arg_stepsToIncrement, consistencyToken: arg_consistencyToken, requestId: arg_requestId).then(unittest.expectAsync1(((api.AchievementIncrementResponse response) {
         checkAchievementIncrementResponse(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_playerId = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_state = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("players/"));
         pathOffset += 8;
@@ skipping 27 matching lines @@
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
         unittest.expect(queryMap["state"].first, unittest.equals(arg_state));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerAchievementListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_playerId, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken, state: arg_state).then(unittest.expectAsync(((api.PlayerAchievementListResponse response) {
+      res.list(arg_playerId, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken, state: arg_state).then(unittest.expectAsync1(((api.PlayerAchievementListResponse response) {
         checkPlayerAchievementListResponse(response);
       })));
     });
 
     unittest.test("method--reveal", () {
 
       var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_achievementId = "foo";
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("achievements/"));
         pathOffset += 13;
@@ skipping 23 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementRevealResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.reveal(arg_achievementId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync(((api.AchievementRevealResponse response) {
+      res.reveal(arg_achievementId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1(((api.AchievementRevealResponse response) {
         checkAchievementRevealResponse(response);
       })));
     });
 
     unittest.test("method--setStepsAtLeast", () {
 
       var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_achievementId = "foo";
       var arg_steps = 42;
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("achievements/"));
         pathOffset += 13;
@@ skipping 24 matching lines @@
         unittest.expect(core.int.parse(queryMap["steps"].first), unittest.equals(arg_steps));
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementSetStepsAtLeastResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.setStepsAtLeast(arg_achievementId, arg_steps, consistencyToken: arg_consistencyToken).then(unittest.expectAsync(((api.AchievementSetStepsAtLeastResponse response) {
+      res.setStepsAtLeast(arg_achievementId, arg_steps, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1(((api.AchievementSetStepsAtLeastResponse response) {
         checkAchievementSetStepsAtLeastResponse(response);
       })));
     });
 
     unittest.test("method--unlock", () {
 
       var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_achievementId = "foo";
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("achievements/"));
         pathOffset += 13;
@@ skipping 23 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementUnlockResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.unlock(arg_achievementId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync(((api.AchievementUnlockResponse response) {
+      res.unlock(arg_achievementId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1(((api.AchievementUnlockResponse response) {
         checkAchievementUnlockResponse(response);
       })));
     });
 
     unittest.test("method--updateMultiple", () {
 
       var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_request = buildAchievementUpdateMultipleRequest();
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.AchievementUpdateMultipleRequest.fromJson(json);
         checkAchievementUpdateMultipleRequest(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 + 9), unittest.equals("games/v1/"));
@@ skipping 19 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementUpdateMultipleResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.updateMultiple(arg_request, consistencyToken: arg_consistencyToken).then(unittest.expectAsync(((api.AchievementUpdateMultipleResponse response) {
+      res.updateMultiple(arg_request, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1(((api.AchievementUpdateMultipleResponse response) {
         checkAchievementUpdateMultipleResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ApplicationsResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.ApplicationsResourceApi res = new api.GamesApi(mock).applications;
       var arg_applicationId = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_platformType = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("applications/"));
         pathOffset += 13;
@@ skipping 21 matching lines @@
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
         unittest.expect(queryMap["platformType"].first, unittest.equals(arg_platformType));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApplication());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_applicationId, consistencyToken: arg_consistencyToken, language: arg_language, platformType: arg_platformType).then(unittest.expectAsync(((api.Application response) {
+      res.get(arg_applicationId, consistencyToken: arg_consistencyToken, language: arg_language, platformType: arg_platformType).then(unittest.expectAsync1(((api.Application response) {
         checkApplication(response);
       })));
     });
 
     unittest.test("method--played", () {
 
       var mock = new HttpServerMock();
       api.ApplicationsResourceApi res = new api.GamesApi(mock).applications;
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 19), unittest.equals("applications/played"));
         pathOffset += 19;
@@ skipping 16 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.played(consistencyToken: arg_consistencyToken).then(unittest.expectAsync((_) {}));
+      res.played(consistencyToken: arg_consistencyToken).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--verify", () {
 
       var mock = new HttpServerMock();
       api.ApplicationsResourceApi res = new api.GamesApi(mock).applications;
       var arg_applicationId = "foo";
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("applications/"));
         pathOffset += 13;
@@ skipping 23 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApplicationVerifyResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.verify(arg_applicationId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync(((api.ApplicationVerifyResponse response) {
+      res.verify(arg_applicationId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1(((api.ApplicationVerifyResponse response) {
         checkApplicationVerifyResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EventsResourceApi", () {
     unittest.test("method--listByPlayer", () {
 
       var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesApi(mock).events;
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("events"));
         pathOffset += 6;
@@ skipping 19 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerEventListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.listByPlayer(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PlayerEventListResponse response) {
+      res.listByPlayer(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.PlayerEventListResponse response) {
         checkPlayerEventListResponse(response);
       })));
     });
 
     unittest.test("method--listDefinitions", () {
 
       var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesApi(mock).events;
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 16), unittest.equals("eventDefinitions"));
         pathOffset += 16;
@@ skipping 19 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEventDefinitionListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.listDefinitions(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.EventDefinitionListResponse response) {
+      res.listDefinitions(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.EventDefinitionListResponse response) {
         checkEventDefinitionListResponse(response);
       })));
     });
 
     unittest.test("method--record", () {
 
       var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesApi(mock).events;
       var arg_request = buildEventRecordRequest();
       var arg_consistencyToken = "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.EventRecordRequest.fromJson(json);
         checkEventRecordRequest(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 + 9), unittest.equals("games/v1/"));
@@ skipping 20 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEventUpdateResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.record(arg_request, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.EventUpdateResponse response) {
+      res.record(arg_request, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.EventUpdateResponse response) {
         checkEventUpdateResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-LeaderboardsResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.LeaderboardsResourceApi res = new api.GamesApi(mock).leaderboards;
       var arg_leaderboardId = "foo";
       var arg_consistencyToken = "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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("leaderboards/"));
         pathOffset += 13;
@@ skipping 20 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboard());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_leaderboardId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.Leaderboard response) {
+      res.get(arg_leaderboardId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.Leaderboard response) {
         checkLeaderboard(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.LeaderboardsResourceApi res = new api.GamesApi(mock).leaderboards;
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("leaderboards"));
         pathOffset += 12;
@@ skipping 19 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LeaderboardListResponse response) {
+      res.list(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.LeaderboardListResponse response) {
         checkLeaderboardListResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-MetagameResourceApi", () {
     unittest.test("method--getMetagameConfig", () {
 
       var mock = new HttpServerMock();
       api.MetagameResourceApi res = new api.GamesApi(mock).metagame;
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("metagameConfig"));
         pathOffset += 14;
@@ skipping 16 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetagameConfig());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getMetagameConfig(consistencyToken: arg_consistencyToken).then(unittest.expectAsync(((api.MetagameConfig response) {
+      res.getMetagameConfig(consistencyToken: arg_consistencyToken).then(unittest.expectAsync1(((api.MetagameConfig response) {
         checkMetagameConfig(response);
       })));
     });
 
     unittest.test("method--listCategoriesByPlayer", () {
 
       var mock = new HttpServerMock();
       api.MetagameResourceApi res = new api.GamesApi(mock).metagame;
       var arg_playerId = "foo";
       var arg_collection = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("players/"));
         pathOffset += 8;
@@ skipping 29 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCategoryListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.listCategoriesByPlayer(arg_playerId, arg_collection, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CategoryListResponse response) {
+      res.listCategoriesByPlayer(arg_playerId, arg_collection, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.CategoryListResponse response) {
         checkCategoryListResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-PlayersResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.PlayersResourceApi res = new api.GamesApi(mock).players;
       var arg_playerId = "foo";
       var arg_consistencyToken = "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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("players/"));
         pathOffset += 8;
@@ skipping 20 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayer());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_playerId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.Player response) {
+      res.get(arg_playerId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.Player response) {
         checkPlayer(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.PlayersResourceApi res = new api.GamesApi(mock).players;
       var arg_collection = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 19), unittest.equals("players/me/players/"));
         pathOffset += 19;
@@ skipping 22 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_collection, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PlayerListResponse response) {
+      res.list(arg_collection, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.PlayerListResponse response) {
         checkPlayerListResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-PushtokensResourceApi", () {
     unittest.test("method--remove", () {
 
       var mock = new HttpServerMock();
       api.PushtokensResourceApi res = new api.GamesApi(mock).pushtokens;
       var arg_request = buildPushTokenId();
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.PushTokenId.fromJson(json);
         checkPushTokenId(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 + 9), unittest.equals("games/v1/"));
@@ skipping 19 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.remove(arg_request, consistencyToken: arg_consistencyToken).then(unittest.expectAsync((_) {}));
+      res.remove(arg_request, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--update", () {
 
       var mock = new HttpServerMock();
       api.PushtokensResourceApi res = new api.GamesApi(mock).pushtokens;
       var arg_request = buildPushToken();
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.PushToken.fromJson(json);
         checkPushToken(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 + 9), unittest.equals("games/v1/"));
@@ skipping 19 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, consistencyToken: arg_consistencyToken).then(unittest.expectAsync((_) {}));
+      res.update(arg_request, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1((_) {}));
     });
 
   });
 
 
   unittest.group("resource-QuestMilestonesResourceApi", () {
     unittest.test("method--claim", () {
 
       var mock = new HttpServerMock();
       api.QuestMilestonesResourceApi res = new api.GamesApi(mock).questMilestones;
       var arg_questId = "foo";
       var arg_milestoneId = "foo";
       var arg_requestId = "foo";
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("quests/"));
         pathOffset += 7;
@@ skipping 31 matching lines @@
         unittest.expect(queryMap["requestId"].first, unittest.equals(arg_requestId));
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.claim(arg_questId, arg_milestoneId, arg_requestId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync((_) {}));
+      res.claim(arg_questId, arg_milestoneId, arg_requestId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1((_) {}));
     });
 
   });
 
 
   unittest.group("resource-QuestsResourceApi", () {
     unittest.test("method--accept", () {
 
       var mock = new HttpServerMock();
       api.QuestsResourceApi res = new api.GamesApi(mock).quests;
       var arg_questId = "foo";
       var arg_consistencyToken = "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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("quests/"));
         pathOffset += 7;
@@ skipping 24 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildQuest());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.accept(arg_questId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.Quest response) {
+      res.accept(arg_questId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.Quest response) {
         checkQuest(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.QuestsResourceApi res = new api.GamesApi(mock).quests;
       var arg_playerId = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("players/"));
         pathOffset += 8;
@@ skipping 26 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildQuestListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_playerId, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.QuestListResponse response) {
+      res.list(arg_playerId, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.QuestListResponse response) {
         checkQuestListResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-RevisionsResourceApi", () {
     unittest.test("method--check", () {
 
       var mock = new HttpServerMock();
       api.RevisionsResourceApi res = new api.GamesApi(mock).revisions;
       var arg_clientRevision = "foo";
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("revisions/check"));
         pathOffset += 15;
@@ skipping 17 matching lines @@
         unittest.expect(queryMap["clientRevision"].first, unittest.equals(arg_clientRevision));
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRevisionCheckResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.check(arg_clientRevision, consistencyToken: arg_consistencyToken).then(unittest.expectAsync(((api.RevisionCheckResponse response) {
+      res.check(arg_clientRevision, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1(((api.RevisionCheckResponse response) {
         checkRevisionCheckResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-RoomsResourceApi", () {
     unittest.test("method--create", () {
 
       var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_request = buildRoomCreateRequest();
       var arg_consistencyToken = "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.RoomCreateRequest.fromJson(json);
         checkRoomCreateRequest(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 + 9), unittest.equals("games/v1/"));
@@ skipping 20 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.Room response) {
+      res.create(arg_request, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.Room response) {
         checkRoom(response);
       })));
     });
 
     unittest.test("method--decline", () {
 
       var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_roomId = "foo";
       var arg_consistencyToken = "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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("rooms/"));
         pathOffset += 6;
@@ skipping 24 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.decline(arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.Room response) {
+      res.decline(arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.Room response) {
         checkRoom(response);
       })));
     });
 
     unittest.test("method--dismiss", () {
 
       var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_roomId = "foo";
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("rooms/"));
         pathOffset += 6;
@@ skipping 23 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.dismiss(arg_roomId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync((_) {}));
+      res.dismiss(arg_roomId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_roomId = "foo";
       var arg_consistencyToken = "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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("rooms/"));
         pathOffset += 6;
@@ skipping 20 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.Room response) {
+      res.get(arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.Room response) {
         checkRoom(response);
       })));
     });
 
     unittest.test("method--join", () {
 
       var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_request = buildRoomJoinRequest();
       var arg_roomId = "foo";
       var arg_consistencyToken = "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.RoomJoinRequest.fromJson(json);
         checkRoomJoinRequest(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 + 9), unittest.equals("games/v1/"));
@@ skipping 27 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.join(arg_request, arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.Room response) {
+      res.join(arg_request, arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.Room response) {
         checkRoom(response);
       })));
     });
 
     unittest.test("method--leave", () {
 
       var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_request = buildRoomLeaveRequest();
       var arg_roomId = "foo";
       var arg_consistencyToken = "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.RoomLeaveRequest.fromJson(json);
         checkRoomLeaveRequest(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 + 9), unittest.equals("games/v1/"));
@@ skipping 27 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.leave(arg_request, arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.Room response) {
+      res.leave(arg_request, arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.Room response) {
         checkRoom(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 5), unittest.equals("rooms"));
         pathOffset += 5;
@@ skipping 19 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoomList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.RoomList response) {
+      res.list(consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.RoomList response) {
         checkRoomList(response);
       })));
     });
 
     unittest.test("method--reportStatus", () {
 
       var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_request = buildRoomP2PStatuses();
       var arg_roomId = "foo";
       var arg_consistencyToken = "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.RoomP2PStatuses.fromJson(json);
         checkRoomP2PStatuses(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 + 9), unittest.equals("games/v1/"));
@@ skipping 27 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoomStatus());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.reportStatus(arg_request, arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.RoomStatus response) {
+      res.reportStatus(arg_request, arg_roomId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.RoomStatus response) {
         checkRoomStatus(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ScoresResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_playerId = "foo";
       var arg_leaderboardId = "foo";
       var arg_timeSpan = "foo";
       var arg_consistencyToken = "foo";
       var arg_includeRankType = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("players/"));
         pathOffset += 8;
@@ skipping 37 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerLeaderboardScoreListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_playerId, arg_leaderboardId, arg_timeSpan, consistencyToken: arg_consistencyToken, includeRankType: arg_includeRankType, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PlayerLeaderboardScoreListResponse response) {
+      res.get(arg_playerId, arg_leaderboardId, arg_timeSpan, consistencyToken: arg_consistencyToken, includeRankType: arg_includeRankType, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.PlayerLeaderboardScoreListResponse response) {
         checkPlayerLeaderboardScoreListResponse(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_leaderboardId = "foo";
       var arg_collection = "foo";
       var arg_timeSpan = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("leaderboards/"));
         pathOffset += 13;
@@ skipping 30 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardScores());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_leaderboardId, arg_collection, arg_timeSpan, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LeaderboardScores response) {
+      res.list(arg_leaderboardId, arg_collection, arg_timeSpan, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.LeaderboardScores response) {
         checkLeaderboardScores(response);
       })));
     });
 
     unittest.test("method--listWindow", () {
 
       var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_leaderboardId = "foo";
       var arg_collection = "foo";
       var arg_timeSpan = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_resultsAbove = 42;
       var arg_returnTopIfAbsent = true;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("leaderboards/"));
         pathOffset += 13;
@@ skipping 32 matching lines @@
         unittest.expect(core.int.parse(queryMap["resultsAbove"].first), unittest.equals(arg_resultsAbove));
         unittest.expect(queryMap["returnTopIfAbsent"].first, unittest.equals("$arg_returnTopIfAbsent"));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardScores());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.listWindow(arg_leaderboardId, arg_collection, arg_timeSpan, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken, resultsAbove: arg_resultsAbove, returnTopIfAbsent: arg_returnTopIfAbsent).then(unittest.expectAsync(((api.LeaderboardScores response) {
+      res.listWindow(arg_leaderboardId, arg_collection, arg_timeSpan, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken, resultsAbove: arg_resultsAbove, returnTopIfAbsent: arg_returnTopIfAbsent).then(unittest.expectAsync1(((api.LeaderboardScores response) {
         checkLeaderboardScores(response);
       })));
     });
 
     unittest.test("method--submit", () {
 
       var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_leaderboardId = "foo";
       var arg_score = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_scoreTag = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("leaderboards/"));
         pathOffset += 13;
@@ skipping 26 matching lines @@
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
         unittest.expect(queryMap["scoreTag"].first, unittest.equals(arg_scoreTag));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerScoreResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.submit(arg_leaderboardId, arg_score, consistencyToken: arg_consistencyToken, language: arg_language, scoreTag: arg_scoreTag).then(unittest.expectAsync(((api.PlayerScoreResponse response) {
+      res.submit(arg_leaderboardId, arg_score, consistencyToken: arg_consistencyToken, language: arg_language, scoreTag: arg_scoreTag).then(unittest.expectAsync1(((api.PlayerScoreResponse response) {
         checkPlayerScoreResponse(response);
       })));
     });
 
     unittest.test("method--submitMultiple", () {
 
       var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_request = buildPlayerScoreSubmissionList();
       var arg_consistencyToken = "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.PlayerScoreSubmissionList.fromJson(json);
         checkPlayerScoreSubmissionList(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 + 9), unittest.equals("games/v1/"));
@@ skipping 20 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerScoreListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.submitMultiple(arg_request, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.PlayerScoreListResponse response) {
+      res.submitMultiple(arg_request, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.PlayerScoreListResponse response) {
         checkPlayerScoreListResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-SnapshotsResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.SnapshotsResourceApi res = new api.GamesApi(mock).snapshots;
       var arg_snapshotId = "foo";
       var arg_consistencyToken = "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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("snapshots/"));
         pathOffset += 10;
@@ skipping 20 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSnapshot());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_snapshotId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.Snapshot response) {
+      res.get(arg_snapshotId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.Snapshot response) {
         checkSnapshot(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.SnapshotsResourceApi res = new api.GamesApi(mock).snapshots;
       var arg_playerId = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("players/"));
         pathOffset += 8;
@@ skipping 26 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSnapshotListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_playerId, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SnapshotListResponse response) {
+      res.list(arg_playerId, consistencyToken: arg_consistencyToken, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.SnapshotListResponse response) {
         checkSnapshotListResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-TurnBasedMatchesResourceApi", () {
     unittest.test("method--cancel", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 17), unittest.equals("turnbasedmatches/"));
         pathOffset += 17;
@@ skipping 23 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.cancel(arg_matchId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync((_) {}));
+      res.cancel(arg_matchId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--create", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_request = buildTurnBasedMatchCreateRequest();
       var arg_consistencyToken = "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.TurnBasedMatchCreateRequest.fromJson(json);
         checkTurnBasedMatchCreateRequest(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 + 9), unittest.equals("games/v1/"));
@@ skipping 20 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
+      res.create(arg_request, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
       })));
     });
 
     unittest.test("method--decline", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_consistencyToken = "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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 17), unittest.equals("turnbasedmatches/"));
         pathOffset += 17;
@@ skipping 24 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.decline(arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
+      res.decline(arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
       })));
     });
 
     unittest.test("method--dismiss", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_consistencyToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 17), unittest.equals("turnbasedmatches/"));
         pathOffset += 17;
@@ skipping 23 matching lines @@
         }
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.dismiss(arg_matchId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync((_) {}));
+      res.dismiss(arg_matchId, consistencyToken: arg_consistencyToken).then(unittest.expectAsync1((_) {}));
     });
 
     unittest.test("method--finish", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_request = buildTurnBasedMatchResults();
       var arg_matchId = "foo";
       var arg_consistencyToken = "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.TurnBasedMatchResults.fromJson(json);
         checkTurnBasedMatchResults(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 + 9), unittest.equals("games/v1/"));
@@ skipping 27 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.finish(arg_request, arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
+      res.finish(arg_request, arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
       })));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_consistencyToken = "foo";
       var arg_includeMatchData = true;
       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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 17), unittest.equals("turnbasedmatches/"));
         pathOffset += 17;
@@ skipping 21 matching lines @@
         unittest.expect(queryMap["includeMatchData"].first, unittest.equals("$arg_includeMatchData"));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_matchId, consistencyToken: arg_consistencyToken, includeMatchData: arg_includeMatchData, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
+      res.get(arg_matchId, consistencyToken: arg_consistencyToken, includeMatchData: arg_includeMatchData, language: arg_language).then(unittest.expectAsync1(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
       })));
     });
 
     unittest.test("method--join", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_consistencyToken = "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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 17), unittest.equals("turnbasedmatches/"));
         pathOffset += 17;
@@ skipping 24 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.join(arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
+      res.join(arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
       })));
     });
 
     unittest.test("method--leave", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_consistencyToken = "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;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 17), unittest.equals("turnbasedmatches/"));
         pathOffset += 17;
@@ skipping 24 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.leave(arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
+      res.leave(arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
       })));
     });
 
     unittest.test("method--leaveTurn", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_matchVersion = 42;
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_pendingParticipantId = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 17), unittest.equals("turnbasedmatches/"));
         pathOffset += 17;
@@ skipping 26 matching lines @@
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
         unittest.expect(queryMap["pendingParticipantId"].first, unittest.equals(arg_pendingParticipantId));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.leaveTurn(arg_matchId, arg_matchVersion, consistencyToken: arg_consistencyToken, language: arg_language, pendingParticipantId: arg_pendingParticipantId).then(unittest.expectAsync(((api.TurnBasedMatch response) {
+      res.leaveTurn(arg_matchId, arg_matchVersion, consistencyToken: arg_consistencyToken, language: arg_language, pendingParticipantId: arg_pendingParticipantId).then(unittest.expectAsync1(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_consistencyToken = "foo";
       var arg_includeMatchData = true;
       var arg_language = "foo";
       var arg_maxCompletedMatches = 42;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 16), unittest.equals("turnbasedmatches"));
         pathOffset += 16;
@@ skipping 21 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatchList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(consistencyToken: arg_consistencyToken, includeMatchData: arg_includeMatchData, language: arg_language, maxCompletedMatches: arg_maxCompletedMatches, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TurnBasedMatchList response) {
+      res.list(consistencyToken: arg_consistencyToken, includeMatchData: arg_includeMatchData, language: arg_language, maxCompletedMatches: arg_maxCompletedMatches, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.TurnBasedMatchList response) {
         checkTurnBasedMatchList(response);
       })));
     });
 
     unittest.test("method--rematch", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_consistencyToken = "foo";
       var arg_language = "foo";
       var arg_requestId = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 17), unittest.equals("turnbasedmatches/"));
         pathOffset += 17;
@@ skipping 25 matching lines @@
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
         unittest.expect(queryMap["requestId"].first, unittest.equals(arg_requestId));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatchRematch());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.rematch(arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language, requestId: arg_requestId).then(unittest.expectAsync(((api.TurnBasedMatchRematch response) {
+      res.rematch(arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language, requestId: arg_requestId).then(unittest.expectAsync1(((api.TurnBasedMatchRematch response) {
         checkTurnBasedMatchRematch(response);
       })));
     });
 
     unittest.test("method--sync", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_consistencyToken = "foo";
       var arg_includeMatchData = true;
       var arg_language = "foo";
       var arg_maxCompletedMatches = 42;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("games/v1/"));
         pathOffset += 9;
         unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("turnbasedmatches/sync"));
         pathOffset += 21;
@@ skipping 21 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatchSync());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.sync(consistencyToken: arg_consistencyToken, includeMatchData: arg_includeMatchData, language: arg_language, maxCompletedMatches: arg_maxCompletedMatches, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TurnBasedMatchSync response) {
+      res.sync(consistencyToken: arg_consistencyToken, includeMatchData: arg_includeMatchData, language: arg_language, maxCompletedMatches: arg_maxCompletedMatches, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.TurnBasedMatchSync response) {
         checkTurnBasedMatchSync(response);
       })));
     });
 
     unittest.test("method--takeTurn", () {
 
       var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_request = buildTurnBasedMatchTurn();
       var arg_matchId = "foo";
       var arg_consistencyToken = "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.TurnBasedMatchTurn.fromJson(json);
         checkTurnBasedMatchTurn(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 + 9), unittest.equals("games/v1/"));
@@ skipping 27 matching lines @@
         unittest.expect(queryMap["consistencyToken"].first, unittest.equals(arg_consistencyToken));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.takeTurn(arg_request, arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
+      res.takeTurn(arg_request, arg_matchId, consistencyToken: arg_consistencyToken, language: arg_language).then(unittest.expectAsync1(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
       })));
     });
 
   });
 
 
 }