Api-Roll 50: 2017-06-12

generated/googleapis/test/safebrowsing/v4_test.dart

 library googleapis.safebrowsing.v4.test;
 
 import "dart:core" as core;
 import "dart:collection" as collection;
 import "dart:async" as async;
 import "dart:convert" as convert;
 
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
-import 'package:unittest/unittest.dart' as unittest;
+import 'package:test/test.dart' as unittest;
 
 import 'package:googleapis/safebrowsing/v4.dart' as api;
 
 class HttpServerMock extends http.BaseClient {
   core.Function _callback;
   core.bool _expectJson;
 
   void register(core.Function callback, core.bool expectJson) {
     _callback = callback;
     _expectJson = expectJson;
@@ skipping 18 matching lines @@
       } else {
         return stream.toBytes().then((data) {
           return _callback(request, data);
         });
       }
     }
   }
 }
 
 http.StreamedResponse stringResponse(
-    core.int status, core.Map headers, core.String body) {
+    core.int status, core.Map<core.String, core.String> headers, core.String body) {
   var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
 core.int buildCounterChecksum = 0;
 buildChecksum() {
   var o = new api.Checksum();
   buildCounterChecksum++;
   if (buildCounterChecksum < 3) {
     o.sha256 = "foo";
@@ skipping 24 matching lines @@
 
 checkClientInfo(api.ClientInfo o) {
   buildCounterClientInfo++;
   if (buildCounterClientInfo < 3) {
     unittest.expect(o.clientId, unittest.equals('foo'));
     unittest.expect(o.clientVersion, unittest.equals('foo'));
   }
   buildCounterClientInfo--;
 }
 
-buildUnnamed1006() {
+buildUnnamed1013() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1006(core.List<core.String> o) {
+checkUnnamed1013(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 buildCounterConstraints = 0;
 buildConstraints() {
   var o = new api.Constraints();
   buildCounterConstraints++;
   if (buildCounterConstraints < 3) {
     o.maxDatabaseEntries = 42;
     o.maxUpdateEntries = 42;
     o.region = "foo";
-    o.supportedCompressions = buildUnnamed1006();
+    o.supportedCompressions = buildUnnamed1013();
   }
   buildCounterConstraints--;
   return o;
 }
 
 checkConstraints(api.Constraints o) {
   buildCounterConstraints++;
   if (buildCounterConstraints < 3) {
     unittest.expect(o.maxDatabaseEntries, unittest.equals(42));
     unittest.expect(o.maxUpdateEntries, unittest.equals(42));
     unittest.expect(o.region, unittest.equals('foo'));
-    checkUnnamed1006(o.supportedCompressions);
+    checkUnnamed1013(o.supportedCompressions);
   }
   buildCounterConstraints--;
 }
 
-buildUnnamed1007() {
+buildUnnamed1014() {
   var o = new core.List<api.ListUpdateRequest>();
   o.add(buildListUpdateRequest());
   o.add(buildListUpdateRequest());
   return o;
 }
 
-checkUnnamed1007(core.List<api.ListUpdateRequest> o) {
+checkUnnamed1014(core.List<api.ListUpdateRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListUpdateRequest(o[0]);
   checkListUpdateRequest(o[1]);
 }
 
 core.int buildCounterFetchThreatListUpdatesRequest = 0;
 buildFetchThreatListUpdatesRequest() {
   var o = new api.FetchThreatListUpdatesRequest();
   buildCounterFetchThreatListUpdatesRequest++;
   if (buildCounterFetchThreatListUpdatesRequest < 3) {
     o.client = buildClientInfo();
-    o.listUpdateRequests = buildUnnamed1007();
+    o.listUpdateRequests = buildUnnamed1014();
   }
   buildCounterFetchThreatListUpdatesRequest--;
   return o;
 }
 
 checkFetchThreatListUpdatesRequest(api.FetchThreatListUpdatesRequest o) {
   buildCounterFetchThreatListUpdatesRequest++;
   if (buildCounterFetchThreatListUpdatesRequest < 3) {
     checkClientInfo(o.client);
-    checkUnnamed1007(o.listUpdateRequests);
+    checkUnnamed1014(o.listUpdateRequests);
   }
   buildCounterFetchThreatListUpdatesRequest--;
 }
 
-buildUnnamed1008() {
+buildUnnamed1015() {
   var o = new core.List<api.ListUpdateResponse>();
   o.add(buildListUpdateResponse());
   o.add(buildListUpdateResponse());
   return o;
 }
 
-checkUnnamed1008(core.List<api.ListUpdateResponse> o) {
+checkUnnamed1015(core.List<api.ListUpdateResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListUpdateResponse(o[0]);
   checkListUpdateResponse(o[1]);
 }
 
 core.int buildCounterFetchThreatListUpdatesResponse = 0;
 buildFetchThreatListUpdatesResponse() {
   var o = new api.FetchThreatListUpdatesResponse();
   buildCounterFetchThreatListUpdatesResponse++;
   if (buildCounterFetchThreatListUpdatesResponse < 3) {
-    o.listUpdateResponses = buildUnnamed1008();
+    o.listUpdateResponses = buildUnnamed1015();
     o.minimumWaitDuration = "foo";
   }
   buildCounterFetchThreatListUpdatesResponse--;
   return o;
 }
 
 checkFetchThreatListUpdatesResponse(api.FetchThreatListUpdatesResponse o) {
   buildCounterFetchThreatListUpdatesResponse++;
   if (buildCounterFetchThreatListUpdatesResponse < 3) {
-    checkUnnamed1008(o.listUpdateResponses);
+    checkUnnamed1015(o.listUpdateResponses);
     unittest.expect(o.minimumWaitDuration, unittest.equals('foo'));
   }
   buildCounterFetchThreatListUpdatesResponse--;
 }
 
-buildUnnamed1009() {
+buildUnnamed1016() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1009(core.List<core.String> o) {
+checkUnnamed1016(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 buildCounterFindFullHashesRequest = 0;
 buildFindFullHashesRequest() {
   var o = new api.FindFullHashesRequest();
   buildCounterFindFullHashesRequest++;
   if (buildCounterFindFullHashesRequest < 3) {
     o.apiClient = buildClientInfo();
     o.client = buildClientInfo();
-    o.clientStates = buildUnnamed1009();
+    o.clientStates = buildUnnamed1016();
     o.threatInfo = buildThreatInfo();
   }
   buildCounterFindFullHashesRequest--;
   return o;
 }
 
 checkFindFullHashesRequest(api.FindFullHashesRequest o) {
   buildCounterFindFullHashesRequest++;
   if (buildCounterFindFullHashesRequest < 3) {
     checkClientInfo(o.apiClient);
     checkClientInfo(o.client);
-    checkUnnamed1009(o.clientStates);
+    checkUnnamed1016(o.clientStates);
     checkThreatInfo(o.threatInfo);
   }
   buildCounterFindFullHashesRequest--;
 }
 
-buildUnnamed1010() {
+buildUnnamed1017() {
   var o = new core.List<api.ThreatMatch>();
   o.add(buildThreatMatch());
   o.add(buildThreatMatch());
   return o;
 }
 
-checkUnnamed1010(core.List<api.ThreatMatch> o) {
+checkUnnamed1017(core.List<api.ThreatMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatMatch(o[0]);
   checkThreatMatch(o[1]);
 }
 
 core.int buildCounterFindFullHashesResponse = 0;
 buildFindFullHashesResponse() {
   var o = new api.FindFullHashesResponse();
   buildCounterFindFullHashesResponse++;
   if (buildCounterFindFullHashesResponse < 3) {
-    o.matches = buildUnnamed1010();
+    o.matches = buildUnnamed1017();
     o.minimumWaitDuration = "foo";
     o.negativeCacheDuration = "foo";
   }
   buildCounterFindFullHashesResponse--;
   return o;
 }
 
 checkFindFullHashesResponse(api.FindFullHashesResponse o) {
   buildCounterFindFullHashesResponse++;
   if (buildCounterFindFullHashesResponse < 3) {
-    checkUnnamed1010(o.matches);
+    checkUnnamed1017(o.matches);
     unittest.expect(o.minimumWaitDuration, unittest.equals('foo'));
     unittest.expect(o.negativeCacheDuration, unittest.equals('foo'));
   }
   buildCounterFindFullHashesResponse--;
 }
 
 core.int buildCounterFindThreatMatchesRequest = 0;
 buildFindThreatMatchesRequest() {
   var o = new api.FindThreatMatchesRequest();
   buildCounterFindThreatMatchesRequest++;
   if (buildCounterFindThreatMatchesRequest < 3) {
     o.client = buildClientInfo();
     o.threatInfo = buildThreatInfo();
   }
   buildCounterFindThreatMatchesRequest--;
   return o;
 }
 
 checkFindThreatMatchesRequest(api.FindThreatMatchesRequest o) {
   buildCounterFindThreatMatchesRequest++;
   if (buildCounterFindThreatMatchesRequest < 3) {
     checkClientInfo(o.client);
     checkThreatInfo(o.threatInfo);
   }
   buildCounterFindThreatMatchesRequest--;
 }
 
-buildUnnamed1011() {
+buildUnnamed1018() {
   var o = new core.List<api.ThreatMatch>();
   o.add(buildThreatMatch());
   o.add(buildThreatMatch());
   return o;
 }
 
-checkUnnamed1011(core.List<api.ThreatMatch> o) {
+checkUnnamed1018(core.List<api.ThreatMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatMatch(o[0]);
   checkThreatMatch(o[1]);
 }
 
 core.int buildCounterFindThreatMatchesResponse = 0;
 buildFindThreatMatchesResponse() {
   var o = new api.FindThreatMatchesResponse();
   buildCounterFindThreatMatchesResponse++;
   if (buildCounterFindThreatMatchesResponse < 3) {
-    o.matches = buildUnnamed1011();
+    o.matches = buildUnnamed1018();
   }
   buildCounterFindThreatMatchesResponse--;
   return o;
 }
 
 checkFindThreatMatchesResponse(api.FindThreatMatchesResponse o) {
   buildCounterFindThreatMatchesResponse++;
   if (buildCounterFindThreatMatchesResponse < 3) {
-    checkUnnamed1011(o.matches);
+    checkUnnamed1018(o.matches);
   }
   buildCounterFindThreatMatchesResponse--;
 }
 
-buildUnnamed1012() {
+buildUnnamed1019() {
   var o = new core.List<api.ThreatListDescriptor>();
   o.add(buildThreatListDescriptor());
   o.add(buildThreatListDescriptor());
   return o;
 }
 
-checkUnnamed1012(core.List<api.ThreatListDescriptor> o) {
+checkUnnamed1019(core.List<api.ThreatListDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatListDescriptor(o[0]);
   checkThreatListDescriptor(o[1]);
 }
 
 core.int buildCounterListThreatListsResponse = 0;
 buildListThreatListsResponse() {
   var o = new api.ListThreatListsResponse();
   buildCounterListThreatListsResponse++;
   if (buildCounterListThreatListsResponse < 3) {
-    o.threatLists = buildUnnamed1012();
+    o.threatLists = buildUnnamed1019();
   }
   buildCounterListThreatListsResponse--;
   return o;
 }
 
 checkListThreatListsResponse(api.ListThreatListsResponse o) {
   buildCounterListThreatListsResponse++;
   if (buildCounterListThreatListsResponse < 3) {
-    checkUnnamed1012(o.threatLists);
+    checkUnnamed1019(o.threatLists);
   }
   buildCounterListThreatListsResponse--;
 }
 
 core.int buildCounterListUpdateRequest = 0;
 buildListUpdateRequest() {
   var o = new api.ListUpdateRequest();
   buildCounterListUpdateRequest++;
   if (buildCounterListUpdateRequest < 3) {
     o.constraints = buildConstraints();
@@ skipping 11 matching lines @@
   if (buildCounterListUpdateRequest < 3) {
     checkConstraints(o.constraints);
     unittest.expect(o.platformType, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
     unittest.expect(o.threatEntryType, unittest.equals('foo'));
     unittest.expect(o.threatType, unittest.equals('foo'));
   }
   buildCounterListUpdateRequest--;
 }
 
-buildUnnamed1013() {
+buildUnnamed1020() {
   var o = new core.List<api.ThreatEntrySet>();
   o.add(buildThreatEntrySet());
   o.add(buildThreatEntrySet());
   return o;
 }
 
-checkUnnamed1013(core.List<api.ThreatEntrySet> o) {
+checkUnnamed1020(core.List<api.ThreatEntrySet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatEntrySet(o[0]);
   checkThreatEntrySet(o[1]);
 }
 
-buildUnnamed1014() {
+buildUnnamed1021() {
   var o = new core.List<api.ThreatEntrySet>();
   o.add(buildThreatEntrySet());
   o.add(buildThreatEntrySet());
   return o;
 }
 
-checkUnnamed1014(core.List<api.ThreatEntrySet> o) {
+checkUnnamed1021(core.List<api.ThreatEntrySet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatEntrySet(o[0]);
   checkThreatEntrySet(o[1]);
 }
 
 core.int buildCounterListUpdateResponse = 0;
 buildListUpdateResponse() {
   var o = new api.ListUpdateResponse();
   buildCounterListUpdateResponse++;
   if (buildCounterListUpdateResponse < 3) {
-    o.additions = buildUnnamed1013();
+    o.additions = buildUnnamed1020();
     o.checksum = buildChecksum();
     o.newClientState = "foo";
     o.platformType = "foo";
-    o.removals = buildUnnamed1014();
+    o.removals = buildUnnamed1021();
     o.responseType = "foo";
     o.threatEntryType = "foo";
     o.threatType = "foo";
   }
   buildCounterListUpdateResponse--;
   return o;
 }
 
 checkListUpdateResponse(api.ListUpdateResponse o) {
   buildCounterListUpdateResponse++;
   if (buildCounterListUpdateResponse < 3) {
-    checkUnnamed1013(o.additions);
+    checkUnnamed1020(o.additions);
     checkChecksum(o.checksum);
     unittest.expect(o.newClientState, unittest.equals('foo'));
     unittest.expect(o.platformType, unittest.equals('foo'));
-    checkUnnamed1014(o.removals);
+    checkUnnamed1021(o.removals);
     unittest.expect(o.responseType, unittest.equals('foo'));
     unittest.expect(o.threatEntryType, unittest.equals('foo'));
     unittest.expect(o.threatType, unittest.equals('foo'));
   }
   buildCounterListUpdateResponse--;
 }
 
 core.int buildCounterMetadataEntry = 0;
 buildMetadataEntry() {
   var o = new api.MetadataEntry();
@@ skipping 29 matching lines @@
 
 checkRawHashes(api.RawHashes o) {
   buildCounterRawHashes++;
   if (buildCounterRawHashes < 3) {
     unittest.expect(o.prefixSize, unittest.equals(42));
     unittest.expect(o.rawHashes, unittest.equals('foo'));
   }
   buildCounterRawHashes--;
 }
 
-buildUnnamed1015() {
+buildUnnamed1022() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1015(core.List<core.int> o) {
+checkUnnamed1022(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
 core.int buildCounterRawIndices = 0;
 buildRawIndices() {
   var o = new api.RawIndices();
   buildCounterRawIndices++;
   if (buildCounterRawIndices < 3) {
-    o.indices = buildUnnamed1015();
+    o.indices = buildUnnamed1022();
   }
   buildCounterRawIndices--;
   return o;
 }
 
 checkRawIndices(api.RawIndices o) {
   buildCounterRawIndices++;
   if (buildCounterRawIndices < 3) {
-    checkUnnamed1015(o.indices);
+    checkUnnamed1022(o.indices);
   }
   buildCounterRawIndices--;
 }
 
 core.int buildCounterRiceDeltaEncoding = 0;
 buildRiceDeltaEncoding() {
   var o = new api.RiceDeltaEncoding();
   buildCounterRiceDeltaEncoding++;
   if (buildCounterRiceDeltaEncoding < 3) {
     o.encodedData = "foo";
@@ skipping 32 matching lines @@
 checkThreatEntry(api.ThreatEntry o) {
   buildCounterThreatEntry++;
   if (buildCounterThreatEntry < 3) {
     unittest.expect(o.digest, unittest.equals('foo'));
     unittest.expect(o.hash, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterThreatEntry--;
 }
 
-buildUnnamed1016() {
+buildUnnamed1023() {
   var o = new core.List<api.MetadataEntry>();
   o.add(buildMetadataEntry());
   o.add(buildMetadataEntry());
   return o;
 }
 
-checkUnnamed1016(core.List<api.MetadataEntry> o) {
+checkUnnamed1023(core.List<api.MetadataEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetadataEntry(o[0]);
   checkMetadataEntry(o[1]);
 }
 
 core.int buildCounterThreatEntryMetadata = 0;
 buildThreatEntryMetadata() {
   var o = new api.ThreatEntryMetadata();
   buildCounterThreatEntryMetadata++;
   if (buildCounterThreatEntryMetadata < 3) {
-    o.entries = buildUnnamed1016();
+    o.entries = buildUnnamed1023();
   }
   buildCounterThreatEntryMetadata--;
   return o;
 }
 
 checkThreatEntryMetadata(api.ThreatEntryMetadata o) {
   buildCounterThreatEntryMetadata++;
   if (buildCounterThreatEntryMetadata < 3) {
-    checkUnnamed1016(o.entries);
+    checkUnnamed1023(o.entries);
   }
   buildCounterThreatEntryMetadata--;
 }
 
 core.int buildCounterThreatEntrySet = 0;
 buildThreatEntrySet() {
   var o = new api.ThreatEntrySet();
   buildCounterThreatEntrySet++;
   if (buildCounterThreatEntrySet < 3) {
     o.compressionType = "foo";
@@ skipping 11 matching lines @@
   if (buildCounterThreatEntrySet < 3) {
     unittest.expect(o.compressionType, unittest.equals('foo'));
     checkRawHashes(o.rawHashes);
     checkRawIndices(o.rawIndices);
     checkRiceDeltaEncoding(o.riceHashes);
     checkRiceDeltaEncoding(o.riceIndices);
   }
   buildCounterThreatEntrySet--;
 }
 
-buildUnnamed1017() {
+buildUnnamed1024() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1017(core.List<core.String> o) {
+checkUnnamed1024(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'));
 }
 
-buildUnnamed1018() {
+buildUnnamed1025() {
   var o = new core.List<api.ThreatEntry>();
   o.add(buildThreatEntry());
   o.add(buildThreatEntry());
   return o;
 }
 
-checkUnnamed1018(core.List<api.ThreatEntry> o) {
+checkUnnamed1025(core.List<api.ThreatEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatEntry(o[0]);
   checkThreatEntry(o[1]);
 }
 
-buildUnnamed1019() {
+buildUnnamed1026() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1019(core.List<core.String> o) {
+checkUnnamed1026(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'));
 }
 
-buildUnnamed1020() {
+buildUnnamed1027() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1020(core.List<core.String> o) {
+checkUnnamed1027(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 buildCounterThreatInfo = 0;
 buildThreatInfo() {
   var o = new api.ThreatInfo();
   buildCounterThreatInfo++;
   if (buildCounterThreatInfo < 3) {
-    o.platformTypes = buildUnnamed1017();
-    o.threatEntries = buildUnnamed1018();
-    o.threatEntryTypes = buildUnnamed1019();
-    o.threatTypes = buildUnnamed1020();
+    o.platformTypes = buildUnnamed1024();
+    o.threatEntries = buildUnnamed1025();
+    o.threatEntryTypes = buildUnnamed1026();
+    o.threatTypes = buildUnnamed1027();
   }
   buildCounterThreatInfo--;
   return o;
 }
 
 checkThreatInfo(api.ThreatInfo o) {
   buildCounterThreatInfo++;
   if (buildCounterThreatInfo < 3) {
-    checkUnnamed1017(o.platformTypes);
-    checkUnnamed1018(o.threatEntries);
-    checkUnnamed1019(o.threatEntryTypes);
-    checkUnnamed1020(o.threatTypes);
+    checkUnnamed1024(o.platformTypes);
+    checkUnnamed1025(o.threatEntries);
+    checkUnnamed1026(o.threatEntryTypes);
+    checkUnnamed1027(o.threatTypes);
   }
   buildCounterThreatInfo--;
 }
 
 core.int buildCounterThreatListDescriptor = 0;
 buildThreatListDescriptor() {
   var o = new api.ThreatListDescriptor();
   buildCounterThreatListDescriptor++;
   if (buildCounterThreatListDescriptor < 3) {
     o.platformType = "foo";
@@ skipping 244 matching lines @@
 
 
   unittest.group("resource-EncodedFullHashesResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.EncodedFullHashesResourceApi res = new api.SafebrowsingApi(mock).encodedFullHashes;
       var arg_encodedRequest = "foo";
       var arg_clientId = "foo";
       var arg_clientVersion = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("v4/encodedFullHashes/"));
         pathOffset += 21;
         subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
         pathOffset = path.length;
@@ skipping 18 matching lines @@
         unittest.expect(queryMap["clientId"].first, unittest.equals(arg_clientId));
         unittest.expect(queryMap["clientVersion"].first, unittest.equals(arg_clientVersion));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFindFullHashesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_encodedRequest, clientId: arg_clientId, clientVersion: arg_clientVersion).then(unittest.expectAsync(((api.FindFullHashesResponse response) {
+      res.get(arg_encodedRequest, clientId: arg_clientId, clientVersion: arg_clientVersion).then(unittest.expectAsync1(((api.FindFullHashesResponse response) {
         checkFindFullHashesResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-EncodedUpdatesResourceApi", () {
     unittest.test("method--get", () {
 
       var mock = new HttpServerMock();
       api.EncodedUpdatesResourceApi res = new api.SafebrowsingApi(mock).encodedUpdates;
       var arg_encodedRequest = "foo";
+      var arg_clientVersion = "foo";
       var arg_clientId = "foo";
-      var arg_clientVersion = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 18), unittest.equals("v4/encodedUpdates/"));
         pathOffset += 18;
         subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
         pathOffset = path.length;
         unittest.expect(subPart, unittest.equals("$arg_encodedRequest"));
 
         var query = (req.url).query;
         var queryOffset = 0;
         var queryMap = {};
         addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
         parseBool(n) {
           if (n == "true") return true;
           if (n == "false") return false;
           if (n == null) return null;
           throw new core.ArgumentError("Invalid boolean: $n");
         }
         if (query.length > 0) {
           for (var part in query.split("&")) {
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
+        unittest.expect(queryMap["clientVersion"].first, unittest.equals(arg_clientVersion));
         unittest.expect(queryMap["clientId"].first, unittest.equals(arg_clientId));
-        unittest.expect(queryMap["clientVersion"].first, unittest.equals(arg_clientVersion));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFetchThreatListUpdatesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_encodedRequest, clientId: arg_clientId, clientVersion: arg_clientVersion).then(unittest.expectAsync(((api.FetchThreatListUpdatesResponse response) {
+      res.get(arg_encodedRequest, clientVersion: arg_clientVersion, clientId: arg_clientId).then(unittest.expectAsync1(((api.FetchThreatListUpdatesResponse response) {
         checkFetchThreatListUpdatesResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-FullHashesResourceApi", () {
     unittest.test("method--find", () {
 
       var mock = new HttpServerMock();
       api.FullHashesResourceApi res = new api.SafebrowsingApi(mock).fullHashes;
       var arg_request = buildFindFullHashesRequest();
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.FindFullHashesRequest.fromJson(json);
         checkFindFullHashesRequest(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 18), unittest.equals("v4/fullHashes:find"));
@@ skipping 16 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFindFullHashesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.find(arg_request).then(unittest.expectAsync(((api.FindFullHashesResponse response) {
+      res.find(arg_request).then(unittest.expectAsync1(((api.FindFullHashesResponse response) {
         checkFindFullHashesResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ThreatListUpdatesResourceApi", () {
     unittest.test("method--fetch", () {
 
       var mock = new HttpServerMock();
       api.ThreatListUpdatesResourceApi res = new api.SafebrowsingApi(mock).threatListUpdates;
       var arg_request = buildFetchThreatListUpdatesRequest();
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.FetchThreatListUpdatesRequest.fromJson(json);
         checkFetchThreatListUpdatesRequest(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 26), unittest.equals("v4/threatListUpdates:fetch"));
@@ skipping 16 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFetchThreatListUpdatesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.fetch(arg_request).then(unittest.expectAsync(((api.FetchThreatListUpdatesResponse response) {
+      res.fetch(arg_request).then(unittest.expectAsync1(((api.FetchThreatListUpdatesResponse response) {
         checkFetchThreatListUpdatesResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ThreatListsResourceApi", () {
     unittest.test("method--list", () {
 
       var mock = new HttpServerMock();
       api.ThreatListsResourceApi res = new api.SafebrowsingApi(mock).threatLists;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("v4/threatLists"));
         pathOffset += 14;
 
         var query = (req.url).query;
@@ skipping 13 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListThreatListsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list().then(unittest.expectAsync(((api.ListThreatListsResponse response) {
+      res.list().then(unittest.expectAsync1(((api.ListThreatListsResponse response) {
         checkListThreatListsResponse(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-ThreatMatchesResourceApi", () {
     unittest.test("method--find", () {
 
       var mock = new HttpServerMock();
       api.ThreatMatchesResourceApi res = new api.SafebrowsingApi(mock).threatMatches;
       var arg_request = buildFindThreatMatchesRequest();
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+      mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.FindThreatMatchesRequest.fromJson(json);
         checkFindThreatMatchesRequest(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("v4/threatMatches:find"));
@@ skipping 16 matching lines @@
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFindThreatMatchesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.find(arg_request).then(unittest.expectAsync(((api.FindThreatMatchesResponse response) {
+      res.find(arg_request).then(unittest.expectAsync1(((api.FindThreatMatchesResponse response) {
         checkFindThreatMatchesResponse(response);
       })));
     });
 
   });
 
 
 }