Roll of googleapis as of 4/7/2015.

generated/googleapis/test/plus/v1_test.dart

 library googleapis.plus.v1.test;
 
 import "dart:core" as core;
 import "dart:collection" as collection;
 import "dart:async" as async;
 import "dart:convert" as convert;
 
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/plus/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed144() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1254() {
   var o = new core.List<api.PlusAclentryResource>();
   o.add(buildPlusAclentryResource());
   o.add(buildPlusAclentryResource());
   return o;
 }
 
-checkUnnamed144(core.List<api.PlusAclentryResource> o) {
+checkUnnamed1254(core.List<api.PlusAclentryResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlusAclentryResource(o[0]);
   checkPlusAclentryResource(o[1]);
 }
 
 core.int buildCounterAcl = 0;
 buildAcl() {
   var o = new api.Acl();
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     o.description = "foo";
-    o.items = buildUnnamed144();
+    o.items = buildUnnamed1254();
     o.kind = "foo";
   }
   buildCounterAcl--;
   return o;
 }
 
 checkAcl(api.Acl o) {
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed144(o.items);
+    checkUnnamed1254(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAcl--;
 }
 
 core.int buildCounterActivityActorImage = 0;
 buildActivityActorImage() {
   var o = new api.ActivityActorImage();
   buildCounterActivityActorImage++;
   if (buildCounterActivityActorImage < 3) {
@@ skipping 215 matching lines @@
 checkActivityObjectAttachmentsThumbnails(api.ActivityObjectAttachmentsThumbnails o) {
   buildCounterActivityObjectAttachmentsThumbnails++;
   if (buildCounterActivityObjectAttachmentsThumbnails < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     checkActivityObjectAttachmentsThumbnailsImage(o.image);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObjectAttachmentsThumbnails--;
 }
 
-buildUnnamed145() {
+buildUnnamed1255() {
   var o = new core.List<api.ActivityObjectAttachmentsThumbnails>();
   o.add(buildActivityObjectAttachmentsThumbnails());
   o.add(buildActivityObjectAttachmentsThumbnails());
   return o;
 }
 
-checkUnnamed145(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
+checkUnnamed1255(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachmentsThumbnails(o[0]);
   checkActivityObjectAttachmentsThumbnails(o[1]);
 }
 
 core.int buildCounterActivityObjectAttachments = 0;
 buildActivityObjectAttachments() {
   var o = new api.ActivityObjectAttachments();
   buildCounterActivityObjectAttachments++;
   if (buildCounterActivityObjectAttachments < 3) {
     o.content = "foo";
     o.displayName = "foo";
     o.embed = buildActivityObjectAttachmentsEmbed();
     o.fullImage = buildActivityObjectAttachmentsFullImage();
     o.id = "foo";
     o.image = buildActivityObjectAttachmentsImage();
     o.objectType = "foo";
-    o.thumbnails = buildUnnamed145();
+    o.thumbnails = buildUnnamed1255();
     o.url = "foo";
   }
   buildCounterActivityObjectAttachments--;
   return o;
 }
 
 checkActivityObjectAttachments(api.ActivityObjectAttachments o) {
   buildCounterActivityObjectAttachments++;
   if (buildCounterActivityObjectAttachments < 3) {
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     checkActivityObjectAttachmentsEmbed(o.embed);
     checkActivityObjectAttachmentsFullImage(o.fullImage);
     unittest.expect(o.id, unittest.equals('foo'));
     checkActivityObjectAttachmentsImage(o.image);
     unittest.expect(o.objectType, unittest.equals('foo'));
-    checkUnnamed145(o.thumbnails);
+    checkUnnamed1255(o.thumbnails);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObjectAttachments--;
 }
 
-buildUnnamed146() {
+buildUnnamed1256() {
   var o = new core.List<api.ActivityObjectAttachments>();
   o.add(buildActivityObjectAttachments());
   o.add(buildActivityObjectAttachments());
   return o;
 }
 
-checkUnnamed146(core.List<api.ActivityObjectAttachments> o) {
+checkUnnamed1256(core.List<api.ActivityObjectAttachments> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachments(o[0]);
   checkActivityObjectAttachments(o[1]);
 }
 
 core.int buildCounterActivityObjectPlusoners = 0;
 buildActivityObjectPlusoners() {
   var o = new api.ActivityObjectPlusoners();
   buildCounterActivityObjectPlusoners++;
   if (buildCounterActivityObjectPlusoners < 3) {
@@ skipping 54 matching lines @@
   }
   buildCounterActivityObjectResharers--;
 }
 
 core.int buildCounterActivityObject = 0;
 buildActivityObject() {
   var o = new api.ActivityObject();
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     o.actor = buildActivityObjectActor();
-    o.attachments = buildUnnamed146();
+    o.attachments = buildUnnamed1256();
     o.content = "foo";
     o.id = "foo";
     o.objectType = "foo";
     o.originalContent = "foo";
     o.plusoners = buildActivityObjectPlusoners();
     o.replies = buildActivityObjectReplies();
     o.resharers = buildActivityObjectResharers();
     o.url = "foo";
   }
   buildCounterActivityObject--;
   return o;
 }
 
 checkActivityObject(api.ActivityObject o) {
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     checkActivityObjectActor(o.actor);
-    checkUnnamed146(o.attachments);
+    checkUnnamed1256(o.attachments);
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.originalContent, unittest.equals('foo'));
     checkActivityObjectPlusoners(o.plusoners);
     checkActivityObjectReplies(o.replies);
     checkActivityObjectResharers(o.resharers);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObject--;
@@ skipping 68 matching lines @@
     unittest.expect(o.published, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.radius, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.url, unittest.equals('foo'));
     unittest.expect(o.verb, unittest.equals('foo'));
   }
   buildCounterActivity--;
 }
 
-buildUnnamed147() {
+buildUnnamed1257() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed147(core.List<api.Activity> o) {
+checkUnnamed1257(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
 }
 
 core.int buildCounterActivityFeed = 0;
 buildActivityFeed() {
   var o = new api.ActivityFeed();
   buildCounterActivityFeed++;
   if (buildCounterActivityFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed147();
+    o.items = buildUnnamed1257();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
     o.title = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
   }
   buildCounterActivityFeed--;
   return o;
 }
 
 checkActivityFeed(api.ActivityFeed o) {
   buildCounterActivityFeed++;
   if (buildCounterActivityFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed147(o.items);
+    checkUnnamed1257(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
   }
   buildCounterActivityFeed--;
 }
 
@@ skipping 55 matching lines @@
 
 checkCommentInReplyTo(api.CommentInReplyTo o) {
   buildCounterCommentInReplyTo++;
   if (buildCounterCommentInReplyTo < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterCommentInReplyTo--;
 }
 
-buildUnnamed148() {
+buildUnnamed1258() {
   var o = new core.List<api.CommentInReplyTo>();
   o.add(buildCommentInReplyTo());
   o.add(buildCommentInReplyTo());
   return o;
 }
 
-checkUnnamed148(core.List<api.CommentInReplyTo> o) {
+checkUnnamed1258(core.List<api.CommentInReplyTo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentInReplyTo(o[0]);
   checkCommentInReplyTo(o[1]);
 }
 
 core.int buildCounterCommentObject = 0;
 buildCommentObject() {
   var o = new api.CommentObject();
   buildCounterCommentObject++;
   if (buildCounterCommentObject < 3) {
@@ skipping 35 matching lines @@
 }
 
 core.int buildCounterComment = 0;
 buildComment() {
   var o = new api.Comment();
   buildCounterComment++;
   if (buildCounterComment < 3) {
     o.actor = buildCommentActor();
     o.etag = "foo";
     o.id = "foo";
-    o.inReplyTo = buildUnnamed148();
+    o.inReplyTo = buildUnnamed1258();
     o.kind = "foo";
     o.object = buildCommentObject();
     o.plusoners = buildCommentPlusoners();
     o.published = core.DateTime.parse("2002-02-27T14:01:02");
     o.selfLink = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
     o.verb = "foo";
   }
   buildCounterComment--;
   return o;
 }
 
 checkComment(api.Comment o) {
   buildCounterComment++;
   if (buildCounterComment < 3) {
     checkCommentActor(o.actor);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed148(o.inReplyTo);
+    checkUnnamed1258(o.inReplyTo);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkCommentObject(o.object);
     checkCommentPlusoners(o.plusoners);
     unittest.expect(o.published, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.verb, unittest.equals('foo'));
   }
   buildCounterComment--;
 }
 
-buildUnnamed149() {
+buildUnnamed1259() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed149(core.List<api.Comment> o) {
+checkUnnamed1259(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
 }
 
 core.int buildCounterCommentFeed = 0;
 buildCommentFeed() {
   var o = new api.CommentFeed();
   buildCounterCommentFeed++;
   if (buildCounterCommentFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed149();
+    o.items = buildUnnamed1259();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
     o.title = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
   }
   buildCounterCommentFeed--;
   return o;
 }
 
 checkCommentFeed(api.CommentFeed o) {
   buildCounterCommentFeed++;
   if (buildCounterCommentFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed149(o.items);
+    checkUnnamed1259(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
   }
   buildCounterCommentFeed--;
 }
 
-buildUnnamed150() {
+buildUnnamed1260() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed150(core.List<core.String> o) {
+checkUnnamed1260(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'));
 }
 
-buildUnnamed151() {
+buildUnnamed1261() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed151(core.List<api.ItemScope> o) {
+checkUnnamed1261(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
 }
 
-buildUnnamed152() {
+buildUnnamed1262() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed152(core.List<api.ItemScope> o) {
+checkUnnamed1262(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
 }
 
-buildUnnamed153() {
+buildUnnamed1263() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed153(core.List<api.ItemScope> o) {
+checkUnnamed1263(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
 }
 
-buildUnnamed154() {
+buildUnnamed1264() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed154(core.List<api.ItemScope> o) {
+checkUnnamed1264(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
 }
 
-buildUnnamed155() {
+buildUnnamed1265() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed155(core.List<api.ItemScope> o) {
+checkUnnamed1265(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
 }
 
 core.int buildCounterItemScope = 0;
 buildItemScope() {
   var o = new api.ItemScope();
   buildCounterItemScope++;
   if (buildCounterItemScope < 3) {
     o.about = buildItemScope();
-    o.additionalName = buildUnnamed150();
+    o.additionalName = buildUnnamed1260();
     o.address = buildItemScope();
     o.addressCountry = "foo";
     o.addressLocality = "foo";
     o.addressRegion = "foo";
-    o.associatedMedia = buildUnnamed151();
+    o.associatedMedia = buildUnnamed1261();
     o.attendeeCount = 42;
-    o.attendees = buildUnnamed152();
+    o.attendees = buildUnnamed1262();
     o.audio = buildItemScope();
-    o.author = buildUnnamed153();
+    o.author = buildUnnamed1263();
     o.bestRating = "foo";
     o.birthDate = "foo";
     o.byArtist = buildItemScope();
     o.caption = "foo";
     o.contentSize = "foo";
     o.contentUrl = "foo";
-    o.contributor = buildUnnamed154();
+    o.contributor = buildUnnamed1264();
     o.dateCreated = "foo";
     o.dateModified = "foo";
     o.datePublished = "foo";
     o.description = "foo";
     o.duration = "foo";
     o.embedUrl = "foo";
     o.endDate = "foo";
     o.familyName = "foo";
     o.gender = "foo";
     o.geo = buildItemScope();
     o.givenName = "foo";
     o.height = "foo";
     o.id = "foo";
     o.image = "foo";
     o.inAlbum = buildItemScope();
     o.kind = "foo";
     o.latitude = 42.0;
     o.location = buildItemScope();
     o.longitude = 42.0;
     o.name = "foo";
     o.partOfTVSeries = buildItemScope();
-    o.performers = buildUnnamed155();
+    o.performers = buildUnnamed1265();
     o.playerType = "foo";
     o.postOfficeBoxNumber = "foo";
     o.postalCode = "foo";
     o.ratingValue = "foo";
     o.reviewRating = buildItemScope();
     o.startDate = "foo";
     o.streetAddress = "foo";
     o.text = "foo";
     o.thumbnail = buildItemScope();
     o.thumbnailUrl = "foo";
     o.tickerSymbol = "foo";
     o.type = "foo";
     o.url = "foo";
     o.width = "foo";
     o.worstRating = "foo";
   }
   buildCounterItemScope--;
   return o;
 }
 
 checkItemScope(api.ItemScope o) {
   buildCounterItemScope++;
   if (buildCounterItemScope < 3) {
     checkItemScope(o.about);
-    checkUnnamed150(o.additionalName);
+    checkUnnamed1260(o.additionalName);
     checkItemScope(o.address);
     unittest.expect(o.addressCountry, unittest.equals('foo'));
     unittest.expect(o.addressLocality, unittest.equals('foo'));
     unittest.expect(o.addressRegion, unittest.equals('foo'));
-    checkUnnamed151(o.associatedMedia);
+    checkUnnamed1261(o.associatedMedia);
     unittest.expect(o.attendeeCount, unittest.equals(42));
-    checkUnnamed152(o.attendees);
+    checkUnnamed1262(o.attendees);
     checkItemScope(o.audio);
-    checkUnnamed153(o.author);
+    checkUnnamed1263(o.author);
     unittest.expect(o.bestRating, unittest.equals('foo'));
     unittest.expect(o.birthDate, unittest.equals('foo'));
     checkItemScope(o.byArtist);
     unittest.expect(o.caption, unittest.equals('foo'));
     unittest.expect(o.contentSize, unittest.equals('foo'));
     unittest.expect(o.contentUrl, unittest.equals('foo'));
-    checkUnnamed154(o.contributor);
+    checkUnnamed1264(o.contributor);
     unittest.expect(o.dateCreated, unittest.equals('foo'));
     unittest.expect(o.dateModified, unittest.equals('foo'));
     unittest.expect(o.datePublished, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.duration, unittest.equals('foo'));
     unittest.expect(o.embedUrl, unittest.equals('foo'));
     unittest.expect(o.endDate, unittest.equals('foo'));
     unittest.expect(o.familyName, unittest.equals('foo'));
     unittest.expect(o.gender, unittest.equals('foo'));
     checkItemScope(o.geo);
     unittest.expect(o.givenName, unittest.equals('foo'));
     unittest.expect(o.height, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.image, unittest.equals('foo'));
     checkItemScope(o.inAlbum);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.latitude, unittest.equals(42.0));
     checkItemScope(o.location);
     unittest.expect(o.longitude, unittest.equals(42.0));
     unittest.expect(o.name, unittest.equals('foo'));
     checkItemScope(o.partOfTVSeries);
-    checkUnnamed155(o.performers);
+    checkUnnamed1265(o.performers);
     unittest.expect(o.playerType, unittest.equals('foo'));
     unittest.expect(o.postOfficeBoxNumber, unittest.equals('foo'));
     unittest.expect(o.postalCode, unittest.equals('foo'));
     unittest.expect(o.ratingValue, unittest.equals('foo'));
     checkItemScope(o.reviewRating);
     unittest.expect(o.startDate, unittest.equals('foo'));
     unittest.expect(o.streetAddress, unittest.equals('foo'));
     unittest.expect(o.text, unittest.equals('foo'));
     checkItemScope(o.thumbnail);
     unittest.expect(o.thumbnailUrl, unittest.equals('foo'));
@@ skipping 30 matching lines @@
     unittest.expect(o.kind, unittest.equals('foo'));
     checkItemScope(o.object);
     checkItemScope(o.result);
     unittest.expect(o.startDate, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     checkItemScope(o.target);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMoment--;
 }
 
-buildUnnamed156() {
+buildUnnamed1266() {
   var o = new core.List<api.Moment>();
   o.add(buildMoment());
   o.add(buildMoment());
   return o;
 }
 
-checkUnnamed156(core.List<api.Moment> o) {
+checkUnnamed1266(core.List<api.Moment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMoment(o[0]);
   checkMoment(o[1]);
 }
 
 core.int buildCounterMomentsFeed = 0;
 buildMomentsFeed() {
   var o = new api.MomentsFeed();
   buildCounterMomentsFeed++;
   if (buildCounterMomentsFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed156();
+    o.items = buildUnnamed1266();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
     o.title = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
   }
   buildCounterMomentsFeed--;
   return o;
 }
 
 checkMomentsFeed(api.MomentsFeed o) {
   buildCounterMomentsFeed++;
   if (buildCounterMomentsFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed156(o.items);
+    checkUnnamed1266(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
   }
   buildCounterMomentsFeed--;
 }
 
-buildUnnamed157() {
+buildUnnamed1267() {
   var o = new core.List<api.Person>();
   o.add(buildPerson());
   o.add(buildPerson());
   return o;
 }
 
-checkUnnamed157(core.List<api.Person> o) {
+checkUnnamed1267(core.List<api.Person> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerson(o[0]);
   checkPerson(o[1]);
 }
 
 core.int buildCounterPeopleFeed = 0;
 buildPeopleFeed() {
   var o = new api.PeopleFeed();
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed157();
+    o.items = buildUnnamed1267();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
     o.title = "foo";
     o.totalItems = 42;
   }
   buildCounterPeopleFeed--;
   return o;
 }
 
 checkPeopleFeed(api.PeopleFeed o) {
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed157(o.items);
+    checkUnnamed1267(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterPeopleFeed--;
 }
 
 core.int buildCounterPersonAgeRange = 0;
@@ skipping 98 matching lines @@
 
 checkPersonEmails(api.PersonEmails o) {
   buildCounterPersonEmails++;
   if (buildCounterPersonEmails < 3) {
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterPersonEmails--;
 }
 
-buildUnnamed158() {
+buildUnnamed1268() {
   var o = new core.List<api.PersonEmails>();
   o.add(buildPersonEmails());
   o.add(buildPersonEmails());
   return o;
 }
 
-checkUnnamed158(core.List<api.PersonEmails> o) {
+checkUnnamed1268(core.List<api.PersonEmails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonEmails(o[0]);
   checkPersonEmails(o[1]);
 }
 
 core.int buildCounterPersonImage = 0;
 buildPersonImage() {
   var o = new api.PersonImage();
   buildCounterPersonImage++;
   if (buildCounterPersonImage < 3) {
@@ skipping 70 matching lines @@
     unittest.expect(o.location, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.primary, unittest.isTrue);
     unittest.expect(o.startDate, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPersonOrganizations--;
 }
 
-buildUnnamed159() {
+buildUnnamed1269() {
   var o = new core.List<api.PersonOrganizations>();
   o.add(buildPersonOrganizations());
   o.add(buildPersonOrganizations());
   return o;
 }
 
-checkUnnamed159(core.List<api.PersonOrganizations> o) {
+checkUnnamed1269(core.List<api.PersonOrganizations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonOrganizations(o[0]);
   checkPersonOrganizations(o[1]);
 }
 
 core.int buildCounterPersonPlacesLived = 0;
 buildPersonPlacesLived() {
   var o = new api.PersonPlacesLived();
   buildCounterPersonPlacesLived++;
   if (buildCounterPersonPlacesLived < 3) {
     o.primary = true;
     o.value = "foo";
   }
   buildCounterPersonPlacesLived--;
   return o;
 }
 
 checkPersonPlacesLived(api.PersonPlacesLived o) {
   buildCounterPersonPlacesLived++;
   if (buildCounterPersonPlacesLived < 3) {
     unittest.expect(o.primary, unittest.isTrue);
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterPersonPlacesLived--;
 }
 
-buildUnnamed160() {
+buildUnnamed1270() {
   var o = new core.List<api.PersonPlacesLived>();
   o.add(buildPersonPlacesLived());
   o.add(buildPersonPlacesLived());
   return o;
 }
 
-checkUnnamed160(core.List<api.PersonPlacesLived> o) {
+checkUnnamed1270(core.List<api.PersonPlacesLived> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonPlacesLived(o[0]);
   checkPersonPlacesLived(o[1]);
 }
 
 core.int buildCounterPersonUrls = 0;
 buildPersonUrls() {
   var o = new api.PersonUrls();
   buildCounterPersonUrls++;
   if (buildCounterPersonUrls < 3) {
     o.label = "foo";
     o.type = "foo";
     o.value = "foo";
   }
   buildCounterPersonUrls--;
   return o;
 }
 
 checkPersonUrls(api.PersonUrls o) {
   buildCounterPersonUrls++;
   if (buildCounterPersonUrls < 3) {
     unittest.expect(o.label, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterPersonUrls--;
 }
 
-buildUnnamed161() {
+buildUnnamed1271() {
   var o = new core.List<api.PersonUrls>();
   o.add(buildPersonUrls());
   o.add(buildPersonUrls());
   return o;
 }
 
-checkUnnamed161(core.List<api.PersonUrls> o) {
+checkUnnamed1271(core.List<api.PersonUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonUrls(o[0]);
   checkPersonUrls(o[1]);
 }
 
 core.int buildCounterPerson = 0;
 buildPerson() {
   var o = new api.Person();
   buildCounterPerson++;
   if (buildCounterPerson < 3) {
     o.aboutMe = "foo";
     o.ageRange = buildPersonAgeRange();
     o.birthday = "foo";
     o.braggingRights = "foo";
     o.circledByCount = 42;
     o.cover = buildPersonCover();
     o.currentLocation = "foo";
     o.displayName = "foo";
     o.domain = "foo";
-    o.emails = buildUnnamed158();
+    o.emails = buildUnnamed1268();
     o.etag = "foo";
     o.gender = "foo";
     o.id = "foo";
     o.image = buildPersonImage();
     o.isPlusUser = true;
     o.kind = "foo";
     o.language = "foo";
     o.name = buildPersonName();
     o.nickname = "foo";
     o.objectType = "foo";
     o.occupation = "foo";
-    o.organizations = buildUnnamed159();
-    o.placesLived = buildUnnamed160();
+    o.organizations = buildUnnamed1269();
+    o.placesLived = buildUnnamed1270();
     o.plusOneCount = 42;
     o.relationshipStatus = "foo";
     o.skills = "foo";
     o.tagline = "foo";
     o.url = "foo";
-    o.urls = buildUnnamed161();
+    o.urls = buildUnnamed1271();
     o.verified = true;
   }
   buildCounterPerson--;
   return o;
 }
 
 checkPerson(api.Person o) {
   buildCounterPerson++;
   if (buildCounterPerson < 3) {
     unittest.expect(o.aboutMe, unittest.equals('foo'));
     checkPersonAgeRange(o.ageRange);
     unittest.expect(o.birthday, unittest.equals('foo'));
     unittest.expect(o.braggingRights, unittest.equals('foo'));
     unittest.expect(o.circledByCount, unittest.equals(42));
     checkPersonCover(o.cover);
     unittest.expect(o.currentLocation, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.domain, unittest.equals('foo'));
-    checkUnnamed158(o.emails);
+    checkUnnamed1268(o.emails);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.gender, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkPersonImage(o.image);
     unittest.expect(o.isPlusUser, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.language, unittest.equals('foo'));
     checkPersonName(o.name);
     unittest.expect(o.nickname, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.occupation, unittest.equals('foo'));
-    checkUnnamed159(o.organizations);
-    checkUnnamed160(o.placesLived);
+    checkUnnamed1269(o.organizations);
+    checkUnnamed1270(o.placesLived);
     unittest.expect(o.plusOneCount, unittest.equals(42));
     unittest.expect(o.relationshipStatus, unittest.equals('foo'));
     unittest.expect(o.skills, unittest.equals('foo'));
     unittest.expect(o.tagline, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
-    checkUnnamed161(o.urls);
+    checkUnnamed1271(o.urls);
     unittest.expect(o.verified, unittest.isTrue);
   }
   buildCounterPerson--;
 }
 
 core.int buildCounterPlaceAddress = 0;
 buildPlaceAddress() {
   var o = new api.PlaceAddress();
   buildCounterPlaceAddress++;
   if (buildCounterPlaceAddress < 3) {
@@ skipping 485 matching lines @@
       var o = buildPlusAclentryResource();
       var od = new api.PlusAclentryResource.fromJson(o.toJson());
       checkPlusAclentryResource(od);
     });
   });
 
 
   unittest.group("resource-ActivitiesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusApi(mock).activities;
       var arg_activityId = "foo";
       mock.register(unittest.expectAsync((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 + 8), unittest.equals("plus/v1/"));
@@ skipping 19 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_activityId).then(unittest.expectAsync(((api.Activity response) {
         checkActivity(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusApi(mock).activities;
       var arg_userId = "foo";
       var arg_collection = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
@@ skipping 31 matching lines @@
           }
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivityFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ActivityFeed response) {
         checkActivityFeed(response);
       })));
     });
 
     unittest.test("method--search", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusApi(mock).activities;
       var arg_query = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
@@ skipping 25 matching lines @@
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["orderBy"].first, unittest.equals(arg_orderBy));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivityFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.search(arg_query, language: arg_language, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ActivityFeed response) {
         checkActivityFeed(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-CommentsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusApi(mock).comments;
       var arg_commentId = "foo";
       mock.register(unittest.expectAsync((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 + 8), unittest.equals("plus/v1/"));
@@ skipping 19 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_commentId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusApi(mock).comments;
       var arg_activityId = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_sortOrder = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
@@ skipping 29 matching lines @@
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
         unittest.expect(queryMap["sortOrder"].first, unittest.equals(arg_sortOrder));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_activityId, maxResults: arg_maxResults, pageToken: arg_pageToken, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.CommentFeed response) {
         checkCommentFeed(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-MomentsResourceApi", () {
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MomentsResourceApi res = new api.PlusApi(mock).moments;
       var arg_request = buildMoment();
       var arg_userId = "foo";
       var arg_collection = "foo";
       var arg_debug = true;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.Moment.fromJson(json);
         checkMoment(obj);
 
         var path = (req.url).path;
@@ skipping 33 matching lines @@
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
         unittest.expect(queryMap["debug"].first, unittest.equals("$arg_debug"));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMoment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userId, arg_collection, debug: arg_debug).then(unittest.expectAsync(((api.Moment response) {
         checkMoment(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MomentsResourceApi res = new api.PlusApi(mock).moments;
       var arg_userId = "foo";
       var arg_collection = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_targetUrl = "foo";
       var arg_type = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ skipping 35 matching lines @@
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
         unittest.expect(queryMap["targetUrl"].first, unittest.equals(arg_targetUrl));
         unittest.expect(queryMap["type"].first, unittest.equals(arg_type));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMomentsFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken, targetUrl: arg_targetUrl, type: arg_type).then(unittest.expectAsync(((api.MomentsFeed response) {
         checkMomentsFeed(response);
       })));
     });
 
     unittest.test("method--remove", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MomentsResourceApi res = new api.PlusApi(mock).moments;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((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 + 8), unittest.equals("plus/v1/"));
@@ skipping 19 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.remove(arg_id).then(unittest.expectAsync((_) {}));
     });
 
   });
 
 
   unittest.group("resource-PeopleResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusApi(mock).people;
       var arg_userId = "foo";
       mock.register(unittest.expectAsync((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 + 8), unittest.equals("plus/v1/"));
@@ skipping 19 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPerson());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId).then(unittest.expectAsync(((api.Person response) {
         checkPerson(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusApi(mock).people;
       var arg_userId = "foo";
       var arg_collection = "foo";
       var arg_maxResults = 42;
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
@@ skipping 33 matching lines @@
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["orderBy"].first, unittest.equals(arg_orderBy));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
       })));
     });
 
     unittest.test("method--listByActivity", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusApi(mock).people;
       var arg_activityId = "foo";
       var arg_collection = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
@@ skipping 31 matching lines @@
           }
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listByActivity(arg_activityId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
       })));
     });
 
     unittest.test("method--search", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusApi(mock).people;
       var arg_query = "foo";
       var arg_language = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
@@ skipping 23 matching lines @@
         unittest.expect(queryMap["query"].first, unittest.equals(arg_query));
         unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.search(arg_query, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
       })));
     });
 
   });
 
 
 }