| Index: generated/googleapis/test/logging/v2_test.dart
 | 
| diff --git a/generated/googleapis/test/logging/v2_test.dart b/generated/googleapis/test/logging/v2_test.dart
 | 
| index 94da6a17852164318f0e66fb3601ae7af5f103c5..8bc0c27e794ba53698682d6325908e87bbf22179 100644
 | 
| --- a/generated/googleapis/test/logging/v2_test.dart
 | 
| +++ b/generated/googleapis/test/logging/v2_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/logging/v2.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);
 | 
|  }
 | 
| @@ -136,27 +136,27 @@ checkLabelDescriptor(api.LabelDescriptor o) {
 | 
|    buildCounterLabelDescriptor--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed198() {
 | 
| +buildUnnamed200() {
 | 
|    var o = new core.List<core.String>();
 | 
|    o.add("foo");
 | 
|    o.add("foo");
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed198(core.List<core.String> o) {
 | 
| +checkUnnamed200(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'));
 | 
|  }
 | 
|  
 | 
| -buildUnnamed199() {
 | 
| +buildUnnamed201() {
 | 
|    var o = new core.List<core.String>();
 | 
|    o.add("foo");
 | 
|    o.add("foo");
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed199(core.List<core.String> o) {
 | 
| +checkUnnamed201(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'));
 | 
| @@ -171,8 +171,8 @@ buildListLogEntriesRequest() {
 | 
|      o.orderBy = "foo";
 | 
|      o.pageSize = 42;
 | 
|      o.pageToken = "foo";
 | 
| -    o.projectIds = buildUnnamed198();
 | 
| -    o.resourceNames = buildUnnamed199();
 | 
| +    o.projectIds = buildUnnamed200();
 | 
| +    o.resourceNames = buildUnnamed201();
 | 
|    }
 | 
|    buildCounterListLogEntriesRequest--;
 | 
|    return o;
 | 
| @@ -185,20 +185,20 @@ checkListLogEntriesRequest(api.ListLogEntriesRequest o) {
 | 
|      unittest.expect(o.orderBy, unittest.equals('foo'));
 | 
|      unittest.expect(o.pageSize, unittest.equals(42));
 | 
|      unittest.expect(o.pageToken, unittest.equals('foo'));
 | 
| -    checkUnnamed198(o.projectIds);
 | 
| -    checkUnnamed199(o.resourceNames);
 | 
| +    checkUnnamed200(o.projectIds);
 | 
| +    checkUnnamed201(o.resourceNames);
 | 
|    }
 | 
|    buildCounterListLogEntriesRequest--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed200() {
 | 
| +buildUnnamed202() {
 | 
|    var o = new core.List<api.LogEntry>();
 | 
|    o.add(buildLogEntry());
 | 
|    o.add(buildLogEntry());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed200(core.List<api.LogEntry> o) {
 | 
| +checkUnnamed202(core.List<api.LogEntry> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkLogEntry(o[0]);
 | 
|    checkLogEntry(o[1]);
 | 
| @@ -209,7 +209,7 @@ buildListLogEntriesResponse() {
 | 
|    var o = new api.ListLogEntriesResponse();
 | 
|    buildCounterListLogEntriesResponse++;
 | 
|    if (buildCounterListLogEntriesResponse < 3) {
 | 
| -    o.entries = buildUnnamed200();
 | 
| +    o.entries = buildUnnamed202();
 | 
|      o.nextPageToken = "foo";
 | 
|    }
 | 
|    buildCounterListLogEntriesResponse--;
 | 
| @@ -219,20 +219,20 @@ buildListLogEntriesResponse() {
 | 
|  checkListLogEntriesResponse(api.ListLogEntriesResponse o) {
 | 
|    buildCounterListLogEntriesResponse++;
 | 
|    if (buildCounterListLogEntriesResponse < 3) {
 | 
| -    checkUnnamed200(o.entries);
 | 
| +    checkUnnamed202(o.entries);
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterListLogEntriesResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed201() {
 | 
| +buildUnnamed203() {
 | 
|    var o = new core.List<api.LogMetric>();
 | 
|    o.add(buildLogMetric());
 | 
|    o.add(buildLogMetric());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed201(core.List<api.LogMetric> o) {
 | 
| +checkUnnamed203(core.List<api.LogMetric> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkLogMetric(o[0]);
 | 
|    checkLogMetric(o[1]);
 | 
| @@ -243,7 +243,7 @@ buildListLogMetricsResponse() {
 | 
|    var o = new api.ListLogMetricsResponse();
 | 
|    buildCounterListLogMetricsResponse++;
 | 
|    if (buildCounterListLogMetricsResponse < 3) {
 | 
| -    o.metrics = buildUnnamed201();
 | 
| +    o.metrics = buildUnnamed203();
 | 
|      o.nextPageToken = "foo";
 | 
|    }
 | 
|    buildCounterListLogMetricsResponse--;
 | 
| @@ -253,20 +253,20 @@ buildListLogMetricsResponse() {
 | 
|  checkListLogMetricsResponse(api.ListLogMetricsResponse o) {
 | 
|    buildCounterListLogMetricsResponse++;
 | 
|    if (buildCounterListLogMetricsResponse < 3) {
 | 
| -    checkUnnamed201(o.metrics);
 | 
| +    checkUnnamed203(o.metrics);
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterListLogMetricsResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed202() {
 | 
| +buildUnnamed204() {
 | 
|    var o = new core.List<core.String>();
 | 
|    o.add("foo");
 | 
|    o.add("foo");
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed202(core.List<core.String> o) {
 | 
| +checkUnnamed204(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'));
 | 
| @@ -277,7 +277,7 @@ buildListLogsResponse() {
 | 
|    var o = new api.ListLogsResponse();
 | 
|    buildCounterListLogsResponse++;
 | 
|    if (buildCounterListLogsResponse < 3) {
 | 
| -    o.logNames = buildUnnamed202();
 | 
| +    o.logNames = buildUnnamed204();
 | 
|      o.nextPageToken = "foo";
 | 
|    }
 | 
|    buildCounterListLogsResponse--;
 | 
| @@ -287,20 +287,20 @@ buildListLogsResponse() {
 | 
|  checkListLogsResponse(api.ListLogsResponse o) {
 | 
|    buildCounterListLogsResponse++;
 | 
|    if (buildCounterListLogsResponse < 3) {
 | 
| -    checkUnnamed202(o.logNames);
 | 
| +    checkUnnamed204(o.logNames);
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterListLogsResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed203() {
 | 
| +buildUnnamed205() {
 | 
|    var o = new core.List<api.MonitoredResourceDescriptor>();
 | 
|    o.add(buildMonitoredResourceDescriptor());
 | 
|    o.add(buildMonitoredResourceDescriptor());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed203(core.List<api.MonitoredResourceDescriptor> o) {
 | 
| +checkUnnamed205(core.List<api.MonitoredResourceDescriptor> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkMonitoredResourceDescriptor(o[0]);
 | 
|    checkMonitoredResourceDescriptor(o[1]);
 | 
| @@ -312,7 +312,7 @@ buildListMonitoredResourceDescriptorsResponse() {
 | 
|    buildCounterListMonitoredResourceDescriptorsResponse++;
 | 
|    if (buildCounterListMonitoredResourceDescriptorsResponse < 3) {
 | 
|      o.nextPageToken = "foo";
 | 
| -    o.resourceDescriptors = buildUnnamed203();
 | 
| +    o.resourceDescriptors = buildUnnamed205();
 | 
|    }
 | 
|    buildCounterListMonitoredResourceDescriptorsResponse--;
 | 
|    return o;
 | 
| @@ -322,19 +322,19 @@ checkListMonitoredResourceDescriptorsResponse(api.ListMonitoredResourceDescripto
 | 
|    buildCounterListMonitoredResourceDescriptorsResponse++;
 | 
|    if (buildCounterListMonitoredResourceDescriptorsResponse < 3) {
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
| -    checkUnnamed203(o.resourceDescriptors);
 | 
| +    checkUnnamed205(o.resourceDescriptors);
 | 
|    }
 | 
|    buildCounterListMonitoredResourceDescriptorsResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed204() {
 | 
| +buildUnnamed206() {
 | 
|    var o = new core.List<api.LogSink>();
 | 
|    o.add(buildLogSink());
 | 
|    o.add(buildLogSink());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed204(core.List<api.LogSink> o) {
 | 
| +checkUnnamed206(core.List<api.LogSink> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkLogSink(o[0]);
 | 
|    checkLogSink(o[1]);
 | 
| @@ -346,7 +346,7 @@ buildListSinksResponse() {
 | 
|    buildCounterListSinksResponse++;
 | 
|    if (buildCounterListSinksResponse < 3) {
 | 
|      o.nextPageToken = "foo";
 | 
| -    o.sinks = buildUnnamed204();
 | 
| +    o.sinks = buildUnnamed206();
 | 
|    }
 | 
|    buildCounterListSinksResponse--;
 | 
|    return o;
 | 
| @@ -356,45 +356,45 @@ checkListSinksResponse(api.ListSinksResponse o) {
 | 
|    buildCounterListSinksResponse++;
 | 
|    if (buildCounterListSinksResponse < 3) {
 | 
|      unittest.expect(o.nextPageToken, unittest.equals('foo'));
 | 
| -    checkUnnamed204(o.sinks);
 | 
| +    checkUnnamed206(o.sinks);
 | 
|    }
 | 
|    buildCounterListSinksResponse--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed205() {
 | 
| +buildUnnamed207() {
 | 
|    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;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed205(core.Map<core.String, core.Object> o) {
 | 
| +checkUnnamed207(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')); 
 | 
|  }
 | 
|  
 | 
| -buildUnnamed206() {
 | 
| +buildUnnamed208() {
 | 
|    var o = new core.Map<core.String, core.String>();
 | 
|    o["x"] = "foo";
 | 
|    o["y"] = "foo";
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed206(core.Map<core.String, core.String> o) {
 | 
| +checkUnnamed208(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'));
 | 
|  }
 | 
|  
 | 
| -buildUnnamed207() {
 | 
| +buildUnnamed209() {
 | 
|    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;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed207(core.Map<core.String, core.Object> o) {
 | 
| +checkUnnamed209(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')); 
 | 
| @@ -407,11 +407,11 @@ buildLogEntry() {
 | 
|    if (buildCounterLogEntry < 3) {
 | 
|      o.httpRequest = buildHttpRequest();
 | 
|      o.insertId = "foo";
 | 
| -    o.jsonPayload = buildUnnamed205();
 | 
| -    o.labels = buildUnnamed206();
 | 
| +    o.jsonPayload = buildUnnamed207();
 | 
| +    o.labels = buildUnnamed208();
 | 
|      o.logName = "foo";
 | 
|      o.operation = buildLogEntryOperation();
 | 
| -    o.protoPayload = buildUnnamed207();
 | 
| +    o.protoPayload = buildUnnamed209();
 | 
|      o.receiveTimestamp = "foo";
 | 
|      o.resource = buildMonitoredResource();
 | 
|      o.severity = "foo";
 | 
| @@ -429,11 +429,11 @@ checkLogEntry(api.LogEntry o) {
 | 
|    if (buildCounterLogEntry < 3) {
 | 
|      checkHttpRequest(o.httpRequest);
 | 
|      unittest.expect(o.insertId, unittest.equals('foo'));
 | 
| -    checkUnnamed205(o.jsonPayload);
 | 
| -    checkUnnamed206(o.labels);
 | 
| +    checkUnnamed207(o.jsonPayload);
 | 
| +    checkUnnamed208(o.labels);
 | 
|      unittest.expect(o.logName, unittest.equals('foo'));
 | 
|      checkLogEntryOperation(o.operation);
 | 
| -    checkUnnamed207(o.protoPayload);
 | 
| +    checkUnnamed209(o.protoPayload);
 | 
|      unittest.expect(o.receiveTimestamp, unittest.equals('foo'));
 | 
|      checkMonitoredResource(o.resource);
 | 
|      unittest.expect(o.severity, unittest.equals('foo'));
 | 
| @@ -576,14 +576,14 @@ checkLogSink(api.LogSink o) {
 | 
|    buildCounterLogSink--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed208() {
 | 
| +buildUnnamed210() {
 | 
|    var o = new core.Map<core.String, core.String>();
 | 
|    o["x"] = "foo";
 | 
|    o["y"] = "foo";
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed208(core.Map<core.String, core.String> o) {
 | 
| +checkUnnamed210(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'));
 | 
| @@ -594,7 +594,7 @@ buildMonitoredResource() {
 | 
|    var o = new api.MonitoredResource();
 | 
|    buildCounterMonitoredResource++;
 | 
|    if (buildCounterMonitoredResource < 3) {
 | 
| -    o.labels = buildUnnamed208();
 | 
| +    o.labels = buildUnnamed210();
 | 
|      o.type = "foo";
 | 
|    }
 | 
|    buildCounterMonitoredResource--;
 | 
| @@ -604,20 +604,20 @@ buildMonitoredResource() {
 | 
|  checkMonitoredResource(api.MonitoredResource o) {
 | 
|    buildCounterMonitoredResource++;
 | 
|    if (buildCounterMonitoredResource < 3) {
 | 
| -    checkUnnamed208(o.labels);
 | 
| +    checkUnnamed210(o.labels);
 | 
|      unittest.expect(o.type, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterMonitoredResource--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed209() {
 | 
| +buildUnnamed211() {
 | 
|    var o = new core.List<api.LabelDescriptor>();
 | 
|    o.add(buildLabelDescriptor());
 | 
|    o.add(buildLabelDescriptor());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed209(core.List<api.LabelDescriptor> o) {
 | 
| +checkUnnamed211(core.List<api.LabelDescriptor> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkLabelDescriptor(o[0]);
 | 
|    checkLabelDescriptor(o[1]);
 | 
| @@ -630,7 +630,7 @@ buildMonitoredResourceDescriptor() {
 | 
|    if (buildCounterMonitoredResourceDescriptor < 3) {
 | 
|      o.description = "foo";
 | 
|      o.displayName = "foo";
 | 
| -    o.labels = buildUnnamed209();
 | 
| +    o.labels = buildUnnamed211();
 | 
|      o.name = "foo";
 | 
|      o.type = "foo";
 | 
|    }
 | 
| @@ -643,34 +643,34 @@ checkMonitoredResourceDescriptor(api.MonitoredResourceDescriptor o) {
 | 
|    if (buildCounterMonitoredResourceDescriptor < 3) {
 | 
|      unittest.expect(o.description, unittest.equals('foo'));
 | 
|      unittest.expect(o.displayName, unittest.equals('foo'));
 | 
| -    checkUnnamed209(o.labels);
 | 
| +    checkUnnamed211(o.labels);
 | 
|      unittest.expect(o.name, unittest.equals('foo'));
 | 
|      unittest.expect(o.type, unittest.equals('foo'));
 | 
|    }
 | 
|    buildCounterMonitoredResourceDescriptor--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed210() {
 | 
| +buildUnnamed212() {
 | 
|    var o = new core.List<api.LogLine>();
 | 
|    o.add(buildLogLine());
 | 
|    o.add(buildLogLine());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed210(core.List<api.LogLine> o) {
 | 
| +checkUnnamed212(core.List<api.LogLine> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkLogLine(o[0]);
 | 
|    checkLogLine(o[1]);
 | 
|  }
 | 
|  
 | 
| -buildUnnamed211() {
 | 
| +buildUnnamed213() {
 | 
|    var o = new core.List<api.SourceReference>();
 | 
|    o.add(buildSourceReference());
 | 
|    o.add(buildSourceReference());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed211(core.List<api.SourceReference> o) {
 | 
| +checkUnnamed213(core.List<api.SourceReference> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkSourceReference(o[0]);
 | 
|    checkSourceReference(o[1]);
 | 
| @@ -693,7 +693,7 @@ buildRequestLog() {
 | 
|      o.instanceIndex = 42;
 | 
|      o.ip = "foo";
 | 
|      o.latency = "foo";
 | 
| -    o.line = buildUnnamed210();
 | 
| +    o.line = buildUnnamed212();
 | 
|      o.megaCycles = "foo";
 | 
|      o.method = "foo";
 | 
|      o.moduleId = "foo";
 | 
| @@ -703,7 +703,7 @@ buildRequestLog() {
 | 
|      o.requestId = "foo";
 | 
|      o.resource = "foo";
 | 
|      o.responseSize = "foo";
 | 
| -    o.sourceReference = buildUnnamed211();
 | 
| +    o.sourceReference = buildUnnamed213();
 | 
|      o.startTime = "foo";
 | 
|      o.status = 42;
 | 
|      o.taskName = "foo";
 | 
| @@ -733,7 +733,7 @@ checkRequestLog(api.RequestLog o) {
 | 
|      unittest.expect(o.instanceIndex, unittest.equals(42));
 | 
|      unittest.expect(o.ip, unittest.equals('foo'));
 | 
|      unittest.expect(o.latency, unittest.equals('foo'));
 | 
| -    checkUnnamed210(o.line);
 | 
| +    checkUnnamed212(o.line);
 | 
|      unittest.expect(o.megaCycles, unittest.equals('foo'));
 | 
|      unittest.expect(o.method, unittest.equals('foo'));
 | 
|      unittest.expect(o.moduleId, unittest.equals('foo'));
 | 
| @@ -743,7 +743,7 @@ checkRequestLog(api.RequestLog o) {
 | 
|      unittest.expect(o.requestId, unittest.equals('foo'));
 | 
|      unittest.expect(o.resource, unittest.equals('foo'));
 | 
|      unittest.expect(o.responseSize, unittest.equals('foo'));
 | 
| -    checkUnnamed211(o.sourceReference);
 | 
| +    checkUnnamed213(o.sourceReference);
 | 
|      unittest.expect(o.startTime, unittest.equals('foo'));
 | 
|      unittest.expect(o.status, unittest.equals(42));
 | 
|      unittest.expect(o.taskName, unittest.equals('foo'));
 | 
| @@ -801,27 +801,27 @@ checkSourceReference(api.SourceReference o) {
 | 
|    buildCounterSourceReference--;
 | 
|  }
 | 
|  
 | 
| -buildUnnamed212() {
 | 
| +buildUnnamed214() {
 | 
|    var o = new core.List<api.LogEntry>();
 | 
|    o.add(buildLogEntry());
 | 
|    o.add(buildLogEntry());
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed212(core.List<api.LogEntry> o) {
 | 
| +checkUnnamed214(core.List<api.LogEntry> o) {
 | 
|    unittest.expect(o, unittest.hasLength(2));
 | 
|    checkLogEntry(o[0]);
 | 
|    checkLogEntry(o[1]);
 | 
|  }
 | 
|  
 | 
| -buildUnnamed213() {
 | 
| +buildUnnamed215() {
 | 
|    var o = new core.Map<core.String, core.String>();
 | 
|    o["x"] = "foo";
 | 
|    o["y"] = "foo";
 | 
|    return o;
 | 
|  }
 | 
|  
 | 
| -checkUnnamed213(core.Map<core.String, core.String> o) {
 | 
| +checkUnnamed215(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'));
 | 
| @@ -832,8 +832,8 @@ buildWriteLogEntriesRequest() {
 | 
|    var o = new api.WriteLogEntriesRequest();
 | 
|    buildCounterWriteLogEntriesRequest++;
 | 
|    if (buildCounterWriteLogEntriesRequest < 3) {
 | 
| -    o.entries = buildUnnamed212();
 | 
| -    o.labels = buildUnnamed213();
 | 
| +    o.entries = buildUnnamed214();
 | 
| +    o.labels = buildUnnamed215();
 | 
|      o.logName = "foo";
 | 
|      o.partialSuccess = true;
 | 
|      o.resource = buildMonitoredResource();
 | 
| @@ -845,8 +845,8 @@ buildWriteLogEntriesRequest() {
 | 
|  checkWriteLogEntriesRequest(api.WriteLogEntriesRequest o) {
 | 
|    buildCounterWriteLogEntriesRequest++;
 | 
|    if (buildCounterWriteLogEntriesRequest < 3) {
 | 
| -    checkUnnamed212(o.entries);
 | 
| -    checkUnnamed213(o.labels);
 | 
| +    checkUnnamed214(o.entries);
 | 
| +    checkUnnamed215(o.labels);
 | 
|      unittest.expect(o.logName, unittest.equals('foo'));
 | 
|      unittest.expect(o.partialSuccess, unittest.isTrue);
 | 
|      checkMonitoredResource(o.resource);
 | 
| @@ -1077,7 +1077,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.BillingAccountsLogsResourceApi res = new api.LoggingApi(mock).billingAccounts.logs;
 | 
|        var arg_logName = "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;
 | 
| @@ -1112,7 +1112,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildEmpty());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_logName).then(unittest.expectAsync(((api.Empty response) {
 | 
| +      res.delete(arg_logName).then(unittest.expectAsync1(((api.Empty response) {
 | 
|          checkEmpty(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1124,7 +1124,7 @@ main() {
 | 
|        var arg_parent = "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;
 | 
| @@ -1161,7 +1161,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListLogsResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListLogsResponse response) {
 | 
| +      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListLogsResponse response) {
 | 
|          checkListLogsResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1177,7 +1177,7 @@ main() {
 | 
|        var arg_request = buildLogSink();
 | 
|        var arg_parent = "foo";
 | 
|        var arg_uniqueWriterIdentity = true;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogSink.fromJson(json);
 | 
|          checkLogSink(obj);
 | 
|  
 | 
| @@ -1216,7 +1216,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.create(arg_request, arg_parent, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.create(arg_request, arg_parent, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1226,7 +1226,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.BillingAccountsSinksResourceApi res = new api.LoggingApi(mock).billingAccounts.sinks;
 | 
|        var arg_sinkName = "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;
 | 
| @@ -1261,7 +1261,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildEmpty());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_sinkName).then(unittest.expectAsync(((api.Empty response) {
 | 
| +      res.delete(arg_sinkName).then(unittest.expectAsync1(((api.Empty response) {
 | 
|          checkEmpty(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1271,7 +1271,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.BillingAccountsSinksResourceApi res = new api.LoggingApi(mock).billingAccounts.sinks;
 | 
|        var arg_sinkName = "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;
 | 
| @@ -1306,7 +1306,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_sinkName).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.get(arg_sinkName).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1318,7 +1318,7 @@ main() {
 | 
|        var arg_parent = "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;
 | 
| @@ -1355,7 +1355,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListSinksResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListSinksResponse response) {
 | 
| +      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListSinksResponse response) {
 | 
|          checkListSinksResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1367,7 +1367,7 @@ main() {
 | 
|        var arg_request = buildLogSink();
 | 
|        var arg_sinkName = "foo";
 | 
|        var arg_uniqueWriterIdentity = true;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogSink.fromJson(json);
 | 
|          checkLogSink(obj);
 | 
|  
 | 
| @@ -1406,7 +1406,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.update(arg_request, arg_sinkName, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.update(arg_request, arg_sinkName, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1420,7 +1420,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.EntriesResourceApi res = new api.LoggingApi(mock).entries;
 | 
|        var arg_request = buildListLogEntriesRequest();
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.ListLogEntriesRequest.fromJson(json);
 | 
|          checkListLogEntriesRequest(obj);
 | 
|  
 | 
| @@ -1457,7 +1457,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListLogEntriesResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_request).then(unittest.expectAsync(((api.ListLogEntriesResponse response) {
 | 
| +      res.list(arg_request).then(unittest.expectAsync1(((api.ListLogEntriesResponse response) {
 | 
|          checkListLogEntriesResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1467,7 +1467,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.EntriesResourceApi res = new api.LoggingApi(mock).entries;
 | 
|        var arg_request = buildWriteLogEntriesRequest();
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.WriteLogEntriesRequest.fromJson(json);
 | 
|          checkWriteLogEntriesRequest(obj);
 | 
|  
 | 
| @@ -1504,7 +1504,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildWriteLogEntriesResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.write(arg_request).then(unittest.expectAsync(((api.WriteLogEntriesResponse response) {
 | 
| +      res.write(arg_request).then(unittest.expectAsync1(((api.WriteLogEntriesResponse response) {
 | 
|          checkWriteLogEntriesResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1518,7 +1518,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.FoldersLogsResourceApi res = new api.LoggingApi(mock).folders.logs;
 | 
|        var arg_logName = "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;
 | 
| @@ -1553,7 +1553,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildEmpty());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_logName).then(unittest.expectAsync(((api.Empty response) {
 | 
| +      res.delete(arg_logName).then(unittest.expectAsync1(((api.Empty response) {
 | 
|          checkEmpty(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1565,7 +1565,7 @@ main() {
 | 
|        var arg_parent = "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;
 | 
| @@ -1602,7 +1602,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListLogsResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListLogsResponse response) {
 | 
| +      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListLogsResponse response) {
 | 
|          checkListLogsResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1618,7 +1618,7 @@ main() {
 | 
|        var arg_request = buildLogSink();
 | 
|        var arg_parent = "foo";
 | 
|        var arg_uniqueWriterIdentity = true;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogSink.fromJson(json);
 | 
|          checkLogSink(obj);
 | 
|  
 | 
| @@ -1657,7 +1657,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.create(arg_request, arg_parent, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.create(arg_request, arg_parent, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1667,7 +1667,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.FoldersSinksResourceApi res = new api.LoggingApi(mock).folders.sinks;
 | 
|        var arg_sinkName = "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;
 | 
| @@ -1702,7 +1702,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildEmpty());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_sinkName).then(unittest.expectAsync(((api.Empty response) {
 | 
| +      res.delete(arg_sinkName).then(unittest.expectAsync1(((api.Empty response) {
 | 
|          checkEmpty(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1712,7 +1712,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.FoldersSinksResourceApi res = new api.LoggingApi(mock).folders.sinks;
 | 
|        var arg_sinkName = "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;
 | 
| @@ -1747,7 +1747,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_sinkName).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.get(arg_sinkName).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1759,7 +1759,7 @@ main() {
 | 
|        var arg_parent = "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;
 | 
| @@ -1796,7 +1796,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListSinksResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListSinksResponse response) {
 | 
| +      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListSinksResponse response) {
 | 
|          checkListSinksResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1808,7 +1808,7 @@ main() {
 | 
|        var arg_request = buildLogSink();
 | 
|        var arg_sinkName = "foo";
 | 
|        var arg_uniqueWriterIdentity = true;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogSink.fromJson(json);
 | 
|          checkLogSink(obj);
 | 
|  
 | 
| @@ -1847,7 +1847,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.update(arg_request, arg_sinkName, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.update(arg_request, arg_sinkName, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1862,7 +1862,7 @@ main() {
 | 
|        api.MonitoredResourceDescriptorsResourceApi res = new api.LoggingApi(mock).monitoredResourceDescriptors;
 | 
|        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;
 | 
| @@ -1898,7 +1898,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListMonitoredResourceDescriptorsResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListMonitoredResourceDescriptorsResponse response) {
 | 
| +      res.list(pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListMonitoredResourceDescriptorsResponse response) {
 | 
|          checkListMonitoredResourceDescriptorsResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1912,7 +1912,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.OrganizationsLogsResourceApi res = new api.LoggingApi(mock).organizations.logs;
 | 
|        var arg_logName = "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;
 | 
| @@ -1947,7 +1947,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildEmpty());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_logName).then(unittest.expectAsync(((api.Empty response) {
 | 
| +      res.delete(arg_logName).then(unittest.expectAsync1(((api.Empty response) {
 | 
|          checkEmpty(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -1957,9 +1957,9 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.OrganizationsLogsResourceApi res = new api.LoggingApi(mock).organizations.logs;
 | 
|        var arg_parent = "foo";
 | 
| -      var arg_pageToken = "foo";
 | 
|        var arg_pageSize = 42;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      var arg_pageToken = "foo";
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var path = (req.url).path;
 | 
|          var pathOffset = 0;
 | 
|          var index;
 | 
| @@ -1986,8 +1986,8 @@ main() {
 | 
|              addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
 | 
|            }
 | 
|          }
 | 
| -        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 | 
|          unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
 | 
| +        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 | 
|  
 | 
|  
 | 
|          var h = {
 | 
| @@ -1996,7 +1996,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListLogsResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListLogsResponse response) {
 | 
| +      res.list(arg_parent, pageSize: arg_pageSize, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.ListLogsResponse response) {
 | 
|          checkListLogsResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2012,7 +2012,7 @@ main() {
 | 
|        var arg_request = buildLogSink();
 | 
|        var arg_parent = "foo";
 | 
|        var arg_uniqueWriterIdentity = true;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogSink.fromJson(json);
 | 
|          checkLogSink(obj);
 | 
|  
 | 
| @@ -2051,7 +2051,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.create(arg_request, arg_parent, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.create(arg_request, arg_parent, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2061,7 +2061,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.OrganizationsSinksResourceApi res = new api.LoggingApi(mock).organizations.sinks;
 | 
|        var arg_sinkName = "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;
 | 
| @@ -2096,7 +2096,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildEmpty());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_sinkName).then(unittest.expectAsync(((api.Empty response) {
 | 
| +      res.delete(arg_sinkName).then(unittest.expectAsync1(((api.Empty response) {
 | 
|          checkEmpty(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2106,7 +2106,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.OrganizationsSinksResourceApi res = new api.LoggingApi(mock).organizations.sinks;
 | 
|        var arg_sinkName = "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;
 | 
| @@ -2141,7 +2141,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_sinkName).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.get(arg_sinkName).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2151,9 +2151,9 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.OrganizationsSinksResourceApi res = new api.LoggingApi(mock).organizations.sinks;
 | 
|        var arg_parent = "foo";
 | 
| -      var arg_pageToken = "foo";
 | 
|        var arg_pageSize = 42;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      var arg_pageToken = "foo";
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var path = (req.url).path;
 | 
|          var pathOffset = 0;
 | 
|          var index;
 | 
| @@ -2180,8 +2180,8 @@ main() {
 | 
|              addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
 | 
|            }
 | 
|          }
 | 
| -        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 | 
|          unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
 | 
| +        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 | 
|  
 | 
|  
 | 
|          var h = {
 | 
| @@ -2190,7 +2190,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListSinksResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListSinksResponse response) {
 | 
| +      res.list(arg_parent, pageSize: arg_pageSize, pageToken: arg_pageToken).then(unittest.expectAsync1(((api.ListSinksResponse response) {
 | 
|          checkListSinksResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2202,7 +2202,7 @@ main() {
 | 
|        var arg_request = buildLogSink();
 | 
|        var arg_sinkName = "foo";
 | 
|        var arg_uniqueWriterIdentity = true;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogSink.fromJson(json);
 | 
|          checkLogSink(obj);
 | 
|  
 | 
| @@ -2241,7 +2241,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.update(arg_request, arg_sinkName, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.update(arg_request, arg_sinkName, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2255,7 +2255,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.ProjectsLogsResourceApi res = new api.LoggingApi(mock).projects.logs;
 | 
|        var arg_logName = "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;
 | 
| @@ -2290,7 +2290,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildEmpty());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_logName).then(unittest.expectAsync(((api.Empty response) {
 | 
| +      res.delete(arg_logName).then(unittest.expectAsync1(((api.Empty response) {
 | 
|          checkEmpty(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2302,7 +2302,7 @@ main() {
 | 
|        var arg_parent = "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;
 | 
| @@ -2339,7 +2339,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListLogsResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListLogsResponse response) {
 | 
| +      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListLogsResponse response) {
 | 
|          checkListLogsResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2354,7 +2354,7 @@ main() {
 | 
|        api.ProjectsMetricsResourceApi res = new api.LoggingApi(mock).projects.metrics;
 | 
|        var arg_request = buildLogMetric();
 | 
|        var arg_parent = "foo";
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogMetric.fromJson(json);
 | 
|          checkLogMetric(obj);
 | 
|  
 | 
| @@ -2392,7 +2392,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogMetric());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.create(arg_request, arg_parent).then(unittest.expectAsync(((api.LogMetric response) {
 | 
| +      res.create(arg_request, arg_parent).then(unittest.expectAsync1(((api.LogMetric response) {
 | 
|          checkLogMetric(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2402,7 +2402,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.ProjectsMetricsResourceApi res = new api.LoggingApi(mock).projects.metrics;
 | 
|        var arg_metricName = "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;
 | 
| @@ -2437,7 +2437,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildEmpty());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_metricName).then(unittest.expectAsync(((api.Empty response) {
 | 
| +      res.delete(arg_metricName).then(unittest.expectAsync1(((api.Empty response) {
 | 
|          checkEmpty(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2447,7 +2447,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.ProjectsMetricsResourceApi res = new api.LoggingApi(mock).projects.metrics;
 | 
|        var arg_metricName = "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;
 | 
| @@ -2482,7 +2482,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogMetric());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_metricName).then(unittest.expectAsync(((api.LogMetric response) {
 | 
| +      res.get(arg_metricName).then(unittest.expectAsync1(((api.LogMetric response) {
 | 
|          checkLogMetric(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2494,7 +2494,7 @@ main() {
 | 
|        var arg_parent = "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;
 | 
| @@ -2531,7 +2531,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListLogMetricsResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListLogMetricsResponse response) {
 | 
| +      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListLogMetricsResponse response) {
 | 
|          checkListLogMetricsResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2542,7 +2542,7 @@ main() {
 | 
|        api.ProjectsMetricsResourceApi res = new api.LoggingApi(mock).projects.metrics;
 | 
|        var arg_request = buildLogMetric();
 | 
|        var arg_metricName = "foo";
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogMetric.fromJson(json);
 | 
|          checkLogMetric(obj);
 | 
|  
 | 
| @@ -2580,7 +2580,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogMetric());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.update(arg_request, arg_metricName).then(unittest.expectAsync(((api.LogMetric response) {
 | 
| +      res.update(arg_request, arg_metricName).then(unittest.expectAsync1(((api.LogMetric response) {
 | 
|          checkLogMetric(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2596,7 +2596,7 @@ main() {
 | 
|        var arg_request = buildLogSink();
 | 
|        var arg_parent = "foo";
 | 
|        var arg_uniqueWriterIdentity = true;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogSink.fromJson(json);
 | 
|          checkLogSink(obj);
 | 
|  
 | 
| @@ -2635,7 +2635,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.create(arg_request, arg_parent, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.create(arg_request, arg_parent, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2645,7 +2645,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.ProjectsSinksResourceApi res = new api.LoggingApi(mock).projects.sinks;
 | 
|        var arg_sinkName = "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;
 | 
| @@ -2680,7 +2680,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildEmpty());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.delete(arg_sinkName).then(unittest.expectAsync(((api.Empty response) {
 | 
| +      res.delete(arg_sinkName).then(unittest.expectAsync1(((api.Empty response) {
 | 
|          checkEmpty(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2690,7 +2690,7 @@ main() {
 | 
|        var mock = new HttpServerMock();
 | 
|        api.ProjectsSinksResourceApi res = new api.LoggingApi(mock).projects.sinks;
 | 
|        var arg_sinkName = "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;
 | 
| @@ -2725,7 +2725,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.get(arg_sinkName).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.get(arg_sinkName).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2737,7 +2737,7 @@ main() {
 | 
|        var arg_parent = "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;
 | 
| @@ -2774,7 +2774,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildListSinksResponse());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync(((api.ListSinksResponse response) {
 | 
| +      res.list(arg_parent, pageToken: arg_pageToken, pageSize: arg_pageSize).then(unittest.expectAsync1(((api.ListSinksResponse response) {
 | 
|          checkListSinksResponse(response);
 | 
|        })));
 | 
|      });
 | 
| @@ -2786,7 +2786,7 @@ main() {
 | 
|        var arg_request = buildLogSink();
 | 
|        var arg_sinkName = "foo";
 | 
|        var arg_uniqueWriterIdentity = true;
 | 
| -      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
 | 
| +      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
 | 
|          var obj = new api.LogSink.fromJson(json);
 | 
|          checkLogSink(obj);
 | 
|  
 | 
| @@ -2825,7 +2825,7 @@ main() {
 | 
|          var resp = convert.JSON.encode(buildLogSink());
 | 
|          return new async.Future.value(stringResponse(200, h, resp));
 | 
|        }), true);
 | 
| -      res.update(arg_request, arg_sinkName, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync(((api.LogSink response) {
 | 
| +      res.update(arg_request, arg_sinkName, uniqueWriterIdentity: arg_uniqueWriterIdentity).then(unittest.expectAsync1(((api.LogSink response) {
 | 
|          checkLogSink(response);
 | 
|        })));
 | 
|      });
 | 
| 
 |