| Index: generated/googleapis/test/admin/reports_v1_test.dart
 | 
| diff --git a/generated/googleapis/test/admin/reports_v1_test.dart b/generated/googleapis/test/admin/reports_v1_test.dart
 | 
| index 8bb51e322b649f3c62a8699cfdbf2df1b04cfe50..cd1fc22ca58badc23879f66e8861f3660d09b586 100644
 | 
| --- a/generated/googleapis/test/admin/reports_v1_test.dart
 | 
| +++ b/generated/googleapis/test/admin/reports_v1_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/admin/reports_v1.dart' as api;
 | 
|  
 | 
| @@ -46,19 +46,19 @@ 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);
 | 
|  }
 | 
|  
 | 
| -buildUnnamed619() {
 | 
| +buildUnnamed624() {
 | 
|    var o = new core.List<api.Activity>();
 | 
|    o.add(buildActivity());
 | 
|    o.add(buildActivity());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed619(core.List<api.Activity> o) {
 | 
| +checkUnnamed624(core.List<api.Activity> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkActivity(o[0]);
 | 
|    checkActivity(o[1]);
 | 
| @@ -70,7 +70,7 @@ buildActivities() {
 | 
|    buildCounterActivities++;
 | 
|    if (buildCounterActivities < 3) {
 | 
|      o.etag = "foo";
 | 
| -    o.items = buildUnnamed619();
 | 
| +    o.items = buildUnnamed624();
 | 
|      o.kind = "foo";
 | 
|      o.nextPageToken = "foo";
 | 
|    }
 | 
| @@ -82,7 +82,7 @@ checkActivities(api.Activities o) {
 | 
|    buildCounterActivities++;
 | 
|    if (buildCounterActivities < 3) {
 | 
|      unittest.expect(o.etag, unittest.equals('foo'));
 | 
| -    checkUnnamed619(o.items);
 | 
| +    checkUnnamed624(o.items);
 | 
|      unittest.expect(o.kind, unittest.equals('foo'));
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
|    }
 | 
| @@ -114,27 +114,27 @@ checkActivityActor(api.ActivityActor o) {
 | 
|    buildCounterActivityActor--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed620() {
 | 
| +buildUnnamed625() {
 | 
|    var o = new core.List<core.String>();
 | 
|    o.add("foo");
 | 
|    o.add("foo");
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed620(core.List<core.String> o) {
 | 
| +checkUnnamed625(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'));
 | 
|  }
 | 
|  
 | 
| -buildUnnamed621() {
 | 
| +buildUnnamed626() {
 | 
|    var o = new core.List<core.String>();
 | 
|    o.add("foo");
 | 
|    o.add("foo");
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed621(core.List<core.String> o) {
 | 
| +checkUnnamed626(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'));
 | 
| @@ -147,8 +147,8 @@ buildActivityEventsParameters() {
 | 
|    if (buildCounterActivityEventsParameters < 3) {
 | 
|      o.boolValue = true;
 | 
|      o.intValue = "foo";
 | 
| -    o.multiIntValue = buildUnnamed620();
 | 
| -    o.multiValue = buildUnnamed621();
 | 
| +    o.multiIntValue = buildUnnamed625();
 | 
| +    o.multiValue = buildUnnamed626();
 | 
|      o.name = "foo";
 | 
|      o.value = "foo";
 | 
|    }
 | 
| @@ -161,22 +161,22 @@ checkActivityEventsParameters(api.ActivityEventsParameters o) {
 | 
|    if (buildCounterActivityEventsParameters < 3) {
 | 
|      unittest.expect(o.boolValue, unittest.isTrue);
 | 
|      unittest.expect(o.intValue, unittest.equals('foo'));
 | 
| -    checkUnnamed620(o.multiIntValue);
 | 
| -    checkUnnamed621(o.multiValue);
 | 
| +    checkUnnamed625(o.multiIntValue);
 | 
| +    checkUnnamed626(o.multiValue);
 | 
|      unittest.expect(o.name, unittest.equals('foo'));
 | 
|      unittest.expect(o.value, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterActivityEventsParameters--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed622() {
 | 
| +buildUnnamed627() {
 | 
|    var o = new core.List<api.ActivityEventsParameters>();
 | 
|    o.add(buildActivityEventsParameters());
 | 
|    o.add(buildActivityEventsParameters());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed622(core.List<api.ActivityEventsParameters> o) {
 | 
| +checkUnnamed627(core.List<api.ActivityEventsParameters> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkActivityEventsParameters(o[0]);
 | 
|    checkActivityEventsParameters(o[1]);
 | 
| @@ -188,7 +188,7 @@ buildActivityEvents() {
 | 
|    buildCounterActivityEvents++;
 | 
|    if (buildCounterActivityEvents < 3) {
 | 
|      o.name = "foo";
 | 
| -    o.parameters = buildUnnamed622();
 | 
| +    o.parameters = buildUnnamed627();
 | 
|      o.type = "foo";
 | 
|    }
 | 
|    buildCounterActivityEvents--;
 | 
| @@ -199,20 +199,20 @@ checkActivityEvents(api.ActivityEvents o) {
 | 
|    buildCounterActivityEvents++;
 | 
|    if (buildCounterActivityEvents < 3) {
 | 
|      unittest.expect(o.name, unittest.equals('foo'));
 | 
| -    checkUnnamed622(o.parameters);
 | 
| +    checkUnnamed627(o.parameters);
 | 
|      unittest.expect(o.type, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterActivityEvents--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed623() {
 | 
| +buildUnnamed628() {
 | 
|    var o = new core.List<api.ActivityEvents>();
 | 
|    o.add(buildActivityEvents());
 | 
|    o.add(buildActivityEvents());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed623(core.List<api.ActivityEvents> o) {
 | 
| +checkUnnamed628(core.List<api.ActivityEvents> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkActivityEvents(o[0]);
 | 
|    checkActivityEvents(o[1]);
 | 
| @@ -250,7 +250,7 @@ buildActivity() {
 | 
|    if (buildCounterActivity < 3) {
 | 
|      o.actor = buildActivityActor();
 | 
|      o.etag = "foo";
 | 
| -    o.events = buildUnnamed623();
 | 
| +    o.events = buildUnnamed628();
 | 
|      o.id = buildActivityId();
 | 
|      o.ipAddress = "foo";
 | 
|      o.kind = "foo";
 | 
| @@ -265,7 +265,7 @@ checkActivity(api.Activity o) {
 | 
|    if (buildCounterActivity < 3) {
 | 
|      checkActivityActor(o.actor);
 | 
|      unittest.expect(o.etag, unittest.equals('foo'));
 | 
| -    checkUnnamed623(o.events);
 | 
| +    checkUnnamed628(o.events);
 | 
|      checkActivityId(o.id);
 | 
|      unittest.expect(o.ipAddress, unittest.equals('foo'));
 | 
|      unittest.expect(o.kind, unittest.equals('foo'));
 | 
| @@ -274,14 +274,14 @@ checkActivity(api.Activity o) {
 | 
|    buildCounterActivity--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed624() {
 | 
| +buildUnnamed629() {
 | 
|    var o = new core.Map<core.String, core.String>();
 | 
|    o["x"] = "foo";
 | 
|    o["y"] = "foo";
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed624(core.Map<core.String, core.String> o) {
 | 
| +checkUnnamed629(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'));
 | 
| @@ -296,7 +296,7 @@ buildChannel() {
 | 
|      o.expiration = "foo";
 | 
|      o.id = "foo";
 | 
|      o.kind = "foo";
 | 
| -    o.params = buildUnnamed624();
 | 
| +    o.params = buildUnnamed629();
 | 
|      o.payload = true;
 | 
|      o.resourceId = "foo";
 | 
|      o.resourceUri = "foo";
 | 
| @@ -314,7 +314,7 @@ checkChannel(api.Channel o) {
 | 
|      unittest.expect(o.expiration, unittest.equals('foo'));
 | 
|      unittest.expect(o.id, unittest.equals('foo'));
 | 
|      unittest.expect(o.kind, unittest.equals('foo'));
 | 
| -    checkUnnamed624(o.params);
 | 
| +    checkUnnamed629(o.params);
 | 
|      unittest.expect(o.payload, unittest.isTrue);
 | 
|      unittest.expect(o.resourceId, unittest.equals('foo'));
 | 
|      unittest.expect(o.resourceUri, unittest.equals('foo'));
 | 
| @@ -349,30 +349,30 @@ checkUsageReportEntity(api.UsageReportEntity o) {
 | 
|    buildCounterUsageReportEntity--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed625() {
 | 
| +buildUnnamed630() {
 | 
|    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;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed625(core.Map<core.String, core.Object> o) {
 | 
| +checkUnnamed630(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')); 
 | 
|  }
 | 
|  
 | 
| -buildUnnamed626() {
 | 
| +buildUnnamed631() {
 | 
|    var o = new core.List<core.Map<core.String, core.Object>>();
 | 
| -  o.add(buildUnnamed625());
 | 
| -  o.add(buildUnnamed625());
 | 
| +  o.add(buildUnnamed630());
 | 
| +  o.add(buildUnnamed630());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed626(core.List<core.Map<core.String, core.Object>> o) {
 | 
| +checkUnnamed631(core.List<core.Map<core.String, core.Object>> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
| -  checkUnnamed625(o[0]);
 | 
| -  checkUnnamed625(o[1]);
 | 
| +  checkUnnamed630(o[0]);
 | 
| +  checkUnnamed630(o[1]);
 | 
|  }
 | 
|  
 | 
|  core.int buildCounterUsageReportParameters = 0;
 | 
| @@ -383,7 +383,7 @@ buildUsageReportParameters() {
 | 
|      o.boolValue = true;
 | 
|      o.datetimeValue = core.DateTime.parse("2002-02-27T14:01:02");
 | 
|      o.intValue = "foo";
 | 
| -    o.msgValue = buildUnnamed626();
 | 
| +    o.msgValue = buildUnnamed631();
 | 
|      o.name = "foo";
 | 
|      o.stringValue = "foo";
 | 
|    }
 | 
| @@ -397,21 +397,21 @@ checkUsageReportParameters(api.UsageReportParameters o) {
 | 
|      unittest.expect(o.boolValue, unittest.isTrue);
 | 
|      unittest.expect(o.datetimeValue, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
 | 
|      unittest.expect(o.intValue, unittest.equals('foo'));
 | 
| -    checkUnnamed626(o.msgValue);
 | 
| +    checkUnnamed631(o.msgValue);
 | 
|      unittest.expect(o.name, unittest.equals('foo'));
 | 
|      unittest.expect(o.stringValue, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterUsageReportParameters--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed627() {
 | 
| +buildUnnamed632() {
 | 
|    var o = new core.List<api.UsageReportParameters>();
 | 
|    o.add(buildUsageReportParameters());
 | 
|    o.add(buildUsageReportParameters());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed627(core.List<api.UsageReportParameters> o) {
 | 
| +checkUnnamed632(core.List<api.UsageReportParameters> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkUsageReportParameters(o[0]);
 | 
|    checkUsageReportParameters(o[1]);
 | 
| @@ -426,7 +426,7 @@ buildUsageReport() {
 | 
|      o.entity = buildUsageReportEntity();
 | 
|      o.etag = "foo";
 | 
|      o.kind = "foo";
 | 
| -    o.parameters = buildUnnamed627();
 | 
| +    o.parameters = buildUnnamed632();
 | 
|    }
 | 
|    buildCounterUsageReport--;
 | 
|    return o;
 | 
| @@ -439,19 +439,19 @@ checkUsageReport(api.UsageReport o) {
 | 
|      checkUsageReportEntity(o.entity);
 | 
|      unittest.expect(o.etag, unittest.equals('foo'));
 | 
|      unittest.expect(o.kind, unittest.equals('foo'));
 | 
| -    checkUnnamed627(o.parameters);
 | 
| +    checkUnnamed632(o.parameters);
 | 
|    }
 | 
|    buildCounterUsageReport--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed628() {
 | 
| +buildUnnamed633() {
 | 
|    var o = new core.List<api.UsageReport>();
 | 
|    o.add(buildUsageReport());
 | 
|    o.add(buildUsageReport());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed628(core.List<api.UsageReport> o) {
 | 
| +checkUnnamed633(core.List<api.UsageReport> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkUsageReport(o[0]);
 | 
|    checkUsageReport(o[1]);
 | 
| @@ -478,14 +478,14 @@ checkUsageReportsWarningsData(api.UsageReportsWarningsData o) {
 | 
|    buildCounterUsageReportsWarningsData--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed629() {
 | 
| +buildUnnamed634() {
 | 
|    var o = new core.List<api.UsageReportsWarningsData>();
 | 
|    o.add(buildUsageReportsWarningsData());
 | 
|    o.add(buildUsageReportsWarningsData());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed629(core.List<api.UsageReportsWarningsData> o) {
 | 
| +checkUnnamed634(core.List<api.UsageReportsWarningsData> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkUsageReportsWarningsData(o[0]);
 | 
|    checkUsageReportsWarningsData(o[1]);
 | 
| @@ -497,7 +497,7 @@ buildUsageReportsWarnings() {
 | 
|    buildCounterUsageReportsWarnings++;
 | 
|    if (buildCounterUsageReportsWarnings < 3) {
 | 
|      o.code = "foo";
 | 
| -    o.data = buildUnnamed629();
 | 
| +    o.data = buildUnnamed634();
 | 
|      o.message = "foo";
 | 
|    }
 | 
|    buildCounterUsageReportsWarnings--;
 | 
| @@ -508,20 +508,20 @@ checkUsageReportsWarnings(api.UsageReportsWarnings o) {
 | 
|    buildCounterUsageReportsWarnings++;
 | 
|    if (buildCounterUsageReportsWarnings < 3) {
 | 
|      unittest.expect(o.code, unittest.equals('foo'));
 | 
| -    checkUnnamed629(o.data);
 | 
| +    checkUnnamed634(o.data);
 | 
|      unittest.expect(o.message, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterUsageReportsWarnings--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed630() {
 | 
| +buildUnnamed635() {
 | 
|    var o = new core.List<api.UsageReportsWarnings>();
 | 
|    o.add(buildUsageReportsWarnings());
 | 
|    o.add(buildUsageReportsWarnings());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed630(core.List<api.UsageReportsWarnings> o) {
 | 
| +checkUnnamed635(core.List<api.UsageReportsWarnings> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkUsageReportsWarnings(o[0]);
 | 
|    checkUsageReportsWarnings(o[1]);
 | 
| @@ -535,8 +535,8 @@ buildUsageReports() {
 | 
|      o.etag = "foo";
 | 
|      o.kind = "foo";
 | 
|      o.nextPageToken = "foo";
 | 
| -    o.usageReports = buildUnnamed628();
 | 
| -    o.warnings = buildUnnamed630();
 | 
| +    o.usageReports = buildUnnamed633();
 | 
| +    o.warnings = buildUnnamed635();
 | 
|    }
 | 
|    buildCounterUsageReports--;
 | 
|    return o;
 | 
| @@ -548,8 +548,8 @@ checkUsageReports(api.UsageReports o) {
 | 
|      unittest.expect(o.etag, unittest.equals('foo'));
 | 
|      unittest.expect(o.kind, unittest.equals('foo'));
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
| -    checkUnnamed628(o.usageReports);
 | 
| -    checkUnnamed630(o.warnings);
 | 
| +    checkUnnamed633(o.usageReports);
 | 
| +    checkUnnamed635(o.warnings);
 | 
|    }
 | 
|    buildCounterUsageReports--;
 | 
|  }
 | 
| @@ -688,7 +688,7 @@ main() {
 | 
|        var arg_maxResults = 42;
 | 
|        var arg_pageToken = "foo";
 | 
|        var arg_startTime = "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;
 | 
| @@ -742,7 +742,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildActivities());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_userKey, arg_applicationName, actorIpAddress: arg_actorIpAddress, customerId: arg_customerId, endTime: arg_endTime, eventName: arg_eventName, filters: arg_filters, maxResults: arg_maxResults, pageToken: arg_pageToken, startTime: arg_startTime).then(unittest.expectAsync(((api.Activities response) {
 | 
| +      res.list(arg_userKey, arg_applicationName, actorIpAddress: arg_actorIpAddress, customerId: arg_customerId, endTime: arg_endTime, eventName: arg_eventName, filters: arg_filters, maxResults: arg_maxResults, pageToken: arg_pageToken, startTime: arg_startTime).then(unittest.expectAsync1(((api.Activities response) {
 | 
|          checkActivities(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -762,7 +762,7 @@ main() {
 | 
|        var arg_maxResults = 42;
 | 
|        var arg_pageToken = "foo";
 | 
|        var arg_startTime = "foo";
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.Channel.fromJson(json);
 | 
|          checkChannel(obj);
 | 
|  
 | 
| @@ -823,7 +823,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildChannel());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.watch(arg_request, arg_userKey, arg_applicationName, actorIpAddress: arg_actorIpAddress, customerId: arg_customerId, endTime: arg_endTime, eventName: arg_eventName, filters: arg_filters, maxResults: arg_maxResults, pageToken: arg_pageToken, startTime: arg_startTime).then(unittest.expectAsync(((api.Channel response) {
 | 
| +      res.watch(arg_request, arg_userKey, arg_applicationName, actorIpAddress: arg_actorIpAddress, customerId: arg_customerId, endTime: arg_endTime, eventName: arg_eventName, filters: arg_filters, maxResults: arg_maxResults, pageToken: arg_pageToken, startTime: arg_startTime).then(unittest.expectAsync1(((api.Channel response) {
 | 
|          checkChannel(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -837,7 +837,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.ChannelsResourceApi res = new api.AdminApi(mock).channels;
 | 
|        var arg_request = buildChannel();
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.Channel.fromJson(json);
 | 
|          checkChannel(obj);
 | 
|  
 | 
| @@ -874,7 +874,7 @@ main() {
 | 
|          var resp = "";
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.stop(arg_request).then(unittest.expectAsync((_) {}));
 | 
| +      res.stop(arg_request).then(unittest.expectAsync1((_) {}));
 | 
|      });
 | 
|  
 | 
|    });
 | 
| @@ -889,7 +889,7 @@ main() {
 | 
|        var arg_customerId = "foo";
 | 
|        var arg_pageToken = "foo";
 | 
|        var arg_parameters = "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;
 | 
| @@ -931,7 +931,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildUsageReports());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_date, customerId: arg_customerId, pageToken: arg_pageToken, parameters: arg_parameters).then(unittest.expectAsync(((api.UsageReports response) {
 | 
| +      res.get(arg_date, customerId: arg_customerId, pageToken: arg_pageToken, parameters: arg_parameters).then(unittest.expectAsync1(((api.UsageReports response) {
 | 
|          checkUsageReports(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -951,7 +951,7 @@ main() {
 | 
|        var arg_maxResults = 42;
 | 
|        var arg_pageToken = "foo";
 | 
|        var arg_parameters = "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;
 | 
| @@ -1002,7 +1002,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildUsageReports());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_userKey, arg_date, customerId: arg_customerId, filters: arg_filters, maxResults: arg_maxResults, pageToken: arg_pageToken, parameters: arg_parameters).then(unittest.expectAsync(((api.UsageReports response) {
 | 
| +      res.get(arg_userKey, arg_date, customerId: arg_customerId, filters: arg_filters, maxResults: arg_maxResults, pageToken: arg_pageToken, parameters: arg_parameters).then(unittest.expectAsync1(((api.UsageReports response) {
 | 
|          checkUsageReports(response);
 | 
|        })));
 | 
|      });
 | 
| 
 |