Api-Roll 50: 2017-06-12

generated/googleapis/test/servicemanagement/v1_test.dart

 library googleapis.servicemanagement.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/servicemanagement/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 buildCounterAdvice = 0;
 buildAdvice() {
   var o = new api.Advice();
   buildCounterAdvice++;
   if (buildCounterAdvice < 3) {
     o.description = "foo";
   }
   buildCounterAdvice--;
   return o;
 }
 
 checkAdvice(api.Advice o) {
   buildCounterAdvice++;
   if (buildCounterAdvice < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
   }
   buildCounterAdvice--;
 }
 
-buildUnnamed1058() {
+buildUnnamed1065() {
   var o = new core.List<api.Method>();
   o.add(buildMethod());
   o.add(buildMethod());
   return o;
 }
 
-checkUnnamed1058(core.List<api.Method> o) {
+checkUnnamed1065(core.List<api.Method> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMethod(o[0]);
   checkMethod(o[1]);
 }
 
-buildUnnamed1059() {
+buildUnnamed1066() {
   var o = new core.List<api.Mixin>();
   o.add(buildMixin());
   o.add(buildMixin());
   return o;
 }
 
-checkUnnamed1059(core.List<api.Mixin> o) {
+checkUnnamed1066(core.List<api.Mixin> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMixin(o[0]);
   checkMixin(o[1]);
 }
 
-buildUnnamed1060() {
+buildUnnamed1067() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed1060(core.List<api.Option> o) {
+checkUnnamed1067(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
 }
 
 core.int buildCounterApi = 0;
 buildApi() {
   var o = new api.Api();
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    o.methods = buildUnnamed1058();
-    o.mixins = buildUnnamed1059();
+    o.methods = buildUnnamed1065();
+    o.mixins = buildUnnamed1066();
     o.name = "foo";
-    o.options = buildUnnamed1060();
+    o.options = buildUnnamed1067();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
     o.version = "foo";
   }
   buildCounterApi--;
   return o;
 }
 
 checkApi(api.Api o) {
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    checkUnnamed1058(o.methods);
-    checkUnnamed1059(o.mixins);
+    checkUnnamed1065(o.methods);
+    checkUnnamed1066(o.mixins);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1060(o.options);
+    checkUnnamed1067(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals('foo'));
   }
   buildCounterApi--;
 }
 
-buildUnnamed1061() {
+buildUnnamed1068() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed1061(core.List<api.AuditLogConfig> o) {
+checkUnnamed1068(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
 }
 
-buildUnnamed1062() {
+buildUnnamed1069() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1062(core.List<core.String> o) {
+checkUnnamed1069(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 buildCounterAuditConfig = 0;
 buildAuditConfig() {
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed1061();
-    o.exemptedMembers = buildUnnamed1062();
+    o.auditLogConfigs = buildUnnamed1068();
+    o.exemptedMembers = buildUnnamed1069();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
   return o;
 }
 
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed1061(o.auditLogConfigs);
-    checkUnnamed1062(o.exemptedMembers);
+    checkUnnamed1068(o.auditLogConfigs);
+    checkUnnamed1069(o.exemptedMembers);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
 }
 
-buildUnnamed1063() {
+buildUnnamed1070() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1063(core.List<core.String> o) {
+checkUnnamed1070(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 buildCounterAuditLogConfig = 0;
 buildAuditLogConfig() {
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed1063();
+    o.exemptedMembers = buildUnnamed1070();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
   return o;
 }
 
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed1063(o.exemptedMembers);
+    checkUnnamed1070(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
 }
 
 core.int buildCounterAuthProvider = 0;
 buildAuthProvider() {
   var o = new api.AuthProvider();
   buildCounterAuthProvider++;
   if (buildCounterAuthProvider < 3) {
@@ skipping 31 matching lines @@
 
 checkAuthRequirement(api.AuthRequirement o) {
   buildCounterAuthRequirement++;
   if (buildCounterAuthRequirement < 3) {
     unittest.expect(o.audiences, unittest.equals('foo'));
     unittest.expect(o.providerId, unittest.equals('foo'));
   }
   buildCounterAuthRequirement--;
 }
 
-buildUnnamed1064() {
+buildUnnamed1071() {
   var o = new core.List<api.AuthProvider>();
   o.add(buildAuthProvider());
   o.add(buildAuthProvider());
   return o;
 }
 
-checkUnnamed1064(core.List<api.AuthProvider> o) {
+checkUnnamed1071(core.List<api.AuthProvider> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthProvider(o[0]);
   checkAuthProvider(o[1]);
 }
 
-buildUnnamed1065() {
+buildUnnamed1072() {
   var o = new core.List<api.AuthenticationRule>();
   o.add(buildAuthenticationRule());
   o.add(buildAuthenticationRule());
   return o;
 }
 
-checkUnnamed1065(core.List<api.AuthenticationRule> o) {
+checkUnnamed1072(core.List<api.AuthenticationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthenticationRule(o[0]);
   checkAuthenticationRule(o[1]);
 }
 
 core.int buildCounterAuthentication = 0;
 buildAuthentication() {
   var o = new api.Authentication();
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    o.providers = buildUnnamed1064();
-    o.rules = buildUnnamed1065();
+    o.providers = buildUnnamed1071();
+    o.rules = buildUnnamed1072();
   }
   buildCounterAuthentication--;
   return o;
 }
 
 checkAuthentication(api.Authentication o) {
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    checkUnnamed1064(o.providers);
-    checkUnnamed1065(o.rules);
+    checkUnnamed1071(o.providers);
+    checkUnnamed1072(o.rules);
   }
   buildCounterAuthentication--;
 }
 
-buildUnnamed1066() {
+buildUnnamed1073() {
   var o = new core.List<api.AuthRequirement>();
   o.add(buildAuthRequirement());
   o.add(buildAuthRequirement());
   return o;
 }
 
-checkUnnamed1066(core.List<api.AuthRequirement> o) {
+checkUnnamed1073(core.List<api.AuthRequirement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthRequirement(o[0]);
   checkAuthRequirement(o[1]);
 }
 
 core.int buildCounterAuthenticationRule = 0;
 buildAuthenticationRule() {
   var o = new api.AuthenticationRule();
   buildCounterAuthenticationRule++;
   if (buildCounterAuthenticationRule < 3) {
     o.allowWithoutCredential = true;
     o.customAuth = buildCustomAuthRequirements();
     o.oauth = buildOAuthRequirements();
-    o.requirements = buildUnnamed1066();
+    o.requirements = buildUnnamed1073();
     o.selector = "foo";
   }
   buildCounterAuthenticationRule--;
   return o;
 }
 
 checkAuthenticationRule(api.AuthenticationRule o) {
   buildCounterAuthenticationRule++;
   if (buildCounterAuthenticationRule < 3) {
     unittest.expect(o.allowWithoutCredential, unittest.isTrue);
     checkCustomAuthRequirements(o.customAuth);
     checkOAuthRequirements(o.oauth);
-    checkUnnamed1066(o.requirements);
+    checkUnnamed1073(o.requirements);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterAuthenticationRule--;
 }
 
 core.int buildCounterAuthorizationConfig = 0;
 buildAuthorizationConfig() {
   var o = new api.AuthorizationConfig();
   buildCounterAuthorizationConfig++;
   if (buildCounterAuthorizationConfig < 3) {
     o.provider = "foo";
   }
   buildCounterAuthorizationConfig--;
   return o;
 }
 
 checkAuthorizationConfig(api.AuthorizationConfig o) {
   buildCounterAuthorizationConfig++;
   if (buildCounterAuthorizationConfig < 3) {
     unittest.expect(o.provider, unittest.equals('foo'));
   }
   buildCounterAuthorizationConfig--;
 }
 
-buildUnnamed1067() {
+buildUnnamed1074() {
   var o = new core.List<api.BackendRule>();
   o.add(buildBackendRule());
   o.add(buildBackendRule());
   return o;
 }
 
-checkUnnamed1067(core.List<api.BackendRule> o) {
+checkUnnamed1074(core.List<api.BackendRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendRule(o[0]);
   checkBackendRule(o[1]);
 }
 
 core.int buildCounterBackend = 0;
 buildBackend() {
   var o = new api.Backend();
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    o.rules = buildUnnamed1067();
+    o.rules = buildUnnamed1074();
   }
   buildCounterBackend--;
   return o;
 }
 
 checkBackend(api.Backend o) {
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    checkUnnamed1067(o.rules);
+    checkUnnamed1074(o.rules);
   }
   buildCounterBackend--;
 }
 
 core.int buildCounterBackendRule = 0;
 buildBackendRule() {
   var o = new api.BackendRule();
   buildCounterBackendRule++;
   if (buildCounterBackendRule < 3) {
     o.address = "foo";
     o.deadline = 42.0;
     o.minDeadline = 42.0;
     o.selector = "foo";
   }
   buildCounterBackendRule--;
   return o;
 }
 
 checkBackendRule(api.BackendRule o) {
   buildCounterBackendRule++;
   if (buildCounterBackendRule < 3) {
     unittest.expect(o.address, unittest.equals('foo'));
     unittest.expect(o.deadline, unittest.equals(42.0));
     unittest.expect(o.minDeadline, unittest.equals(42.0));
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterBackendRule--;
 }
 
-buildUnnamed1068() {
+buildUnnamed1075() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1068(core.List<core.String> o) {
+checkUnnamed1075(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 buildCounterBinding = 0;
 buildBinding() {
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed1068();
+    o.condition = buildExpr();
+    o.members = buildUnnamed1075();
     o.role = "foo";
   }
   buildCounterBinding--;
   return o;
 }
 
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed1068(o.members);
+    checkExpr(o.condition);
+    checkUnnamed1075(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
 }
 
-buildUnnamed1069() {
+buildUnnamed1076() {
   var o = new core.List<api.ConfigChange>();
   o.add(buildConfigChange());
   o.add(buildConfigChange());
   return o;
 }
 
-checkUnnamed1069(core.List<api.ConfigChange> o) {
+checkUnnamed1076(core.List<api.ConfigChange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConfigChange(o[0]);
   checkConfigChange(o[1]);
 }
 
 core.int buildCounterChangeReport = 0;
 buildChangeReport() {
   var o = new api.ChangeReport();
   buildCounterChangeReport++;
   if (buildCounterChangeReport < 3) {
-    o.configChanges = buildUnnamed1069();
+    o.configChanges = buildUnnamed1076();
   }
   buildCounterChangeReport--;
   return o;
 }
 
 checkChangeReport(api.ChangeReport o) {
   buildCounterChangeReport++;
   if (buildCounterChangeReport < 3) {
-    checkUnnamed1069(o.configChanges);
+    checkUnnamed1076(o.configChanges);
   }
   buildCounterChangeReport--;
 }
 
 core.int buildCounterCloudAuditOptions = 0;
 buildCloudAuditOptions() {
   var o = new api.CloudAuditOptions();
   buildCounterCloudAuditOptions++;
   if (buildCounterCloudAuditOptions < 3) {
     o.logName = "foo";
   }
   buildCounterCloudAuditOptions--;
   return o;
 }
 
 checkCloudAuditOptions(api.CloudAuditOptions o) {
   buildCounterCloudAuditOptions++;
   if (buildCounterCloudAuditOptions < 3) {
     unittest.expect(o.logName, unittest.equals('foo'));
   }
   buildCounterCloudAuditOptions--;
 }
 
-buildUnnamed1070() {
+buildUnnamed1077() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1070(core.List<core.String> o) {
+checkUnnamed1077(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 buildCounterCondition = 0;
 buildCondition() {
   var o = new api.Condition();
   buildCounterCondition++;
   if (buildCounterCondition < 3) {
     o.iam = "foo";
     o.op = "foo";
     o.svc = "foo";
     o.sys = "foo";
     o.value = "foo";
-    o.values = buildUnnamed1070();
+    o.values = buildUnnamed1077();
   }
   buildCounterCondition--;
   return o;
 }
 
 checkCondition(api.Condition o) {
   buildCounterCondition++;
   if (buildCounterCondition < 3) {
     unittest.expect(o.iam, unittest.equals('foo'));
     unittest.expect(o.op, unittest.equals('foo'));
     unittest.expect(o.svc, unittest.equals('foo'));
     unittest.expect(o.sys, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
-    checkUnnamed1070(o.values);
+    checkUnnamed1077(o.values);
   }
   buildCounterCondition--;
 }
 
-buildUnnamed1071() {
+buildUnnamed1078() {
   var o = new core.List<api.Advice>();
   o.add(buildAdvice());
   o.add(buildAdvice());
   return o;
 }
 
-checkUnnamed1071(core.List<api.Advice> o) {
+checkUnnamed1078(core.List<api.Advice> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdvice(o[0]);
   checkAdvice(o[1]);
 }
 
 core.int buildCounterConfigChange = 0;
 buildConfigChange() {
   var o = new api.ConfigChange();
   buildCounterConfigChange++;
   if (buildCounterConfigChange < 3) {
-    o.advices = buildUnnamed1071();
+    o.advices = buildUnnamed1078();
     o.changeType = "foo";
     o.element = "foo";
     o.newValue = "foo";
     o.oldValue = "foo";
   }
   buildCounterConfigChange--;
   return o;
 }
 
 checkConfigChange(api.ConfigChange o) {
   buildCounterConfigChange++;
   if (buildCounterConfigChange < 3) {
-    checkUnnamed1071(o.advices);
+    checkUnnamed1078(o.advices);
     unittest.expect(o.changeType, unittest.equals('foo'));
     unittest.expect(o.element, unittest.equals('foo'));
     unittest.expect(o.newValue, unittest.equals('foo'));
     unittest.expect(o.oldValue, unittest.equals('foo'));
   }
   buildCounterConfigChange--;
 }
 
 core.int buildCounterConfigFile = 0;
 buildConfigFile() {
@@ skipping 30 matching lines @@
 }
 
 checkConfigRef(api.ConfigRef o) {
   buildCounterConfigRef++;
   if (buildCounterConfigRef < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterConfigRef--;
 }
 
-buildUnnamed1072() {
+buildUnnamed1079() {
   var o = new core.List<api.ConfigFile>();
   o.add(buildConfigFile());
   o.add(buildConfigFile());
   return o;
 }
 
-checkUnnamed1072(core.List<api.ConfigFile> o) {
+checkUnnamed1079(core.List<api.ConfigFile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConfigFile(o[0]);
   checkConfigFile(o[1]);
 }
 
 core.int buildCounterConfigSource = 0;
 buildConfigSource() {
   var o = new api.ConfigSource();
   buildCounterConfigSource++;
   if (buildCounterConfigSource < 3) {
-    o.files = buildUnnamed1072();
+    o.files = buildUnnamed1079();
     o.id = "foo";
   }
   buildCounterConfigSource--;
   return o;
 }
 
 checkConfigSource(api.ConfigSource o) {
   buildCounterConfigSource++;
   if (buildCounterConfigSource < 3) {
-    checkUnnamed1072(o.files);
+    checkUnnamed1079(o.files);
     unittest.expect(o.id, unittest.equals('foo'));
   }
   buildCounterConfigSource--;
 }
 
-buildUnnamed1073() {
+buildUnnamed1080() {
   var o = new core.List<api.ContextRule>();
   o.add(buildContextRule());
   o.add(buildContextRule());
   return o;
 }
 
-checkUnnamed1073(core.List<api.ContextRule> o) {
+checkUnnamed1080(core.List<api.ContextRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContextRule(o[0]);
   checkContextRule(o[1]);
 }
 
 core.int buildCounterContext = 0;
 buildContext() {
   var o = new api.Context();
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    o.rules = buildUnnamed1073();
+    o.rules = buildUnnamed1080();
   }
   buildCounterContext--;
   return o;
 }
 
 checkContext(api.Context o) {
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    checkUnnamed1073(o.rules);
+    checkUnnamed1080(o.rules);
   }
   buildCounterContext--;
 }
 
-buildUnnamed1074() {
+buildUnnamed1081() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1074(core.List<core.String> o) {
+checkUnnamed1081(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'));
 }
 
-buildUnnamed1075() {
+buildUnnamed1082() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1075(core.List<core.String> o) {
+checkUnnamed1082(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 buildCounterContextRule = 0;
 buildContextRule() {
   var o = new api.ContextRule();
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    o.provided = buildUnnamed1074();
-    o.requested = buildUnnamed1075();
+    o.provided = buildUnnamed1081();
+    o.requested = buildUnnamed1082();
     o.selector = "foo";
   }
   buildCounterContextRule--;
   return o;
 }
 
 checkContextRule(api.ContextRule o) {
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    checkUnnamed1074(o.provided);
-    checkUnnamed1075(o.requested);
+    checkUnnamed1081(o.provided);
+    checkUnnamed1082(o.requested);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterContextRule--;
 }
 
 core.int buildCounterControl = 0;
 buildControl() {
   var o = new api.Control();
   buildCounterControl++;
   if (buildCounterControl < 3) {
@@ skipping 44 matching lines @@
 }
 
 checkCustomAuthRequirements(api.CustomAuthRequirements o) {
   buildCounterCustomAuthRequirements++;
   if (buildCounterCustomAuthRequirements < 3) {
     unittest.expect(o.provider, unittest.equals('foo'));
   }
   buildCounterCustomAuthRequirements--;
 }
 
-buildUnnamed1076() {
+buildUnnamed1083() {
   var o = new core.List<api.CustomErrorRule>();
   o.add(buildCustomErrorRule());
   o.add(buildCustomErrorRule());
   return o;
 }
 
-checkUnnamed1076(core.List<api.CustomErrorRule> o) {
+checkUnnamed1083(core.List<api.CustomErrorRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomErrorRule(o[0]);
   checkCustomErrorRule(o[1]);
 }
 
-buildUnnamed1077() {
+buildUnnamed1084() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1077(core.List<core.String> o) {
+checkUnnamed1084(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 buildCounterCustomError = 0;
 buildCustomError() {
   var o = new api.CustomError();
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    o.rules = buildUnnamed1076();
-    o.types = buildUnnamed1077();
+    o.rules = buildUnnamed1083();
+    o.types = buildUnnamed1084();
   }
   buildCounterCustomError--;
   return o;
 }
 
 checkCustomError(api.CustomError o) {
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    checkUnnamed1076(o.rules);
-    checkUnnamed1077(o.types);
+    checkUnnamed1083(o.rules);
+    checkUnnamed1084(o.types);
   }
   buildCounterCustomError--;
 }
 
 core.int buildCounterCustomErrorRule = 0;
 buildCustomErrorRule() {
   var o = new api.CustomErrorRule();
   buildCounterCustomErrorRule++;
   if (buildCounterCustomErrorRule < 3) {
     o.isErrorType = true;
@@ skipping 102 matching lines @@
 }
 
 checkDisableServiceRequest(api.DisableServiceRequest o) {
   buildCounterDisableServiceRequest++;
   if (buildCounterDisableServiceRequest < 3) {
     unittest.expect(o.consumerId, unittest.equals('foo'));
   }
   buildCounterDisableServiceRequest--;
 }
 
-buildUnnamed1078() {
+buildUnnamed1085() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed1078(core.List<api.Page> o) {
+checkUnnamed1085(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
 }
 
-buildUnnamed1079() {
+buildUnnamed1086() {
   var o = new core.List<api.DocumentationRule>();
   o.add(buildDocumentationRule());
   o.add(buildDocumentationRule());
   return o;
 }
 
-checkUnnamed1079(core.List<api.DocumentationRule> o) {
+checkUnnamed1086(core.List<api.DocumentationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDocumentationRule(o[0]);
   checkDocumentationRule(o[1]);
 }
 
 core.int buildCounterDocumentation = 0;
 buildDocumentation() {
   var o = new api.Documentation();
   buildCounterDocumentation++;
   if (buildCounterDocumentation < 3) {
     o.documentationRootUrl = "foo";
     o.overview = "foo";
-    o.pages = buildUnnamed1078();
-    o.rules = buildUnnamed1079();
+    o.pages = buildUnnamed1085();
+    o.rules = buildUnnamed1086();
     o.summary = "foo";
   }
   buildCounterDocumentation--;
   return o;
 }
 
 checkDocumentation(api.Documentation o) {
   buildCounterDocumentation++;
   if (buildCounterDocumentation < 3) {
     unittest.expect(o.documentationRootUrl, unittest.equals('foo'));
     unittest.expect(o.overview, unittest.equals('foo'));
-    checkUnnamed1078(o.pages);
-    checkUnnamed1079(o.rules);
+    checkUnnamed1085(o.pages);
+    checkUnnamed1086(o.rules);
     unittest.expect(o.summary, unittest.equals('foo'));
   }
   buildCounterDocumentation--;
 }
 
 core.int buildCounterDocumentationRule = 0;
 buildDocumentationRule() {
   var o = new api.DocumentationRule();
   buildCounterDocumentationRule++;
   if (buildCounterDocumentationRule < 3) {
@@ skipping 27 matching lines @@
 }
 
 checkEnableServiceRequest(api.EnableServiceRequest o) {
   buildCounterEnableServiceRequest++;
   if (buildCounterEnableServiceRequest < 3) {
     unittest.expect(o.consumerId, unittest.equals('foo'));
   }
   buildCounterEnableServiceRequest--;
 }
 
-buildUnnamed1080() {
+buildUnnamed1087() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1080(core.List<core.String> o) {
+checkUnnamed1087(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'));
 }
 
-buildUnnamed1081() {
+buildUnnamed1088() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1081(core.List<core.String> o) {
+checkUnnamed1088(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'));
 }
 
-buildUnnamed1082() {
+buildUnnamed1089() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1082(core.List<core.String> o) {
+checkUnnamed1089(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 buildCounterEndpoint = 0;
 buildEndpoint() {
   var o = new api.Endpoint();
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    o.aliases = buildUnnamed1080();
+    o.aliases = buildUnnamed1087();
     o.allowCors = true;
-    o.apis = buildUnnamed1081();
-    o.features = buildUnnamed1082();
+    o.apis = buildUnnamed1088();
+    o.features = buildUnnamed1089();
     o.name = "foo";
     o.target = "foo";
   }
   buildCounterEndpoint--;
   return o;
 }
 
 checkEndpoint(api.Endpoint o) {
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    checkUnnamed1080(o.aliases);
+    checkUnnamed1087(o.aliases);
     unittest.expect(o.allowCors, unittest.isTrue);
-    checkUnnamed1081(o.apis);
-    checkUnnamed1082(o.features);
+    checkUnnamed1088(o.apis);
+    checkUnnamed1089(o.features);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
   }
   buildCounterEndpoint--;
 }
 
-buildUnnamed1083() {
+buildUnnamed1090() {
   var o = new core.List<api.EnumValue>();
   o.add(buildEnumValue());
   o.add(buildEnumValue());
   return o;
 }
 
-checkUnnamed1083(core.List<api.EnumValue> o) {
+checkUnnamed1090(core.List<api.EnumValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnumValue(o[0]);
   checkEnumValue(o[1]);
 }
 
-buildUnnamed1084() {
+buildUnnamed1091() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed1084(core.List<api.Option> o) {
+checkUnnamed1091(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
 }
 
 core.int buildCounterEnum = 0;
 buildEnum() {
   var o = new api.Enum();
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    o.enumvalue = buildUnnamed1083();
+    o.enumvalue = buildUnnamed1090();
     o.name = "foo";
-    o.options = buildUnnamed1084();
+    o.options = buildUnnamed1091();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
   buildCounterEnum--;
   return o;
 }
 
 checkEnum(api.Enum o) {
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    checkUnnamed1083(o.enumvalue);
+    checkUnnamed1090(o.enumvalue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1084(o.options);
+    checkUnnamed1091(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterEnum--;
 }
 
-buildUnnamed1085() {
+buildUnnamed1092() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed1085(core.List<api.Option> o) {
+checkUnnamed1092(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
 }
 
 core.int buildCounterEnumValue = 0;
 buildEnumValue() {
   var o = new api.EnumValue();
   buildCounterEnumValue++;
   if (buildCounterEnumValue < 3) {
     o.name = "foo";
     o.number = 42;
-    o.options = buildUnnamed1085();
+    o.options = buildUnnamed1092();
   }
   buildCounterEnumValue--;
   return o;
 }
 
 checkEnumValue(api.EnumValue o) {
   buildCounterEnumValue++;
   if (buildCounterEnumValue < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
-    checkUnnamed1085(o.options);
+    checkUnnamed1092(o.options);
   }
   buildCounterEnumValue--;
 }
 
 core.int buildCounterExperimental = 0;
 buildExperimental() {
   var o = new api.Experimental();
   buildCounterExperimental++;
   if (buildCounterExperimental < 3) {
     o.authorization = buildAuthorizationConfig();
   }
   buildCounterExperimental--;
   return o;
 }
 
 checkExperimental(api.Experimental o) {
   buildCounterExperimental++;
   if (buildCounterExperimental < 3) {
     checkAuthorizationConfig(o.authorization);
   }
   buildCounterExperimental--;
 }
 
-buildUnnamed1086() {
+core.int buildCounterExpr = 0;
+buildExpr() {
+  var o = new api.Expr();
+  buildCounterExpr++;
+  if (buildCounterExpr < 3) {
+    o.description = "foo";
+    o.expression = "foo";
+    o.location = "foo";
+    o.title = "foo";
+  }
+  buildCounterExpr--;
+  return o;
+}
+
+checkExpr(api.Expr o) {
+  buildCounterExpr++;
+  if (buildCounterExpr < 3) {
+    unittest.expect(o.description, unittest.equals('foo'));
+    unittest.expect(o.expression, unittest.equals('foo'));
+    unittest.expect(o.location, unittest.equals('foo'));
+    unittest.expect(o.title, unittest.equals('foo'));
+  }
+  buildCounterExpr--;
+}
+
+buildUnnamed1093() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed1086(core.List<api.Option> o) {
+checkUnnamed1093(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
 }
 
 core.int buildCounterField = 0;
 buildField() {
   var o = new api.Field();
   buildCounterField++;
   if (buildCounterField < 3) {
     o.cardinality = "foo";
     o.defaultValue = "foo";
     o.jsonName = "foo";
     o.kind = "foo";
     o.name = "foo";
     o.number = 42;
     o.oneofIndex = 42;
-    o.options = buildUnnamed1086();
+    o.options = buildUnnamed1093();
     o.packed = true;
     o.typeUrl = "foo";
   }
   buildCounterField--;
   return o;
 }
 
 checkField(api.Field o) {
   buildCounterField++;
   if (buildCounterField < 3) {
     unittest.expect(o.cardinality, unittest.equals('foo'));
     unittest.expect(o.defaultValue, unittest.equals('foo'));
     unittest.expect(o.jsonName, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
     unittest.expect(o.oneofIndex, unittest.equals(42));
-    checkUnnamed1086(o.options);
+    checkUnnamed1093(o.options);
     unittest.expect(o.packed, unittest.isTrue);
     unittest.expect(o.typeUrl, unittest.equals('foo'));
   }
   buildCounterField--;
 }
 
-buildUnnamed1087() {
+buildUnnamed1094() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1087(core.List<core.String> o) {
+checkUnnamed1094(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 buildCounterFlowOperationMetadata = 0;
 buildFlowOperationMetadata() {
   var o = new api.FlowOperationMetadata();
   buildCounterFlowOperationMetadata++;
   if (buildCounterFlowOperationMetadata < 3) {
     o.cancelState = "foo";
     o.deadline = "foo";
     o.flowName = "foo";
-    o.resourceNames = buildUnnamed1087();
+    o.resourceNames = buildUnnamed1094();
     o.startTime = "foo";
   }
   buildCounterFlowOperationMetadata--;
   return o;
 }
 
 checkFlowOperationMetadata(api.FlowOperationMetadata o) {
   buildCounterFlowOperationMetadata++;
   if (buildCounterFlowOperationMetadata < 3) {
     unittest.expect(o.cancelState, unittest.equals('foo'));
     unittest.expect(o.deadline, unittest.equals('foo'));
     unittest.expect(o.flowName, unittest.equals('foo'));
-    checkUnnamed1087(o.resourceNames);
+    checkUnnamed1094(o.resourceNames);
     unittest.expect(o.startTime, unittest.equals('foo'));
   }
   buildCounterFlowOperationMetadata--;
 }
 
-buildUnnamed1088() {
+buildUnnamed1095() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   o["y"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   return o;
 }
 
-checkUnnamed1088(core.Map<core.String, core.Object> o) {
+checkUnnamed1095(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o["y"]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed1089() {
+buildUnnamed1096() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   o["y"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   return o;
 }
 
-checkUnnamed1089(core.Map<core.String, core.Object> o) {
+checkUnnamed1096(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map; unittest.expect(casted3, unittest.hasLength(3)); unittest.expect(casted3["list"], unittest.equals([1, 2, 3])); unittest.expect(casted3["bool"], unittest.equals(true)); unittest.expect(casted3["string"], unittest.equals('foo')); 
   var casted4 = (o["y"]) as core.Map; unittest.expect(casted4, unittest.hasLength(3)); unittest.expect(casted4["list"], unittest.equals([1, 2, 3])); unittest.expect(casted4["bool"], unittest.equals(true)); unittest.expect(casted4["string"], unittest.equals('foo')); 
 }
 
 core.int buildCounterGenerateConfigReportRequest = 0;
 buildGenerateConfigReportRequest() {
   var o = new api.GenerateConfigReportRequest();
   buildCounterGenerateConfigReportRequest++;
   if (buildCounterGenerateConfigReportRequest < 3) {
-    o.newConfig = buildUnnamed1088();
-    o.oldConfig = buildUnnamed1089();
+    o.newConfig = buildUnnamed1095();
+    o.oldConfig = buildUnnamed1096();
   }
   buildCounterGenerateConfigReportRequest--;
   return o;
 }
 
 checkGenerateConfigReportRequest(api.GenerateConfigReportRequest o) {
   buildCounterGenerateConfigReportRequest++;
   if (buildCounterGenerateConfigReportRequest < 3) {
-    checkUnnamed1088(o.newConfig);
-    checkUnnamed1089(o.oldConfig);
+    checkUnnamed1095(o.newConfig);
+    checkUnnamed1096(o.oldConfig);
   }
   buildCounterGenerateConfigReportRequest--;
 }
 
-buildUnnamed1090() {
+buildUnnamed1097() {
   var o = new core.List<api.ChangeReport>();
   o.add(buildChangeReport());
   o.add(buildChangeReport());
   return o;
 }
 
-checkUnnamed1090(core.List<api.ChangeReport> o) {
+checkUnnamed1097(core.List<api.ChangeReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChangeReport(o[0]);
   checkChangeReport(o[1]);
 }
 
-buildUnnamed1091() {
+buildUnnamed1098() {
   var o = new core.List<api.Diagnostic>();
   o.add(buildDiagnostic());
   o.add(buildDiagnostic());
   return o;
 }
 
-checkUnnamed1091(core.List<api.Diagnostic> o) {
+checkUnnamed1098(core.List<api.Diagnostic> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiagnostic(o[0]);
   checkDiagnostic(o[1]);
 }
 
 core.int buildCounterGenerateConfigReportResponse = 0;
 buildGenerateConfigReportResponse() {
   var o = new api.GenerateConfigReportResponse();
   buildCounterGenerateConfigReportResponse++;
   if (buildCounterGenerateConfigReportResponse < 3) {
-    o.changeReports = buildUnnamed1090();
-    o.diagnostics = buildUnnamed1091();
+    o.changeReports = buildUnnamed1097();
+    o.diagnostics = buildUnnamed1098();
     o.id = "foo";
     o.serviceName = "foo";
   }
   buildCounterGenerateConfigReportResponse--;
   return o;
 }
 
 checkGenerateConfigReportResponse(api.GenerateConfigReportResponse o) {
   buildCounterGenerateConfigReportResponse++;
   if (buildCounterGenerateConfigReportResponse < 3) {
-    checkUnnamed1090(o.changeReports);
-    checkUnnamed1091(o.diagnostics);
+    checkUnnamed1097(o.changeReports);
+    checkUnnamed1098(o.diagnostics);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.serviceName, unittest.equals('foo'));
   }
   buildCounterGenerateConfigReportResponse--;
 }
 
 core.int buildCounterGetIamPolicyRequest = 0;
 buildGetIamPolicyRequest() {
   var o = new api.GetIamPolicyRequest();
   buildCounterGetIamPolicyRequest++;
   if (buildCounterGetIamPolicyRequest < 3) {
   }
   buildCounterGetIamPolicyRequest--;
   return o;
 }
 
 checkGetIamPolicyRequest(api.GetIamPolicyRequest o) {
   buildCounterGetIamPolicyRequest++;
   if (buildCounterGetIamPolicyRequest < 3) {
   }
   buildCounterGetIamPolicyRequest--;
 }
 
-buildUnnamed1092() {
+buildUnnamed1099() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed1092(core.List<api.HttpRule> o) {
+checkUnnamed1099(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
 }
 
 core.int buildCounterHttp = 0;
 buildHttp() {
   var o = new api.Http();
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     o.fullyDecodeReservedExpansion = true;
-    o.rules = buildUnnamed1092();
+    o.rules = buildUnnamed1099();
   }
   buildCounterHttp--;
   return o;
 }
 
 checkHttp(api.Http o) {
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     unittest.expect(o.fullyDecodeReservedExpansion, unittest.isTrue);
-    checkUnnamed1092(o.rules);
+    checkUnnamed1099(o.rules);
   }
   buildCounterHttp--;
 }
 
-buildUnnamed1093() {
+buildUnnamed1100() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed1093(core.List<api.HttpRule> o) {
+checkUnnamed1100(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
 }
 
 core.int buildCounterHttpRule = 0;
 buildHttpRule() {
   var o = new api.HttpRule();
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    o.additionalBindings = buildUnnamed1093();
+    o.additionalBindings = buildUnnamed1100();
     o.body = "foo";
     o.custom = buildCustomHttpPattern();
     o.delete = "foo";
     o.get = "foo";
     o.mediaDownload = buildMediaDownload();
     o.mediaUpload = buildMediaUpload();
     o.patch = "foo";
     o.post = "foo";
     o.put = "foo";
     o.responseBody = "foo";
     o.restCollection = "foo";
+    o.restMethodName = "foo";
     o.selector = "foo";
   }
   buildCounterHttpRule--;
   return o;
 }
 
 checkHttpRule(api.HttpRule o) {
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    checkUnnamed1093(o.additionalBindings);
+    checkUnnamed1100(o.additionalBindings);
     unittest.expect(o.body, unittest.equals('foo'));
     checkCustomHttpPattern(o.custom);
     unittest.expect(o.delete, unittest.equals('foo'));
     unittest.expect(o.get, unittest.equals('foo'));
     checkMediaDownload(o.mediaDownload);
     checkMediaUpload(o.mediaUpload);
     unittest.expect(o.patch, unittest.equals('foo'));
     unittest.expect(o.post, unittest.equals('foo'));
     unittest.expect(o.put, unittest.equals('foo'));
     unittest.expect(o.responseBody, unittest.equals('foo'));
     unittest.expect(o.restCollection, unittest.equals('foo'));
+    unittest.expect(o.restMethodName, unittest.equals('foo'));
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterHttpRule--;
 }
 
 core.int buildCounterLabelDescriptor = 0;
 buildLabelDescriptor() {
   var o = new api.LabelDescriptor();
   buildCounterLabelDescriptor++;
   if (buildCounterLabelDescriptor < 3) {
     o.description = "foo";
     o.key = "foo";
     o.valueType = "foo";
   }
   buildCounterLabelDescriptor--;
   return o;
 }
 
 checkLabelDescriptor(api.LabelDescriptor o) {
   buildCounterLabelDescriptor++;
   if (buildCounterLabelDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.key, unittest.equals('foo'));
     unittest.expect(o.valueType, unittest.equals('foo'));
   }
   buildCounterLabelDescriptor--;
 }
 
-buildUnnamed1094() {
+buildUnnamed1101() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed1094(core.List<api.Operation> o) {
+checkUnnamed1101(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
 }
 
 core.int buildCounterListOperationsResponse = 0;
 buildListOperationsResponse() {
   var o = new api.ListOperationsResponse();
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed1094();
+    o.operations = buildUnnamed1101();
   }
   buildCounterListOperationsResponse--;
   return o;
 }
 
 checkListOperationsResponse(api.ListOperationsResponse o) {
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1094(o.operations);
+    checkUnnamed1101(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed1095() {
+buildUnnamed1102() {
   var o = new core.List<api.Service>();
   o.add(buildService());
   o.add(buildService());
   return o;
 }
 
-checkUnnamed1095(core.List<api.Service> o) {
+checkUnnamed1102(core.List<api.Service> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkService(o[0]);
   checkService(o[1]);
 }
 
 core.int buildCounterListServiceConfigsResponse = 0;
 buildListServiceConfigsResponse() {
   var o = new api.ListServiceConfigsResponse();
   buildCounterListServiceConfigsResponse++;
   if (buildCounterListServiceConfigsResponse < 3) {
     o.nextPageToken = "foo";
-    o.serviceConfigs = buildUnnamed1095();
+    o.serviceConfigs = buildUnnamed1102();
   }
   buildCounterListServiceConfigsResponse--;
   return o;
 }
 
 checkListServiceConfigsResponse(api.ListServiceConfigsResponse o) {
   buildCounterListServiceConfigsResponse++;
   if (buildCounterListServiceConfigsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1095(o.serviceConfigs);
+    checkUnnamed1102(o.serviceConfigs);
   }
   buildCounterListServiceConfigsResponse--;
 }
 
-buildUnnamed1096() {
+buildUnnamed1103() {
   var o = new core.List<api.Rollout>();
   o.add(buildRollout());
   o.add(buildRollout());
   return o;
 }
 
-checkUnnamed1096(core.List<api.Rollout> o) {
+checkUnnamed1103(core.List<api.Rollout> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRollout(o[0]);
   checkRollout(o[1]);
 }
 
 core.int buildCounterListServiceRolloutsResponse = 0;
 buildListServiceRolloutsResponse() {
   var o = new api.ListServiceRolloutsResponse();
   buildCounterListServiceRolloutsResponse++;
   if (buildCounterListServiceRolloutsResponse < 3) {
     o.nextPageToken = "foo";
-    o.rollouts = buildUnnamed1096();
+    o.rollouts = buildUnnamed1103();
   }
   buildCounterListServiceRolloutsResponse--;
   return o;
 }
 
 checkListServiceRolloutsResponse(api.ListServiceRolloutsResponse o) {
   buildCounterListServiceRolloutsResponse++;
   if (buildCounterListServiceRolloutsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1096(o.rollouts);
+    checkUnnamed1103(o.rollouts);
   }
   buildCounterListServiceRolloutsResponse--;
 }
 
-buildUnnamed1097() {
+buildUnnamed1104() {
   var o = new core.List<api.ManagedService>();
   o.add(buildManagedService());
   o.add(buildManagedService());
   return o;
 }
 
-checkUnnamed1097(core.List<api.ManagedService> o) {
+checkUnnamed1104(core.List<api.ManagedService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedService(o[0]);
   checkManagedService(o[1]);
 }
 
 core.int buildCounterListServicesResponse = 0;
 buildListServicesResponse() {
   var o = new api.ListServicesResponse();
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed1097();
+    o.services = buildUnnamed1104();
   }
   buildCounterListServicesResponse--;
   return o;
 }
 
 checkListServicesResponse(api.ListServicesResponse o) {
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1097(o.services);
+    checkUnnamed1104(o.services);
   }
   buildCounterListServicesResponse--;
 }
 
 core.int buildCounterLogConfig = 0;
 buildLogConfig() {
   var o = new api.LogConfig();
   buildCounterLogConfig++;
   if (buildCounterLogConfig < 3) {
     o.cloudAudit = buildCloudAuditOptions();
     o.counter = buildCounterOptions();
     o.dataAccess = buildDataAccessOptions();
   }
   buildCounterLogConfig--;
   return o;
 }
 
 checkLogConfig(api.LogConfig o) {
   buildCounterLogConfig++;
   if (buildCounterLogConfig < 3) {
     checkCloudAuditOptions(o.cloudAudit);
     checkCounterOptions(o.counter);
     checkDataAccessOptions(o.dataAccess);
   }
   buildCounterLogConfig--;
 }
 
-buildUnnamed1098() {
+buildUnnamed1105() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed1098(core.List<api.LabelDescriptor> o) {
+checkUnnamed1105(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
 }
 
 core.int buildCounterLogDescriptor = 0;
 buildLogDescriptor() {
   var o = new api.LogDescriptor();
   buildCounterLogDescriptor++;
   if (buildCounterLogDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed1098();
+    o.labels = buildUnnamed1105();
     o.name = "foo";
   }
   buildCounterLogDescriptor--;
   return o;
 }
 
 checkLogDescriptor(api.LogDescriptor o) {
   buildCounterLogDescriptor++;
   if (buildCounterLogDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed1098(o.labels);
+    checkUnnamed1105(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLogDescriptor--;
 }
 
-buildUnnamed1099() {
+buildUnnamed1106() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed1099(core.List<api.LoggingDestination> o) {
+checkUnnamed1106(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
 }
 
-buildUnnamed1100() {
+buildUnnamed1107() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed1100(core.List<api.LoggingDestination> o) {
+checkUnnamed1107(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
 }
 
 core.int buildCounterLogging = 0;
 buildLogging() {
   var o = new api.Logging();
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    o.consumerDestinations = buildUnnamed1099();
-    o.producerDestinations = buildUnnamed1100();
+    o.consumerDestinations = buildUnnamed1106();
+    o.producerDestinations = buildUnnamed1107();
   }
   buildCounterLogging--;
   return o;
 }
 
 checkLogging(api.Logging o) {
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    checkUnnamed1099(o.consumerDestinations);
-    checkUnnamed1100(o.producerDestinations);
+    checkUnnamed1106(o.consumerDestinations);
+    checkUnnamed1107(o.producerDestinations);
   }
   buildCounterLogging--;
 }
 
-buildUnnamed1101() {
+buildUnnamed1108() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1101(core.List<core.String> o) {
+checkUnnamed1108(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 buildCounterLoggingDestination = 0;
 buildLoggingDestination() {
   var o = new api.LoggingDestination();
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    o.logs = buildUnnamed1101();
+    o.logs = buildUnnamed1108();
     o.monitoredResource = "foo";
   }
   buildCounterLoggingDestination--;
   return o;
 }
 
 checkLoggingDestination(api.LoggingDestination o) {
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    checkUnnamed1101(o.logs);
+    checkUnnamed1108(o.logs);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterLoggingDestination--;
 }
 
 core.int buildCounterManagedService = 0;
 buildManagedService() {
   var o = new api.ManagedService();
   buildCounterManagedService++;
   if (buildCounterManagedService < 3) {
@@ skipping 35 matching lines @@
     unittest.expect(o.completeNotification, unittest.isTrue);
     unittest.expect(o.downloadService, unittest.equals('foo'));
     unittest.expect(o.dropzone, unittest.equals('foo'));
     unittest.expect(o.enabled, unittest.isTrue);
     unittest.expect(o.maxDirectDownloadSize, unittest.equals('foo'));
     unittest.expect(o.useDirectDownload, unittest.isTrue);
   }
   buildCounterMediaDownload--;
 }
 
-buildUnnamed1102() {
+buildUnnamed1109() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1102(core.List<core.String> o) {
+checkUnnamed1109(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 buildCounterMediaUpload = 0;
 buildMediaUpload() {
   var o = new api.MediaUpload();
   buildCounterMediaUpload++;
   if (buildCounterMediaUpload < 3) {
     o.completeNotification = true;
     o.dropzone = "foo";
     o.enabled = true;
     o.maxSize = "foo";
-    o.mimeTypes = buildUnnamed1102();
+    o.mimeTypes = buildUnnamed1109();
     o.progressNotification = true;
     o.startNotification = true;
     o.uploadService = "foo";
   }
   buildCounterMediaUpload--;
   return o;
 }
 
 checkMediaUpload(api.MediaUpload o) {
   buildCounterMediaUpload++;
   if (buildCounterMediaUpload < 3) {
     unittest.expect(o.completeNotification, unittest.isTrue);
     unittest.expect(o.dropzone, unittest.equals('foo'));
     unittest.expect(o.enabled, unittest.isTrue);
     unittest.expect(o.maxSize, unittest.equals('foo'));
-    checkUnnamed1102(o.mimeTypes);
+    checkUnnamed1109(o.mimeTypes);
     unittest.expect(o.progressNotification, unittest.isTrue);
     unittest.expect(o.startNotification, unittest.isTrue);
     unittest.expect(o.uploadService, unittest.equals('foo'));
   }
   buildCounterMediaUpload--;
 }
 
-buildUnnamed1103() {
+buildUnnamed1110() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed1103(core.List<api.Option> o) {
+checkUnnamed1110(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
 }
 
 core.int buildCounterMethod = 0;
 buildMethod() {
   var o = new api.Method();
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     o.name = "foo";
-    o.options = buildUnnamed1103();
+    o.options = buildUnnamed1110();
     o.requestStreaming = true;
     o.requestTypeUrl = "foo";
     o.responseStreaming = true;
     o.responseTypeUrl = "foo";
     o.syntax = "foo";
   }
   buildCounterMethod--;
   return o;
 }
 
 checkMethod(api.Method o) {
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1103(o.options);
+    checkUnnamed1110(o.options);
     unittest.expect(o.requestStreaming, unittest.isTrue);
     unittest.expect(o.requestTypeUrl, unittest.equals('foo'));
     unittest.expect(o.responseStreaming, unittest.isTrue);
     unittest.expect(o.responseTypeUrl, unittest.equals('foo'));
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterMethod--;
 }
 
-buildUnnamed1104() {
+buildUnnamed1111() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed1104(core.List<api.LabelDescriptor> o) {
+checkUnnamed1111(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
 }
 
 core.int buildCounterMetricDescriptor = 0;
 buildMetricDescriptor() {
   var o = new api.MetricDescriptor();
   buildCounterMetricDescriptor++;
   if (buildCounterMetricDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed1104();
+    o.labels = buildUnnamed1111();
     o.metricKind = "foo";
     o.name = "foo";
     o.type = "foo";
     o.unit = "foo";
     o.valueType = "foo";
   }
   buildCounterMetricDescriptor--;
   return o;
 }
 
 checkMetricDescriptor(api.MetricDescriptor o) {
   buildCounterMetricDescriptor++;
   if (buildCounterMetricDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed1104(o.labels);
+    checkUnnamed1111(o.labels);
     unittest.expect(o.metricKind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.unit, unittest.equals('foo'));
     unittest.expect(o.valueType, unittest.equals('foo'));
   }
   buildCounterMetricDescriptor--;
 }
 
-buildUnnamed1105() {
+buildUnnamed1112() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1105(core.Map<core.String, core.String> o) {
+checkUnnamed1112(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
 core.int buildCounterMetricRule = 0;
 buildMetricRule() {
   var o = new api.MetricRule();
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    o.metricCosts = buildUnnamed1105();
+    o.metricCosts = buildUnnamed1112();
     o.selector = "foo";
   }
   buildCounterMetricRule--;
   return o;
 }
 
 checkMetricRule(api.MetricRule o) {
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    checkUnnamed1105(o.metricCosts);
+    checkUnnamed1112(o.metricCosts);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterMetricRule--;
 }
 
 core.int buildCounterMixin = 0;
 buildMixin() {
   var o = new api.Mixin();
   buildCounterMixin++;
   if (buildCounterMixin < 3) {
     o.name = "foo";
     o.root = "foo";
   }
   buildCounterMixin--;
   return o;
 }
 
 checkMixin(api.Mixin o) {
   buildCounterMixin++;
   if (buildCounterMixin < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.root, unittest.equals('foo'));
   }
   buildCounterMixin--;
 }
 
-buildUnnamed1106() {
+buildUnnamed1113() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed1106(core.List<api.LabelDescriptor> o) {
+checkUnnamed1113(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
 }
 
 core.int buildCounterMonitoredResourceDescriptor = 0;
 buildMonitoredResourceDescriptor() {
   var o = new api.MonitoredResourceDescriptor();
   buildCounterMonitoredResourceDescriptor++;
   if (buildCounterMonitoredResourceDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed1106();
+    o.labels = buildUnnamed1113();
     o.name = "foo";
     o.type = "foo";
   }
   buildCounterMonitoredResourceDescriptor--;
   return o;
 }
 
 checkMonitoredResourceDescriptor(api.MonitoredResourceDescriptor o) {
   buildCounterMonitoredResourceDescriptor++;
   if (buildCounterMonitoredResourceDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed1106(o.labels);
+    checkUnnamed1113(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResourceDescriptor--;
 }
 
-buildUnnamed1107() {
+buildUnnamed1114() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed1107(core.List<api.MonitoringDestination> o) {
+checkUnnamed1114(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
 }
 
-buildUnnamed1108() {
+buildUnnamed1115() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed1108(core.List<api.MonitoringDestination> o) {
+checkUnnamed1115(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
 }
 
 core.int buildCounterMonitoring = 0;
 buildMonitoring() {
   var o = new api.Monitoring();
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    o.consumerDestinations = buildUnnamed1107();
-    o.producerDestinations = buildUnnamed1108();
+    o.consumerDestinations = buildUnnamed1114();
+    o.producerDestinations = buildUnnamed1115();
   }
   buildCounterMonitoring--;
   return o;
 }
 
 checkMonitoring(api.Monitoring o) {
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    checkUnnamed1107(o.consumerDestinations);
-    checkUnnamed1108(o.producerDestinations);
+    checkUnnamed1114(o.consumerDestinations);
+    checkUnnamed1115(o.producerDestinations);
   }
   buildCounterMonitoring--;
 }
 
-buildUnnamed1109() {
+buildUnnamed1116() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1109(core.List<core.String> o) {
+checkUnnamed1116(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 buildCounterMonitoringDestination = 0;
 buildMonitoringDestination() {
   var o = new api.MonitoringDestination();
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    o.metrics = buildUnnamed1109();
+    o.metrics = buildUnnamed1116();
     o.monitoredResource = "foo";
   }
   buildCounterMonitoringDestination--;
   return o;
 }
 
 checkMonitoringDestination(api.MonitoringDestination o) {
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    checkUnnamed1109(o.metrics);
+    checkUnnamed1116(o.metrics);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterMonitoringDestination--;
 }
 
 core.int buildCounterOAuthRequirements = 0;
 buildOAuthRequirements() {
   var o = new api.OAuthRequirements();
   buildCounterOAuthRequirements++;
   if (buildCounterOAuthRequirements < 3) {
     o.canonicalScopes = "foo";
   }
   buildCounterOAuthRequirements--;
   return o;
 }
 
 checkOAuthRequirements(api.OAuthRequirements o) {
   buildCounterOAuthRequirements++;
   if (buildCounterOAuthRequirements < 3) {
     unittest.expect(o.canonicalScopes, unittest.equals('foo'));
   }
   buildCounterOAuthRequirements--;
 }
 
-buildUnnamed1110() {
+buildUnnamed1117() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   o["y"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   return o;
 }
 
-checkUnnamed1110(core.Map<core.String, core.Object> o) {
+checkUnnamed1117(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map; unittest.expect(casted5, unittest.hasLength(3)); unittest.expect(casted5["list"], unittest.equals([1, 2, 3])); unittest.expect(casted5["bool"], unittest.equals(true)); unittest.expect(casted5["string"], unittest.equals('foo')); 
   var casted6 = (o["y"]) as core.Map; unittest.expect(casted6, unittest.hasLength(3)); unittest.expect(casted6["list"], unittest.equals([1, 2, 3])); unittest.expect(casted6["bool"], unittest.equals(true)); unittest.expect(casted6["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed1111() {
+buildUnnamed1118() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   o["y"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   return o;
 }
 
-checkUnnamed1111(core.Map<core.String, core.Object> o) {
+checkUnnamed1118(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map; unittest.expect(casted7, unittest.hasLength(3)); unittest.expect(casted7["list"], unittest.equals([1, 2, 3])); unittest.expect(casted7["bool"], unittest.equals(true)); unittest.expect(casted7["string"], unittest.equals('foo')); 
   var casted8 = (o["y"]) as core.Map; unittest.expect(casted8, unittest.hasLength(3)); unittest.expect(casted8["list"], unittest.equals([1, 2, 3])); unittest.expect(casted8["bool"], unittest.equals(true)); unittest.expect(casted8["string"], unittest.equals('foo')); 
 }
 
 core.int buildCounterOperation = 0;
 buildOperation() {
   var o = new api.Operation();
   buildCounterOperation++;
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed1110();
+    o.metadata = buildUnnamed1117();
     o.name = "foo";
-    o.response = buildUnnamed1111();
+    o.response = buildUnnamed1118();
   }
   buildCounterOperation--;
   return o;
 }
 
 checkOperation(api.Operation o) {
   buildCounterOperation++;
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed1110(o.metadata);
+    checkUnnamed1117(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1111(o.response);
+    checkUnnamed1118(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed1112() {
+buildUnnamed1119() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1112(core.List<core.String> o) {
+checkUnnamed1119(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'));
 }
 
-buildUnnamed1113() {
+buildUnnamed1120() {
   var o = new core.List<api.Step>();
   o.add(buildStep());
   o.add(buildStep());
   return o;
 }
 
-checkUnnamed1113(core.List<api.Step> o) {
+checkUnnamed1120(core.List<api.Step> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStep(o[0]);
   checkStep(o[1]);
 }
 
 core.int buildCounterOperationMetadata = 0;
 buildOperationMetadata() {
   var o = new api.OperationMetadata();
   buildCounterOperationMetadata++;
   if (buildCounterOperationMetadata < 3) {
     o.progressPercentage = 42;
-    o.resourceNames = buildUnnamed1112();
+    o.resourceNames = buildUnnamed1119();
     o.startTime = "foo";
-    o.steps = buildUnnamed1113();
+    o.steps = buildUnnamed1120();
   }
   buildCounterOperationMetadata--;
   return o;
 }
 
 checkOperationMetadata(api.OperationMetadata o) {
   buildCounterOperationMetadata++;
   if (buildCounterOperationMetadata < 3) {
     unittest.expect(o.progressPercentage, unittest.equals(42));
-    checkUnnamed1112(o.resourceNames);
+    checkUnnamed1119(o.resourceNames);
     unittest.expect(o.startTime, unittest.equals('foo'));
-    checkUnnamed1113(o.steps);
+    checkUnnamed1120(o.steps);
   }
   buildCounterOperationMetadata--;
 }
 
-buildUnnamed1114() {
+buildUnnamed1121() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   o["y"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   return o;
 }
 
-checkUnnamed1114(core.Map<core.String, core.Object> o) {
+checkUnnamed1121(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map; unittest.expect(casted9, unittest.hasLength(3)); unittest.expect(casted9["list"], unittest.equals([1, 2, 3])); unittest.expect(casted9["bool"], unittest.equals(true)); unittest.expect(casted9["string"], unittest.equals('foo')); 
   var casted10 = (o["y"]) as core.Map; unittest.expect(casted10, unittest.hasLength(3)); unittest.expect(casted10["list"], unittest.equals([1, 2, 3])); unittest.expect(casted10["bool"], unittest.equals(true)); unittest.expect(casted10["string"], unittest.equals('foo')); 
 }
 
 core.int buildCounterOption = 0;
 buildOption() {
   var o = new api.Option();
   buildCounterOption++;
   if (buildCounterOption < 3) {
     o.name = "foo";
-    o.value = buildUnnamed1114();
+    o.value = buildUnnamed1121();
   }
   buildCounterOption--;
   return o;
 }
 
 checkOption(api.Option o) {
   buildCounterOption++;
   if (buildCounterOption < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1114(o.value);
+    checkUnnamed1121(o.value);
   }
   buildCounterOption--;
 }
 
-buildUnnamed1115() {
+buildUnnamed1122() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed1115(core.List<api.Page> o) {
+checkUnnamed1122(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
 }
 
 core.int buildCounterPage = 0;
 buildPage() {
   var o = new api.Page();
   buildCounterPage++;
   if (buildCounterPage < 3) {
     o.content = "foo";
     o.name = "foo";
-    o.subpages = buildUnnamed1115();
+    o.subpages = buildUnnamed1122();
   }
   buildCounterPage--;
   return o;
 }
 
 checkPage(api.Page o) {
   buildCounterPage++;
   if (buildCounterPage < 3) {
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1115(o.subpages);
+    checkUnnamed1122(o.subpages);
   }
   buildCounterPage--;
 }
 
-buildUnnamed1116() {
+buildUnnamed1123() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed1116(core.List<api.AuditConfig> o) {
+checkUnnamed1123(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed1117() {
+buildUnnamed1124() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed1117(core.List<api.Binding> o) {
+checkUnnamed1124(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
 }
 
-buildUnnamed1118() {
+buildUnnamed1125() {
   var o = new core.List<api.Rule>();
   o.add(buildRule());
   o.add(buildRule());
   return o;
 }
 
-checkUnnamed1118(core.List<api.Rule> o) {
+checkUnnamed1125(core.List<api.Rule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRule(o[0]);
   checkRule(o[1]);
 }
 
 core.int buildCounterPolicy = 0;
 buildPolicy() {
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed1116();
-    o.bindings = buildUnnamed1117();
+    o.auditConfigs = buildUnnamed1123();
+    o.bindings = buildUnnamed1124();
     o.etag = "foo";
     o.iamOwned = true;
-    o.rules = buildUnnamed1118();
+    o.rules = buildUnnamed1125();
     o.version = 42;
   }
   buildCounterPolicy--;
   return o;
 }
 
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed1116(o.auditConfigs);
-    checkUnnamed1117(o.bindings);
+    checkUnnamed1123(o.auditConfigs);
+    checkUnnamed1124(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.iamOwned, unittest.isTrue);
-    checkUnnamed1118(o.rules);
+    checkUnnamed1125(o.rules);
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterPolicy--;
 }
 
-buildUnnamed1119() {
+buildUnnamed1126() {
   var o = new core.List<api.QuotaLimit>();
   o.add(buildQuotaLimit());
   o.add(buildQuotaLimit());
   return o;
 }
 
-checkUnnamed1119(core.List<api.QuotaLimit> o) {
+checkUnnamed1126(core.List<api.QuotaLimit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuotaLimit(o[0]);
   checkQuotaLimit(o[1]);
 }
 
-buildUnnamed1120() {
+buildUnnamed1127() {
   var o = new core.List<api.MetricRule>();
   o.add(buildMetricRule());
   o.add(buildMetricRule());
   return o;
 }
 
-checkUnnamed1120(core.List<api.MetricRule> o) {
+checkUnnamed1127(core.List<api.MetricRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricRule(o[0]);
   checkMetricRule(o[1]);
 }
 
 core.int buildCounterQuota = 0;
 buildQuota() {
   var o = new api.Quota();
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    o.limits = buildUnnamed1119();
-    o.metricRules = buildUnnamed1120();
+    o.limits = buildUnnamed1126();
+    o.metricRules = buildUnnamed1127();
   }
   buildCounterQuota--;
   return o;
 }
 
 checkQuota(api.Quota o) {
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    checkUnnamed1119(o.limits);
-    checkUnnamed1120(o.metricRules);
+    checkUnnamed1126(o.limits);
+    checkUnnamed1127(o.metricRules);
   }
   buildCounterQuota--;
 }
 
-buildUnnamed1121() {
+buildUnnamed1128() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1121(core.Map<core.String, core.String> o) {
+checkUnnamed1128(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
 core.int buildCounterQuotaLimit = 0;
 buildQuotaLimit() {
   var o = new api.QuotaLimit();
   buildCounterQuotaLimit++;
   if (buildCounterQuotaLimit < 3) {
     o.defaultLimit = "foo";
     o.description = "foo";
     o.displayName = "foo";
     o.duration = "foo";
     o.freeTier = "foo";
     o.maxLimit = "foo";
     o.metric = "foo";
     o.name = "foo";
     o.unit = "foo";
-    o.values = buildUnnamed1121();
+    o.values = buildUnnamed1128();
   }
   buildCounterQuotaLimit--;
   return o;
 }
 
 checkQuotaLimit(api.QuotaLimit o) {
   buildCounterQuotaLimit++;
   if (buildCounterQuotaLimit < 3) {
     unittest.expect(o.defaultLimit, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.duration, unittest.equals('foo'));
     unittest.expect(o.freeTier, unittest.equals('foo'));
     unittest.expect(o.maxLimit, unittest.equals('foo'));
     unittest.expect(o.metric, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.unit, unittest.equals('foo'));
-    checkUnnamed1121(o.values);
+    checkUnnamed1128(o.values);
   }
   buildCounterQuotaLimit--;
 }
 
 core.int buildCounterRollout = 0;
 buildRollout() {
   var o = new api.Rollout();
   buildCounterRollout++;
   if (buildCounterRollout < 3) {
     o.createTime = "foo";
@@ skipping 15 matching lines @@
     unittest.expect(o.createdBy, unittest.equals('foo'));
     checkDeleteServiceStrategy(o.deleteServiceStrategy);
     unittest.expect(o.rolloutId, unittest.equals('foo'));
     unittest.expect(o.serviceName, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     checkTrafficPercentStrategy(o.trafficPercentStrategy);
   }
   buildCounterRollout--;
 }
 
-buildUnnamed1122() {
+buildUnnamed1129() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed1122(core.List<api.Condition> o) {
+checkUnnamed1129(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed1123() {
+buildUnnamed1130() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1123(core.List<core.String> o) {
+checkUnnamed1130(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'));
 }
 
-buildUnnamed1124() {
+buildUnnamed1131() {
   var o = new core.List<api.LogConfig>();
   o.add(buildLogConfig());
   o.add(buildLogConfig());
   return o;
 }
 
-checkUnnamed1124(core.List<api.LogConfig> o) {
+checkUnnamed1131(core.List<api.LogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogConfig(o[0]);
   checkLogConfig(o[1]);
 }
 
-buildUnnamed1125() {
+buildUnnamed1132() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1125(core.List<core.String> o) {
+checkUnnamed1132(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'));
 }
 
-buildUnnamed1126() {
+buildUnnamed1133() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1126(core.List<core.String> o) {
+checkUnnamed1133(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 buildCounterRule = 0;
 buildRule() {
   var o = new api.Rule();
   buildCounterRule++;
   if (buildCounterRule < 3) {
     o.action = "foo";
-    o.conditions = buildUnnamed1122();
+    o.conditions = buildUnnamed1129();
     o.description = "foo";
-    o.in_ = buildUnnamed1123();
-    o.logConfig = buildUnnamed1124();
-    o.notIn = buildUnnamed1125();
-    o.permissions = buildUnnamed1126();
+    o.in_ = buildUnnamed1130();
+    o.logConfig = buildUnnamed1131();
+    o.notIn = buildUnnamed1132();
+    o.permissions = buildUnnamed1133();
   }
   buildCounterRule--;
   return o;
 }
 
 checkRule(api.Rule o) {
   buildCounterRule++;
   if (buildCounterRule < 3) {
     unittest.expect(o.action, unittest.equals('foo'));
-    checkUnnamed1122(o.conditions);
+    checkUnnamed1129(o.conditions);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed1123(o.in_);
-    checkUnnamed1124(o.logConfig);
-    checkUnnamed1125(o.notIn);
-    checkUnnamed1126(o.permissions);
+    checkUnnamed1130(o.in_);
+    checkUnnamed1131(o.logConfig);
+    checkUnnamed1132(o.notIn);
+    checkUnnamed1133(o.permissions);
   }
   buildCounterRule--;
 }
 
-buildUnnamed1127() {
+buildUnnamed1134() {
   var o = new core.List<api.Api>();
   o.add(buildApi());
   o.add(buildApi());
   return o;
 }
 
-checkUnnamed1127(core.List<api.Api> o) {
+checkUnnamed1134(core.List<api.Api> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApi(o[0]);
   checkApi(o[1]);
 }
 
-buildUnnamed1128() {
+buildUnnamed1135() {
   var o = new core.List<api.Endpoint>();
   o.add(buildEndpoint());
   o.add(buildEndpoint());
   return o;
 }
 
-checkUnnamed1128(core.List<api.Endpoint> o) {
+checkUnnamed1135(core.List<api.Endpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEndpoint(o[0]);
   checkEndpoint(o[1]);
 }
 
-buildUnnamed1129() {
+buildUnnamed1136() {
   var o = new core.List<api.Enum>();
   o.add(buildEnum());
   o.add(buildEnum());
   return o;
 }
 
-checkUnnamed1129(core.List<api.Enum> o) {
+checkUnnamed1136(core.List<api.Enum> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnum(o[0]);
   checkEnum(o[1]);
 }
 
-buildUnnamed1130() {
+buildUnnamed1137() {
   var o = new core.List<api.LogDescriptor>();
   o.add(buildLogDescriptor());
   o.add(buildLogDescriptor());
   return o;
 }
 
-checkUnnamed1130(core.List<api.LogDescriptor> o) {
+checkUnnamed1137(core.List<api.LogDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogDescriptor(o[0]);
   checkLogDescriptor(o[1]);
 }
 
-buildUnnamed1131() {
+buildUnnamed1138() {
   var o = new core.List<api.MetricDescriptor>();
   o.add(buildMetricDescriptor());
   o.add(buildMetricDescriptor());
   return o;
 }
 
-checkUnnamed1131(core.List<api.MetricDescriptor> o) {
+checkUnnamed1138(core.List<api.MetricDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricDescriptor(o[0]);
   checkMetricDescriptor(o[1]);
 }
 
-buildUnnamed1132() {
+buildUnnamed1139() {
   var o = new core.List<api.MonitoredResourceDescriptor>();
   o.add(buildMonitoredResourceDescriptor());
   o.add(buildMonitoredResourceDescriptor());
   return o;
 }
 
-checkUnnamed1132(core.List<api.MonitoredResourceDescriptor> o) {
+checkUnnamed1139(core.List<api.MonitoredResourceDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoredResourceDescriptor(o[0]);
   checkMonitoredResourceDescriptor(o[1]);
 }
 
-buildUnnamed1133() {
+buildUnnamed1140() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed1133(core.List<api.Type> o) {
+checkUnnamed1140(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
 }
 
-buildUnnamed1134() {
+buildUnnamed1141() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed1134(core.List<api.Type> o) {
+checkUnnamed1141(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
 }
 
 core.int buildCounterService = 0;
 buildService() {
   var o = new api.Service();
   buildCounterService++;
   if (buildCounterService < 3) {
-    o.apis = buildUnnamed1127();
+    o.apis = buildUnnamed1134();
     o.authentication = buildAuthentication();
     o.backend = buildBackend();
     o.configVersion = 42;
     o.context = buildContext();
     o.control = buildControl();
     o.customError = buildCustomError();
     o.documentation = buildDocumentation();
-    o.endpoints = buildUnnamed1128();
-    o.enums = buildUnnamed1129();
+    o.endpoints = buildUnnamed1135();
+    o.enums = buildUnnamed1136();
     o.experimental = buildExperimental();
     o.http = buildHttp();
     o.id = "foo";
     o.logging = buildLogging();
-    o.logs = buildUnnamed1130();
-    o.metrics = buildUnnamed1131();
-    o.monitoredResources = buildUnnamed1132();
+    o.logs = buildUnnamed1137();
+    o.metrics = buildUnnamed1138();
+    o.monitoredResources = buildUnnamed1139();
     o.monitoring = buildMonitoring();
     o.name = "foo";
     o.producerProjectId = "foo";
     o.quota = buildQuota();
     o.sourceInfo = buildSourceInfo();
     o.systemParameters = buildSystemParameters();
-    o.systemTypes = buildUnnamed1133();
+    o.systemTypes = buildUnnamed1140();
     o.title = "foo";
-    o.types = buildUnnamed1134();
+    o.types = buildUnnamed1141();
     o.usage = buildUsage();
     o.visibility = buildVisibility();
   }
   buildCounterService--;
   return o;
 }
 
 checkService(api.Service o) {
   buildCounterService++;
   if (buildCounterService < 3) {
-    checkUnnamed1127(o.apis);
+    checkUnnamed1134(o.apis);
     checkAuthentication(o.authentication);
     checkBackend(o.backend);
     unittest.expect(o.configVersion, unittest.equals(42));
     checkContext(o.context);
     checkControl(o.control);
     checkCustomError(o.customError);
     checkDocumentation(o.documentation);
-    checkUnnamed1128(o.endpoints);
-    checkUnnamed1129(o.enums);
+    checkUnnamed1135(o.endpoints);
+    checkUnnamed1136(o.enums);
     checkExperimental(o.experimental);
     checkHttp(o.http);
     unittest.expect(o.id, unittest.equals('foo'));
     checkLogging(o.logging);
-    checkUnnamed1130(o.logs);
-    checkUnnamed1131(o.metrics);
-    checkUnnamed1132(o.monitoredResources);
+    checkUnnamed1137(o.logs);
+    checkUnnamed1138(o.metrics);
+    checkUnnamed1139(o.monitoredResources);
     checkMonitoring(o.monitoring);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.producerProjectId, unittest.equals('foo'));
     checkQuota(o.quota);
     checkSourceInfo(o.sourceInfo);
     checkSystemParameters(o.systemParameters);
-    checkUnnamed1133(o.systemTypes);
+    checkUnnamed1140(o.systemTypes);
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed1134(o.types);
+    checkUnnamed1141(o.types);
     checkUsage(o.usage);
     checkVisibility(o.visibility);
   }
   buildCounterService--;
 }
 
 core.int buildCounterSetIamPolicyRequest = 0;
 buildSetIamPolicyRequest() {
   var o = new api.SetIamPolicyRequest();
   buildCounterSetIamPolicyRequest++;
@@ skipping 26 matching lines @@
 }
 
 checkSourceContext(api.SourceContext o) {
   buildCounterSourceContext++;
   if (buildCounterSourceContext < 3) {
     unittest.expect(o.fileName, unittest.equals('foo'));
   }
   buildCounterSourceContext--;
 }
 
-buildUnnamed1135() {
+buildUnnamed1142() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   o["y"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   return o;
 }
 
-checkUnnamed1135(core.Map<core.String, core.Object> o) {
+checkUnnamed1142(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted11 = (o["x"]) as core.Map; unittest.expect(casted11, unittest.hasLength(3)); unittest.expect(casted11["list"], unittest.equals([1, 2, 3])); unittest.expect(casted11["bool"], unittest.equals(true)); unittest.expect(casted11["string"], unittest.equals('foo')); 
   var casted12 = (o["y"]) as core.Map; unittest.expect(casted12, unittest.hasLength(3)); unittest.expect(casted12["list"], unittest.equals([1, 2, 3])); unittest.expect(casted12["bool"], unittest.equals(true)); unittest.expect(casted12["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed1136() {
+buildUnnamed1143() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1135());
-  o.add(buildUnnamed1135());
+  o.add(buildUnnamed1142());
+  o.add(buildUnnamed1142());
   return o;
 }
 
-checkUnnamed1136(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1143(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1135(o[0]);
-  checkUnnamed1135(o[1]);
+  checkUnnamed1142(o[0]);
+  checkUnnamed1142(o[1]);
 }
 
 core.int buildCounterSourceInfo = 0;
 buildSourceInfo() {
   var o = new api.SourceInfo();
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    o.sourceFiles = buildUnnamed1136();
+    o.sourceFiles = buildUnnamed1143();
   }
   buildCounterSourceInfo--;
   return o;
 }
 
 checkSourceInfo(api.SourceInfo o) {
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    checkUnnamed1136(o.sourceFiles);
+    checkUnnamed1143(o.sourceFiles);
   }
   buildCounterSourceInfo--;
 }
 
-buildUnnamed1137() {
+buildUnnamed1144() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   o["y"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   return o;
 }
 
-checkUnnamed1137(core.Map<core.String, core.Object> o) {
+checkUnnamed1144(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted13 = (o["x"]) as core.Map; unittest.expect(casted13, unittest.hasLength(3)); unittest.expect(casted13["list"], unittest.equals([1, 2, 3])); unittest.expect(casted13["bool"], unittest.equals(true)); unittest.expect(casted13["string"], unittest.equals('foo')); 
   var casted14 = (o["y"]) as core.Map; unittest.expect(casted14, unittest.hasLength(3)); unittest.expect(casted14["list"], unittest.equals([1, 2, 3])); unittest.expect(casted14["bool"], unittest.equals(true)); unittest.expect(casted14["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed1138() {
+buildUnnamed1145() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1137());
-  o.add(buildUnnamed1137());
+  o.add(buildUnnamed1144());
+  o.add(buildUnnamed1144());
   return o;
 }
 
-checkUnnamed1138(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1145(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1137(o[0]);
-  checkUnnamed1137(o[1]);
+  checkUnnamed1144(o[0]);
+  checkUnnamed1144(o[1]);
 }
 
 core.int buildCounterStatus = 0;
 buildStatus() {
   var o = new api.Status();
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1138();
+    o.details = buildUnnamed1145();
     o.message = "foo";
   }
   buildCounterStatus--;
   return o;
 }
 
 checkStatus(api.Status o) {
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1138(o.details);
+    checkUnnamed1145(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
 core.int buildCounterStep = 0;
 buildStep() {
   var o = new api.Step();
   buildCounterStep++;
   if (buildCounterStep < 3) {
@@ skipping 69 matching lines @@
 checkSystemParameter(api.SystemParameter o) {
   buildCounterSystemParameter++;
   if (buildCounterSystemParameter < 3) {
     unittest.expect(o.httpHeader, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.urlQueryParameter, unittest.equals('foo'));
   }
   buildCounterSystemParameter--;
 }
 
-buildUnnamed1139() {
+buildUnnamed1146() {
   var o = new core.List<api.SystemParameter>();
   o.add(buildSystemParameter());
   o.add(buildSystemParameter());
   return o;
 }
 
-checkUnnamed1139(core.List<api.SystemParameter> o) {
+checkUnnamed1146(core.List<api.SystemParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameter(o[0]);
   checkSystemParameter(o[1]);
 }
 
 core.int buildCounterSystemParameterRule = 0;
 buildSystemParameterRule() {
   var o = new api.SystemParameterRule();
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    o.parameters = buildUnnamed1139();
+    o.parameters = buildUnnamed1146();
     o.selector = "foo";
   }
   buildCounterSystemParameterRule--;
   return o;
 }
 
 checkSystemParameterRule(api.SystemParameterRule o) {
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    checkUnnamed1139(o.parameters);
+    checkUnnamed1146(o.parameters);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterSystemParameterRule--;
 }
 
-buildUnnamed1140() {
+buildUnnamed1147() {
   var o = new core.List<api.SystemParameterRule>();
   o.add(buildSystemParameterRule());
   o.add(buildSystemParameterRule());
   return o;
 }
 
-checkUnnamed1140(core.List<api.SystemParameterRule> o) {
+checkUnnamed1147(core.List<api.SystemParameterRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameterRule(o[0]);
   checkSystemParameterRule(o[1]);
 }
 
 core.int buildCounterSystemParameters = 0;
 buildSystemParameters() {
   var o = new api.SystemParameters();
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    o.rules = buildUnnamed1140();
+    o.rules = buildUnnamed1147();
   }
   buildCounterSystemParameters--;
   return o;
 }
 
 checkSystemParameters(api.SystemParameters o) {
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    checkUnnamed1140(o.rules);
+    checkUnnamed1147(o.rules);
   }
   buildCounterSystemParameters--;
 }
 
-buildUnnamed1141() {
+buildUnnamed1148() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1141(core.List<core.String> o) {
+checkUnnamed1148(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 buildCounterTestIamPermissionsRequest = 0;
 buildTestIamPermissionsRequest() {
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed1141();
+    o.permissions = buildUnnamed1148();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
 }
 
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed1141(o.permissions);
+    checkUnnamed1148(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed1142() {
+buildUnnamed1149() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1142(core.List<core.String> o) {
+checkUnnamed1149(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 buildCounterTestIamPermissionsResponse = 0;
 buildTestIamPermissionsResponse() {
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed1142();
+    o.permissions = buildUnnamed1149();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
 }
 
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed1142(o.permissions);
+    checkUnnamed1149(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
 
-buildUnnamed1143() {
+buildUnnamed1150() {
   var o = new core.Map<core.String, core.double>();
   o["x"] = 42.0;
   o["y"] = 42.0;
   return o;
 }
 
-checkUnnamed1143(core.Map<core.String, core.double> o) {
+checkUnnamed1150(core.Map<core.String, core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42.0));
   unittest.expect(o["y"], unittest.equals(42.0));
 }
 
 core.int buildCounterTrafficPercentStrategy = 0;
 buildTrafficPercentStrategy() {
   var o = new api.TrafficPercentStrategy();
   buildCounterTrafficPercentStrategy++;
   if (buildCounterTrafficPercentStrategy < 3) {
-    o.percentages = buildUnnamed1143();
+    o.percentages = buildUnnamed1150();
   }
   buildCounterTrafficPercentStrategy--;
   return o;
 }
 
 checkTrafficPercentStrategy(api.TrafficPercentStrategy o) {
   buildCounterTrafficPercentStrategy++;
   if (buildCounterTrafficPercentStrategy < 3) {
-    checkUnnamed1143(o.percentages);
+    checkUnnamed1150(o.percentages);
   }
   buildCounterTrafficPercentStrategy--;
 }
 
-buildUnnamed1144() {
+buildUnnamed1151() {
   var o = new core.List<api.Field>();
   o.add(buildField());
   o.add(buildField());
   return o;
 }
 
-checkUnnamed1144(core.List<api.Field> o) {
+checkUnnamed1151(core.List<api.Field> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkField(o[0]);
   checkField(o[1]);
 }
 
-buildUnnamed1145() {
+buildUnnamed1152() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1145(core.List<core.String> o) {
+checkUnnamed1152(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'));
 }
 
-buildUnnamed1146() {
+buildUnnamed1153() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed1146(core.List<api.Option> o) {
+checkUnnamed1153(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
 }
 
 core.int buildCounterType = 0;
 buildType() {
   var o = new api.Type();
   buildCounterType++;
   if (buildCounterType < 3) {
-    o.fields = buildUnnamed1144();
+    o.fields = buildUnnamed1151();
     o.name = "foo";
-    o.oneofs = buildUnnamed1145();
-    o.options = buildUnnamed1146();
+    o.oneofs = buildUnnamed1152();
+    o.options = buildUnnamed1153();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
   buildCounterType--;
   return o;
 }
 
 checkType(api.Type o) {
   buildCounterType++;
   if (buildCounterType < 3) {
-    checkUnnamed1144(o.fields);
+    checkUnnamed1151(o.fields);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1145(o.oneofs);
-    checkUnnamed1146(o.options);
+    checkUnnamed1152(o.oneofs);
+    checkUnnamed1153(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterType--;
 }
 
 core.int buildCounterUndeleteServiceResponse = 0;
 buildUndeleteServiceResponse() {
   var o = new api.UndeleteServiceResponse();
   buildCounterUndeleteServiceResponse++;
   if (buildCounterUndeleteServiceResponse < 3) {
     o.service = buildManagedService();
   }
   buildCounterUndeleteServiceResponse--;
   return o;
 }
 
 checkUndeleteServiceResponse(api.UndeleteServiceResponse o) {
   buildCounterUndeleteServiceResponse++;
   if (buildCounterUndeleteServiceResponse < 3) {
     checkManagedService(o.service);
   }
   buildCounterUndeleteServiceResponse--;
 }
 
-buildUnnamed1147() {
+buildUnnamed1154() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1147(core.List<core.String> o) {
+checkUnnamed1154(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'));
 }
 
-buildUnnamed1148() {
+buildUnnamed1155() {
   var o = new core.List<api.UsageRule>();
   o.add(buildUsageRule());
   o.add(buildUsageRule());
   return o;
 }
 
-checkUnnamed1148(core.List<api.UsageRule> o) {
+checkUnnamed1155(core.List<api.UsageRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageRule(o[0]);
   checkUsageRule(o[1]);
 }
 
 core.int buildCounterUsage = 0;
 buildUsage() {
   var o = new api.Usage();
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     o.producerNotificationChannel = "foo";
-    o.requirements = buildUnnamed1147();
-    o.rules = buildUnnamed1148();
+    o.requirements = buildUnnamed1154();
+    o.rules = buildUnnamed1155();
   }
   buildCounterUsage--;
   return o;
 }
 
 checkUsage(api.Usage o) {
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     unittest.expect(o.producerNotificationChannel, unittest.equals('foo'));
-    checkUnnamed1147(o.requirements);
-    checkUnnamed1148(o.rules);
+    checkUnnamed1154(o.requirements);
+    checkUnnamed1155(o.rules);
   }
   buildCounterUsage--;
 }
 
 core.int buildCounterUsageRule = 0;
 buildUsageRule() {
   var o = new api.UsageRule();
   buildCounterUsageRule++;
   if (buildCounterUsageRule < 3) {
     o.allowUnregisteredCalls = true;
     o.selector = "foo";
   }
   buildCounterUsageRule--;
   return o;
 }
 
 checkUsageRule(api.UsageRule o) {
   buildCounterUsageRule++;
   if (buildCounterUsageRule < 3) {
     unittest.expect(o.allowUnregisteredCalls, unittest.isTrue);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterUsageRule--;
 }
 
-buildUnnamed1149() {
+buildUnnamed1156() {
   var o = new core.List<api.VisibilityRule>();
   o.add(buildVisibilityRule());
   o.add(buildVisibilityRule());
   return o;
 }
 
-checkUnnamed1149(core.List<api.VisibilityRule> o) {
+checkUnnamed1156(core.List<api.VisibilityRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVisibilityRule(o[0]);
   checkVisibilityRule(o[1]);
 }
 
 core.int buildCounterVisibility = 0;
 buildVisibility() {
   var o = new api.Visibility();
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    o.rules = buildUnnamed1149();
+    o.rules = buildUnnamed1156();
   }
   buildCounterVisibility--;
   return o;
 }
 
 checkVisibility(api.Visibility o) {
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    checkUnnamed1149(o.rules);
+    checkUnnamed1156(o.rules);
   }
   buildCounterVisibility--;
 }
 
 core.int buildCounterVisibilityRule = 0;
 buildVisibilityRule() {
   var o = new api.VisibilityRule();
   buildCounterVisibilityRule++;
   if (buildCounterVisibilityRule < 3) {
     o.restriction = "foo";
@@ skipping 349 matching lines @@
 
   unittest.group("obj-schema-Experimental", () {
     unittest.test("to-json--from-json", () {
       var o = buildExperimental();
       var od = new api.Experimental.fromJson(o.toJson());
       checkExperimental(od);
     });
   });
 
 
+  unittest.group("obj-schema-Expr", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildExpr();
+      var od = new api.Expr.fromJson(o.toJson());
+      checkExpr(od);
+    });
+  });
+
+
   unittest.group("obj-schema-Field", () {
     unittest.test("to-json--from-json", () {
       var o = buildField();
       var od = new api.Field.fromJson(o.toJson());
       checkField(od);
     });
   });
 
 
   unittest.group("obj-schema-FlowOperationMetadata", () {
@@ skipping 490 matching lines @@
     });
   });
 
 
   unittest.group("resource-OperationsResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.OperationsResourceApi res = new api.ServicemanagementApi(mock).operations;
       var arg_name = "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 + 3), unittest.equals("v1/"));
         pathOffset += 3;
         // NOTE: We cannot test reserved expansions due to the inability to reverse the operation;
 
@@ skipping 14 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name).then(unittest.expectAsync(((api.Operation response) {
+      res.get(arg_name).then(unittest.expectAsync1(((api.Operation response) {
         checkOperation(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.OperationsResourceApi res = new api.ServicemanagementApi(mock).operations;
       var arg_name = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
       var arg_filter = "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 + 13), unittest.equals("v1/operations"));
         pathOffset += 13;
 
         var query = (req.url).query;
@@ skipping 17 matching lines @@
         unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
         unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListOperationsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(name: arg_name, pageToken: arg_pageToken, pageSize: arg_pageSize, filter: arg_filter).then(unittest.expectAsync(((api.ListOperationsResponse response) {
+      res.list(name: arg_name, pageToken: arg_pageToken, pageSize: arg_pageSize, filter: arg_filter).then(unittest.expectAsync1(((api.ListOperationsResponse response) {
         checkListOperationsResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ServicesResourceApi", () {
     unittest.test("method--create", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_request = buildManagedService();
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.ManagedService.fromJson(json);
         checkManagedService(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 + 11), unittest.equals("v1/services"));
@@ skipping 16 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request).then(unittest.expectAsync(((api.Operation response) {
+      res.create(arg_request).then(unittest.expectAsync1(((api.Operation response) {
         checkOperation(response);
       })));
     });
 
     unittest.test("method--delete", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_serviceName = "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 + 12), unittest.equals("v1/services/"));
         pathOffset += 12;
         subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
         pathOffset = path.length;
@@ skipping 16 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.delete(arg_serviceName).then(unittest.expectAsync(((api.Operation response) {
+      res.delete(arg_serviceName).then(unittest.expectAsync1(((api.Operation response) {
         checkOperation(response);
       })));
     });
 
     unittest.test("method--disable", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_request = buildDisableServiceRequest();
       var arg_serviceName = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.DisableServiceRequest.fromJson(json);
         checkDisableServiceRequest(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 + 12), unittest.equals("v1/services/"));
@@ skipping 23 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.disable(arg_request, arg_serviceName).then(unittest.expectAsync(((api.Operation response) {
+      res.disable(arg_request, arg_serviceName).then(unittest.expectAsync1(((api.Operation response) {
         checkOperation(response);
       })));
     });
 
     unittest.test("method--enable", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_request = buildEnableServiceRequest();
       var arg_serviceName = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.EnableServiceRequest.fromJson(json);
         checkEnableServiceRequest(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 + 12), unittest.equals("v1/services/"));
@@ skipping 23 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.enable(arg_request, arg_serviceName).then(unittest.expectAsync(((api.Operation response) {
+      res.enable(arg_request, arg_serviceName).then(unittest.expectAsync1(((api.Operation response) {
         checkOperation(response);
       })));
     });
 
     unittest.test("method--generateConfigReport", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_request = buildGenerateConfigReportRequest();
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.GenerateConfigReportRequest.fromJson(json);
         checkGenerateConfigReportRequest(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 + 32), unittest.equals("v1/services:generateConfigReport"));
@@ skipping 16 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGenerateConfigReportResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.generateConfigReport(arg_request).then(unittest.expectAsync(((api.GenerateConfigReportResponse response) {
+      res.generateConfigReport(arg_request).then(unittest.expectAsync1(((api.GenerateConfigReportResponse response) {
         checkGenerateConfigReportResponse(response);
       })));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_serviceName = "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 + 12), unittest.equals("v1/services/"));
         pathOffset += 12;
         subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
         pathOffset = path.length;
@@ skipping 16 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildManagedService());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_serviceName).then(unittest.expectAsync(((api.ManagedService response) {
+      res.get(arg_serviceName).then(unittest.expectAsync1(((api.ManagedService response) {
         checkManagedService(response);
       })));
     });
 
     unittest.test("method--getConfig", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_serviceName = "foo";
       var arg_configId = "foo";
       var arg_view = "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 + 12), unittest.equals("v1/services/"));
         pathOffset += 12;
         index = path.indexOf("/config", pathOffset);
         unittest.expect(index >= 0, unittest.isTrue);
@@ skipping 22 matching lines @@
         unittest.expect(queryMap["configId"].first, unittest.equals(arg_configId));
         unittest.expect(queryMap["view"].first, unittest.equals(arg_view));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildService());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getConfig(arg_serviceName, configId: arg_configId, view: arg_view).then(unittest.expectAsync(((api.Service response) {
+      res.getConfig(arg_serviceName, configId: arg_configId, view: arg_view).then(unittest.expectAsync1(((api.Service response) {
         checkService(response);
       })));
     });
 
     unittest.test("method--getIamPolicy", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_request = buildGetIamPolicyRequest();
       var arg_resource = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.GetIamPolicyRequest.fromJson(json);
         checkGetIamPolicyRequest(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 + 3), unittest.equals("v1/"));
@@ skipping 17 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPolicy());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getIamPolicy(arg_request, arg_resource).then(unittest.expectAsync(((api.Policy response) {
+      res.getIamPolicy(arg_request, arg_resource).then(unittest.expectAsync1(((api.Policy response) {
         checkPolicy(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_consumerId = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
       var arg_producerProjectId = "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 + 11), unittest.equals("v1/services"));
         pathOffset += 11;
 
         var query = (req.url).query;
@@ skipping 17 matching lines @@
         unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
         unittest.expect(queryMap["producerProjectId"].first, unittest.equals(arg_producerProjectId));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListServicesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(consumerId: arg_consumerId, pageToken: arg_pageToken, pageSize: arg_pageSize, producerProjectId: arg_producerProjectId).then(unittest.expectAsync(((api.ListServicesResponse response) {
+      res.list(consumerId: arg_consumerId, pageToken: arg_pageToken, pageSize: arg_pageSize, producerProjectId: arg_producerProjectId).then(unittest.expectAsync1(((api.ListServicesResponse response) {
         checkListServicesResponse(response);
       })));
     });
 
     unittest.test("method--setIamPolicy", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_request = buildSetIamPolicyRequest();
       var arg_resource = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.SetIamPolicyRequest.fromJson(json);
         checkSetIamPolicyRequest(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 + 3), unittest.equals("v1/"));
@@ skipping 17 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPolicy());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.setIamPolicy(arg_request, arg_resource).then(unittest.expectAsync(((api.Policy response) {
+      res.setIamPolicy(arg_request, arg_resource).then(unittest.expectAsync1(((api.Policy response) {
         checkPolicy(response);
       })));
     });
 
     unittest.test("method--testIamPermissions", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_request = buildTestIamPermissionsRequest();
       var arg_resource = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.TestIamPermissionsRequest.fromJson(json);
         checkTestIamPermissionsRequest(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 + 3), unittest.equals("v1/"));
@@ skipping 17 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTestIamPermissionsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.testIamPermissions(arg_request, arg_resource).then(unittest.expectAsync(((api.TestIamPermissionsResponse response) {
+      res.testIamPermissions(arg_request, arg_resource).then(unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
 
     unittest.test("method--undelete", () {
 
       var mock = new HttpServerMock();
       api.ServicesResourceApi res = new api.ServicemanagementApi(mock).services;
       var arg_serviceName = "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 + 12), unittest.equals("v1/services/"));
         pathOffset += 12;
         index = path.indexOf(":undelete", pathOffset);
         unittest.expect(index >= 0, unittest.isTrue);
@@ skipping 20 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.undelete(arg_serviceName).then(unittest.expectAsync(((api.Operation response) {
+      res.undelete(arg_serviceName).then(unittest.expectAsync1(((api.Operation response) {
         checkOperation(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ServicesConfigsResourceApi", () {
     unittest.test("method--create", () {
 
       var mock = new HttpServerMock();
       api.ServicesConfigsResourceApi res = new api.ServicemanagementApi(mock).services.configs;
       var arg_request = buildService();
       var arg_serviceName = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Service.fromJson(json);
         checkService(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 + 12), unittest.equals("v1/services/"));
@@ skipping 23 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildService());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_serviceName).then(unittest.expectAsync(((api.Service response) {
+      res.create(arg_request, arg_serviceName).then(unittest.expectAsync1(((api.Service response) {
         checkService(response);
       })));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.ServicesConfigsResourceApi res = new api.ServicemanagementApi(mock).services.configs;
       var arg_serviceName = "foo";
       var arg_configId = "foo";
       var arg_view = "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 + 12), unittest.equals("v1/services/"));
         pathOffset += 12;
         index = path.indexOf("/configs/", pathOffset);
         unittest.expect(index >= 0, unittest.isTrue);
@@ skipping 24 matching lines @@
         }
         unittest.expect(queryMap["view"].first, unittest.equals(arg_view));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildService());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_serviceName, arg_configId, view: arg_view).then(unittest.expectAsync(((api.Service response) {
+      res.get(arg_serviceName, arg_configId, view: arg_view).then(unittest.expectAsync1(((api.Service response) {
         checkService(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.ServicesConfigsResourceApi res = new api.ServicemanagementApi(mock).services.configs;
       var arg_serviceName = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("v1/services/"));
         pathOffset += 12;
         index = path.indexOf("/configs", pathOffset);
         unittest.expect(index >= 0, unittest.isTrue);
@@ skipping 22 matching lines @@
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
         unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListServiceConfigsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_serviceName, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListServiceConfigsResponse response) {
+      res.list(arg_serviceName, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListServiceConfigsResponse response) {
         checkListServiceConfigsResponse(response);
       })));
     });
 
     unittest.test("method--submit", () {
 
       var mock = new HttpServerMock();
       api.ServicesConfigsResourceApi res = new api.ServicemanagementApi(mock).services.configs;
       var arg_request = buildSubmitConfigSourceRequest();
       var arg_serviceName = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.SubmitConfigSourceRequest.fromJson(json);
         checkSubmitConfigSourceRequest(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 + 12), unittest.equals("v1/services/"));
@@ skipping 23 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.submit(arg_request, arg_serviceName).then(unittest.expectAsync(((api.Operation response) {
+      res.submit(arg_request, arg_serviceName).then(unittest.expectAsync1(((api.Operation response) {
         checkOperation(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ServicesConsumersResourceApi", () {
     unittest.test("method--getIamPolicy", () {
 
       var mock = new HttpServerMock();
       api.ServicesConsumersResourceApi res = new api.ServicemanagementApi(mock).services.consumers;
       var arg_request = buildGetIamPolicyRequest();
       var arg_resource = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.GetIamPolicyRequest.fromJson(json);
         checkGetIamPolicyRequest(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 + 3), unittest.equals("v1/"));
@@ skipping 17 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPolicy());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getIamPolicy(arg_request, arg_resource).then(unittest.expectAsync(((api.Policy response) {
+      res.getIamPolicy(arg_request, arg_resource).then(unittest.expectAsync1(((api.Policy response) {
         checkPolicy(response);
       })));
     });
 
     unittest.test("method--setIamPolicy", () {
 
       var mock = new HttpServerMock();
       api.ServicesConsumersResourceApi res = new api.ServicemanagementApi(mock).services.consumers;
       var arg_request = buildSetIamPolicyRequest();
       var arg_resource = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.SetIamPolicyRequest.fromJson(json);
         checkSetIamPolicyRequest(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 + 3), unittest.equals("v1/"));
@@ skipping 17 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPolicy());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.setIamPolicy(arg_request, arg_resource).then(unittest.expectAsync(((api.Policy response) {
+      res.setIamPolicy(arg_request, arg_resource).then(unittest.expectAsync1(((api.Policy response) {
         checkPolicy(response);
       })));
     });
 
     unittest.test("method--testIamPermissions", () {
 
       var mock = new HttpServerMock();
       api.ServicesConsumersResourceApi res = new api.ServicemanagementApi(mock).services.consumers;
       var arg_request = buildTestIamPermissionsRequest();
       var arg_resource = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.TestIamPermissionsRequest.fromJson(json);
         checkTestIamPermissionsRequest(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 + 3), unittest.equals("v1/"));
@@ skipping 17 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTestIamPermissionsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.testIamPermissions(arg_request, arg_resource).then(unittest.expectAsync(((api.TestIamPermissionsResponse response) {
+      res.testIamPermissions(arg_request, arg_resource).then(unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ServicesRolloutsResourceApi", () {
     unittest.test("method--create", () {
 
       var mock = new HttpServerMock();
       api.ServicesRolloutsResourceApi res = new api.ServicemanagementApi(mock).services.rollouts;
       var arg_request = buildRollout();
       var arg_serviceName = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Rollout.fromJson(json);
         checkRollout(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 + 12), unittest.equals("v1/services/"));
@@ skipping 23 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_serviceName).then(unittest.expectAsync(((api.Operation response) {
+      res.create(arg_request, arg_serviceName).then(unittest.expectAsync1(((api.Operation response) {
         checkOperation(response);
       })));
     });
 
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.ServicesRolloutsResourceApi res = new api.ServicemanagementApi(mock).services.rollouts;
       var arg_serviceName = "foo";
       var arg_rolloutId = "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 + 12), unittest.equals("v1/services/"));
         pathOffset += 12;
         index = path.indexOf("/rollouts/", pathOffset);
         unittest.expect(index >= 0, unittest.isTrue);
@@ skipping 23 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRollout());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_serviceName, arg_rolloutId).then(unittest.expectAsync(((api.Rollout response) {
+      res.get(arg_serviceName, arg_rolloutId).then(unittest.expectAsync1(((api.Rollout response) {
         checkRollout(response);
       })));
     });
 
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.ServicesRolloutsResourceApi res = new api.ServicemanagementApi(mock).services.rollouts;
       var arg_serviceName = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
       var arg_filter = "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 + 12), unittest.equals("v1/services/"));
         pathOffset += 12;
         index = path.indexOf("/rollouts", pathOffset);
         unittest.expect(index >= 0, unittest.isTrue);
@@ skipping 23 matching lines @@
         unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
         unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListServiceRolloutsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_serviceName, pageToken: arg_pageToken, pageSize: arg_pageSize, filter: arg_filter).then(unittest.expectAsync(((api.ListServiceRolloutsResponse response) {
+      res.list(arg_serviceName, pageToken: arg_pageToken, pageSize: arg_pageSize, filter: arg_filter).then(unittest.expectAsync1(((api.ListServiceRolloutsResponse response) {
         checkListServiceRolloutsResponse(response);
       })));
     });
 
   });
 
 
 }