| Index: generated/googleapis_beta/test/appengine/v1beta5_test.dart
 | 
| diff --git a/generated/googleapis_beta/test/appengine/v1beta5_test.dart b/generated/googleapis_beta/test/appengine/v1beta5_test.dart
 | 
| index cacf97589b07361cfd44450dc29c5dd370b3cab2..5ef18abca16696925d271f444186581cd60fe01b 100644
 | 
| --- a/generated/googleapis_beta/test/appengine/v1beta5_test.dart
 | 
| +++ b/generated/googleapis_beta/test/appengine/v1beta5_test.dart
 | 
| @@ -7,7 +7,7 @@ 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_beta/appengine/v1beta5.dart' as api;
 | 
|  
 | 
| @@ -46,7 +46,7 @@ class HttpServerMock extends http.BaseClient {
 | 
|  }
 | 
|  
 | 
|  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);
 | 
|  }
 | 
| @@ -97,14 +97,14 @@ checkApiEndpointHandler(api.ApiEndpointHandler o) {
 | 
|    buildCounterApiEndpointHandler--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3867() {
 | 
| +buildUnnamed3341() {
 | 
|    var o = new core.List<api.UrlDispatchRule>();
 | 
|    o.add(buildUrlDispatchRule());
 | 
|    o.add(buildUrlDispatchRule());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3867(core.List<api.UrlDispatchRule> o) {
 | 
| +checkUnnamed3341(core.List<api.UrlDispatchRule> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkUrlDispatchRule(o[0]);
 | 
|    checkUrlDispatchRule(o[1]);
 | 
| @@ -120,7 +120,7 @@ buildApplication() {
 | 
|      o.defaultBucket = "foo";
 | 
|      o.defaultCookieExpiration = "foo";
 | 
|      o.defaultHostname = "foo";
 | 
| -    o.dispatchRules = buildUnnamed3867();
 | 
| +    o.dispatchRules = buildUnnamed3341();
 | 
|      o.iap = buildIdentityAwareProxy();
 | 
|      o.id = "foo";
 | 
|      o.location = "foo";
 | 
| @@ -138,7 +138,7 @@ checkApplication(api.Application o) {
 | 
|      unittest.expect(o.defaultBucket, unittest.equals('foo'));
 | 
|      unittest.expect(o.defaultCookieExpiration, unittest.equals('foo'));
 | 
|      unittest.expect(o.defaultHostname, unittest.equals('foo'));
 | 
| -    checkUnnamed3867(o.dispatchRules);
 | 
| +    checkUnnamed3341(o.dispatchRules);
 | 
|      checkIdentityAwareProxy(o.iap);
 | 
|      unittest.expect(o.id, unittest.equals('foo'));
 | 
|      unittest.expect(o.location, unittest.equals('foo'));
 | 
| @@ -268,27 +268,27 @@ checkDebugInstanceRequest(api.DebugInstanceRequest o) {
 | 
|    buildCounterDebugInstanceRequest--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3868() {
 | 
| +buildUnnamed3342() {
 | 
|    var o = new core.Map<core.String, api.FileInfo>();
 | 
|    o["x"] = buildFileInfo();
 | 
|    o["y"] = buildFileInfo();
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3868(core.Map<core.String, api.FileInfo> o) {
 | 
| +checkUnnamed3342(core.Map<core.String, api.FileInfo> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkFileInfo(o["x"]);
 | 
|    checkFileInfo(o["y"]);
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3869() {
 | 
| +buildUnnamed3343() {
 | 
|    var o = new core.List<api.SourceReference>();
 | 
|    o.add(buildSourceReference());
 | 
|    o.add(buildSourceReference());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3869(core.List<api.SourceReference> o) {
 | 
| +checkUnnamed3343(core.List<api.SourceReference> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkSourceReference(o[0]);
 | 
|    checkSourceReference(o[1]);
 | 
| @@ -300,8 +300,8 @@ buildDeployment() {
 | 
|    buildCounterDeployment++;
 | 
|    if (buildCounterDeployment < 3) {
 | 
|      o.container = buildContainerInfo();
 | 
| -    o.files = buildUnnamed3868();
 | 
| -    o.sourceReferences = buildUnnamed3869();
 | 
| +    o.files = buildUnnamed3342();
 | 
| +    o.sourceReferences = buildUnnamed3343();
 | 
|    }
 | 
|    buildCounterDeployment--;
 | 
|    return o;
 | 
| @@ -311,8 +311,8 @@ checkDeployment(api.Deployment o) {
 | 
|    buildCounterDeployment++;
 | 
|    if (buildCounterDeployment < 3) {
 | 
|      checkContainerInfo(o.container);
 | 
| -    checkUnnamed3868(o.files);
 | 
| -    checkUnnamed3869(o.sourceReferences);
 | 
| +    checkUnnamed3342(o.files);
 | 
| +    checkUnnamed3343(o.sourceReferences);
 | 
|    }
 | 
|    buildCounterDeployment--;
 | 
|  }
 | 
| @@ -535,14 +535,14 @@ checkLibrary(api.Library o) {
 | 
|    buildCounterLibrary--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3870() {
 | 
| +buildUnnamed3344() {
 | 
|    var o = new core.List<api.Instance>();
 | 
|    o.add(buildInstance());
 | 
|    o.add(buildInstance());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3870(core.List<api.Instance> o) {
 | 
| +checkUnnamed3344(core.List<api.Instance> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkInstance(o[0]);
 | 
|    checkInstance(o[1]);
 | 
| @@ -553,7 +553,7 @@ buildListInstancesResponse() {
 | 
|    var o = new api.ListInstancesResponse();
 | 
|    buildCounterListInstancesResponse++;
 | 
|    if (buildCounterListInstancesResponse < 3) {
 | 
| -    o.instances = buildUnnamed3870();
 | 
| +    o.instances = buildUnnamed3344();
 | 
|      o.nextPageToken = "foo";
 | 
|    }
 | 
|    buildCounterListInstancesResponse--;
 | 
| @@ -563,20 +563,20 @@ buildListInstancesResponse() {
 | 
|  checkListInstancesResponse(api.ListInstancesResponse o) {
 | 
|    buildCounterListInstancesResponse++;
 | 
|    if (buildCounterListInstancesResponse < 3) {
 | 
| -    checkUnnamed3870(o.instances);
 | 
| +    checkUnnamed3344(o.instances);
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterListInstancesResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3871() {
 | 
| +buildUnnamed3345() {
 | 
|    var o = new core.List<api.Location>();
 | 
|    o.add(buildLocation());
 | 
|    o.add(buildLocation());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3871(core.List<api.Location> o) {
 | 
| +checkUnnamed3345(core.List<api.Location> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkLocation(o[0]);
 | 
|    checkLocation(o[1]);
 | 
| @@ -587,7 +587,7 @@ buildListLocationsResponse() {
 | 
|    var o = new api.ListLocationsResponse();
 | 
|    buildCounterListLocationsResponse++;
 | 
|    if (buildCounterListLocationsResponse < 3) {
 | 
| -    o.locations = buildUnnamed3871();
 | 
| +    o.locations = buildUnnamed3345();
 | 
|      o.nextPageToken = "foo";
 | 
|    }
 | 
|    buildCounterListLocationsResponse--;
 | 
| @@ -597,20 +597,20 @@ buildListLocationsResponse() {
 | 
|  checkListLocationsResponse(api.ListLocationsResponse o) {
 | 
|    buildCounterListLocationsResponse++;
 | 
|    if (buildCounterListLocationsResponse < 3) {
 | 
| -    checkUnnamed3871(o.locations);
 | 
| +    checkUnnamed3345(o.locations);
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterListLocationsResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3872() {
 | 
| +buildUnnamed3346() {
 | 
|    var o = new core.List<api.Operation>();
 | 
|    o.add(buildOperation());
 | 
|    o.add(buildOperation());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3872(core.List<api.Operation> o) {
 | 
| +checkUnnamed3346(core.List<api.Operation> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkOperation(o[0]);
 | 
|    checkOperation(o[1]);
 | 
| @@ -622,7 +622,7 @@ buildListOperationsResponse() {
 | 
|    buildCounterListOperationsResponse++;
 | 
|    if (buildCounterListOperationsResponse < 3) {
 | 
|      o.nextPageToken = "foo";
 | 
| -    o.operations = buildUnnamed3872();
 | 
| +    o.operations = buildUnnamed3346();
 | 
|    }
 | 
|    buildCounterListOperationsResponse--;
 | 
|    return o;
 | 
| @@ -632,19 +632,19 @@ checkListOperationsResponse(api.ListOperationsResponse o) {
 | 
|    buildCounterListOperationsResponse++;
 | 
|    if (buildCounterListOperationsResponse < 3) {
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
| -    checkUnnamed3872(o.operations);
 | 
| +    checkUnnamed3346(o.operations);
 | 
|    }
 | 
|    buildCounterListOperationsResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3873() {
 | 
| +buildUnnamed3347() {
 | 
|    var o = new core.List<api.Service>();
 | 
|    o.add(buildService());
 | 
|    o.add(buildService());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3873(core.List<api.Service> o) {
 | 
| +checkUnnamed3347(core.List<api.Service> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkService(o[0]);
 | 
|    checkService(o[1]);
 | 
| @@ -656,7 +656,7 @@ buildListServicesResponse() {
 | 
|    buildCounterListServicesResponse++;
 | 
|    if (buildCounterListServicesResponse < 3) {
 | 
|      o.nextPageToken = "foo";
 | 
| -    o.services = buildUnnamed3873();
 | 
| +    o.services = buildUnnamed3347();
 | 
|    }
 | 
|    buildCounterListServicesResponse--;
 | 
|    return o;
 | 
| @@ -666,19 +666,19 @@ checkListServicesResponse(api.ListServicesResponse o) {
 | 
|    buildCounterListServicesResponse++;
 | 
|    if (buildCounterListServicesResponse < 3) {
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
| -    checkUnnamed3873(o.services);
 | 
| +    checkUnnamed3347(o.services);
 | 
|    }
 | 
|    buildCounterListServicesResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3874() {
 | 
| +buildUnnamed3348() {
 | 
|    var o = new core.List<api.Version>();
 | 
|    o.add(buildVersion());
 | 
|    o.add(buildVersion());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3874(core.List<api.Version> o) {
 | 
| +checkUnnamed3348(core.List<api.Version> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkVersion(o[0]);
 | 
|    checkVersion(o[1]);
 | 
| @@ -690,7 +690,7 @@ buildListVersionsResponse() {
 | 
|    buildCounterListVersionsResponse++;
 | 
|    if (buildCounterListVersionsResponse < 3) {
 | 
|      o.nextPageToken = "foo";
 | 
| -    o.versions = buildUnnamed3874();
 | 
| +    o.versions = buildUnnamed3348();
 | 
|    }
 | 
|    buildCounterListVersionsResponse--;
 | 
|    return o;
 | 
| @@ -700,32 +700,32 @@ checkListVersionsResponse(api.ListVersionsResponse o) {
 | 
|    buildCounterListVersionsResponse++;
 | 
|    if (buildCounterListVersionsResponse < 3) {
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
| -    checkUnnamed3874(o.versions);
 | 
| +    checkUnnamed3348(o.versions);
 | 
|    }
 | 
|    buildCounterListVersionsResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3875() {
 | 
| +buildUnnamed3349() {
 | 
|    var o = new core.Map<core.String, core.String>();
 | 
|    o["x"] = "foo";
 | 
|    o["y"] = "foo";
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3875(core.Map<core.String, core.String> o) {
 | 
| +checkUnnamed3349(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'));
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3876() {
 | 
| +buildUnnamed3350() {
 | 
|    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;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3876(core.Map<core.String, core.Object> o) {
 | 
| +checkUnnamed3350(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')); 
 | 
| @@ -736,9 +736,9 @@ buildLocation() {
 | 
|    var o = new api.Location();
 | 
|    buildCounterLocation++;
 | 
|    if (buildCounterLocation < 3) {
 | 
| -    o.labels = buildUnnamed3875();
 | 
| +    o.labels = buildUnnamed3349();
 | 
|      o.locationId = "foo";
 | 
| -    o.metadata = buildUnnamed3876();
 | 
| +    o.metadata = buildUnnamed3350();
 | 
|      o.name = "foo";
 | 
|    }
 | 
|    buildCounterLocation--;
 | 
| @@ -748,9 +748,9 @@ buildLocation() {
 | 
|  checkLocation(api.Location o) {
 | 
|    buildCounterLocation++;
 | 
|    if (buildCounterLocation < 3) {
 | 
| -    checkUnnamed3875(o.labels);
 | 
| +    checkUnnamed3349(o.labels);
 | 
|      unittest.expect(o.locationId, unittest.equals('foo'));
 | 
| -    checkUnnamed3876(o.metadata);
 | 
| +    checkUnnamed3350(o.metadata);
 | 
|      unittest.expect(o.name, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterLocation--;
 | 
| @@ -796,14 +796,14 @@ checkManualScaling(api.ManualScaling o) {
 | 
|    buildCounterManualScaling--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3877() {
 | 
| +buildUnnamed3351() {
 | 
|    var o = new core.List<core.String>();
 | 
|    o.add("foo");
 | 
|    o.add("foo");
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3877(core.List<core.String> o) {
 | 
| +checkUnnamed3351(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'));
 | 
| @@ -814,7 +814,7 @@ buildNetwork() {
 | 
|    var o = new api.Network();
 | 
|    buildCounterNetwork++;
 | 
|    if (buildCounterNetwork < 3) {
 | 
| -    o.forwardedPorts = buildUnnamed3877();
 | 
| +    o.forwardedPorts = buildUnnamed3351();
 | 
|      o.instanceTag = "foo";
 | 
|      o.name = "foo";
 | 
|      o.subnetworkName = "foo";
 | 
| @@ -826,7 +826,7 @@ buildNetwork() {
 | 
|  checkNetwork(api.Network o) {
 | 
|    buildCounterNetwork++;
 | 
|    if (buildCounterNetwork < 3) {
 | 
| -    checkUnnamed3877(o.forwardedPorts);
 | 
| +    checkUnnamed3351(o.forwardedPorts);
 | 
|      unittest.expect(o.instanceTag, unittest.equals('foo'));
 | 
|      unittest.expect(o.name, unittest.equals('foo'));
 | 
|      unittest.expect(o.subnetworkName, unittest.equals('foo'));
 | 
| @@ -859,27 +859,27 @@ checkNetworkUtilization(api.NetworkUtilization o) {
 | 
|    buildCounterNetworkUtilization--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3878() {
 | 
| +buildUnnamed3352() {
 | 
|    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;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3878(core.Map<core.String, core.Object> o) {
 | 
| +checkUnnamed3352(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')); 
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3879() {
 | 
| +buildUnnamed3353() {
 | 
|    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;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3879(core.Map<core.String, core.Object> o) {
 | 
| +checkUnnamed3353(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')); 
 | 
| @@ -892,9 +892,9 @@ buildOperation() {
 | 
|    if (buildCounterOperation < 3) {
 | 
|      o.done = true;
 | 
|      o.error = buildStatus();
 | 
| -    o.metadata = buildUnnamed3878();
 | 
| +    o.metadata = buildUnnamed3352();
 | 
|      o.name = "foo";
 | 
| -    o.response = buildUnnamed3879();
 | 
| +    o.response = buildUnnamed3353();
 | 
|    }
 | 
|    buildCounterOperation--;
 | 
|    return o;
 | 
| @@ -905,9 +905,9 @@ checkOperation(api.Operation o) {
 | 
|    if (buildCounterOperation < 3) {
 | 
|      unittest.expect(o.done, unittest.isTrue);
 | 
|      checkStatus(o.error);
 | 
| -    checkUnnamed3878(o.metadata);
 | 
| +    checkUnnamed3352(o.metadata);
 | 
|      unittest.expect(o.name, unittest.equals('foo'));
 | 
| -    checkUnnamed3879(o.response);
 | 
| +    checkUnnamed3353(o.response);
 | 
|    }
 | 
|    buildCounterOperation--;
 | 
|  }
 | 
| @@ -968,14 +968,14 @@ checkOperationMetadataExperimental(api.OperationMetadataExperimental o) {
 | 
|    buildCounterOperationMetadataExperimental--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3880() {
 | 
| +buildUnnamed3354() {
 | 
|    var o = new core.List<core.String>();
 | 
|    o.add("foo");
 | 
|    o.add("foo");
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3880(core.List<core.String> o) {
 | 
| +checkUnnamed3354(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'));
 | 
| @@ -992,7 +992,7 @@ buildOperationMetadataV1() {
 | 
|      o.method = "foo";
 | 
|      o.target = "foo";
 | 
|      o.user = "foo";
 | 
| -    o.warning = buildUnnamed3880();
 | 
| +    o.warning = buildUnnamed3354();
 | 
|    }
 | 
|    buildCounterOperationMetadataV1--;
 | 
|    return o;
 | 
| @@ -1007,19 +1007,63 @@ checkOperationMetadataV1(api.OperationMetadataV1 o) {
 | 
|      unittest.expect(o.method, unittest.equals('foo'));
 | 
|      unittest.expect(o.target, unittest.equals('foo'));
 | 
|      unittest.expect(o.user, unittest.equals('foo'));
 | 
| -    checkUnnamed3880(o.warning);
 | 
| +    checkUnnamed3354(o.warning);
 | 
|    }
 | 
|    buildCounterOperationMetadataV1--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3881() {
 | 
| +buildUnnamed3355() {
 | 
|    var o = new core.List<core.String>();
 | 
|    o.add("foo");
 | 
|    o.add("foo");
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3881(core.List<core.String> o) {
 | 
| +checkUnnamed3355(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 buildCounterOperationMetadataV1Alpha = 0;
 | 
| +buildOperationMetadataV1Alpha() {
 | 
| +  var o = new api.OperationMetadataV1Alpha();
 | 
| +  buildCounterOperationMetadataV1Alpha++;
 | 
| +  if (buildCounterOperationMetadataV1Alpha < 3) {
 | 
| +    o.endTime = "foo";
 | 
| +    o.ephemeralMessage = "foo";
 | 
| +    o.insertTime = "foo";
 | 
| +    o.method = "foo";
 | 
| +    o.target = "foo";
 | 
| +    o.user = "foo";
 | 
| +    o.warning = buildUnnamed3355();
 | 
| +  }
 | 
| +  buildCounterOperationMetadataV1Alpha--;
 | 
| +  return o;
 | 
| +}
 | 
| +
 | 
| +checkOperationMetadataV1Alpha(api.OperationMetadataV1Alpha o) {
 | 
| +  buildCounterOperationMetadataV1Alpha++;
 | 
| +  if (buildCounterOperationMetadataV1Alpha < 3) {
 | 
| +    unittest.expect(o.endTime, unittest.equals('foo'));
 | 
| +    unittest.expect(o.ephemeralMessage, unittest.equals('foo'));
 | 
| +    unittest.expect(o.insertTime, unittest.equals('foo'));
 | 
| +    unittest.expect(o.method, unittest.equals('foo'));
 | 
| +    unittest.expect(o.target, unittest.equals('foo'));
 | 
| +    unittest.expect(o.user, unittest.equals('foo'));
 | 
| +    checkUnnamed3355(o.warning);
 | 
| +  }
 | 
| +  buildCounterOperationMetadataV1Alpha--;
 | 
| +}
 | 
| +
 | 
| +buildUnnamed3356() {
 | 
| +  var o = new core.List<core.String>();
 | 
| +  o.add("foo");
 | 
| +  o.add("foo");
 | 
| +  return o;
 | 
| +}
 | 
| +
 | 
| +checkUnnamed3356(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'));
 | 
| @@ -1036,7 +1080,7 @@ buildOperationMetadataV1Beta() {
 | 
|      o.method = "foo";
 | 
|      o.target = "foo";
 | 
|      o.user = "foo";
 | 
| -    o.warning = buildUnnamed3881();
 | 
| +    o.warning = buildUnnamed3356();
 | 
|    }
 | 
|    buildCounterOperationMetadataV1Beta--;
 | 
|    return o;
 | 
| @@ -1051,7 +1095,7 @@ checkOperationMetadataV1Beta(api.OperationMetadataV1Beta o) {
 | 
|      unittest.expect(o.method, unittest.equals('foo'));
 | 
|      unittest.expect(o.target, unittest.equals('foo'));
 | 
|      unittest.expect(o.user, unittest.equals('foo'));
 | 
| -    checkUnnamed3881(o.warning);
 | 
| +    checkUnnamed3356(o.warning);
 | 
|    }
 | 
|    buildCounterOperationMetadataV1Beta--;
 | 
|  }
 | 
| @@ -1104,14 +1148,14 @@ checkRequestUtilization(api.RequestUtilization o) {
 | 
|    buildCounterRequestUtilization--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3882() {
 | 
| +buildUnnamed3357() {
 | 
|    var o = new core.List<api.Volume>();
 | 
|    o.add(buildVolume());
 | 
|    o.add(buildVolume());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3882(core.List<api.Volume> o) {
 | 
| +checkUnnamed3357(core.List<api.Volume> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkVolume(o[0]);
 | 
|    checkVolume(o[1]);
 | 
| @@ -1125,7 +1169,7 @@ buildResources() {
 | 
|      o.cpu = 42.0;
 | 
|      o.diskGb = 42.0;
 | 
|      o.memoryGb = 42.0;
 | 
| -    o.volumes = buildUnnamed3882();
 | 
| +    o.volumes = buildUnnamed3357();
 | 
|    }
 | 
|    buildCounterResources--;
 | 
|    return o;
 | 
| @@ -1137,7 +1181,7 @@ checkResources(api.Resources o) {
 | 
|      unittest.expect(o.cpu, unittest.equals(42.0));
 | 
|      unittest.expect(o.diskGb, unittest.equals(42.0));
 | 
|      unittest.expect(o.memoryGb, unittest.equals(42.0));
 | 
| -    checkUnnamed3882(o.volumes);
 | 
| +    checkUnnamed3357(o.volumes);
 | 
|    }
 | 
|    buildCounterResources--;
 | 
|  }
 | 
| @@ -1205,14 +1249,14 @@ checkSourceReference(api.SourceReference o) {
 | 
|    buildCounterSourceReference--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3883() {
 | 
| +buildUnnamed3358() {
 | 
|    var o = new core.Map<core.String, core.String>();
 | 
|    o["x"] = "foo";
 | 
|    o["y"] = "foo";
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3883(core.Map<core.String, core.String> o) {
 | 
| +checkUnnamed3358(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'));
 | 
| @@ -1225,7 +1269,7 @@ buildStaticFilesHandler() {
 | 
|    if (buildCounterStaticFilesHandler < 3) {
 | 
|      o.applicationReadable = true;
 | 
|      o.expiration = "foo";
 | 
| -    o.httpHeaders = buildUnnamed3883();
 | 
| +    o.httpHeaders = buildUnnamed3358();
 | 
|      o.mimeType = "foo";
 | 
|      o.path = "foo";
 | 
|      o.requireMatchingFile = true;
 | 
| @@ -1240,7 +1284,7 @@ checkStaticFilesHandler(api.StaticFilesHandler o) {
 | 
|    if (buildCounterStaticFilesHandler < 3) {
 | 
|      unittest.expect(o.applicationReadable, unittest.isTrue);
 | 
|      unittest.expect(o.expiration, unittest.equals('foo'));
 | 
| -    checkUnnamed3883(o.httpHeaders);
 | 
| +    checkUnnamed3358(o.httpHeaders);
 | 
|      unittest.expect(o.mimeType, unittest.equals('foo'));
 | 
|      unittest.expect(o.path, unittest.equals('foo'));
 | 
|      unittest.expect(o.requireMatchingFile, unittest.isTrue);
 | 
| @@ -1249,30 +1293,30 @@ checkStaticFilesHandler(api.StaticFilesHandler o) {
 | 
|    buildCounterStaticFilesHandler--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3884() {
 | 
| +buildUnnamed3359() {
 | 
|    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;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3884(core.Map<core.String, core.Object> o) {
 | 
| +checkUnnamed3359(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')); 
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3885() {
 | 
| +buildUnnamed3360() {
 | 
|    var o = new core.List<core.Map<core.String, core.Object>>();
 | 
| -  o.add(buildUnnamed3884());
 | 
| -  o.add(buildUnnamed3884());
 | 
| +  o.add(buildUnnamed3359());
 | 
| +  o.add(buildUnnamed3359());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3885(core.List<core.Map<core.String, core.Object>> o) {
 | 
| +checkUnnamed3360(core.List<core.Map<core.String, core.Object>> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
| -  checkUnnamed3884(o[0]);
 | 
| -  checkUnnamed3884(o[1]);
 | 
| +  checkUnnamed3359(o[0]);
 | 
| +  checkUnnamed3359(o[1]);
 | 
|  }
 | 
|  
 | 
|  core.int buildCounterStatus = 0;
 | 
| @@ -1281,7 +1325,7 @@ buildStatus() {
 | 
|    buildCounterStatus++;
 | 
|    if (buildCounterStatus < 3) {
 | 
|      o.code = 42;
 | 
| -    o.details = buildUnnamed3885();
 | 
| +    o.details = buildUnnamed3360();
 | 
|      o.message = "foo";
 | 
|    }
 | 
|    buildCounterStatus--;
 | 
| @@ -1292,20 +1336,20 @@ checkStatus(api.Status o) {
 | 
|    buildCounterStatus++;
 | 
|    if (buildCounterStatus < 3) {
 | 
|      unittest.expect(o.code, unittest.equals(42));
 | 
| -    checkUnnamed3885(o.details);
 | 
| +    checkUnnamed3360(o.details);
 | 
|      unittest.expect(o.message, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterStatus--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3886() {
 | 
| +buildUnnamed3361() {
 | 
|    var o = new core.Map<core.String, core.double>();
 | 
|    o["x"] = 42.0;
 | 
|    o["y"] = 42.0;
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3886(core.Map<core.String, core.double> o) {
 | 
| +checkUnnamed3361(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));
 | 
| @@ -1316,7 +1360,7 @@ buildTrafficSplit() {
 | 
|    var o = new api.TrafficSplit();
 | 
|    buildCounterTrafficSplit++;
 | 
|    if (buildCounterTrafficSplit < 3) {
 | 
| -    o.allocations = buildUnnamed3886();
 | 
| +    o.allocations = buildUnnamed3361();
 | 
|      o.shardBy = "foo";
 | 
|    }
 | 
|    buildCounterTrafficSplit--;
 | 
| @@ -1326,7 +1370,7 @@ buildTrafficSplit() {
 | 
|  checkTrafficSplit(api.TrafficSplit o) {
 | 
|    buildCounterTrafficSplit++;
 | 
|    if (buildCounterTrafficSplit < 3) {
 | 
| -    checkUnnamed3886(o.allocations);
 | 
| +    checkUnnamed3361(o.allocations);
 | 
|      unittest.expect(o.shardBy, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterTrafficSplit--;
 | 
| @@ -1388,79 +1432,79 @@ checkUrlMap(api.UrlMap o) {
 | 
|    buildCounterUrlMap--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3887() {
 | 
| +buildUnnamed3362() {
 | 
|    var o = new core.Map<core.String, core.String>();
 | 
|    o["x"] = "foo";
 | 
|    o["y"] = "foo";
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3887(core.Map<core.String, core.String> o) {
 | 
| +checkUnnamed3362(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'));
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3888() {
 | 
| +buildUnnamed3363() {
 | 
|    var o = new core.Map<core.String, core.String>();
 | 
|    o["x"] = "foo";
 | 
|    o["y"] = "foo";
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3888(core.Map<core.String, core.String> o) {
 | 
| +checkUnnamed3363(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'));
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3889() {
 | 
| +buildUnnamed3364() {
 | 
|    var o = new core.List<api.ErrorHandler>();
 | 
|    o.add(buildErrorHandler());
 | 
|    o.add(buildErrorHandler());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3889(core.List<api.ErrorHandler> o) {
 | 
| +checkUnnamed3364(core.List<api.ErrorHandler> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkErrorHandler(o[0]);
 | 
|    checkErrorHandler(o[1]);
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3890() {
 | 
| +buildUnnamed3365() {
 | 
|    var o = new core.List<api.UrlMap>();
 | 
|    o.add(buildUrlMap());
 | 
|    o.add(buildUrlMap());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3890(core.List<api.UrlMap> o) {
 | 
| +checkUnnamed3365(core.List<api.UrlMap> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkUrlMap(o[0]);
 | 
|    checkUrlMap(o[1]);
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3891() {
 | 
| +buildUnnamed3366() {
 | 
|    var o = new core.List<core.String>();
 | 
|    o.add("foo");
 | 
|    o.add("foo");
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3891(core.List<core.String> o) {
 | 
| +checkUnnamed3366(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'));
 | 
|  }
 | 
|  
 | 
| -buildUnnamed3892() {
 | 
| +buildUnnamed3367() {
 | 
|    var o = new core.List<api.Library>();
 | 
|    o.add(buildLibrary());
 | 
|    o.add(buildLibrary());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed3892(core.List<api.Library> o) {
 | 
| +checkUnnamed3367(core.List<api.Library> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkLibrary(o[0]);
 | 
|    checkLibrary(o[1]);
 | 
| @@ -1474,7 +1518,7 @@ buildVersion() {
 | 
|      o.apiConfig = buildApiConfigHandler();
 | 
|      o.automaticScaling = buildAutomaticScaling();
 | 
|      o.basicScaling = buildBasicScaling();
 | 
| -    o.betaSettings = buildUnnamed3887();
 | 
| +    o.betaSettings = buildUnnamed3362();
 | 
|      o.creationTime = "foo";
 | 
|      o.defaultExpiration = "foo";
 | 
|      o.deployer = "foo";
 | 
| @@ -1482,20 +1526,21 @@ buildVersion() {
 | 
|      o.diskUsageBytes = "foo";
 | 
|      o.endpointsApiService = buildEndpointsApiService();
 | 
|      o.env = "foo";
 | 
| -    o.envVariables = buildUnnamed3888();
 | 
| -    o.errorHandlers = buildUnnamed3889();
 | 
| -    o.handlers = buildUnnamed3890();
 | 
| +    o.envVariables = buildUnnamed3363();
 | 
| +    o.errorHandlers = buildUnnamed3364();
 | 
| +    o.handlers = buildUnnamed3365();
 | 
|      o.healthCheck = buildHealthCheck();
 | 
|      o.id = "foo";
 | 
| -    o.inboundServices = buildUnnamed3891();
 | 
| +    o.inboundServices = buildUnnamed3366();
 | 
|      o.instanceClass = "foo";
 | 
| -    o.libraries = buildUnnamed3892();
 | 
| +    o.libraries = buildUnnamed3367();
 | 
|      o.manualScaling = buildManualScaling();
 | 
|      o.name = "foo";
 | 
|      o.network = buildNetwork();
 | 
|      o.nobuildFilesRegex = "foo";
 | 
|      o.resources = buildResources();
 | 
|      o.runtime = "foo";
 | 
| +    o.runtimeApiVersion = "foo";
 | 
|      o.servingStatus = "foo";
 | 
|      o.threadsafe = true;
 | 
|      o.vm = true;
 | 
| @@ -1510,7 +1555,7 @@ checkVersion(api.Version o) {
 | 
|      checkApiConfigHandler(o.apiConfig);
 | 
|      checkAutomaticScaling(o.automaticScaling);
 | 
|      checkBasicScaling(o.basicScaling);
 | 
| -    checkUnnamed3887(o.betaSettings);
 | 
| +    checkUnnamed3362(o.betaSettings);
 | 
|      unittest.expect(o.creationTime, unittest.equals('foo'));
 | 
|      unittest.expect(o.defaultExpiration, unittest.equals('foo'));
 | 
|      unittest.expect(o.deployer, unittest.equals('foo'));
 | 
| @@ -1518,20 +1563,21 @@ checkVersion(api.Version o) {
 | 
|      unittest.expect(o.diskUsageBytes, unittest.equals('foo'));
 | 
|      checkEndpointsApiService(o.endpointsApiService);
 | 
|      unittest.expect(o.env, unittest.equals('foo'));
 | 
| -    checkUnnamed3888(o.envVariables);
 | 
| -    checkUnnamed3889(o.errorHandlers);
 | 
| -    checkUnnamed3890(o.handlers);
 | 
| +    checkUnnamed3363(o.envVariables);
 | 
| +    checkUnnamed3364(o.errorHandlers);
 | 
| +    checkUnnamed3365(o.handlers);
 | 
|      checkHealthCheck(o.healthCheck);
 | 
|      unittest.expect(o.id, unittest.equals('foo'));
 | 
| -    checkUnnamed3891(o.inboundServices);
 | 
| +    checkUnnamed3366(o.inboundServices);
 | 
|      unittest.expect(o.instanceClass, unittest.equals('foo'));
 | 
| -    checkUnnamed3892(o.libraries);
 | 
| +    checkUnnamed3367(o.libraries);
 | 
|      checkManualScaling(o.manualScaling);
 | 
|      unittest.expect(o.name, unittest.equals('foo'));
 | 
|      checkNetwork(o.network);
 | 
|      unittest.expect(o.nobuildFilesRegex, unittest.equals('foo'));
 | 
|      checkResources(o.resources);
 | 
|      unittest.expect(o.runtime, unittest.equals('foo'));
 | 
| +    unittest.expect(o.runtimeApiVersion, unittest.equals('foo'));
 | 
|      unittest.expect(o.servingStatus, unittest.equals('foo'));
 | 
|      unittest.expect(o.threadsafe, unittest.isTrue);
 | 
|      unittest.expect(o.vm, unittest.isTrue);
 | 
| @@ -1843,6 +1889,15 @@ main() {
 | 
|    });
 | 
|  
 | 
|  
 | 
| +  unittest.group("obj-schema-OperationMetadataV1Alpha", () {
 | 
| +    unittest.test("to-json--from-json", () {
 | 
| +      var o = buildOperationMetadataV1Alpha();
 | 
| +      var od = new api.OperationMetadataV1Alpha.fromJson(o.toJson());
 | 
| +      checkOperationMetadataV1Alpha(od);
 | 
| +    });
 | 
| +  });
 | 
| +
 | 
| +
 | 
|    unittest.group("obj-schema-OperationMetadataV1Beta", () {
 | 
|      unittest.test("to-json--from-json", () {
 | 
|        var o = buildOperationMetadataV1Beta();
 | 
| @@ -1975,7 +2030,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.AppsResourceApi res = new api.AppengineApi(mock).apps;
 | 
|        var arg_request = buildApplication();
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.Application.fromJson(json);
 | 
|          checkApplication(obj);
 | 
|  
 | 
| @@ -2012,7 +2067,7 @@ main() {
 | 
|          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);
 | 
|        })));
 | 
|      });
 | 
| @@ -2023,7 +2078,7 @@ main() {
 | 
|        api.AppsResourceApi res = new api.AppengineApi(mock).apps;
 | 
|        var arg_appsId = "foo";
 | 
|        var arg_ensureResourcesExist = true;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var path = (req.url).path;
 | 
|          var pathOffset = 0;
 | 
|          var index;
 | 
| @@ -2061,7 +2116,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildApplication());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_appsId, ensureResourcesExist: arg_ensureResourcesExist).then(unittest.expectAsync(((api.Application response) {
 | 
| +      res.get(arg_appsId, ensureResourcesExist: arg_ensureResourcesExist).then(unittest.expectAsync1(((api.Application response) {
 | 
|          checkApplication(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2073,7 +2128,7 @@ main() {
 | 
|        var arg_request = buildApplication();
 | 
|        var arg_appsId = "foo";
 | 
|        var arg_mask = "foo";
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.Application.fromJson(json);
 | 
|          checkApplication(obj);
 | 
|  
 | 
| @@ -2114,7 +2169,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildOperation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.patch(arg_request, arg_appsId, mask: arg_mask).then(unittest.expectAsync(((api.Operation response) {
 | 
| +      res.patch(arg_request, arg_appsId, mask: arg_mask).then(unittest.expectAsync1(((api.Operation response) {
 | 
|          checkOperation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2129,7 +2184,7 @@ main() {
 | 
|        api.AppsLocationsResourceApi res = new api.AppengineApi(mock).apps.locations;
 | 
|        var arg_appsId = "foo";
 | 
|        var arg_locationsId = "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;
 | 
| @@ -2173,7 +2228,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLocation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_appsId, arg_locationsId).then(unittest.expectAsync(((api.Location response) {
 | 
| +      res.get(arg_appsId, arg_locationsId).then(unittest.expectAsync1(((api.Location response) {
 | 
|          checkLocation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2183,10 +2238,10 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.AppsLocationsResourceApi res = new api.AppengineApi(mock).apps.locations;
 | 
|        var arg_appsId = "foo";
 | 
| -      var arg_filter = "foo";
 | 
|        var arg_pageToken = "foo";
 | 
|        var arg_pageSize = 42;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      var arg_filter = "foo";
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var path = (req.url).path;
 | 
|          var pathOffset = 0;
 | 
|          var index;
 | 
| @@ -2219,9 +2274,9 @@ main() {
 | 
|              addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
 | 
|            }
 | 
|          }
 | 
| -        unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
 | 
|          unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 | 
|          unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
 | 
| +        unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
 | 
|  
 | 
|  
 | 
|          var h = {
 | 
| @@ -2230,7 +2285,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListLocationsResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_appsId, filter: arg_filter, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListLocationsResponse response) {
 | 
| +      res.list(arg_appsId, pageToken: arg_pageToken, pageSize: arg_pageSize, filter: arg_filter).then(unittest.expectAsync1(((api.ListLocationsResponse response) {
 | 
|          checkListLocationsResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2245,7 +2300,7 @@ main() {
 | 
|        api.AppsOperationsResourceApi res = new api.AppengineApi(mock).apps.operations;
 | 
|        var arg_appsId = "foo";
 | 
|        var arg_operationsId = "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;
 | 
| @@ -2289,7 +2344,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildOperation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_appsId, arg_operationsId).then(unittest.expectAsync(((api.Operation response) {
 | 
| +      res.get(arg_appsId, arg_operationsId).then(unittest.expectAsync1(((api.Operation response) {
 | 
|          checkOperation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2299,10 +2354,10 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.AppsOperationsResourceApi res = new api.AppengineApi(mock).apps.operations;
 | 
|        var arg_appsId = "foo";
 | 
| -      var arg_filter = "foo";
 | 
|        var arg_pageToken = "foo";
 | 
|        var arg_pageSize = 42;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      var arg_filter = "foo";
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var path = (req.url).path;
 | 
|          var pathOffset = 0;
 | 
|          var index;
 | 
| @@ -2335,9 +2390,9 @@ main() {
 | 
|              addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
 | 
|            }
 | 
|          }
 | 
| -        unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
 | 
|          unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 | 
|          unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
 | 
| +        unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
 | 
|  
 | 
|  
 | 
|          var h = {
 | 
| @@ -2346,7 +2401,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListOperationsResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_appsId, filter: arg_filter, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListOperationsResponse response) {
 | 
| +      res.list(arg_appsId, pageToken: arg_pageToken, pageSize: arg_pageSize, filter: arg_filter).then(unittest.expectAsync1(((api.ListOperationsResponse response) {
 | 
|          checkListOperationsResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2361,7 +2416,7 @@ main() {
 | 
|        api.AppsServicesResourceApi res = new api.AppengineApi(mock).apps.services;
 | 
|        var arg_appsId = "foo";
 | 
|        var arg_servicesId = "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;
 | 
| @@ -2405,7 +2460,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildOperation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_appsId, arg_servicesId).then(unittest.expectAsync(((api.Operation response) {
 | 
| +      res.delete(arg_appsId, arg_servicesId).then(unittest.expectAsync1(((api.Operation response) {
 | 
|          checkOperation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2416,7 +2471,7 @@ main() {
 | 
|        api.AppsServicesResourceApi res = new api.AppengineApi(mock).apps.services;
 | 
|        var arg_appsId = "foo";
 | 
|        var arg_servicesId = "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;
 | 
| @@ -2460,7 +2515,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildService());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_appsId, arg_servicesId).then(unittest.expectAsync(((api.Service response) {
 | 
| +      res.get(arg_appsId, arg_servicesId).then(unittest.expectAsync1(((api.Service response) {
 | 
|          checkService(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2472,7 +2527,7 @@ main() {
 | 
|        var arg_appsId = "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;
 | 
| @@ -2515,7 +2570,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListServicesResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_appsId, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListServicesResponse response) {
 | 
| +      res.list(arg_appsId, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListServicesResponse response) {
 | 
|          checkListServicesResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2529,7 +2584,7 @@ main() {
 | 
|        var arg_servicesId = "foo";
 | 
|        var arg_migrateTraffic = true;
 | 
|        var arg_mask = "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);
 | 
|  
 | 
| @@ -2578,7 +2633,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildOperation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.patch(arg_request, arg_appsId, arg_servicesId, migrateTraffic: arg_migrateTraffic, mask: arg_mask).then(unittest.expectAsync(((api.Operation response) {
 | 
| +      res.patch(arg_request, arg_appsId, arg_servicesId, migrateTraffic: arg_migrateTraffic, mask: arg_mask).then(unittest.expectAsync1(((api.Operation response) {
 | 
|          checkOperation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2594,7 +2649,7 @@ main() {
 | 
|        var arg_request = buildVersion();
 | 
|        var arg_appsId = "foo";
 | 
|        var arg_servicesId = "foo";
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.Version.fromJson(json);
 | 
|          checkVersion(obj);
 | 
|  
 | 
| @@ -2645,7 +2700,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildOperation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.create(arg_request, arg_appsId, arg_servicesId).then(unittest.expectAsync(((api.Operation response) {
 | 
| +      res.create(arg_request, arg_appsId, arg_servicesId).then(unittest.expectAsync1(((api.Operation response) {
 | 
|          checkOperation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2657,7 +2712,7 @@ main() {
 | 
|        var arg_appsId = "foo";
 | 
|        var arg_servicesId = "foo";
 | 
|        var arg_versionsId = "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;
 | 
| @@ -2708,7 +2763,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildOperation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_appsId, arg_servicesId, arg_versionsId).then(unittest.expectAsync(((api.Operation response) {
 | 
| +      res.delete(arg_appsId, arg_servicesId, arg_versionsId).then(unittest.expectAsync1(((api.Operation response) {
 | 
|          checkOperation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2721,7 +2776,7 @@ main() {
 | 
|        var arg_servicesId = "foo";
 | 
|        var arg_versionsId = "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;
 | 
| @@ -2773,7 +2828,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildVersion());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_appsId, arg_servicesId, arg_versionsId, view: arg_view).then(unittest.expectAsync(((api.Version response) {
 | 
| +      res.get(arg_appsId, arg_servicesId, arg_versionsId, view: arg_view).then(unittest.expectAsync1(((api.Version response) {
 | 
|          checkVersion(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2787,7 +2842,7 @@ main() {
 | 
|        var arg_pageToken = "foo";
 | 
|        var arg_pageSize = 42;
 | 
|        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;
 | 
| @@ -2838,7 +2893,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListVersionsResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_appsId, arg_servicesId, pageToken: arg_pageToken, pageSize: arg_pageSize, view: arg_view).then(unittest.expectAsync(((api.ListVersionsResponse response) {
 | 
| +      res.list(arg_appsId, arg_servicesId, pageToken: arg_pageToken, pageSize: arg_pageSize, view: arg_view).then(unittest.expectAsync1(((api.ListVersionsResponse response) {
 | 
|          checkListVersionsResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2852,7 +2907,7 @@ main() {
 | 
|        var arg_servicesId = "foo";
 | 
|        var arg_versionsId = "foo";
 | 
|        var arg_mask = "foo";
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.Version.fromJson(json);
 | 
|          checkVersion(obj);
 | 
|  
 | 
| @@ -2907,7 +2962,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildOperation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.patch(arg_request, arg_appsId, arg_servicesId, arg_versionsId, mask: arg_mask).then(unittest.expectAsync(((api.Operation response) {
 | 
| +      res.patch(arg_request, arg_appsId, arg_servicesId, arg_versionsId, mask: arg_mask).then(unittest.expectAsync1(((api.Operation response) {
 | 
|          checkOperation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2925,7 +2980,7 @@ main() {
 | 
|        var arg_servicesId = "foo";
 | 
|        var arg_versionsId = "foo";
 | 
|        var arg_instancesId = "foo";
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.DebugInstanceRequest.fromJson(json);
 | 
|          checkDebugInstanceRequest(obj);
 | 
|  
 | 
| @@ -2990,7 +3045,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildOperation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.debug(arg_request, arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId).then(unittest.expectAsync(((api.Operation response) {
 | 
| +      res.debug(arg_request, arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId).then(unittest.expectAsync1(((api.Operation response) {
 | 
|          checkOperation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -3003,7 +3058,7 @@ main() {
 | 
|        var arg_servicesId = "foo";
 | 
|        var arg_versionsId = "foo";
 | 
|        var arg_instancesId = "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;
 | 
| @@ -3061,7 +3116,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildOperation());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId).then(unittest.expectAsync(((api.Operation response) {
 | 
| +      res.delete(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId).then(unittest.expectAsync1(((api.Operation response) {
 | 
|          checkOperation(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -3074,7 +3129,7 @@ main() {
 | 
|        var arg_servicesId = "foo";
 | 
|        var arg_versionsId = "foo";
 | 
|        var arg_instancesId = "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;
 | 
| @@ -3132,7 +3187,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildInstance());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId).then(unittest.expectAsync(((api.Instance response) {
 | 
| +      res.get(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId).then(unittest.expectAsync1(((api.Instance response) {
 | 
|          checkInstance(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -3146,7 +3201,7 @@ main() {
 | 
|        var arg_versionsId = "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;
 | 
| @@ -3203,7 +3258,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListInstancesResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_appsId, arg_servicesId, arg_versionsId, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListInstancesResponse response) {
 | 
| +      res.list(arg_appsId, arg_servicesId, arg_versionsId, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListInstancesResponse response) {
 | 
|          checkListInstancesResponse(response);
 | 
|        })));
 | 
|      });
 | 
| 
 |